Add sane defaults for additional config stanzas; Minor cosmetics

This commit is contained in:
Alessio Cassibba (x-drum)
2015-09-04 00:32:22 +02:00
parent 4689c25db4
commit bdf746fa01
6 changed files with 15 additions and 14 deletions

View File

@@ -11,5 +11,6 @@ rsyslog_action_file_default_template: RSYSLOG_TraditionalFileFormat
#rsyslog_action_file_template: "%rawmsg%\n" #rsyslog_action_file_template: "%rawmsg%\n"
#rsyslog_priv_drop_to_user: syslog #rsyslog_priv_drop_to_user: syslog
#rsyslog_priv_drop_to_group: syslog #rsyslog_priv_drop_to_group: syslog
items: []
rsyslog_default_config: "True" rsyslog_default_config: "True"
rsyslog_os_supported: no rsyslog_os_supported: no

View File

@@ -1,5 +1,5 @@
--- ---
- name: rsyslog | restart service - name: restart rsyslog
tags: tags:
- rsyslog - rsyslog
- configuration - configuration

View File

@@ -1,6 +1,6 @@
# Install packages for Archlinux # Install packages for Archlinux
--- ---
- name: Install packages for Archlinux - name: install packages for Archlinux
tags: tags:
- rsyslog - rsyslog
- packages - packages

View File

@@ -1,6 +1,6 @@
# Install packages for Debian # Install packages for Debian
--- ---
- name: Install packages for Debian - name: install packages for Debian
tags: tags:
- rsyslog - rsyslog
- packages - packages

View File

@@ -1,6 +1,6 @@
# Install and configure rsyslog # Install and configure rsyslog
- name: rsyslog | Set OS dependent variables - name: set OS dependent variables
tags: tags:
- rsyslog - rsyslog
- prereq - prereq
@@ -21,7 +21,7 @@
- include: main_arch.yml - include: main_arch.yml
when: ansible_os_family == 'Archlinux' when: ansible_os_family == 'Archlinux'
- name: rsyslog | Setup main configuration - name: setup main configuration
tags: tags:
- rsyslog - rsyslog
- files - files
@@ -32,10 +32,10 @@
group={{ rsyslog_file_group }} group={{ rsyslog_file_group }}
mode={{ rsyslog_file_mode }} mode={{ rsyslog_file_mode }}
notify: notify:
- rsyslog | restart service - restart rsyslog
when: rsyslog_os_supported == True when: rsyslog_os_supported == True
- name: rsyslog | create additional configuration directory - name: create additional configuration directory
tags: tags:
- rsyslog - rsyslog
- files - files
@@ -47,7 +47,7 @@
state=directory state=directory
when: rsyslog_os_supported == True when: rsyslog_os_supported == True
- name: rsyslog | Setup default additional configuration - name: setup default additional configuration
tags: tags:
- rsyslog - rsyslog
- files - files
@@ -71,10 +71,10 @@
- 'local7.* /var/log/boot.log' - 'local7.* /var/log/boot.log'
- '*.* /var/log/uncategorized.log' - '*.* /var/log/uncategorized.log'
notify: notify:
- rsyslog | restart service - restart rsyslog
when: rsyslog_default_config == "True" and rsyslog_os_supported == True when: rsyslog_default_config == "True" and rsyslog_os_supported == True
- name: rsyslog | Setup additional configurations - name: setup additional configurations
tags: tags:
- rsyslog - rsyslog
- files - files
@@ -87,13 +87,13 @@
with_items: with_items:
- "{{ items }}" - "{{ items }}"
notify: notify:
- rsyslog | restart service - restart rsyslog
when: rsyslog_os_supported == True when: rsyslog_os_supported == True
- name: rsyslog | Enable service - name: enable service
tags: tags:
- rsyslog - rsyslog
- configuration - configuration
service: name={{ rsyslog_service_name }} enabled=yes service: name={{ rsyslog_service_name }} enabled=yes state=started
when: rsyslog_os_supported == True when: rsyslog_os_supported == True

View File

@@ -1,6 +1,6 @@
# Install packages for RHEL # Install packages for RHEL
--- ---
- name: Install packages for RHEL - name: install packages for RHEL
tags: tags:
- rsyslog - rsyslog
- packages - packages