Sync feature/zappa-migration with main

.coderabbit.yaml

@@ -1,9 +1,14 @@
+# https://docs.coderabbit.ai/reference/configuration
+
 chat:
   auto_reply: true
 code_generation:
   docstrings:
     language: en-US
 early_access: true
+issue_enrichment:
+  auto_enrich:
+    enabled: false
 language: en-US
 reviews:
   assess_linked_issues: true
@@ -19,6 +24,6 @@ reviews:
   labeling_instructions: []
   poem: false
   profile: chill
-  request_changes_workflow: false
+  request_changes_workflow: true
   review_status: true
   sequence_diagrams: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,28 @@
-<!-- Thanks for contributing to OWASP Nest!-->
+
+## STOP AND READ BEFORE SUBMITTING! REMOVE THIS PARAGRAPH BEFORE OPENING THE PR
+
+Thank you for your interest in contributing to OWASP Nest!
+
+Before starting any work, all external contributors **must first be assigned to an issue** in the repository.
+This is a mandatory step in the OWASP Nest workflow and ensures that effort is coordinated, approved, and tracked properly.
+
+**Exception:** OWASP leaders are not required to follow this rule —- just make sure your username is included in the [exception list](https://github.com/OWASP/Nest/blob/main/.github/workflows/check-pr-issue-skip-usernames.txt).
+
+**If you were not assigned to the issue you are trying to resolve, stop right now and do NOT create this PR.**
+Unassigned pull requests are automatically closed by our workflows — please don't waste your time.
+
+If you want to be assigned on any available issue, comment on it and wait for confirmation from the maintainers or project leads.
 
 ## Proposed change
 
-<!-- Don't forget to link your PR to an existing issue if any.-->
+<!-- Don't forget to link your PR to an existing issue.-->
 Resolves #(put the issue number here)
 
 <!-- Describe the big picture of your changes.-->
 Add the PR description here.
 
 ## Checklist
 
-- [ ] I've read and followed the [contributing guidelines](https://github.com/OWASP/Nest/blob/main/CONTRIBUTING.md).
-- [ ] I've run `make check-test` locally; all checks and tests passed.
+- [ ] **Required:** I read and followed the [contributing guidelines](https://github.com/OWASP/Nest/blob/main/CONTRIBUTING.md)
+- [ ] **Required:** I ran `make check-test` locally and all tests passed
+- [ ] I used AI for code, documentation, or tests in this PR

.github/ansible/production/nest.yaml

@@ -3,7 +3,7 @@
     tasks:
       - name: Copy docker-compose.yaml
         ansible.builtin.copy:
-          src: '{{ github_workspace }}/docker-compose/production.yaml'
+          src: '{{ github_workspace }}/docker-compose/production/compose.yaml'
           dest: ~/docker-compose.yaml
           mode: '0644'
 
@@ -63,7 +63,7 @@
         ansible.builtin.command:
           cmd: crontab /tmp/production_crontab
 
-      - name: Retart services
+      - name: Restart services
         shell:
           cmd: docker compose up -d --pull always
 

.github/ansible/production/proxy.yaml

@@ -1,22 +1,29 @@
-  - name: Deploy Production Nest Proxy
-    hosts: production_nest_proxy
-    tasks:
-      - name: Copy proxy configuration files
-        copy:
-          src: '{{ github_workspace }}/proxy/{{ item }}'
-          dest: ~/
-          mode: '0644'
-        loop:
-          - blocked_ips.conf
-          - docker-compose.yaml
-          - headers.conf
-          - production.conf
-          - redirects.conf
+- name: Deploy Production Nest Proxy
+  hosts: production_nest_proxy
+  tasks:
+    - name: Copy proxy configuration files
+      copy:
+        src: '{{ github_workspace }}/proxy/{{ item }}'
+        dest: ~/
+        mode: '0644'
+      loop:
+        - blocked_ips.conf
+        - cloudflare_realip.conf
+        - headers.conf
+        - production.conf
+        - proxy_cache.conf
+        - redirects.conf
 
-      - name: Retart services
-        shell:
-          cmd: docker compose up -d --pull always
+    - name: Copy docker compose file
+      copy:
+        src: '{{ github_workspace }}/docker-compose/proxy/compose.yaml'
+        dest: ~/docker-compose.yaml
+        mode: '0644'
 
-      - name: Prune docker images
-        shell:
-          cmd: docker image prune -f
+    - name: Restart services
+      shell:
+        cmd: docker compose up -d --pull always && docker compose restart
+
+    - name: Prune docker images
+      shell:
+        cmd: docker image prune -f

.github/ansible/staging/nest.yaml

@@ -3,7 +3,7 @@
     tasks:
       - name: Copy docker-compose.yaml
         ansible.builtin.copy:
-          src: '{{ github_workspace }}/docker-compose/staging.yaml'
+          src: '{{ github_workspace }}/docker-compose/staging/compose.yaml'
           dest: ~/docker-compose.yaml
           mode: '0644'
 
@@ -67,7 +67,7 @@
         ansible.builtin.command:
           cmd: crontab /tmp/staging_crontab
 
-      - name: Retart services
+      - name: Restart services
         shell:
           cmd: docker compose up -d --pull always
 

.github/ansible/staging/proxy.yaml

@@ -1,22 +1,29 @@
-  - name: Deploy Staging Nest Proxy
-    hosts: staging_nest_proxy
-    tasks:
-      - name: Copy proxy configuration files
-        copy:
-          src: '{{ github_workspace }}/proxy/{{ item }}'
-          dest: ~/
-          mode: '0644'
-        loop:
-          - blocked_ips.conf
-          - docker-compose.yaml
-          - headers.conf
-          - redirects.conf
-          - staging.conf
+- name: Deploy Staging Nest Proxy
+  hosts: staging_nest_proxy
+  tasks:
+    - name: Copy proxy configuration files
+      copy:
+        src: '{{ github_workspace }}/proxy/{{ item }}'
+        dest: ~/
+        mode: '0644'
+      loop:
+        - blocked_ips.conf
+        - cloudflare_realip.conf
+        - headers.conf
+        - proxy_cache.conf
+        - redirects.conf
+        - staging.conf
 
-      - name: Retart services
-        shell:
-          cmd: docker compose up -d --pull always
+    - name: Copy docker compose file
+      copy:
+        src: '{{ github_workspace }}/docker-compose/proxy/compose.yaml'
+        dest: ~/docker-compose.yaml
+        mode: '0644'
 
-      - name: Prune docker images
-        shell:
-          cmd: docker image prune -f
+    - name: Restart services
+      shell:
+        cmd: docker compose up -d --pull always && docker compose restart
+
+    - name: Prune docker images
+      shell:
+        cmd: docker image prune -f

.github/dependabot.yml

@@ -1,22 +1,42 @@
 version: 2
 updates:
   - package-ecosystem: docker
-    directory: /backend/docker
+    directory: /docker/backend
     schedule:
       interval: daily
 
   - package-ecosystem: docker
-    directory: /cspell
+    directory: /docker/cspell
+    schedule:
+      interval: daily
+
+  - package-ecosystem: docker-compose
+    directory: /docker-compose/local
+    schedule:
+      interval: daily
+
+  - package-ecosystem: docker-compose
+    directory: /docker-compose/production
+    schedule:
+      interval: daily
+
+  - package-ecosystem: docker-compose
+    directory: /docker-compose/proxy
+    schedule:
+      interval: daily
+
+  - package-ecosystem: docker-compose
+    directory: /docker-compose/staging
     schedule:
       interval: daily
 
   - package-ecosystem: docker
-    directory: /docs/docker
+    directory: /docker/docs
     schedule:
       interval: daily
 
   - package-ecosystem: docker
-    directory: /frontend/docker
+    directory: /docker/frontend
     schedule:
       interval: daily