Updated envs in order to take the correct variables

scify · Oct 8, 2024 · 4a40f03 · 4a40f03
1 parent 5de7888
commit 4a40f03
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/.github/templates/.env.j2 b/.github/templates/.env.j2
@@ -1,6 +1,6 @@
 APP_NAME="Crowdsourcing platform | Let's crowdsource our future"
 APP_ENV=production
-APP_KEY={{ LARAVEL_STAGING_SEC_DATA_APP_KEY }}
+APP_KEY={{LARAVEL_APP_KEY}}
 APP_DEBUG=false
 DEBUGBAR_ENABLED=false
 APP_LOG_LEVEL=debug
@@ -78,7 +78,7 @@ VITE_SENTRY_DSN_PUBLIC="${SENTRY_LARAVEL_DSN}"
 VITE_APP_URL="${APP_URL}"
 
 
-INSTALLATION_RESOURCES_DIR=ecas
+INSTALLATION_RESOURCES_DIR={{ INSTALLATION_RESOURCES_DIR }}
 API_AUTH_TOKEN={{ API_AUTH_TOKEN }}
 MIX_API_AUTH_TOKEN="${API_AUTH_TOKEN}"
 MIX_APP_URL="${APP_URL}"
@@ -96,8 +96,8 @@ AWS_DEFAULT_REGION=eu-central-1
 AWS_BUCKET=crowdsourcing-ecas-bucket-s3
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
-INSTALLATION_COMPANY_NAME="ECAS - European Citizen Action Service"
-INSTALLATION_COMPANY_ADDRESS="BeCentral Cantersteen 12 B-1000 Brussels, Belgium"
-INSTALLATION_COMPANY_PHONE="+32 (0) 2 548 04 90"
-INSTALLATION_COMPANY_EMAIL="info(at)ecas.org"
+INSTALLATION_COMPANY_NAME={{ INSTALLATION_COMPANY_NAME}}
+INSTALLATION_COMPANY_ADDRESS={{INSTALLATION_COMPANY_ADDRESS}}
+INSTALLATION_COMPANY_PHONE={{INSTALLATION_COMPANY_PHONE}}
+INSTALLATION_COMPANY_EMAIL={{INSTALLATION_COMPANY_EMAIL}}
 
diff --git a/.github/workflows/deploy-secondary-staging.yml b/.github/workflows/deploy-secondary-staging.yml
@@ -73,7 +73,7 @@ jobs:
             DB_NAME=${{ env.DB_NAME }}
             DB_USER=${{ env.DB_USER }}
             DB_PASSWORD=${{ env.DB_PASSWORD }}
-            LARAVEL_STAGING_SEC_DATA_APP_KEY=${{ secrets.LARAVEL_STAGING_SEC_DATA_APP_KEY }}
+            LARAVEL_APP_KEY=${{ secrets.LARAVEL_STAGING_SEC_DATA_APP_KEY }}
             PROJECT_URL=${{ env.PROJECT_URL }}
             MAILGUN_SECRET=${{ env.MAILGUN_SECRET }}
             PERSONAL_CLIENT_ID=${{ secrets.PERSONAL_CLIENT_ID }}
@@ -97,8 +97,13 @@ jobs:
             USERWAY_ID=${{ secrets.USERWAY_ID }}
             AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
             AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}
-
-    
+            INSTALLATION_COMPANY_NAME="ECAS - European Citizen Action Service"
+            INSTALLATION_COMPANY_ADDRESS="BeCentral Cantersteen 12 B-1000 Brussels, Belgium"
+            INSTALLATION_COMPANY_PHONE="+32 (0) 2 548 04 90"
+            INSTALLATION_COMPANY_EMAIL="info(at)ecas.org"
+            INSTALLATION_RESOURCES_DIR=ecas
+            
+            
       
       - name: Setup node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -73,7 +73,7 @@ jobs:
             DB_NAME=${{ env.DB_NAME }}
             DB_USER=${{ env.DB_USER }}
             DB_PASSWORD=${{ env.DB_PASSWORD }}
-            LARAVEL_STAGING_SCIFY_APP_KEY=${{ secrets.LARAVEL_STAGING_SCIFY_APP_KEY }}
+            LARAVEL_APP_KEY=${{ secrets.LARAVEL_STAGING_SCIFY_APP_KEY }}
             PROJECT_URL=${{ env.PROJECT_URL }}
             MAILGUN_SECRET=${{ env.MAILGUN_SECRET }}
             PERSONAL_CLIENT_ID=${{ secrets.PERSONAL_CLIENT_ID }}
@@ -97,7 +97,11 @@ jobs:
             USERWAY_ID=${{ secrets.USERWAY_ID }}
             AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
             AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}
-
+            INSTALLATION_COMPANY_NAME="SciFY"
+            INSTALLATION_COMPANY_ADDRESS="TEPA LEFKIPPOS - NCSR Demokritos 27 Neapoleos Str, 15341 Agia Paraskevi, Greece"
+            INSTALLATION_COMPANY_PHONE="+30 2114004192"
+            INSTALLATION_COMPANY_EMAIL="info(at)scify.org"
+            INSTALLATION_RESOURCES_DIR=together
     
 
       - name: Setup node
@@ -133,5 +137,5 @@ jobs:
           script: |
             source /home/${{ env.REMOTE_USER }}/.profile
             cd /home/${{ env.REMOTE_USER }}/www/${{ env.PROJECT_URL }}
-            composer install --no-interaction --no-progress --optimize-autoloader 
+            composer install --no-interaction --no-progress --optimize-autoloader
   # --no-dev