From ca866d36e3fd75143ad73ce104d002710fb033aa Mon Sep 17 00:00:00 2001
From: mgutzeit <moritz.gutzeit@proton.me>
Date: Wed, 18 Dec 2024 10:25:40 +0100
Subject: [PATCH] added vars

---
 group_vars/all/nameserver.yml        |   5 +++++
 group_vars/all/users.yml             |  19 +++++++++++++++++++
 group_vars/database/.mariadb.yml.swp | Bin 0 -> 12288 bytes
 group_vars/database/mariadb.yml      |  13 +++++++++++++
 host_vars/db01/nameserver.yml        |   4 ++++
 roles/debian/tasks/main.yml          |   4 ++++
 roles/debian/tasks/users.yml         |  25 ++-----------------------
 roles/mariadb/tasks/main.yml         |  12 ++----------
 8 files changed, 49 insertions(+), 33 deletions(-)
 create mode 100644 group_vars/all/nameserver.yml
 create mode 100644 group_vars/all/users.yml
 create mode 100644 group_vars/database/.mariadb.yml.swp
 create mode 100644 group_vars/database/mariadb.yml
 create mode 100644 host_vars/db01/nameserver.yml

diff --git a/group_vars/all/nameserver.yml b/group_vars/all/nameserver.yml
new file mode 100644
index 0000000..a213d8d
--- /dev/null
+++ b/group_vars/all/nameserver.yml
@@ -0,0 +1,5 @@
+---
+
+nameserver:
+  google: 8.8.8.8
+  cloudflare: 1.1.1.1
diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml
new file mode 100644
index 0000000..8d81d15
--- /dev/null
+++ b/group_vars/all/users.yml
@@ -0,0 +1,19 @@
+users:
+  - name: root
+    uid: 0
+    gid: 0
+    groups: sudo
+    shell: /bin/bash
+    password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0
+  - name: admin
+    uid: 1040
+    gid: 1040
+    groups: sudo
+    shell: /bin/zsh
+    password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0
+  - name: developer 
+    uid: 1050
+    gid: 1050
+    groups: 
+    shell: /bin/zsh
+    password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0
diff --git a/group_vars/database/.mariadb.yml.swp b/group_vars/database/.mariadb.yml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..90e18d8171368cb91c659497dc121eb36a0bd95f
GIT binary patch
literal 12288
zcmeI&F-yZh6bJAZ2e+yyI5?d;6pEL$wu5F9C!vnImb)g_V%vmV(jtO>gMy#I#qZ#%
zAHvba)xp)lmvD7Zi(M=KgFi>^U0#wObSR0go*o^GeYZ+HR*3G#y0gBqNN<rtNff2|
z@?WE`5+l{XbagMR)~4^i&Kr7mqcrXFtd|WsUMGpNxHaS^UZ7H?l?gp=*;RpdFZ;de
z{ZN4b1ZEV-(lfbNqWW&F_^EGiZHl$klNnFOHV8lf0uX=z1Rwwb2teRJ2&Az?H~b(A
z_F+nPcD~K_5EBF-009U<00Izz00bZa0SG_<0&^&!0-~2CBDu^r&+q>y|NlSu_?`30
zdFDKE9yt%3d(JKAilaD(oc#P94h94u009U<00Izz00bZa0SG`~?gd0K;-owDMY-Zu
z{DWq*Om<ZnGm4VH7o)mv#BobE+80?|RHYcGe#n(jtGuGVDniWG?Uy#Zl$kIwKH1{W
V?$Tb7H%z{)=k4~}dY`0}^a<-KZ6W{w

literal 0
HcmV?d00001

diff --git a/group_vars/database/mariadb.yml b/group_vars/database/mariadb.yml
new file mode 100644
index 0000000..5537112
--- /dev/null
+++ b/group_vars/database/mariadb.yml
@@ -0,0 +1,13 @@
+---
+mariadb:
+  databases:
+    - webapp
+    - webapp_backup
+
+  users:
+    - name: webapp
+      password: w3b4pp
+      priv: '*.*:ALL'
+    - name: webapp_backup
+      password: w3b4pp_b4ckup
+      priv: '*.*:ALL'
diff --git a/host_vars/db01/nameserver.yml b/host_vars/db01/nameserver.yml
new file mode 100644
index 0000000..1b503bd
--- /dev/null
+++ b/host_vars/db01/nameserver.yml
@@ -0,0 +1,4 @@
+---
+
+nameserver:
+  local: 127.0.0.1
diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yml
index 014fb60..3866d0d 100644
--- a/roles/debian/tasks/main.yml
+++ b/roles/debian/tasks/main.yml
@@ -28,3 +28,7 @@
       copy:
         src: resolv.conf
         dest: /etc/resolv.conf
+
+    - name: Debug
+      debug:
+        var: nameserver
diff --git a/roles/debian/tasks/users.yml b/roles/debian/tasks/users.yml
index 6a8af56..f110b9c 100644
--- a/roles/debian/tasks/users.yml
+++ b/roles/debian/tasks/users.yml
@@ -10,13 +10,7 @@
       gid: "{{ item.gid }}"
     loop_control:
       label: "{{ item.name }}"
-    loop:
-      - name: root
-        gid: 0
-      - name: admin
-        gid: 1040
-      - name: developer
-        gid: 1050
+    loop: "{{ users }}"
 
   - name: Users
     user:
@@ -28,22 +22,7 @@
       password: "{{ item.password }}"
     loop_control:
       label: "{{ item.name }}"
-    loop:
-      - name: root
-        uid: 0
-        groups: sudo
-        shell: /bin/bash
-        password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0
-      - name: admin
-        uid: 1040
-        groups: sudo
-        shell: /bin/zsh
-        password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0
-      - name: developer 
-        uid: 1050
-        groups: 
-        shell: /bin/zsh
-        password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0
+    loop: "{{ users }}"
 
   - name: zsh config
     copy:
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index 72d4fe3..ab6ffc8 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -21,9 +21,7 @@
     community.mysql.mysql_db:
       login_unix_socket: /var/run/mysqld/mysqld.sock
       name: "{{ item }}"
-    loop:
-     - webapp
-     - webapp_backup
+    loop: "{{ mariadb.databases }}"
 
   - name: DB User
     mysql_user:
@@ -31,12 +29,6 @@
       password: "{{ item.password }}"
       priv: "{{ item.priv }}"
       login_unix_socket: /var/run/mysqld/mysqld.sock
-    loop:
-      - name: webapp
-        password: w3b4pp
-        priv: '*.*:ALL'
-      - name: webapp_backup
-        password: w3b4pp_b4ckup
-        priv: '*.*:ALL'
+    loop: "{{ mariadb.users }}"
     loop_control:
       label: "{{ item.name }}"