FIX: Fixing broken rebase :D

Ansible/example_secrets.yml

@@ -1,2 +1,7 @@
 # Copy this into secrets.yml and replate with a real values
-ansible_password: 'REPLACE_WITH_ROOT_PASSWORD'
+ansible_password: 'REPLACE_WITH_ROOT_PASSWORD'
+# Zabbix proxy parameters for connecting to Zabbix server
+zabbix_server_address: 'x.x.x.x'
+zabbix_psk_identity: '<zabbix_psk_identity'
+zabbix_proxy_hostname: '<zabbix_proxy_hostname>' # if needed, in the actual playbook it is set to the hostname of the target
+zabbix_proxy_psk: 'REPLACE_WITH_ZABBIX_PSK'

Ansible/inventory/hosts.ini

@@ -20,7 +20,9 @@ truenas ansible_host=10.0.0.200
 gitea ansible_host=10.0.0.108
 zabbix-proxy ansible_host=10.0.0.110 
 pi-hole ansible_host=10.0.0.104
-localhost ansible_connection=local # for testing playbooks on the control node
+ansible ansible_host=10.0.0.111
+#localhost ansible_connection=local # for testing playbooks on the control node
+
 
 [pbs]
 proxmox-backup ansible_host=10.0.0.201

Docker/semaphore-ui/.env.example

@@ -1,4 +1,11 @@
+<<<<<<< HEAD
+SEMAPHORE_ADMIN=admin
+SEMAPHORE_ADMIN_PASSWORD=changeme
+SEMAPHORE_ADMIN_NAME=Admin
+SEMAPHORE_ADMIN_EMAIL=admin@example.com
+=======
 ADMIN_USER=admin
 ADMIN_PASS=changeme
 ADMIN_NAME=Admin
 ADMIN_EMAIL=admin@example.com
+>>>>>>> ab90593 (ADD: Semaphore UI initial commit)

Docker/semaphore-ui/docker-compose.yml

@@ -9,6 +9,9 @@ services:
             SEMAPHORE_ADMIN_PASSWORD: ${ADMIN_PASS}
             SEMAPHORE_ADMIN_NAME: ${ADMIN_NAME}
             SEMAPHORE_ADMIN_EMAIL: ${ADMIN_EMAIL}
-        volumes:
-            - /home/mbuz/docker/semaphore/data:/var/lib/semaphore
-            - /home/mbuz/docker/semaphore/config:/etc/semaphore
+        volumes:       
+            - semaphore-data:/var/lib/semaphore
+            - semaphore-config:/etc/semaphore  
+volumes:
+  semaphore-data:
+  semaphore-config:

Docker/semaphore-ui/docker-run.sh

@@ -0,0 +1,9 @@
+docker run -d \
+  --restart unless-stopped \
+  --name semaphore \
+  -p 3030:3000 \
+  --env-file .env \
+  -e SEMAPHORE_DB_DIALECT=sqlite \
+  -v semaphore-data:/var/lib/semaphore \
+  -v semaphore-config:/etc/semaphore \
+  semaphoreui/semaphore:latest