Merge branch 'main' into feat/playbook

.gitignore

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

README.md

@@ -1,3 +1,8 @@
-Opinionated set of roles to configure reasonable defaults for newly provisioned virtual machines. The repository provides a ready-to-use Ansible Collection (`studiovitali.ansible`) containing reusable roles.
+# Ansible Collection
+
+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.
+

galaxy.yml

@@ -1,9 +1,9 @@
 ## galaxy.yml
 
-namespace: studiovitali
+namespace: studio
 name: ansible
 readme: README.md
-version: 0.1.1
+version: 0.0.1
 authors:
   - Studio Vitali
 description: Studio Ansible collection containing common roles

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/base/defaults/main.yml

@@ -9,6 +9,6 @@ base_packages:
   - rsync
   - unzip
   - unattended-upgrades
-  # - acl ## needed for ansible to become unprivileged user
+  # - acl ## needed for Ansible to become unprivileged user
   # - python3-pip
   # - wget

roles/base/tasks/main.yml

@@ -26,7 +26,7 @@
     state: present
     update_cache: true
   become: true
-
+#
 # - name: Enable unattended-upgrades
 #   ansible.builtin.copy:
 #     dest: /etc/apt/apt.conf.d/20auto-upgrades
@@ -35,14 +35,3 @@
 #       APT::Periodic::Unattended-Upgrade "1";
 #     mode: "0644"
 #   when: ansible_facts['os_family'] == "Debian"
-
-- name: Check if reboot is required
-  ansible.builtin.stat:
-    path: /var/run/reboot-required
-  register: reboot_required_file
-
-- name: Reboot host if necessary
-  ansible.builtin.reboot:
-    post_reboot_delay: 10
-  become: true
-  when: reboot_required_file.stat.exists

roles/security/handlers/main.yml

@@ -1,6 +1,5 @@
 ---
 - name: Restart sshd
-  become: true
   ansible.builtin.service:
     name: ssh
     state: restarted

roles/security/tasks/main.yml

@@ -17,7 +17,6 @@
         owner: root
         group: root
         mode: "0644"
-        validate: /usr/sbin/sshd -t -f %s
       notify: Restart sshd
 
 - name: Enable fail2ban
@@ -33,4 +32,4 @@
       ansible.builtin.service:
         name: fail2ban
         state: started
-        enabled: true
+        enabled: yes