Endret navn på variabel

DirektoratetForByggkvalitet · Jul 17, 2024 · ecbf5e5 · ecbf5e5
1 parent 063c0f1
commit ecbf5e5
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/.github/workflows/utsending.yml b/.github/workflows/utsending.yml
@@ -21,9 +21,6 @@ jobs:
         AZURE_SP_ID=${{vars.AZURE_SP_ID}}
         AZURE_TENANT_ID=${{ vars.AZURE_TENANT_ID }}
         MICROSOFT_GRAPH_CLIENT_ID=${{ vars.MICROSOFT_GRAPH_CLIENT_ID }}
-        MAIL_FROM_ADDRESS=${{ vars.MAIL_FROM_ADDRESS }}
-        MAIL_FROM_NAME='${{ vars.MAIL_FROM_NAME }}'
-        MAIL_REPLYTO_ADDRESS=${{ vars.MAIL_REPLYTO_ADDRESS }}
 
         PURESERVICE_URL=${{ vars.PURESERVICE_URL }}
 
@@ -32,15 +29,9 @@ jobs:
 
         MAIL_MAILER=${{ vars.MAILER }}
         MAIL_HOST=${{ vars.MAIL_HOST }}
-        MAIL_USER=${{ vars.MAIL_USER }}
+        MAIL_USERNAME=${{ vars.MAIL_USER }}
 
         APP_DEBUG=${{ vars.APP_DEBUG }}
-
-        PURESERVICE_APIKEY=${{ secrets.PURESERVICE_APIKEY }}
-        MICROSOFT_GRAPH_CLIENT_SECRET=${{ secrets.MICROSOFT_GRAPH_CLIENT_SECRET }}
-        REDIS_PASSWORD=${{ secrets.REDIS_SECRET }}
-        MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }}
-        EF_IP_PASSWORD=${{ secrets.INTEGRASJONSPUNKT_PASSWORD }}
         EOF
     - name: Cache dependencies
       id: vendor-cache
@@ -57,6 +48,12 @@ jobs:
     - name: Install dependencies
       run: composer install
     - name: Run Jamf2Pureservice
+      env:
+        PURESERVICE_APIKEY: ${{ secrets.PURESERVICE_APIKEY }}
+        MICROSOFT_GRAPH_CLIENT_SECRET: ${{ secrets.MICROSOFT_GRAPH_CLIENT_SECRET }}
+        REDIS_PASSWORD: ${{ secrets.REDIS_SECRET }}
+        MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }}
+        EF_IP_PASSWORD: ${{ secrets.INTEGRASJONSPUNKT_PASSWORD }}
       run: |
         ./artisan migrate:fresh --force
         ./artisan pureservice:utsending