chore: fix deploy configuration

openfoodfacts · Aug 21, 2024 · e4999ac · e4999ac
1 parent 0f5b8ca
commit e4999ac
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml
@@ -24,6 +24,7 @@ jobs:
         echo "SSH_PROXY_HOST=ovh1.openfoodfacts.org" >> $GITHUB_ENV
         echo "SSH_USERNAME=off" >> $GITHUB_ENV
         echo "SSH_HOST=10.1.0.200" >> $GITHUB_ENV
+        echo "SSH_PROTOCOL=tcp" >> $GITHUB_ENV
         echo "ROBOTOFF_INSTANCE=dev" >> $GITHUB_ENV
         echo "ROBOTOFF_TLD=net" >> $GITHUB_ENV
         echo "MONGO_URI=mongodb://10.1.0.200:27017" >> $GITHUB_ENV
@@ -38,9 +39,11 @@ jobs:
     - name: Set various variable for production deployment
       if: matrix.env == 'robotoff-org'
       run: |
-        # First connect on the SSH proxy, using ipv6 address
-        echo "SSH_PROXY_HOST=osm45.openstreetmap.fr" >> $GITHUB_ENV
-        echo "SSH_USERNAME=off" >> $GITHUB_ENV
+        # This is the OSM proxy server, that does have an ipv4 address
+        echo "SSH_PROXY_HOST=45.147.209.254" >> $GITHUB_ENV
+        # We use 'raphael' user as we don't have an off user yet on the proxy machine
+        echo "SSH_USERNAME=raphael" >> $GITHUB_ENV
+        echo "SSH_PROTOCOL=tcp" >> $GITHUB_ENV
         echo "SSH_HOST=10.3.0.200" >> $GITHUB_ENV
         echo "ROBOTOFF_INSTANCE=prod" >> $GITHUB_ENV
         echo "ROBOTOFF_TLD=org" >> $GITHUB_ENV
@@ -81,6 +84,7 @@ jobs:
         proxy_host: ${{ env.SSH_PROXY_HOST }}
         proxy_username: ${{ env.SSH_USERNAME }}
         proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
+        protocol: ${{ env.SSH_PROTOCOL }}
         script_stop: false
         script: |
           # Clone Git repository if not already there
@@ -111,6 +115,7 @@ jobs:
         proxy_host: ${{ env.SSH_PROXY_HOST }}
         proxy_username: ${{ env.SSH_USERNAME }}
         proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
+        protocol: ${{ env.SSH_PROTOCOL }}
         script_stop: false
         script: |
           # Go to repository directory
@@ -177,6 +182,7 @@ jobs:
         proxy_host: ${{ env.SSH_PROXY_HOST }}
         proxy_username: ${{ env.SSH_USERNAME }}
         proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
+        protocol: ${{ env.SSH_PROTOCOL }}
         script_stop: false
         script: |
           cd ${{ matrix.env }}
@@ -194,6 +200,7 @@ jobs:
         proxy_host: ${{ env.SSH_PROXY_HOST }}
         proxy_username: ${{ env.SSH_USERNAME }}
         proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
+        protocol: ${{ env.SSH_PROTOCOL }}
         envs: DOCKER_CLIENT_TIMEOUT,COMPOSE_HTTP_TIMEOUT
         script_stop: false
         script: |
@@ -216,6 +223,7 @@ jobs:
         proxy_host: ${{ env.SSH_PROXY_HOST }}
         proxy_username: ${{ env.SSH_USERNAME }}
         proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
+        protocol: ${{ env.SSH_PROTOCOL }}
         script_stop: false
         script: |
           cd ${{ matrix.env}}
@@ -237,6 +245,7 @@ jobs:
         proxy_host: ${{ env.SSH_PROXY_HOST }}
         proxy_username: ${{ env.SSH_USERNAME }}
         proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
+        protocol: ${{ env.SSH_PROTOCOL }}
         envs: DOCKER_CLIENT_TIMEOUT,COMPOSE_HTTP_TIMEOUT
         script_stop: false
         script: |
@@ -253,6 +262,7 @@ jobs:
         proxy_host: ${{ env.SSH_PROXY_HOST }}
         proxy_username: ${{ env.SSH_USERNAME }}
         proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
+        protocol: ${{ env.SSH_PROTOCOL }}
         script_stop: false
         script: |
           cd ${{ matrix.env }}