added reverb config values to secrets and .env build

switch to daily laravel logs moved up docker compose down and added 'public' volume purge to deploy action
hrsa · May 13, 2024 · dfd44d6 · dfd44d6
1 parent 20049fd
commit dfd44d6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.env.example b/.env.example
@@ -18,7 +18,7 @@ APP_MAINTENANCE_STORE=database
 BCRYPT_ROUNDS=12
 
 LOG_CHANNEL=stack
-LOG_STACK=single
+LOG_STACK=daily
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 TELEGRAM_BOT_TOKEN=

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -66,6 +66,8 @@ jobs:
           REVERB_APP_KEY: ${{ secrets.REVERB_APP_KEY }}
           REVERB_APP_SECRET: ${{ secrets.REVERB_APP_SECRET }}
           REVERB_HOST: ${{ secrets.REVERB_HOST }}
+          REVERB_PORT: ${{ secrets.REVERB_PORT }}
+          REVERB_SCHEME: ${{ secrets.REVERB_SCHEME }}
           MISTRAL_API_KEY: ${{ secrets.MISTRAL_API_KEY }}
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           OPENAI_ORGANIZATION: ${{ secrets.OPENAI_ORGANIZATION }}
@@ -136,6 +138,8 @@ jobs:
           REVERB_APP_KEY: ${{ secrets.REVERB_APP_KEY }}
           REVERB_APP_SECRET: ${{ secrets.REVERB_APP_SECRET }}
           REVERB_HOST: ${{ secrets.REVERB_HOST }}
+          REVERB_PORT: ${{ secrets.REVERB_PORT }}
+          REVERB_SCHEME: ${{ secrets.REVERB_SCHEME }}
           MISTRAL_API_KEY: ${{ secrets.MISTRAL_API_KEY }}
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           OPENAI_ORGANIZATION: ${{ secrets.OPENAI_ORGANIZATION }}

diff --git a/.github/workflows/jobs/build-env/action.yml b/.github/workflows/jobs/build-env/action.yml
@@ -64,6 +64,10 @@ inputs:
     required: true
   REVERB_HOST:
     required: true
+  REVERB_PORT:
+    required: true
+  REVERB_SCHEME:
+    required: true
   MISTRAL_API_KEY:
     required: true
   OPENAI_API_KEY:
@@ -155,6 +159,8 @@ runs:
         sed -i "s|REVERB_APP_KEY=.*|REVERB_APP_KEY=${{ inputs.REVERB_APP_KEY }}|" .env
         sed -i "s|REVERB_APP_SECRET=.*|REVERB_APP_SECRET=${{ inputs.REVERB_APP_SECRET }}|" .env
         sed -i "s|REVERB_HOST=.*|REVERB_HOST=${{ inputs.REVERB_HOST }}|" .env
+        sed -i "s|REVERB_PORT=.*|REVERB_PORT=${{ inputs.REVERB_PORT }}|" .env
+        sed -i "s|REVERB_SCHEME=.*|REVERB_SCHEME=${{ inputs.REVERB_SCHEME }}|" .env
         sed -i "s|MISTRAL_API_KEY=.*|MISTRAL_API_KEY=${{ inputs.MISTRAL_API_KEY }}|" .env
         sed -i "s|OPENAI_API_KEY=.*|OPENAI_API_KEY=${{ inputs.OPENAI_API_KEY }}|" .env
         sed -i "s|OPENAI_ORGANIZATION=.*|OPENAI_ORGANIZATION=${{ inputs.OPENAI_ORGANIZATION }}|" .env

diff --git a/.github/workflows/jobs/deploy/action.yml b/.github/workflows/jobs/deploy/action.yml
@@ -24,15 +24,16 @@ runs:
     - name: Copy files and restart containers
       run: |
         ssh -o StrictHostKeyChecking=no root@${{ inputs.SERVER_IP }}  <<EOF
+        docker compose -f /var/www/docker-compose-prod.yml down
+        docker system prune -a -f
+        docker volume rm www_public
         cp /var/www/docker-compose-prod.yml /var/www/docker-compose-prev.yml
         cp /var/www/.env /var/www/.env.prev
         EOF
         scp -o StrictHostKeyChecking=no docker/renew-ssl.sh root@${{ inputs.SERVER_IP }}:/var/www
         scp -o StrictHostKeyChecking=no .env root@${{ inputs.SERVER_IP }}:/var/www
         scp -o StrictHostKeyChecking=no docker-compose-prod.yml root@${{ inputs.SERVER_IP }}:/var/www
         ssh -o StrictHostKeyChecking=no root@${{ inputs.SERVER_IP }}  <<EOF
-        docker compose -f /var/www/docker-compose-prod.yml down
-        docker system prune -a -f
         docker compose -f /var/www/docker-compose-prod.yml up -d nginx
         EOF
       shell: bash