From 90b875752ba17ac01d1c68bfe57a689b4f56c921 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Wed, 10 Sep 2025 10:11:00 +0300 Subject: [PATCH 1/5] fix --- nginx/nginx-dev/prepare.py | 2 +- nginx/nginx-prod/prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/nginx-dev/prepare.py b/nginx/nginx-dev/prepare.py index c0d7946..77e9572 100644 --- a/nginx/nginx-dev/prepare.py +++ b/nginx/nginx-dev/prepare.py @@ -6,7 +6,7 @@ from json import loads minio_client = Minio( - "minio.develop.sprinthub.ru:9000", + "minio.dev.chocomarsh.com:9000", access_key="serviceminioadmin", secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secure=False, diff --git a/nginx/nginx-prod/prepare.py b/nginx/nginx-prod/prepare.py index 10566b0..e15aa91 100644 --- a/nginx/nginx-prod/prepare.py +++ b/nginx/nginx-prod/prepare.py @@ -6,7 +6,7 @@ from json import loads minio_client = Minio( - "minio.sprinthub.ru:9000", + "minio.chocomarsh.com:9000", access_key="serviceminioadmin", secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secure=False, -- 2.45.2 From d6669a1d1162443206aaf0753a8c440ee2f730ec Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sun, 14 Sep 2025 23:16:57 +0300 Subject: [PATCH 2/5] Update nginx/nginx-prod/prepare.py --- nginx/nginx-prod/prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/nginx-prod/prepare.py b/nginx/nginx-prod/prepare.py index 10566b0..e15aa91 100644 --- a/nginx/nginx-prod/prepare.py +++ b/nginx/nginx-prod/prepare.py @@ -6,7 +6,7 @@ from json import loads minio_client = Minio( - "minio.sprinthub.ru:9000", + "minio.chocomarsh.com:9000", access_key="serviceminioadmin", secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secure=False, -- 2.45.2 From 0877334a4b40ad27a9bbc532e5f8ebcd93e67dfc Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sun, 14 Sep 2025 23:17:22 +0300 Subject: [PATCH 3/5] Update nginx/nginx-dev/prepare.py --- nginx/nginx-dev/prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/nginx-dev/prepare.py b/nginx/nginx-dev/prepare.py index c0d7946..77e9572 100644 --- a/nginx/nginx-dev/prepare.py +++ b/nginx/nginx-dev/prepare.py @@ -6,7 +6,7 @@ from json import loads minio_client = Minio( - "minio.develop.sprinthub.ru:9000", + "minio.dev.chocomarsh.com:9000", access_key="serviceminioadmin", secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secure=False, -- 2.45.2 From 5a7d51e253f8f2cf40c4bd750229a460898dad78 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Sun, 14 Sep 2025 23:31:24 +0300 Subject: [PATCH 4/5] fix --- .deploy-infra/deploy-prod.yaml | 51 ------------------------------- .gitea/workflows/deploy-dev.yaml | 2 -- .gitea/workflows/deploy-prod.yaml | 6 ---- authelia/Dockerfile | 3 -- authelia/configuration.yml | 44 -------------------------- authelia/users.yml | 5 --- 6 files changed, 111 deletions(-) delete mode 100644 authelia/Dockerfile delete mode 100644 authelia/configuration.yml delete mode 100644 authelia/users.yml diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 1b729d1..263f53b 100755 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -26,57 +26,6 @@ services: update_config: parallelism: 1 # order: start-first - - zitadel: - image: ghcr.io/zitadel/zitadel:latest - networks: - - common-infra-nginx - command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --tlsMode disabled' - environment: - ZITADEL_DATABASE_POSTGRES_HOST: pg.sprinthub.ru - ZITADEL_DATABASE_POSTGRES_PORT: 5432 - ZITADEL_DATABASE_POSTGRES_DATABASE: zitadel - ZITADEL_DATABASE_POSTGRES_USER_USERNAME: postgres - ZITADEL_DATABASE_POSTGRES_USER_PASSWORD: $DB_PASSWORD_PROD - ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE: disable - ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME: postgres - ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD: $DB_PASSWORD_PROD - ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE: disable - ZITADEL_EXTERNALSECURE: "false" - ZITADEL_EXTERNALDOMAIN: zitadel.chocomarsh.com - deploy: - mode: replicated - replicas: 1 - restart_policy: - condition: any - update_config: - parallelism: 1 - - # authelia: - # image: mathwave/sprint-repo:authelia - # networks: - # - common-infra-nginx - # environment: - # AUTHELIA_JWT_SECRET: $AUTHTHELIA_JWT_SECRET - # AUTHELIA_SESSION_SECRET: $AUTHTHELIA_SESSION_SECRET - # AUTHELIA_STORAGE_ENCRYPTION_KEY: $AUTHELIA_STORAGE_ENCRYPTION_KEY - # AUTHELIA_STORAGE_POSTGRES_PORT: "5432" - # AUTHELIA_STORAGE_POSTGRES_DATABASE: "authelia" - # AUTHELIA_STORAGE_POSTGRES_USERNAME: "postgres" - # AUTHELIA_STORAGE_POSTGRES_PASSWORD: $DB_PASSWORD_PROD - # AUTHELIA_ACCESS_CONTROL_DEFAULT_POLICY: "one_factor" - # AUTHELIA_NOTIFIER_SMTP_ENABLED: "false" - # volumes: - # - /sprint-data/authelia/data:/var/lib/authelia - # deploy: - # mode: replicated - # replicas: 1 - # restart_policy: - # condition: any - # placement: - # constraints: [node.labels.stage == production] - # update_config: - # parallelism: 1 grafana: image: grafana/grafana diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml index 936be64..9677647 100644 --- a/.gitea/workflows/deploy-dev.yaml +++ b/.gitea/workflows/deploy-dev.yaml @@ -19,8 +19,6 @@ jobs: ref: dev - name: build nginx dev run: docker build -t mathwave/sprint-repo:sprint-infra-nginx-dev nginx/nginx-dev - - name: build gitea runner - run: docker build -t mathwave/sprint-repo:gitea-runner gitea-runner push: name: Push runs-on: [ prod ] diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml index 5a25d69..43502be 100644 --- a/.gitea/workflows/deploy-prod.yaml +++ b/.gitea/workflows/deploy-prod.yaml @@ -21,8 +21,6 @@ jobs: run: docker build -t mathwave/sprint-repo:sprint-infra-nginx-prod nginx/nginx-prod - name: build gitea runner run: docker build -t mathwave/sprint-repo:gitea-runner gitea-runner - - name: build authelia - run: docker build -t mathwave/sprint-repo:authelia authelia push: name: Push runs-on: [ prod ] @@ -32,8 +30,6 @@ jobs: run: docker push mathwave/sprint-repo:sprint-infra-nginx-prod - name: push gitea runner run: docker push mathwave/sprint-repo:gitea-runner - - name: push authelia - run: docker push mathwave/sprint-repo:authelia prepare: name: prepare runs-on: [prod] @@ -58,8 +54,6 @@ jobs: uses: actions/checkout@v4 with: ref: prod - - name: deploy swarmpit - run: docker stack deploy --with-registry-auth -c ./.deploy-swarmpit/deploy-prod.yaml swarmpit - name: deploy portainer run: docker stack deploy --with-registry-auth -c ./.deploy-portainer/deploy-prod.yaml portainer - name: deploy infra diff --git a/authelia/Dockerfile b/authelia/Dockerfile deleted file mode 100644 index 4d57156..0000000 --- a/authelia/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM authelia/authelia -COPY configuration.yml /config/configuration.yml -COPY users.yml /config/users.yml \ No newline at end of file diff --git a/authelia/configuration.yml b/authelia/configuration.yml deleted file mode 100644 index 7d3d5ff..0000000 --- a/authelia/configuration.yml +++ /dev/null @@ -1,44 +0,0 @@ -theme: dark - -jwt_secret: secret-jwt-will-be-overridden-by-env - -server: - host: 0.0.0.0 - port: 9091 - -log: - level: info - -authentication_backend: - file: - path: /config/users.yml - -access_control: - default_policy: one_factor - rules: - - domain: "*.chocomarsh.com" - policy: one_factor - -session: - name: authelia_session - expiration: 1h - inactivity: 5m - remember_me_duration: 1w - cookies: - - domain: chocomarsh.com - authelia_url: https://auth.chocomarsh.com - default_redirection_url: https://login.chocomarsh.com - -storage: - encryption_key: "a_very_long_secret_32_characters_minimum" - postgres: - host: pg.sprinthub.ru - port: 5432 - database: authelia - schema: public - username: postgres - password: autheliapass # also override with env if preferred - -notifier: - filesystem: - filename: /config/notification.txt \ No newline at end of file diff --git a/authelia/users.yml b/authelia/users.yml deleted file mode 100644 index e493d4d..0000000 --- a/authelia/users.yml +++ /dev/null @@ -1,5 +0,0 @@ -users: - emmatveev: - password: "$argon2id$v=19$m=65536,t=1,p=4$CixMXaAilVof3yk1rtghwg$V/kcl1HNDWeybrV3SrVjjdI00D1lFtuvLldkwAklSOE" - displayname: "Egor Matveev" - email: emmtvv@gmail.com \ No newline at end of file -- 2.45.2 From 0ba70d2e60046ecf28ab50e0d53850ea2f1ad8b2 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Sun, 14 Sep 2025 23:32:16 +0300 Subject: [PATCH 5/5] fix --- .deploy-infra/deploy-dev.yaml | 2 +- .deploy-infra/deploy-prod.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.deploy-infra/deploy-dev.yaml b/.deploy-infra/deploy-dev.yaml index 645b139..8c55fac 100644 --- a/.deploy-infra/deploy-dev.yaml +++ b/.deploy-infra/deploy-dev.yaml @@ -165,7 +165,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /sprint-data:/sprint-data environment: - GITEA_INSTANCE_URL: https://gitea.sprinthub.ru/ + GITEA_INSTANCE_URL: https://gitea.chocomarsh.com/ GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN GITEA_RUNNER_NAME: dev GITEA_RUNNER_LABELS: dev diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 263f53b..1d9b497 100755 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -183,7 +183,7 @@ services: USER_UID: 1000 USER_GID: 1000 GITEA__database__DB_TYPE: postgres - GITEA__database__HOST: pg.sprinthub.ru:5432 + GITEA__database__HOST: pg.chocomarsh.com:5432 GITEA__database__NAME: gitea GITEA__database__USER: postgres GITEA__database__PASSWD: $DB_PASSWORD_PROD @@ -203,7 +203,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /sprint-data:/sprint-data environment: - GITEA_INSTANCE_URL: https://gitea.sprinthub.ru/ + GITEA_INSTANCE_URL: https://gitea.chocomarsh.com/ GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN GITEA_RUNNER_NAME: prod GITEA_RUNNER_LABELS: prod -- 2.45.2