From da8feaa244b7f647f5a156ae701c6fc6c9600721 Mon Sep 17 00:00:00 2001
From: cspark <git@cspark.dev>
Date: Mon, 18 Mar 2024 10:41:22 +0000
Subject: [PATCH] Proxy server/host server setup reconfiguration

---
 .gitignore                                       |  1 -
 prox-server-ansible-playbooks-generate.yml       |  7 -------
 ...rox-server-setup.yml => prox-server-setup.yml | 16 +++++++---------
 server-setup.yml                                 |  8 +++++++-
 4 files changed, 14 insertions(+), 18 deletions(-)
 rename ansible_resources/prox-server-setup.yml => prox-server-setup.yml (78%)
 mode change 100644 => 100755

diff --git a/.gitignore b/.gitignore
index 124a171..2b6b63d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 newkey_out
 hosts
 prox-server-firewall-setup.yml
-prox-server-setup.yml
 prox-deploy-service.yml
 
 !**/ansible_resources/*
diff --git a/prox-server-ansible-playbooks-generate.yml b/prox-server-ansible-playbooks-generate.yml
index 5f094ee..775c8b0 100644
--- a/prox-server-ansible-playbooks-generate.yml
+++ b/prox-server-ansible-playbooks-generate.yml
@@ -5,13 +5,6 @@
         src: "ansible_resources/hosts"
         dest: "hosts"
         mode: '0777'
-    - name: Generate proxy server playbooks
-      template:
-        src: "ansible_resources/{{ item }}"
-        dest: "{{ item }}"
-        mode: '0777'
-      loop:
-        - prox-server-setup.yml
     - name: Debug Finish message
       debug:
         msg: Ansible playbook has finished!
diff --git a/ansible_resources/prox-server-setup.yml b/prox-server-setup.yml
old mode 100644
new mode 100755
similarity index 78%
rename from ansible_resources/prox-server-setup.yml
rename to prox-server-setup.yml
index 2f534f7..b5ba658
--- a/ansible_resources/prox-server-setup.yml
+++ b/prox-server-setup.yml
@@ -1,8 +1,6 @@
-# {{ ansible_managed }}
-
 - hosts: 
-    - {{ proxy_server_hostname }} 
-      #    - {{ proxy_server_hostname }}-defaultport
+    - "{{ proxy_server_hostname }}"
+      #    - "{{ proxy_server_hostname }}-defaultport"
   become: 'yes'
   ignore_errors: true
   vars:
@@ -34,7 +32,7 @@
 
     - name: Ensure list of packages is installed
       apt:
-        name: '{{ "{{" }} packages {{ "}}" }}'
+        name: '{{ packages }}'
         state: present
     # NGinx Reverse Proxy/Webserver Setup
     - name: Ensure NGinx sites config directory exists 
@@ -42,14 +40,14 @@
         path: /etc/nginx/sites-available/
         state: directory
 
-    - name: Ensure reverse proxy git domain config is updated
+    - name: Ensure reverse proxy cockpit domain config is updated
       template:
         src: proxy_resources/etc/nginx/sites-available/cockpit.domain
         dest: "/etc/nginx/sites-available/cockpit.{{ domain_name }}"
-    - name: Enable the reverse proxy git domain config
+    - name: Enable the reverse proxy cockpit domain config
       ansible.builtin.file:
-        src: /etc/nginx/sites-available/cockpit.{{ domain_name }}
-        dest: /etc/nginx/sites-enabled/cockpit.{{ domain_name }}
+        src: "/etc/nginx/sites-available/cockpit.{{ domain_name }}"
+        dest: "/etc/nginx/sites-enabled/cockpit.{{ domain_name }}"
         state: link
 
     - name: Enable NGinx
diff --git a/server-setup.yml b/server-setup.yml
index dea4a3b..9fc50f5 100644
--- a/server-setup.yml
+++ b/server-setup.yml
@@ -114,6 +114,12 @@
         name: '{{ packages }}'
         state: present
 
+
+    - name: Ensure USB key mountpoint exists
+      become: yes
+      ansible.builtin.file:
+        path: "{{ usbkey_mountdir }}"
+        state: directory
     # FStab Config
     - name: Mount up USB key by UUID
       become: yes
@@ -122,7 +128,7 @@
         src: UUID={{ usbkey_uuid }}
         fstype: exfat
         opts: nofail,dmask=0000,fmask=0111,gid=1000,uid=1000
-        state: present
+        state: present 
 
     # SSH Server Setup
     - name: Enable SSH