diff --git a/files/apache/syslog.conf b/files/apache/syslog.conf new file mode 100644 index 0000000..9add43d --- /dev/null +++ b/files/apache/syslog.conf @@ -0,0 +1,2 @@ +CustomLog "| /usr/bin/logger -thttpd -plocal6.info" combined +ErrorLog "| /usr/bin/logger -thttpd -plocal6.error" diff --git a/files/nginx/syslog.conf b/files/nginx/syslog.conf new file mode 100644 index 0000000..ae738f7 --- /dev/null +++ b/files/nginx/syslog.conf @@ -0,0 +1,2 @@ +access_log syslog:server=unix:/dev/log,tag=nginx,facility=local7,severity=info; +error_log syslog:server=unix:/dev/log,tag=nginx,facility=local7,severity=error; diff --git a/tasks/apache/install.yml b/tasks/apache/install.yml index 075adfe..dd95fc5 100644 --- a/tasks/apache/install.yml +++ b/tasks/apache/install.yml @@ -12,6 +12,8 @@ group: root with_items: - '{{ common__apache__conf_dir }}' + - '{{ common__apache__conf_available_dir }}' + - '{{ common__apache__conf_enabled_dir }}' - '{{ common__apache__available_dir }}' - '{{ common__apache__enabled_dir }}' - '{{ common__apache__snippets_dir }}' @@ -32,6 +34,24 @@ line: 'Options FollowSymLinks' notify: common | Restart Apache +- name: Install Apache log config + copy: + src: 'files/apache/syslog.conf' + dest: '{{ common__apache__conf_available_dir }}/syslog.conf' + mode: 'u=rw,g=r,o=r' + owner: root + group: root + notify: common | Restart Apache + +- name: Enable Apache log config + file: + state: link + src: '{{ common__apache__conf_available_dir }}/syslog.conf' + dest: '{{ common__apache__conf_enabled_dir }}/syslog.conf' + owner: root + group: root + notify: common | Restart Apache + - name: Remove Apache default site file: state: absent diff --git a/tasks/nginx/install.yml b/tasks/nginx/install.yml index 794a53c..b4bb66e 100644 --- a/tasks/nginx/install.yml +++ b/tasks/nginx/install.yml @@ -16,6 +16,16 @@ - '{{ common__nginx__available_dir }}' - '{{ common__nginx__enabled_dir }}' - '{{ common__nginx__snippets_dir }}' + notify: common | Restart Nginx + +- name: Install Nginx log config + copy: + src: 'files/nginx/syslog.conf' + dest: '{{ common__nginx__confd_dir }}/syslog.conf' + mode: 'u=rw,g=r,o=r' + owner: root + group: root + notify: common | Restart Nginx - name: Remove Nginx default site file: diff --git a/vars/main.yml b/vars/main.yml index a0d0e8f..a427281 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -14,6 +14,8 @@ common__nginx__enabled_dir: '{{ common__nginx__conf_dir }}/sites-enabled' common__nginx__snippets_dir: '{{ common__nginx__conf_dir }}/snippets' common__apache__conf_dir: '/etc/apache2' +common__apache__conf_available_dir: '{{ common__apache__conf_dir }}/conf-available' +common__apache__conf_enabled_dir: '{{ common__apache__conf_dir }}/conf-enabled' common__apache__available_dir: '{{ common__apache__conf_dir }}/sites-available' common__apache__enabled_dir: '{{ common__apache__conf_dir }}/sites-enabled' common__apache__snippets_dir: '{{ common__apache__conf_dir }}/snippets'