From 0f64b867de30610c4069c1e3d6e07a1ff0513fab Mon Sep 17 00:00:00 2001
From: Alexandre Pires <c.alexandre.pires@gmail.com>
Date: Thu, 26 Sep 2024 12:08:00 +0200
Subject: [PATCH] Refactor ansible-apply.yaml and inventory/hosts, add
 playbook_m3uproxy.yml

---
 .github/workflows/ansible-apply.yaml |  4 ++--
 ansible/inventory/hosts              |  3 +++
 ansible/playbook_m3uproxy.yml        | 30 ++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 ansible/playbook_m3uproxy.yml

diff --git a/.github/workflows/ansible-apply.yaml b/.github/workflows/ansible-apply.yaml
index 7da3b04..f07105c 100644
--- a/.github/workflows/ansible-apply.yaml
+++ b/.github/workflows/ansible-apply.yaml
@@ -78,9 +78,9 @@ jobs:
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
           cd ansible
-          # Currently, the playbook_hardening.yml is failing due to the aide package and UFW
-          # sectool exec ansible-playbook -u $ANSIBLE_USER -i inventory/hosts playbook_hardening.yml
+          sectool exec ansible-playbook -u $ANSIBLE_USER -i inventory/hosts playbook_hardening.yml
           sectool exec ansible-playbook -u $ANSIBLE_USER -i inventory/hosts playbook_microk8s.yml
           sectool exec ansible-playbook -u $ANSIBLE_USER -i inventory/hosts playbook_gitea.yml
           sectool exec ansible-playbook -u $ANSIBLE_USER -i inventory/hosts playbook_nextcloud.yml
           sectool exec ansible-playbook -u $ANSIBLE_USER -i inventory/hosts playbook_wordpress.yml
+          sectool exec ansible-playbook -u $ANSIBLE_USER -i inventory/hosts playbook_m3uproxy.yml
diff --git a/ansible/inventory/hosts b/ansible/inventory/hosts
index 8655787..452af68 100644
--- a/ansible/inventory/hosts
+++ b/ansible/inventory/hosts
@@ -25,5 +25,8 @@ contabo01.a13labs.pt
 [nextcloud]
 contabo01.a13labs.pt
 
+[m3uproxy]
+contabo01.a13labs.pt
+
 [microk8s]
 contabo01.a13labs.pt
diff --git a/ansible/playbook_m3uproxy.yml b/ansible/playbook_m3uproxy.yml
new file mode 100644
index 0000000..50e41e4
--- /dev/null
+++ b/ansible/playbook_m3uproxy.yml
@@ -0,0 +1,30 @@
+---
+- name: M3Uproxy Playbook (K8s)
+  hosts: m3uproxy
+  gather_facts: true
+
+# Specific tasks for this playbook
+  tasks:
+    - name: Set required facts
+      ansible.builtin.set_fact:
+        m3uproxy_home: "/var/lib/m3uproxy"
+        m3uproxy_user_id: 1000
+        m3uproxy_group_id: 1000
+      tags: always
+
+    - name: Create required m3uproxy data folder
+      become: true
+      ansible.builtin.file:
+        state: directory
+        path: "{{ item }}"
+        mode: "0750"
+        owner: "{{ m3uproxy_user_id }}"
+        group: "{{ m3uproxy_group_id }}"
+      with_items:
+        - "{{ m3uproxy_home }}"
+        - "{{ m3uproxy_home }}/cache"
+        - "{{ m3uproxy_home }}/squid"
+        - "{{ m3uproxy_home }}/geoip"
+      tags:
+        - tasks
+        - tasks::folders