From 42908f580c66991b31d0fdfa11e2a4daad572478 Mon Sep 17 00:00:00 2001
From: Laci Dusa <jaydee@sectorq.eu>
Date: Thu, 28 Nov 2024 12:11:11 +0100
Subject: [PATCH] Update 3 files

- /zabbix-server/.env.default
- /zabbix-server/.env
- /zabbix-server/docker-compose.yml
---
 zabbix-server/.env               | 28 -------------------------
 zabbix-server/.env.default       |  0
 zabbix-server/docker-compose.yml | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 28 deletions(-)
 delete mode 100644 zabbix-server/.env
 delete mode 100644 zabbix-server/.env.default

diff --git a/zabbix-server/.env b/zabbix-server/.env
deleted file mode 100644
index a19b265..0000000
--- a/zabbix-server/.env
+++ /dev/null
@@ -1,28 +0,0 @@
-# Zabbix global
-# ZBX_DEBUGLEVEL=3
-
-# Database
-MYSQL_PASSWORD=zabbix
-MYSQL_USER=zabbix
-MYSQL_ROOT_PASSWORD=rootpwd
-
-POSTGRES_PASSWORD=zabbix
-POSTGRES_USER=zabbix
-POSTGRES_DB=zabbix
-
-# Zabbix server
-# all env variables https://hub.docker.com/r/zabbix/zabbix-server-mysql
-DB_SERVER_HOST=db-server
-ZBX_SERVER_HOST=zabbix-server
-ZBX_SSO_SP_KEY=/usr/share/zabbix/conf/certs/sp.key
-ZBX_SSO_SP_CERT=/usr/share/zabbix/conf/certs/sp.crt
-ZBX_SSO_IDP_CERT=/usr/share/zabbix/conf/certs/idp.crt
-# Zabbix frontend
-# all env variable https://hub.docker.com/r/zabbix/zabbix-web-nginx-mysql
-ZBX_SSO_SP_KEY=/usr/share/zabbix/conf/certs/sp.key
-ZBX_SSO_SP_CERT=/usr/share/zabbix/conf/certs/sp.crt
-ZBX_SSO_IDP_CERT=/usr/share/zabbix/conf/certs/idp.crt:wq
-
-### Zabbix agent ###
-# all env variable https://hub.docker.com/r/zabbix/zabbix-agent2
-
diff --git a/zabbix-server/.env.default b/zabbix-server/.env.default
deleted file mode 100644
index e69de29..0000000
diff --git a/zabbix-server/docker-compose.yml b/zabbix-server/docker-compose.yml
index e69de29..0baf367 100644
--- a/zabbix-server/docker-compose.yml
+++ b/zabbix-server/docker-compose.yml
@@ -0,0 +1,36 @@
+version: '3'
+services:
+  zabbix-server:
+    image: zabbix/zabbix-server-pgsql:alpine-latest
+    ports:
+      - "10051:10051"
+    env_file:
+      - stack.env
+    depends_on:
+      - db-server
+    restart: always
+
+  zabbix-frontend:
+    image: zabbix/zabbix-web-nginx-pgsql:alpine-latest
+    ports:
+      - "8051:8080"
+      - "4435:8443"
+    env_file:
+      - stack.env
+    depends_on:
+      - db-server
+        #volumes:
+        #- "./ui:/usr/share/zabbix"
+    volumes:
+      - /share/docker_data/zabbix-server/frontend/certs:/usr/share/zabbix/conf/certs
+    restart: always
+  db-server:
+    image: postgres:16-alpine
+    ports:
+      - 5432:5432
+    volumes:
+      - /share/docker_data/zabbix-server/postgres-data:/var/lib/postgresql/data
+    env_file:
+      - /data/zabbix.env
+      - /data/zabbix.env.default
+    restart: always