Merge pull request #572 from PAWECOGmbH/development

Dev to Staging
PAWECOGmbH · Dec 5, 2024 · a6477fa · a6477fa
2 parents a2d5e47 + 29b8c41
commit a6477fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Deploy to server via rsync
         uses: Burnett01/[email protected]
         with:
-          switches: -avzr --delete --exclude-from='.gitignore'
+          switches: -avzr --delete --exclude-from='.gitignore' --exclude='/config/nginx/conf.d/custom.conf'
           path: ./
           remote_path: ${{ secrets.PROD_REMOTE_PATH }}
           remote_host: ${{ secrets.PROD_HOST }}

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Deploy to server via rsync
         uses: Burnett01/[email protected]
         with:
-          switches: -avzr --delete --exclude-from='.gitignore'
+          switches: -avzr --delete --exclude-from='.gitignore' --exclude='/config/nginx/conf.d/custom.conf'
           path: ./
           remote_path: ${{ secrets.STAGING_REMOTE_PATH }}
           remote_host: ${{ secrets.STAGING_HOST }}

diff --git a/config/example.custom.conf b/config/example.custom.conf
@@ -0,0 +1,8 @@
+# For your own NGINX settings#
+#
+# server {
+#   listen 80;
+#    server_name yourdomain.com;
+#    return 301 https://www.yourdomain.com$request_uri;
+# }
+#
diff --git a/config/nginx/conf.d/custom.conf b/config/nginx/conf.d/custom.conf
@@ -0,0 +1 @@
+# For your own settings