From 2c1f68ee62372fbcf75b3df663bbf0730befdd9b Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 16 Feb 2024 03:02:55 +0000 Subject: [PATCH] Update stack.staging.yml --- stack.staging.yml | 114 ++++++---------------------------------------- 1 file changed, 15 insertions(+), 99 deletions(-) diff --git a/stack.staging.yml b/stack.staging.yml index 687c565..d445629 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -1,114 +1,30 @@ version: "3.8" -x-environment: - &default-environment - REDIS_HOST: glitch_redis - DATABASE_URL: postgres://postgres:postgres@glitch_postgres:5432/postgres - SECRET_KEY: 4f99181d528f201c16806b34b980791f9a99570d645910dacfe31198b503ea2f # best to run openssl rand -hex 32 - PORT: 8000 - EMAIL_URL: smtp://glitch@nixc.us:G2BeHLDezu2Eg8x5aDy8MZ3RTLJoP6xJyvwDnFDMCrFxe7AWW5mAst96zvkcDq3R@box.p.nixc.us:465 # https://glitchtip.com/documentation/install#configuration - GLITCHTIP_DOMAIN: https://staging.glitch.nixc.us # Change this to your domain - DEFAULT_FROM_EMAIL: glitch@nixc.us # Change this to your email - CELERY_WORKER_CONCURRENCY: 2 # Set to 2 to prevent excessive memory usage. Change it or remove to set it to the number of cpu cores. - ## custom config - GLITCHTIP_MAX_EVENT_LIFE_DAYS: 30 - GLITCHTIP_MAX_TRANSACTION_EVENT_LIFE_DAYS: 5 - GLITCHTIP_MAX_FILE_LIFE_DAYS: 5 - ENABLE_USER_REGISTRATION: "true" - ENABLE_ORGANIZATION_CREATION: "true" - ## gitea api b994dd8dd3162aa79db17bdb893a7c9271c63369 - # SOCIALACCOUNT_PROVIDERS_gitea_GITEA_URL: "https://git.nixc.us/" -x-depends_on: - &default-depends_on - - postgres - - redis - services: - postgres: - image: git.nixc.us/colin/glitch:staging-postgres - environment: - POSTGRES_HOST_AUTH_METHOD: "trust" - volumes: - - /mnt/tank/persist/nixc.us/glitch/staging/db:/var/lib/postgresql/data - deploy: - replicas: 1 - placement: - constraints: - - node.hostname == macmini1 - labels: - - "us.nixc.autodeploy=true" - - "traefik.enable=false" - networks: - - default - redis: - image: git.nixc.us/colin/glitch:staging-redis - deploy: - replicas: 1 - placement: - constraints: - # - node.hostname == macmini1 - - node.labels.mac-rack == true - labels: - - "us.nixc.autodeploy=true" - - "traefik.enable=false" - networks: - - default - web: - image: git.nixc.us/colin/glitch:staging-glitch - depends_on: *default-depends_on - environment: *default-environment + ntfy: + image: git.nixc.us/colin/ntfy:staging volumes: - - /mnt/tank/persist/nixc.us/glitch/staging/uploads:/code/uploads + - /mnt/tank/persist/nixc.us/ntfy/staging/data:/data deploy: replicas: 1 placement: constraints: - - node.hostname == macmini1 + - node.hostname == macmini14 labels: - "us.nixc.autodeploy=true" - "traefik.enable=true" - - "traefik.http.routers.staging-glitch_glitch.tls=true" - - "traefik.http.services.staging-glitch_glitch.loadbalancer.server.port=8000" - - "traefik.http.routers.staging-glitch_glitch.rule=Host(`staging.glitch.nixc.us`)" - - "traefik.http.routers.staging-glitch_glitch.entrypoints=websecure" - - "traefik.http.routers.staging-glitch_glitch.tls.certresolver=letsencryptresolver" - - "traefik.http.routers.staging-glitch_glitch.service=staging-glitch_glitch" + - "traefik.http.routers.staging-ntfy_ntfy.tls=true" + - "traefik.http.services.staging-ntfy_ntfy.loadbalancer.server.port=80" + - "traefik.http.routers.staging-ntfy_ntfy.rule=Host(`staging.ntfy.nixc.us`)" + - "traefik.http.routers.staging-ntfy_ntfy.entrypoints=websecure" + - "traefik.http.routers.staging-ntfy_ntfy.tls.certresolver=letsencryptresolver" + - "traefik.http.routers.staging-ntfy_ntfy.service=staging-ntfy_ntfy" - "traefik.docker.network=traefik" - # - 'traefik.http.routers.staging-glitch_glitch.middlewares=authelia@docker' + # - 'traefik.http.routers.staging-ntfy_ntfy.middlewares=authelia@docker' networks: - - default - traefik - worker: - image: git.nixc.us/colin/glitch:staging-glitch - command: ./bin/run-celery-with-beat.sh - depends_on: *default-depends_on - environment: *default-environment - volumes: - - /mnt/tank/persist/nixc.us/glitch/staging/uploads:/code/uploads - deploy: - replicas: 1 - placement: - constraints: - - node.hostname == ingress.nixc.us - labels: - - "traefik.enable=false" - networks: - - default - migrate: - image: git.nixc.us/colin/glitch:staging-glitch - depends_on: *default-depends_on - command: "./manage.py migrate" - environment: *default-environment - deploy: - replicas: 1 - placement: - constraints: - - node.hostname == macmini1 - labels: - - "traefik.enable=false" - networks: - - default + environment: + - NTFY_LISTEN_ADDR=0.0.0.0:80 + - NTFY_DATA_DIR=/data networks: traefik: - external: true - default: - external: false + external: true \ No newline at end of file