From c35b4a6c322a14900a669589566b90fe5a604d68 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 4 May 2023 00:54:52 -0400 Subject: [PATCH] Add a doas role for both FreeBSD and Linux. --- ansible/playbook.yaml | 1 + ansible/roles/doas/files/doas.conf | 1 + ansible/roles/doas/tasks/common.yaml | 21 ++++++++++++++ ansible/roles/doas/tasks/freebsd.yaml | 11 +++++++ ansible/roles/doas/tasks/linux.yaml | 29 +++++++++++++++++++ ansible/roles/doas/tasks/main.yaml | 2 ++ ansible/roles/doas/tasks/peruser.yaml | 29 +++++++++++++++++++ ansible/roles/doas/tasks/peruser_freebsd.yaml | 0 ansible/roles/doas/tasks/peruser_linux.yaml | 0 9 files changed, 94 insertions(+) create mode 100644 ansible/roles/doas/files/doas.conf create mode 100644 ansible/roles/doas/tasks/common.yaml create mode 100644 ansible/roles/doas/tasks/freebsd.yaml create mode 100644 ansible/roles/doas/tasks/linux.yaml create mode 100644 ansible/roles/doas/tasks/main.yaml create mode 100644 ansible/roles/doas/tasks/peruser.yaml create mode 100644 ansible/roles/doas/tasks/peruser_freebsd.yaml create mode 100644 ansible/roles/doas/tasks/peruser_linux.yaml diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml index 6b912ef..4a1e174 100644 --- a/ansible/playbook.yaml +++ b/ansible/playbook.yaml @@ -3,6 +3,7 @@ ansible_become: True roles: - sudo + - doas - users - package_manager - zfs diff --git a/ansible/roles/doas/files/doas.conf b/ansible/roles/doas/files/doas.conf new file mode 100644 index 0000000..d2423e7 --- /dev/null +++ b/ansible/roles/doas/files/doas.conf @@ -0,0 +1 @@ +permit nopass :wheel diff --git a/ansible/roles/doas/tasks/common.yaml b/ansible/roles/doas/tasks/common.yaml new file mode 100644 index 0000000..9f00756 --- /dev/null +++ b/ansible/roles/doas/tasks/common.yaml @@ -0,0 +1,21 @@ +- name: Install packages + package: + name: + - doas + state: present + +- 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/doas/tasks/freebsd.yaml b/ansible/roles/doas/tasks/freebsd.yaml new file mode 100644 index 0000000..42cb6d9 --- /dev/null +++ b/ansible/roles/doas/tasks/freebsd.yaml @@ -0,0 +1,11 @@ +- name: Install Configuration + copy: + src: "files/{{ item.src }}" + dest: "{{ item.dest }}" + mode: 0644 + owner: root + group: wheel + validate: "doas -C %s" + loop: + - src: doas.conf + dest: /usr/local/etc/doas.conf diff --git a/ansible/roles/doas/tasks/linux.yaml b/ansible/roles/doas/tasks/linux.yaml new file mode 100644 index 0000000..43ba876 --- /dev/null +++ b/ansible/roles/doas/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/doas/tasks/main.yaml b/ansible/roles/doas/tasks/main.yaml new file mode 100644 index 0000000..6805b9d --- /dev/null +++ b/ansible/roles/doas/tasks/main.yaml @@ -0,0 +1,2 @@ +- import_tasks: tasks/common.yaml + # when: foo is defined diff --git a/ansible/roles/doas/tasks/peruser.yaml b/ansible/roles/doas/tasks/peruser.yaml new file mode 100644 index 0000000..111e886 --- /dev/null +++ b/ansible/roles/doas/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/doas/tasks/peruser_freebsd.yaml b/ansible/roles/doas/tasks/peruser_freebsd.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/doas/tasks/peruser_linux.yaml b/ansible/roles/doas/tasks/peruser_linux.yaml new file mode 100644 index 0000000..e69de29