FIX: Fixing broken rebase :D

ADD: Semaphore UI initial commit
2025-08-25 17:55:19 +02:00 · 2025-08-25 17:52:41 +02:00 · 2025-08-25 17:51:00 +02:00 · 2025-08-24 23:21:41 +02:00 · 2025-08-24 21:55:10 +02:00 · 2025-08-24 19:56:39 +02:00
3 changed files with 15 additions and 3 deletions
--- a/Ansible/example_secrets.yml
+++ b/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'
+# 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'
--- a/Docker/semaphore-ui/.env.example
+++ b/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)
Author	SHA1	Message	Date
Maksym Buz	8a0c432db6	FIX: Fixing broken rebase :D	2025-08-25 17:55:19 +02:00
Maksym Buz	5a9bd17e13	ADD: Semaphore UI initial commit	2025-08-25 17:52:41 +02:00
Maksym Buz	617ec624cb	ADD: Semaphore UI initial commit	2025-08-25 17:51:00 +02:00
Maksym Buz	8d8b40f2e6	FIX: Fixed problems with .env file. Added separate ansible host	2025-08-24 23:21:41 +02:00
Maksym Buz	b12b1fa924	Merge branch 'test'	2025-08-24 21:55:10 +02:00
Maksym Buz	8391a77535	change: added more secrects (some of which are used in playbooks) to the example file	2025-08-24 19:56:39 +02:00
Maksym Buz	2a091a6f21	change: removed not needed image from the Docker/immich directory	2025-08-24 19:19:26 +02:00