Merge branch 'main' into feat/playbook

README.md

@@ -1,5 +1,8 @@
 # Ansible Collection
 
-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.
+Opinionated set of roles to configure reasonable defaults for newly provisioned virtual machines. The repository provides:
+- 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

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

playbooks/setup.yml

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

roles/docker/tasks/main.yml

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

roles/users/tasks/main.yml

@@ -1,9 +1,9 @@
 ---
 - name: Set up primary sysadmin user
-  when: deployment_public_ssh_key is defined
+  when: sysadmin_public_ssh_key is defined
   become: true
   block:
-    - name: Create user
+    - name: Create sysadmin user
       ansible.builtin.user:
         name: "{{ sysadmin_user }}"
         groups: sudo
@@ -29,7 +29,7 @@
   when: deployment_public_ssh_key is defined
   become: true
   block:
-    - name: Create user
+    - name: Create deployment user
       ansible.builtin.user:
         name: deployment
         shell: /bin/bash