From cb30e012997e3b335ff620930cbc42c42c45e600 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Tue, 22 Apr 2025 06:29:17 +0200
Subject: [PATCH] Remove common role usage

---
 ansible.cfg       |  1 -
 handlers.yml      | 25 +++++++++++++++++++++++--
 playbook.yml      |  2 --
 requirements.yml  |  4 ----
 tasks/network.yml |  2 +-
 tasks/setup.yml   |  6 +++---
 6 files changed, 27 insertions(+), 13 deletions(-)
 delete mode 100644 requirements.yml

diff --git a/ansible.cfg b/ansible.cfg
index d3d000d..da825e5 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,5 +1,4 @@
 [defaults]
-roles_path = ./roles
 ask_vault_pass = True
 
 [privilege_escalation]
diff --git a/handlers.yml b/handlers.yml
index e3927a7..214addc 100644
--- a/handlers.yml
+++ b/handlers.yml
@@ -12,9 +12,19 @@
     state: restarted
     enabled: true
 
-- name: regenerate initramfs
+- name: restart nftables
   become: true
-  command: update-initramfs -u -k all
+  systemd:
+    name: nftables.service
+    state: restarted
+    enabled: true
+
+- name: restart ssh
+  become: true
+  systemd:
+    name: ssh.service
+    state: restarted
+    enabled: true
 
 - name: restart docker service
   become: true
@@ -23,6 +33,17 @@
     state: restarted
     enabled: true
 
+- name: restart nginx
+  become: true
+  systemd:
+    name: nginx.service
+    state: restarted
+    enabled: true
+
+- name: regenerate initramfs
+  become: true
+  command: update-initramfs -u -k all
+
 - name: restart certbot
   become: true
   systemd:
diff --git a/playbook.yml b/playbook.yml
index 1cc43d2..f65dbe3 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -5,8 +5,6 @@
       become: true
       ansible.builtin.apt:
         name: '{{ packages }}'
-  roles:
-    - common
   tasks:
     - name: Generic provisioning
       ansible.builtin.import_tasks: 'tasks/setup.yml'
diff --git a/requirements.yml b/requirements.yml
deleted file mode 100644
index ba54c45..0000000
--- a/requirements.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- src: git+https://git.fudiggity.nl/ansible/common.git
-  name: common
-  version: master
-  scm: git
diff --git a/tasks/network.yml b/tasks/network.yml
index b61f9c8..28cc96d 100644
--- a/tasks/network.yml
+++ b/tasks/network.yml
@@ -47,6 +47,6 @@
     owner: root
     group: root
     mode: '0644'
-  notify: 
+  notify:
     - restart nftables
     - restart docker service
diff --git a/tasks/setup.yml b/tasks/setup.yml
index e9cbb6f..6408a0f 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -14,7 +14,7 @@
     owner: root
     group: root
     mode: '0644'
-  notify: reload ssh
+  notify: restart ssh
 
 - name: Copy wezterm terminfo file
   ansible.builtin.copy:
@@ -25,12 +25,12 @@
 
 - name: Disable user lingering
   become: true
-  ansible.builtin.command: 'loginctl disable-linger sonny'
+  ansible.builtin.command: loginctl disable-linger sonny
 
 - name: Copy unattended upgrades configuration
   become: true
   ansible.builtin.template:
-    src: 'templates/unattended-upgrades.j2'
+    src: templates/unattended-upgrades.j2
     dest: '/etc/apt/apt.conf.d/10periodic'
     owner: root
     group: root