feat: set feature flags to opt in or out of tasks

users/tasks/main.yml functions as a thin dispatcher with logical steps imported from their own files gated by a variable

.gitignore

@@ -1,4 +1,4 @@
 ## OS generated files
 # macOS
 .DS_Store
-._*
+._*

README.md

@@ -1,8 +1,5 @@
 # Ansible Collection
 
-Opinionated set of roles to configure reasonable defaults for newly provisioned virtual machines. The repository provides:
+Opinionated set of roles to configure reasonable defaults for newly provisioned virtual machines. The repository provides a ready-to-use Ansible Collection (`studio.ansible`) containing reusable roles.
-- An Ansible Collection (`studio.ansible`) containing reusable roles. Use with ansible-galaxy's `requirements.yml`.
-- A ready-to-use playbook configured by passing CLI vars `--extra-vars "ansible_host=${HOST_IP}` locally or through CI / CD.
 
 Currently only supports Debian-based systems.
-

inventory/hosts.ini

@@ -1,5 +0,0 @@
-[target]
-target_host ansible_host="{{ ansible_host }}"
-
-[all:vars]
-ansible_user="{{ ansible_user }}"

playbooks/setup.yml

@@ -1,11 +0,0 @@
----
-- name: Setup machines
-  hosts: all
-  become: true
-
-  roles:
-    - base
-    - users
-    - security
-    - docker
-    # - backup

roles/docker/tasks/main.yml

@@ -39,10 +39,9 @@
         enabled: true
 
 - name: Configure deployment user for Docker
-  when: deployment_public_ssh_key is defined
   become: true
   block:
-    - name: Add deployment user to docker group
+    - name: Add user to docker group
       ansible.builtin.user:
         name: deployment
         groups: docker
@@ -65,7 +64,7 @@
         state: present
         gid: 9999
 
-    - name: Create appuser
+    - name: Create user
       ansible.builtin.user:
         name: appuser
         state: present

roles/users/defaults/main.yml

@@ -0,0 +1,3 @@
+---
+users_setup_sysadmin: true
+users_setup_deployment: false   # opt-in: enable explicitly to use

roles/users/tasks/deployment.yml

@@ -0,0 +1,14 @@
+---
+- name: Create deployment user for CI/CD
+  ansible.builtin.user:
+    name: deployment
+    shell: /bin/bash
+    create_home: yes
+  become: true
+
+- name: Add SSH public key for deployment user
+  ansible.posix.authorized_key:
+    user: deployment
+    state: present
+    key: "{{ deployment_public_ssh_key }}"
+  become: true

roles/users/tasks/main.yml

@@ -1,42 +1,14 @@
 ---
-- name: Set up primary sysadmin user
+- name: Configure sysadmin user
-  when: sysadmin_public_ssh_key is defined
+  ansible.builtin.import_tasks: sysadmin.yml
-  become: true
+  when: users_setup_sysadmin | bool
-  block:
-    - name: Create sysadmin user
-      ansible.builtin.user:
-        name: "{{ sysadmin_user }}"
-        groups: sudo
-        append: yes
-        shell: /bin/bash
-        create_home: yes
 
-    - name: Add SSH public key
+- name: Configure deployment user
-      ansible.posix.authorized_key:
+  ansible.builtin.import_tasks: deployment.yml
-        user: "{{ sysadmin_user }}"
+  when: users_setup_deployment | bool
-        state: present
-        key: "{{ sysadmin_public_ssh_key }}"
 
-    - name: Allow passwordless sudo
+# opt in to feature flags / tasks with:
-      ansible.builtin.copy:
+# roles:
-        dest: /etc/sudoers.d/sudo-nopasswd
+#   - role: studio.ansible.users
-        content: "%sudo ALL=(ALL) NOPASSWD: ALL"
+#     vars:
-        mode: "0440"
+#       users_setup_deployment: true
-        validate: /usr/sbin/visudo -cf %s
-
-
-- name: Set up deployment user for CI/CD
-  when: deployment_public_ssh_key is defined
-  become: true
-  block:
-    - name: Create deployment user
-      ansible.builtin.user:
-        name: deployment
-        shell: /bin/bash
-        create_home: yes
-
-    - name: Add SSH public key
-      ansible.posix.authorized_key:
-        user: deployment
-        state: present
-        key: "{{ deployment_public_ssh_key }}"

roles/users/tasks/sysadmin.yml

@@ -0,0 +1,24 @@
+---
+- name: Create primary sysadmin user
+  ansible.builtin.user:
+    name: "{{ sysadmin_user }}"
+    groups: sudo
+    append: yes
+    shell: /bin/bash
+    create_home: yes
+  become: true
+
+- name: Add SSH public key for sysadmin
+  ansible.posix.authorized_key:
+    user: "{{ sysadmin_user }}"
+    state: present
+    key: "{{ sysadmin_public_ssh_key }}"
+  become: true
+
+- name: Allow passwordless sudo for sudo group
+  ansible.builtin.copy:
+    dest: /etc/sudoers.d/sudo-nopasswd
+    content: "%sudo ALL=(ALL) NOPASSWD: ALL"
+    mode: "0440"
+    validate: /usr/sbin/visudo -cf %s
+  become: true