From 2b1a2bf1d6a6564994abd8c4517a411abcd328f1 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 15 Oct 2022 19:59:25 -0400 Subject: [PATCH] Import the FreeBSD ntp role. --- ansible/playbook.yaml | 1 + ansible/roles/base/files/homeserver_rc.conf | 1 - ansible/roles/base/files/odofreebsd_rc.conf | 1 - ansible/roles/ntp/files/rc.conf | 1 + ansible/roles/ntp/handlers/main.yaml | 4 +++ ansible/roles/ntp/tasks/common.yaml | 14 ++++++++++ ansible/roles/ntp/tasks/freebsd.yaml | 11 ++++++++ ansible/roles/ntp/tasks/linux.yaml | 6 ++++ ansible/roles/ntp/tasks/main.yaml | 1 + ansible/roles/ntp/tasks/peruser.yaml | 29 ++++++++++++++++++++ ansible/roles/ntp/tasks/peruser_freebsd.yaml | 0 ansible/roles/ntp/tasks/peruser_linux.yaml | 0 12 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 ansible/roles/ntp/files/rc.conf create mode 100644 ansible/roles/ntp/handlers/main.yaml create mode 100644 ansible/roles/ntp/tasks/common.yaml create mode 100644 ansible/roles/ntp/tasks/freebsd.yaml create mode 100644 ansible/roles/ntp/tasks/linux.yaml create mode 100644 ansible/roles/ntp/tasks/main.yaml create mode 100644 ansible/roles/ntp/tasks/peruser.yaml create mode 100644 ansible/roles/ntp/tasks/peruser_freebsd.yaml create mode 100644 ansible/roles/ntp/tasks/peruser_linux.yaml diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml index 022ff3e..e93263f 100644 --- a/ansible/playbook.yaml +++ b/ansible/playbook.yaml @@ -11,3 +11,4 @@ - base - firewall - cpu + - ntp diff --git a/ansible/roles/base/files/homeserver_rc.conf b/ansible/roles/base/files/homeserver_rc.conf index 080e10b..0633277 100644 --- a/ansible/roles/base/files/homeserver_rc.conf +++ b/ansible/roles/base/files/homeserver_rc.conf @@ -4,7 +4,6 @@ sendmail_enable="NONE" hostname="computer" local_unbound_enable="YES" sshd_enable="YES" -ntpd_enable="YES" powerd_enable="YES" dumpdev="NO" zfs_enable="YES" diff --git a/ansible/roles/base/files/odofreebsd_rc.conf b/ansible/roles/base/files/odofreebsd_rc.conf index c14feb0..25fd6cf 100644 --- a/ansible/roles/base/files/odofreebsd_rc.conf +++ b/ansible/roles/base/files/odofreebsd_rc.conf @@ -4,7 +4,6 @@ sendmail_enable="NONE" hostname="odo" local_unbound_enable="YES" sshd_enable="YES" -ntpd_enable="YES" powerd_enable="YES" # Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable dumpdev="NO" diff --git a/ansible/roles/ntp/files/rc.conf b/ansible/roles/ntp/files/rc.conf new file mode 100644 index 0000000..a0ef512 --- /dev/null +++ b/ansible/roles/ntp/files/rc.conf @@ -0,0 +1 @@ +ntpdate_enable="YES" diff --git a/ansible/roles/ntp/handlers/main.yaml b/ansible/roles/ntp/handlers/main.yaml new file mode 100644 index 0000000..6a4732d --- /dev/null +++ b/ansible/roles/ntp/handlers/main.yaml @@ -0,0 +1,4 @@ +- name: restart ntpdate + service: + name: ntpdate + state: restarted diff --git a/ansible/roles/ntp/tasks/common.yaml b/ansible/roles/ntp/tasks/common.yaml new file mode 100644 index 0000000..d7c1735 --- /dev/null +++ b/ansible/roles/ntp/tasks/common.yaml @@ -0,0 +1,14 @@ +- 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 }}" + loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}" + loop_control: + loop_var: initialize_user diff --git a/ansible/roles/ntp/tasks/freebsd.yaml b/ansible/roles/ntp/tasks/freebsd.yaml new file mode 100644 index 0000000..ac5b062 --- /dev/null +++ b/ansible/roles/ntp/tasks/freebsd.yaml @@ -0,0 +1,11 @@ +- name: Install Configuration + notify: restart ntpdate + copy: + src: "files/{{ item.src }}" + dest: "{{ item.dest }}" + mode: 0644 + owner: root + group: wheel + loop: + - src: rc.conf + dest: /etc/rc.conf.d/ntpdate diff --git a/ansible/roles/ntp/tasks/linux.yaml b/ansible/roles/ntp/tasks/linux.yaml new file mode 100644 index 0000000..e1835f0 --- /dev/null +++ b/ansible/roles/ntp/tasks/linux.yaml @@ -0,0 +1,6 @@ +# - name: Install packages +# pacman: +# name: +# - foo +# state: present +# update_cache: true diff --git a/ansible/roles/ntp/tasks/main.yaml b/ansible/roles/ntp/tasks/main.yaml new file mode 100644 index 0000000..5c1df6c --- /dev/null +++ b/ansible/roles/ntp/tasks/main.yaml @@ -0,0 +1 @@ +- import_tasks: tasks/common.yaml diff --git a/ansible/roles/ntp/tasks/peruser.yaml b/ansible/roles/ntp/tasks/peruser.yaml new file mode 100644 index 0000000..111e886 --- /dev/null +++ b/ansible/roles/ntp/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/ntp/tasks/peruser_freebsd.yaml b/ansible/roles/ntp/tasks/peruser_freebsd.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/ntp/tasks/peruser_linux.yaml b/ansible/roles/ntp/tasks/peruser_linux.yaml new file mode 100644 index 0000000..e69de29