From 2671dc007341edd8b37bd1756d47d60dc8847257 Mon Sep 17 00:00:00 2001 From: Alex Lambson Date: Sat, 12 Jul 2025 22:36:31 -0600 Subject: [PATCH 1/4] Fix silly mistake with CD and secrets --- .github/workflows/cd.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b08047e..410b475 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -64,13 +64,13 @@ jobs: target_path: "~/staging.mapdb.cncnet.org" compose_file: "docker-compose.prod.yml" nginx_conf: "docker/nginx.prod.conf" - host: ${{ secrets.STAGING_SSH_HOST }} + host-s-name: "STAGING_SSH_HOST" - environment: production branch: main target_path: "~/mapdb.cncnet.org" compose_file: "docker-compose.prod.yml" nginx_conf: "docker/nginx.prod.conf" - host: ${{ secrets.PROD_SSH_HOST }} + host-s-name: "PROD_SSH_HOST" steps: - name: "Exit if not matching branch" @@ -83,7 +83,7 @@ jobs: - name: Copy docker-compose and nginx config over ssh uses: appleboy/scp-action@v0.1.7 with: - host: ${{ matrix.host }} + host: ${{ secrets[matrix.host-s-name] }} username: ${{ secrets.SSH_USER }} key: ${{ secrets.SSH_PRIVATE_KEY }} source: "${{ matrix.compose_file }},${{ matrix.nginx_conf }}" @@ -92,7 +92,7 @@ jobs: - name: SSH into server and deploy uses: appleboy/ssh-action@v1.2.1 with: - host: ${{ matrix.host }} + host: ${{ secrets[matrix.host-s-name] }} username: ${{ secrets.SSH_USER }} key: ${{ secrets.SSH_PRIVATE_KEY }} script: | From deecd9a4b5753feb365b01ac2e9f61b77ffb7a26 Mon Sep 17 00:00:00 2001 From: Alex Lambson Date: Sat, 12 Jul 2025 22:45:41 -0600 Subject: [PATCH 2/4] test better env delivery --- .github/workflows/cd.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 410b475..b2d3e22 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -98,8 +98,6 @@ jobs: script: | cd ${{ matrix.target_path }} echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - envstr='${{ secrets.PROD_ENV_FILE }}' - echo -e $envstr > .env docker compose -f ${{ matrix.compose_file }} pull docker compose -f ${{ matrix.compose_file }} down docker compose -f ${{ matrix.compose_file }} up -d From fb1816537a56de13360cf4353ad4f4a47b2cd883 Mon Sep 17 00:00:00 2001 From: Alex Lambson Date: Sat, 12 Jul 2025 22:50:17 -0600 Subject: [PATCH 3/4] skip staging for now --- .github/workflows/cd.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b2d3e22..1c49075 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -59,12 +59,12 @@ jobs: strategy: matrix: include: - - environment: staging - branch: staging - target_path: "~/staging.mapdb.cncnet.org" - compose_file: "docker-compose.prod.yml" - nginx_conf: "docker/nginx.prod.conf" - host-s-name: "STAGING_SSH_HOST" +# - environment: staging +# branch: staging +# target_path: "~/staging.mapdb.cncnet.org" +# compose_file: "docker-compose.prod.yml" +# nginx_conf: "docker/nginx.prod.conf" +# host-s-name: "STAGING_SSH_HOST" - environment: production branch: main target_path: "~/mapdb.cncnet.org" From d1d165fdcc2125852a0ae4275cf976a2f9c74c8c Mon Sep 17 00:00:00 2001 From: Alex Lambson Date: Sat, 12 Jul 2025 23:05:50 -0600 Subject: [PATCH 4/4] Add old mapdb URL to the UI --- kirovy/templates/legacy_outer.html | 1 + 1 file changed, 1 insertion(+) diff --git a/kirovy/templates/legacy_outer.html b/kirovy/templates/legacy_outer.html index e815799..04d319b 100644 --- a/kirovy/templates/legacy_outer.html +++ b/kirovy/templates/legacy_outer.html @@ -23,6 +23,7 @@
Search Upload + Old Map DB

{% block header_text %}404{% endblock %}