From 824707d7ff094c10ebac5d71560adbcfdd6c08e1 Mon Sep 17 00:00:00 2001 From: Florian THIERRY Date: Mon, 4 May 2026 17:54:39 +0200 Subject: [PATCH 1/5] Add gitea-workflow to upload on debipogi server. --- .gitea/workflows/build-and-deploy.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 8efd101..6597a13 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -4,7 +4,7 @@ on: push: branches: - main - + - main-debipogi jobs: build-and-deploy: runs-on: ubuntu-latest @@ -14,7 +14,7 @@ jobs: - name: 📄 Checkout configuration env: - SSH_PRIVATE_KEY: ${{ secrets.PROD_PROPERTIES_SSH_KEY }} + SSH_PRIVATE_KEY: ${{ secrets.D_PROD_PROPERTIES_SSH_KEY }} run: | mkdir -p ~/.ssh echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa @@ -45,11 +45,11 @@ jobs: - name: 📤 Transfer artifacts to remote server env: - SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }} - REMOTE_USER: ${{ secrets.PROD_REMOTE_USER }} - REMOTE_HOST: ${{ secrets.PROD_REMOTE_HOST }} - REMOTE_PORT: ${{ secrets.PROD_REMOTE_PORT }} - REMOTE_PATH: ${{ secrets.PROD_REMOTE_PATH }} + SSH_PRIVATE_KEY: ${{ secrets.D_PROD_SSH_PRIVATE_KEY }} + REMOTE_USER: ${{ secrets.D_PROD_REMOTE_USER }} + REMOTE_HOST: ${{ secrets.D_PROD_REMOTE_HOST }} + REMOTE_PORT: ${{ secrets.D_PROD_REMOTE_PORT }} + REMOTE_PATH: ${{ secrets.D_PROD_REMOTE_PATH }} run: | mkdir -p ~/.ssh echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa @@ -61,10 +61,10 @@ jobs: - name: 🚀 Launch application onto remote server env: SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }} - REMOTE_USER: ${{ secrets.PROD_REMOTE_USER }} - REMOTE_HOST: ${{ secrets.PROD_REMOTE_HOST }} - REMOTE_PORT: ${{ secrets.PROD_REMOTE_PORT }} - REMOTE_PATH: ${{ secrets.PROD_REMOTE_PATH }} + REMOTE_USER: ${{ secrets.D_PROD_REMOTE_USER }} + REMOTE_HOST: ${{ secrets.D_PROD_REMOTE_HOST }} + REMOTE_PORT: ${{ secrets.D_PROD_REMOTE_PORT }} + REMOTE_PATH: ${{ secrets.D_PROD_REMOTE_PATH }} run: | ssh -o StrictHostKeyChecking=no $REMOTE_HOST -l $REMOTE_USER -p $REMOTE_PORT << EOC cd $REMOTE_PATH -- 2.47.3 From 6fadc81c39bcbfea65ca80769016dd1c5d291208 Mon Sep 17 00:00:00 2001 From: Florian THIERRY Date: Mon, 4 May 2026 17:59:33 +0200 Subject: [PATCH 2/5] Fix workflow --- .gitea/workflows/build-and-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 6597a13..9c49d69 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -70,6 +70,6 @@ jobs: cd $REMOTE_PATH sudo /usr/bin/docker load < $REMOTE_PATH/codiki-backend.tar sudo /usr/bin/docker load < $REMOTE_PATH/codiki-frontend.tar - sudo /usr/bin/docker compose down - sudo /usr/bin/docker compose up --detach + sudo /usr/bin/docker compose --file /home/codiki/docker-compose.yml down + sudo /usr/bin/docker compose --file /home/codiki/docker-compose.yml up --detach EOC \ No newline at end of file -- 2.47.3 From 613d95a2e7bb42e6fee1ca93ce34494a41564d67 Mon Sep 17 00:00:00 2001 From: Florian THIERRY Date: Mon, 4 May 2026 18:00:24 +0200 Subject: [PATCH 3/5] Fix properties repository rights. --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 9c49d69..00787de 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -14,7 +14,7 @@ jobs: - name: 📄 Checkout configuration env: - SSH_PRIVATE_KEY: ${{ secrets.D_PROD_PROPERTIES_SSH_KEY }} + SSH_PRIVATE_KEY: ${{ secrets.PROD_PROPERTIES_SSH_KEY }} run: | mkdir -p ~/.ssh echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa -- 2.47.3 From 22af16c9afe860e936c7e565234cee7ffd308b96 Mon Sep 17 00:00:00 2001 From: Florian THIERRY Date: Mon, 4 May 2026 23:22:05 +0200 Subject: [PATCH 4/5] Add production configuration for debipogi server. --- .gitea/workflows/build-and-deploy.yml | 2 +- docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 00787de..102ab41 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -19,7 +19,7 @@ jobs: mkdir -p ~/.ssh echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - git clone -b hexagonal-reforged ssh://gitea@gitea.takiguchi.ovh:12960/Codiki/codiki-properties.git --config core.sshCommand='ssh -o StrictHostKeyChecking=no' + git clone --branch debipogi ssh://gitea@gitea.takiguchi.ovh:12960/Codiki/codiki-properties.git --config core.sshCommand='ssh -o StrictHostKeyChecking=no' - name: 📄 Edit configuration run: | diff --git a/docker-compose.yml b/docker-compose.yml index b2109da..90972fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_PASSWORD: PGDATA: /var/lib/postgresql/data/pgdata volumes: - - "./docker/postgresql/pgdata:/var/lib/postgresql/data/pgdata" + - "/home/codiki/database:/var/lib/postgresql/data/pgdata" restart: always codiki-backend: @@ -23,7 +23,7 @@ services: ports: - "50011:8080" volumes: - - "/opt/codiki/pictures:/opt/codiki/pictures" + - "/home/codiki/pictures:/opt/codiki/pictures" networks: - "codiki-network" restart: always -- 2.47.3 From 44537ddeff374e2c36c0273ed73cf1ab6db76096 Mon Sep 17 00:00:00 2001 From: Florian THIERRY Date: Tue, 5 May 2026 13:37:48 +0200 Subject: [PATCH 5/5] Fix depogi ip address in nginx configuration. --- frontend/conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/conf/nginx.conf b/frontend/conf/nginx.conf index 15740a9..9e37b94 100644 --- a/frontend/conf/nginx.conf +++ b/frontend/conf/nginx.conf @@ -44,7 +44,7 @@ http { } location ~ ^/api { - proxy_pass http://192.168.1.153:50011; + proxy_pass http://192.168.1.154:50011; proxy_set_header Host $host:$server_port; proxy_set_header X-Forwarded-Host $server_name; proxy_set_header X-Real-IP $remote_addr; -- 2.47.3