BC-8528 disable /stats for etherpad (#1055)

cleanup: merged etherpad and ehterpad_nginx anrible role
hpi-schul-cloud · Dec 10, 2024 · 64b059b · 64b059b
1 parent 7bbcfbf
commit 64b059b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 37 deletions.
diff --git a/ansible/playbook.yml b/ansible/playbook.yml
@@ -22,7 +22,6 @@
     - hydra
     - erwin-idm
     - oidcmock
-    - dof_etherpad_nginx
     - dof_etherpad
     - clamav
     - schulcloud-server-core

diff --git a/ansible/playbook_rollout.yml b/ansible/playbook_rollout.yml
@@ -23,7 +23,6 @@
       when: KEDA_ENABLED is defined and KEDA_ENABLED|bool
     - role: hydra
     - role: erwin-idm
-    - role: dof_etherpad_nginx
     - role: dof_etherpad
     - role: clamav
     - role: schulcloud-server-core

diff --git a/...oles/dof_etherpad_nginx/defaults/main.yml → ansible/roles/dof_etherpad/defaults/main.yml b/...oles/dof_etherpad_nginx/defaults/main.yml → ansible/roles/dof_etherpad/defaults/main.yml
diff --git a/ansible/roles/dof_etherpad/tasks/main.yml b/ansible/roles/dof_etherpad/tasks/main.yml
@@ -41,4 +41,29 @@
       template: deployment.yml.j2
     tags:
       - deployment
-
+
+  - name: nginx service
+    kubernetes.core.k8s:
+      kubeconfig: ~/.kube/config
+      namespace: "{{ NAMESPACE }}"
+      template: nginx-svc.yml.j2
+    tags:
+      - service
+
+  - name: nginx configmap files
+    kubernetes.core.k8s:
+      kubeconfig: ~/.kube/config
+      namespace: "{{ NAMESPACE }}"
+      template: nginx-configmap-files.yml.j2
+      apply: yes
+    tags:
+      - configmap
+
+  - name: nginx deployment
+    kubernetes.core.k8s:
+      kubeconfig: ~/.kube/config
+      namespace: "{{ NAMESPACE }}"
+      template: nginx-deployment.yml.j2
+    tags:
+      - deployment
+
diff --git a/...ad_nginx/templates/configmap-files.yml.j2 → ...ad/templates/nginx-configmap-files.yml.j2 b/...ad_nginx/templates/configmap-files.yml.j2 → ...ad/templates/nginx-configmap-files.yml.j2
@@ -47,6 +47,10 @@ data:
         proxy_buffering off;
       }
 
+      location /etherpad/stats {
+        return 404;
+      }
+
       location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;

diff --git a/...therpad_nginx/templates/deployment.yml.j2 → ...therpad/templates/nginx-deployment.yml.j2 b/...therpad_nginx/templates/deployment.yml.j2 → ...therpad/templates/nginx-deployment.yml.j2
diff --git a/...s/dof_etherpad_nginx/templates/svc.yml.j2 → ...s/dof_etherpad/templates/nginx-svc.yml.j2 b/...s/dof_etherpad_nginx/templates/svc.yml.j2 → ...s/dof_etherpad/templates/nginx-svc.yml.j2
diff --git a/ansible/roles/dof_etherpad_nginx/meta/main.yml b/ansible/roles/dof_etherpad_nginx/meta/main.yml
diff --git a/ansible/roles/dof_etherpad_nginx/tasks/main.yml b/ansible/roles/dof_etherpad_nginx/tasks/main.yml