diff --git a/ansible/roles/poudrierenginx/meta/main.yaml b/ansible/roles/poudrierenginx/meta/main.yaml new file mode 100644 index 0000000..ecea872 --- /dev/null +++ b/ansible/roles/poudrierenginx/meta/main.yaml @@ -0,0 +1,2 @@ +dependencies: + - syslog diff --git a/ansible/roles/poudrierenginx/tasks/freebsd.yaml b/ansible/roles/poudrierenginx/tasks/freebsd.yaml index 3be9ee3..4777d27 100644 --- a/ansible/roles/poudrierenginx/tasks/freebsd.yaml +++ b/ansible/roles/poudrierenginx/tasks/freebsd.yaml @@ -41,13 +41,14 @@ dest: /usr/local/etc/nginx/nginx.conf - src: headers.include dest: /usr/local/etc/nginx/conf.d/headers.include -# - name: Install newsyslog configuration -# copy: -# src: "files/{{ item.src }}" -# dest: "{{ item.dest }}" -# mode: 0600 -# owner: root -# group: wheel -# loop: -# - src: newsyslog.conf -# dest: /usr/local/etc/newsyslog.conf.d/nginx.conf + +- name: Install newsyslog configuration + copy: + src: "files/{{ item.src }}" + dest: "{{ item.dest }}" + mode: 0600 + owner: root + group: wheel + loop: + - src: newsyslog.conf + dest: /usr/local/etc/newsyslog.conf.d/nginx.conf diff --git a/ansible/roles/syslog/files/syslogd_rc.conf b/ansible/roles/syslog/files/syslogd_rc.conf new file mode 100644 index 0000000..7376416 --- /dev/null +++ b/ansible/roles/syslog/files/syslogd_rc.conf @@ -0,0 +1,5 @@ +# One -s disables connections from remote machines, two disables +# network entirely which blocks logging to remote machines + +syslogd_enable="YES" +syslogd_flags="-ss -v -v" diff --git a/ansible/roles/syslog/tasks/common.yaml b/ansible/roles/syslog/tasks/common.yaml new file mode 100644 index 0000000..fef1101 --- /dev/null +++ b/ansible/roles/syslog/tasks/common.yaml @@ -0,0 +1,15 @@ +- import_tasks: tasks/freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/linux.yaml + when: 'os_flavor == "linux"' + +- include_tasks: + file: tasks/peruser.yaml + apply: + become: yes + become_user: "{{ initialize_user }}" + when: users is defined + loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}" + loop_control: + loop_var: initialize_user diff --git a/ansible/roles/syslog/tasks/freebsd.yaml b/ansible/roles/syslog/tasks/freebsd.yaml new file mode 100644 index 0000000..4c83ffc --- /dev/null +++ b/ansible/roles/syslog/tasks/freebsd.yaml @@ -0,0 +1,19 @@ +- name: Create directories + file: + name: "{{ item }}" + state: directory + mode: 0755 + owner: root + group: wheel + loop: + - /usr/local/etc/newsyslog.conf.d + +- name: Install service configuration + copy: + src: "files/{{ item }}_rc.conf" + dest: "/etc/rc.conf.d/{{ item }}" + mode: 0644 + owner: root + group: wheel + loop: + - syslogd diff --git a/ansible/roles/syslog/tasks/linux.yaml b/ansible/roles/syslog/tasks/linux.yaml new file mode 100644 index 0000000..43ba876 --- /dev/null +++ b/ansible/roles/syslog/tasks/linux.yaml @@ -0,0 +1,29 @@ +# - name: Build aur packages +# register: buildaur +# become_user: "{{ build_user.name }}" +# command: "aurutils-sync --no-view {{ item }}" +# args: +# creates: "/var/cache/pacman/custom/{{ item }}-*.pkg.tar.*" +# loop: +# - foo + +# - name: Update cache +# when: buildaur.changed +# pacman: +# name: [] +# state: present +# update_cache: true + +# - name: Install packages +# package: +# name: +# - foo +# state: present + +# - name: Enable services +# systemd: +# enabled: yes +# name: "{{ item }}" +# daemon_reload: yes +# loop: +# - foo.service diff --git a/ansible/roles/syslog/tasks/main.yaml b/ansible/roles/syslog/tasks/main.yaml new file mode 100644 index 0000000..6805b9d --- /dev/null +++ b/ansible/roles/syslog/tasks/main.yaml @@ -0,0 +1,2 @@ +- import_tasks: tasks/common.yaml + # when: foo is defined diff --git a/ansible/roles/syslog/tasks/peruser.yaml b/ansible/roles/syslog/tasks/peruser.yaml new file mode 100644 index 0000000..111e886 --- /dev/null +++ b/ansible/roles/syslog/tasks/peruser.yaml @@ -0,0 +1,29 @@ +- include_role: + name: per_user + +# - name: Create directories +# file: +# name: "{{ account_homedir.stdout }}/{{ item }}" +# state: directory +# mode: 0700 +# owner: "{{ account_name.stdout }}" +# group: "{{ group_name.stdout }}" +# loop: +# - ".config/foo" + +# - name: Copy files +# copy: +# src: "files/{{ item.src }}" +# dest: "{{ account_homedir.stdout }}/{{ item.dest }}" +# mode: 0600 +# owner: "{{ account_name.stdout }}" +# group: "{{ group_name.stdout }}" +# loop: +# - src: foo.conf +# dest: .config/foo/foo.conf + +- import_tasks: tasks/peruser_freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/peruser_linux.yaml + when: 'os_flavor == "linux"' diff --git a/ansible/roles/syslog/tasks/peruser_freebsd.yaml b/ansible/roles/syslog/tasks/peruser_freebsd.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/syslog/tasks/peruser_linux.yaml b/ansible/roles/syslog/tasks/peruser_linux.yaml new file mode 100644 index 0000000..e69de29