From 184fb7f117bd79275e9d1da19ce78ac327f38100 Mon Sep 17 00:00:00 2001 From: drmathias Date: Thu, 2 Oct 2025 22:38:08 +0100 Subject: [PATCH] fix: remove simplelogin setup --- gateway/caddy/Caddyfile | 6 -- gateway/cloudflare-ddns/config.json | 4 - simplelogin/docker-compose.yml | 154 ---------------------------- 3 files changed, 164 deletions(-) delete mode 100644 simplelogin/docker-compose.yml diff --git a/gateway/caddy/Caddyfile b/gateway/caddy/Caddyfile index ce25707..78176bc 100644 --- a/gateway/caddy/Caddyfile +++ b/gateway/caddy/Caddyfile @@ -45,12 +45,6 @@ www.64815139.xyz { redir https://www.{host}{uri} } -alias.64815139.xyz { - route { - reverse_proxy 192.168.0.216:7777 - } -} - gitea.64815139.xyz { route { rewrite /user/login /user/oauth2/Authelia diff --git a/gateway/cloudflare-ddns/config.json b/gateway/cloudflare-ddns/config.json index 1d0e29b..faf68d9 100644 --- a/gateway/cloudflare-ddns/config.json +++ b/gateway/cloudflare-ddns/config.json @@ -14,10 +14,6 @@ "name": "www", "proxied": false }, - { - "name": "alias", - "proxied": false - }, { "name": "auth", "proxied": false diff --git a/simplelogin/docker-compose.yml b/simplelogin/docker-compose.yml deleted file mode 100644 index 6666d01..0000000 --- a/simplelogin/docker-compose.yml +++ /dev/null @@ -1,154 +0,0 @@ -name: simplelogin - -secrets: - POSTGRES_PASSWORD: - file: './secrets/POSTGRES_PASSWORD' - RELAY_PASSWORD: - file: './secrets/RELAY_PASSWORD' - -services: - postgres: - image: postgres - container_name: simplelogin_postgres - restart: always - secrets: - - POSTGRES_PASSWORD - environment: - POSTGRES_USER: postgres - POSTGRES_PASSWORD_FILE: /run/secrets/POSTGRES_PASSWORD - POSTGRES_DB: simplelogin - volumes: - - postgres_data:/var/lib/postgresql/data - networks: - - default - - postfix: - image: simplelogin/postfix:latest - container_name: simplelogin_postfix - restart: always - ports: - - "25:25" - - "587:587" - secrets: - - POSTGRES_PASSWORD - - RELAY_PASSWORD - env_file: - - ./secrets/postfix/.env - environment: - DB_HOST: postgres - DB_USER: postgres - DB_PASSWORD_FILE: /run/secrets/POSTGRES_PASSWORD - DB_NAME: simplelogin - ALIASES_DEFAULT_DOMAIN: 64815139.xyz - POSTFIX_FQDN: alias.64815139.xyz - EMAIL_HANDLER_HOST: simplelogin-handler - RELAY_HOST: in-v3.mailjet.com - RELAY_PORT: 587 - RELAY_HOST_PASSWORD_FILE: /run/secrets/RELAY_PASSWORD - SIMPLELOGIN_COMPATIBILITY_MODE: v4 - ENABLE_PROXY_PROTOCOL: "false" - entrypoint: /bin/sh -c 'MYNETWORKS=$(ip -o -f inet addr show eth0 | awk "/scope global/ {print \$4}"); export MYNETWORKS; exec /src/docker-entrypoint.sh' - networks: - - default - depends_on: - - postgres - - app: - image: simplelogin/app-ci:latest - container_name: simplelogin_app - volumes: - - ./data/sl:/sl - - ./data/sl/upload:/code/static/upload - - ./data/dkim/dkim.key:/dkim.key:ro - - ./data/dkim/dkim.pub.key:/dkim.pub.key:ro - - ./data/env/simplelogin.env:/code/.env - env_file: - - ./secrets/app/.env - networks: - - default - restart: always - ports: - - "7777:7777" - depends_on: - - postgres - - migration - - init_data - - email_handler: - image: simplelogin/app-ci:latest - container_name: simplelogin_email - command: python email_handler.py - env_file: - - ./secrets/app/.env - volumes: - - ./data/sl:/sl - - ./data/sl/upload:/code/static/upload - - ./data/dkim/dkim.key:/dkim.key:ro - - ./data/dkim/dkim.pub.key:/dkim.pub.key:ro - - ./data/env/simplelogin.env:/code/.env - networks: - - default - restart: always - depends_on: - - app - - job_runner: - image: simplelogin/app-ci:latest - container_name: simplelogin_job-runner - command: python job_runner.py - env_file: - - ./secrets/app/.env - volumes: - - ./data/sl:/sl - - ./data/sl/upload:/code/static/upload - - ./data/dkim/dkim.key:/dkim.key:ro - - ./data/dkim/dkim.pub.key:/dkim.pub.key:ro - - ./data/env/simplelogin.env:/code/.env - networks: - - default - restart: always - depends_on: - - app - - migration: - image: simplelogin/app-ci:latest - container_name: simplelogin_migration - command: flask db upgrade - env_file: - - ./secrets/app/.env - volumes: - - ./data/sl:/sl - - ./data/sl/upload:/code/static/upload - - ./data/dkim/dkim.key:/dkim.key:ro - - ./data/dkim/dkim.pub.key:/dkim.pub.key:ro - - ./data/env/simplelogin.env:/code/.env - networks: - - default - restart: "no" - depends_on: - - postgres - - init_data: - image: simplelogin/app-ci:latest - container_name: simplelogin_init - command: python init_app.py - env_file: - - ./secrets/app/.env - volumes: - - ./data/sl:/sl - - ./data/dkim/dkim.key:/dkim.key:ro - - ./data/dkim/dkim.pub.key:/dkim.pub.key:ro - - ./data/env/simplelogin.env:/code/.env - networks: - - default - restart: "no" - depends_on: - - migration - -networks: - default: - driver: bridge - -volumes: - postgres_data: - driver: local