diff --git a/hosts.yml b/hosts.yml index ec9714c..25a83fd 100644 --- a/hosts.yml +++ b/hosts.yml @@ -108,20 +108,6 @@ sftpbackup: collab: ldap: sqldb: -webservers: - children: - adm: - collab: - git: - ldap: - mirror: - munin: - ns: - proxy: - relay: - shell: - static: - zm: vultr: hosts: diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml index 9688781..0dbdd6f 100644 --- a/roles/apache/tasks/main.yml +++ b/roles/apache/tasks/main.yml @@ -68,22 +68,6 @@ group: "{{ ansible_wheel }}" notify: Restart apache -- name: Fix log directory permissions - ansible.builtin.file: - path: /var/log/httpd - state: directory - mode: 0755 - owner: root - group: "{{ ansible_wheel }}" - -- name: Import sftpuser role - ansible.builtin.import_role: - name: sftpuser - vars: - chroot: "/var/log/httpd" - user: logsync - publickeys: "{{ logsync_publickeys }}" - - name: Enable apache ansible.builtin.service: name: httpd diff --git a/roles/nginx/server/tasks/main.yml b/roles/nginx/server/tasks/main.yml index 66602dc..6db2997 100644 --- a/roles/nginx/server/tasks/main.yml +++ b/roles/nginx/server/tasks/main.yml @@ -51,49 +51,6 @@ group: "{{ ansible_wheel }}" notify: Restart nginx -- name: Fix logdir permissions - ansible.builtin.file: - path: "{{ nginx_logdir }}" - state: directory - mode: 0755 - owner: root - group: "{{ ansible_wheel }}" - -- name: Disable system log rotate - ansible.builtin.lineinfile: - path: /etc/newsyslog.conf - state: absent - regexp: '^/var/www/logs/{{ item }}\s+.*' - with_items: - - access.log - - error.log - when: ansible_os_family == "OpenBSD" - -- name: Install custom logrotate - ansible.builtin.template: - dest: /usr/local/sbin/nginx-logrotate - src: nginx-logrotate.sh - mode: 0755 - owner: root - group: "{{ ansible_wheel }}" - when: ansible_os_family == "OpenBSD" - -- name: Add logrotate cron job - ansible.builtin.cron: - name: nginx-logrotate - hour: "0" - minute: "0" - job: /usr/local/sbin/nginx-logrotate - when: ansible_os_family == "OpenBSD" - -- name: Import sftpuser role - ansible.builtin.import_role: - name: sftpuser - vars: - chroot: "{{ nginx_logdir }}" - user: logsync - publickeys: "{{ logsync_publickeys }}" - # https://bugzilla.redhat.com/show_bug.cgi?id=1725248 - name: Create drop-in directory for service ansible.builtin.file: