From 0cbd6482f0f27d2089060aa9b7f304cbd05db27d Mon Sep 17 00:00:00 2001 From: Admin Date: Tue, 17 Mar 2026 23:57:38 +0100 Subject: [PATCH] =?UTF-8?q?Usuni=C4=99cie=20Authentika=20i=20Mattermosta,?= =?UTF-8?q?=20dodanie=20us=C5=82ugi=20kopii=20zapasowych=20Duplicati?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- authentik/.env | 8 --- authentik/docker-compose.yml | 117 ---------------------------------- duplicati/docker-compose.yml | 16 +++++ mattermost/docker-compose.yml | 45 ------------- 4 files changed, 16 insertions(+), 170 deletions(-) delete mode 100644 authentik/.env delete mode 100644 authentik/docker-compose.yml create mode 100644 duplicati/docker-compose.yml delete mode 100644 mattermost/docker-compose.yml diff --git a/authentik/.env b/authentik/.env deleted file mode 100644 index 1d8c21d..0000000 --- a/authentik/.env +++ /dev/null @@ -1,8 +0,0 @@ -PG_PASS=KmIN0VBVvwALVUh7q5ZsMSsi2Y8Cj3Kv -AUTHENTIK_SECRET_KEY=ffk6hAoOwp6VEFW2xWFcErP83Ch4uchm -COMPOSE_PORT_HTTP=9000 -COMPOSE_PORT_HTTPS=9443 -AUTHENTIK_ERROR_REPORTING__ENABLED=true - -AUTHENTIK_POSTGRES__HOST=postgresql -AUTHENTIK_REDIS__HOST=redis diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml deleted file mode 100644 index 7c74814..0000000 --- a/authentik/docker-compose.yml +++ /dev/null @@ -1,117 +0,0 @@ -name: authentik - -services: - postgresql: - image: postgres:16-alpine - restart: unless-stopped - healthcheck: - test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] - start_period: 20s - interval: 30s - retries: 5 - timeout: 5s - volumes: - - database:/var/lib/postgresql/data - environment: - POSTGRES_PASSWORD: ${PG_PASS} - POSTGRES_USER: authentik - POSTGRES_DB: authentik - env_file: - - .env - networks: - - default - - redis: - image: redis:alpine - command: --save 60 1 --loglevel warning - restart: unless-stopped - healthcheck: - test: ["CMD-SHELL", "redis-cli ping | grep PONG"] - start_period: 20s - interval: 30s - retries: 5 - timeout: 3s - volumes: - - redis:/data - networks: - - default - - server: - image: ghcr.io/goauthentik/server:2024.12 - restart: unless-stopped - command: server - environment: - # WERSJA 1 (Standardowa) - AUTHENTIK_REDIS__HOST: redis - AUTHENTIK_POSTGRES__HOST: postgresql - AUTHENTIK_POSTGRES__USER: authentik - AUTHENTIK_POSTGRES__NAME: authentik - AUTHENTIK_POSTGRES__PASSWORD: ${PG_PASS} - - # WERSJA 2 (Alternatywna - z 'L' na końcu) - # Jeśli aplikacja ignoruje wersję wyżej, to ta zadziała - AUTHENTIK_POSTGRESQL__HOST: postgresql - AUTHENTIK_POSTGRESQL__USER: authentik - AUTHENTIK_POSTGRESQL__NAME: authentik - AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} - AUTHENTIK_POSTGRESQL__PORT: 5432 - volumes: - - ./media:/media - - ./custom-templates:/templates - env_file: - - .env - ports: - - "${COMPOSE_PORT_HTTP:-9000}:9000" - - "${COMPOSE_PORT_HTTPS:-9443}:9443" - depends_on: - postgresql: - condition: service_healthy - redis: - condition: service_healthy - networks: - - central_dogma - - default - - worker: - image: ghcr.io/goauthentik/server:2024.12 - restart: unless-stopped - command: worker - environment: - # Podajemy oba warianty dla pewności - AUTHENTIK_REDIS__HOST: redis - AUTHENTIK_POSTGRES__HOST: postgresql - AUTHENTIK_POSTGRES__USER: authentik - AUTHENTIK_POSTGRES__NAME: authentik - AUTHENTIK_POSTGRES__PASSWORD: ${PG_PASS} - - AUTHENTIK_POSTGRESQL__HOST: postgresql - AUTHENTIK_POSTGRESQL__USER: authentik - AUTHENTIK_POSTGRESQL__NAME: authentik - AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} - AUTHENTIK_POSTGRESQL__PORT: 5432 - user: root - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./media:/media - - ./certs:/certs - - ./custom-templates:/templates - env_file: - - .env - depends_on: - postgresql: - condition: service_healthy - redis: - condition: service_healthy - networks: - - central_dogma - - default - -volumes: - database: - driver: local - redis: - driver: local - -networks: - central_dogma: - external: true diff --git a/duplicati/docker-compose.yml b/duplicati/docker-compose.yml new file mode 100644 index 0000000..74ac1f4 --- /dev/null +++ b/duplicati/docker-compose.yml @@ -0,0 +1,16 @@ +services: + duplicati: + image: lscr.io/linuxserver/duplicati:latest + container_name: backup_duplicati + environment: + - PUID=0 + - PGID=0 + - TZ=Europe/Warsaw + volumes: + - ./config:/config + - /mnt/second_disk/duplicati:/backups + - /opt:/source/opt:ro + - /var/lib/docker/volumes:/source/docker_volumes:ro + ports: + - 8200:8200 + restart: unless-stopped diff --git a/mattermost/docker-compose.yml b/mattermost/docker-compose.yml deleted file mode 100644 index 8e30167..0000000 --- a/mattermost/docker-compose.yml +++ /dev/null @@ -1,45 +0,0 @@ -version: '3.8' - -services: - # Baza danych dla Mattermosta - mattermost-db: - image: postgres:16-alpine - container_name: mattermost-db - restart: unless-stopped - volumes: - - ./volumes/db/var/lib/postgresql/data:/var/lib/postgresql/data - environment: - - POSTGRES_USER=mmuser - - POSTGRES_PASSWORD=mmuser_password - - POSTGRES_DB=mattermost - networks: - - central_dogma - - # Aplikacja Mattermost - mattermost-app: - image: mattermost/mattermost-team-edition:latest - container_name: mattermost-app - restart: unless-stopped - depends_on: - - mattermost-db - volumes: - - ./volumes/app/config:/mattermost/config - - ./volumes/app/data:/mattermost/data - - ./volumes/app/logs:/mattermost/logs - - ./volumes/app/plugins:/mattermost/plugins - - ./volumes/app/client/plugins:/mattermost/client/plugins - - /etc/localtime:/etc/localtime:ro - environment: - # Ustawienia połączenia z bazą (zwróć uwagę na hasło i nazwę hosta 'mattermost-db') - - MM_SQLSETTINGS_DRIVERNAME=postgres - - MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mmuser_password@mattermost-db:5432/mattermost?sslmode=disable&connect_timeout=10 - - # Adres strony (ważne dla linków w mailach/zaproszeniach) - - MM_SERVICESETTINGS_SITEURL=https://mattermost.archvium.eu - networks: - - central_dogma - -# Używamy tej samej sieci co GitLab i Nginx Proxy Manager -networks: - central_dogma: - external: true