actions

nycmeshnet · Sep 6, 2024 · 4890b8c · 4890b8c
1 parent 80b34dd
commit 4890b8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -4,11 +4,11 @@ permissions: read-all
 on:
   push:
     branches:
-      - main
+      - master
       - james/iac
   workflow_dispatch:
     branches:
-      - main
+      - master
 
 jobs:
   deploy_dev3:
@@ -17,12 +17,12 @@ jobs:
     with:
       environment: dev3
     secrets: inherit
-    #if: github.ref == 'refs/heads/main'
+    #if: github.ref == 'refs/heads/master'
 
   deploy_prod1:
     name: Deploy prod1
     uses: ./.github/workflows/deploy_environment.yaml
     with:
       environment: prod1
     secrets: inherit
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/master'
diff --git a/.github/workflows/deploy_environment.yaml b/.github/workflows/deploy_environment.yaml
@@ -83,10 +83,10 @@ jobs:
 
       - name: Terraform Apply
         run: |
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > terraform/vpn
-          echo "${{ secrets.SSH_PUBLIC_KEY }}" > terraform/vpn.pub
-          chmod 600 terraform/vpn
-          chmod 600 terraform/vpn.pub
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > vpn
+          echo "${{ secrets.SSH_PUBLIC_KEY }}" > vpn.pub
+          chmod 600 vpn
+          chmod 600 vpn.pub
           terraform apply -auto-approve -input=false -var-file=${{ inputs.environment }}.tfvars
         working-directory: ./terraform/