Skip to content

Commit 944e39e

Browse files
committed
ansible: Extract syslog-client role
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 1fedae6 commit 944e39e

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- name: restart rsyslog
2+
service: name=rsyslog state=restarted
+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
- name: Install rsyslog-relp
2+
apt: name=rsyslog-relp state=present
3+
- name: Configure rsyslog
4+
copy:
5+
dest: /etc/rsyslog.d/scripts-syslog-client.conf
6+
content: |
7+
$ModLoad omrelp
8+
{% for rsyslog in rsyslogs %}
9+
{% if loop.first %}
10+
*.info :omrelp:{{ rsyslog }}:2514
11+
$ActionExecOnlyWhenPreviousIsSuspended on
12+
{% else %}
13+
& :omrelp:{{ rsyslog }}:2514
14+
{% endif %}
15+
{% endfor %}
16+
$ActionExecOnlyWhenPreviousIsSuspended off
17+
notify: restart rsyslog

ansible/scripts-directors.yml

+1-18
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
with_items:
2323
- open-vm-tools
2424
- open-vm-tools-dkms
25-
- rsyslog-relp
2625
- exim4-daemon-light
2726
- resolvconf
2827
- mlocate
@@ -49,26 +48,12 @@
4948
- setup
5049
roles:
5150
- k5login
51+
- syslog-client
5252
- ldirectord-status
5353
- lvs-iptables
5454
- lvs-lighttpd
5555
- munin-node
5656
tasks:
57-
- name: Configure rsyslog
58-
copy:
59-
dest: /etc/rsyslog.d/scripts-syslog-client.conf
60-
content: |
61-
$ModLoad omrelp
62-
{% for rsyslog in rsyslogs %}
63-
{% if loop.first %}
64-
*.info :omrelp:{{ rsyslog }}:2514
65-
$ActionExecOnlyWhenPreviousIsSuspended on
66-
{% else %}
67-
& :omrelp:{{ rsyslog }}:2514
68-
{% endif %}
69-
{% endfor %}
70-
$ActionExecOnlyWhenPreviousIsSuspended off
71-
notify: restart rsyslog
7257
- name: Install munin cps plugin
7358
copy:
7459
dest: /etc/munin/plugins/cps_1_0
@@ -161,8 +146,6 @@
161146
dest: /etc/ha.d/ldirectord.cf
162147
src: files/ldirectord.cf
163148
handlers:
164-
- name: restart rsyslog
165-
service: name=rsyslog state=restarted
166149
- name: newaliases
167150
command: newaliases
168151
- name: load modules

0 commit comments

Comments
 (0)