diff --git a/roles/web_logs/meta/main.yml b/roles/web_logs/meta/main.yml deleted file mode 100644 index 61cc3ce..0000000 --- a/roles/web_logs/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - {role: ssh_known_hosts} diff --git a/roles/web_logs/tasks/main.yml b/roles/web_logs/tasks/main.yml index d554ce8..0cb63fb 100644 --- a/roles/web_logs/tasks/main.yml +++ b/roles/web_logs/tasks/main.yml @@ -2,6 +2,7 @@ - name: Create logsync group ansible.builtin.group: name: logsync + gid: 312 system: true - name: Create logsync user @@ -11,72 +12,15 @@ createhome: false group: logsync home: /var/empty - shell: /sbin/nologin + shell: /bin/sh system: true + uid: 312 -- name: Create logsync ssh key directory - ansible.builtin.file: - path: /etc/ssh/logsync - state: directory - mode: "0750" - owner: root - group: logsync - -- name: Create logsync ssh keys - ansible.builtin.command: - argv: - - ssh-keygen - - -t - - ed25519 - - -C - - "logsync@{{ inventory_hostname }}" - - -N - - "" - - -f - - /etc/ssh/logsync/id_ed25519 - creates: /etc/ssh/logsync/id_ed25519 - -- name: Fix logsync ssh key permissions - ansible.builtin.file: - path: "{{ item }}" - owner: root - group: logsync - mode: "0640" - with_items: - - /etc/ssh/logsync/id_ed25519 - - /etc/ssh/logsync/id_ed25519.pub - -- name: Import rclone role - ansible.builtin.import_role: +- name: Include rclone role + ansible.builtin.include_role: name: rclone vars: - local_user: logsync - remote_user: logsync - hostgroup: webservers - destination: /var/cache/sync-http-logs - private_key: /etc/ssh/logsync/id_ed25519 + rclone_hostgroup: proxy + rclone_service: logsync -- name: Create cache directory - ansible.builtin.file: - path: /var/cache/sync-http-logs - state: directory - mode: "0750" - owner: logsync - group: logsync -- name: Create log directory - ansible.builtin.file: - path: /export/web-log - state: directory - mode: "0750" - owner: root - group: "{{ ansible_wheel }}" - -- name: Link data directory - ansible.builtin.file: - dest: /srv/web-log - src: /export/web-log - state: link - owner: root - group: "{{ ansible_wheel }}" - follow: false diff --git a/roles/web_logs/templates/rclone.conf.j2 b/roles/web_logs/templates/rclone.conf.j2 deleted file mode 100644 index 34524ec..0000000 --- a/roles/web_logs/templates/rclone.conf.j2 +++ /dev/null @@ -1,10 +0,0 @@ -# {{ ansible_managed }} -{% for host in groups['webservers'] %} - -[{{ host.split('.')[0] }}] -type = sftp -host = {{ host }} -user = logsync -key_file = ~/.ssh/id_ed25519 -known_hosts_file = /etc/ssh/ssh_known_hosts -{% endfor %} diff --git a/users.md b/users.md index 132c84e..70e9176 100644 --- a/users.md +++ b/users.md @@ -17,3 +17,4 @@ entry empty. If only a group is created, leave the user entry empty. | 309 | mirror | mirror | | | 310 | collab | collab | | | 311 | docker | docker | docker registry | +| 312 | logsync | logsync | nginx log sync |