From 052706bc0054cceb888fdff82b0a05e12189fafd Mon Sep 17 00:00:00 2001 From: Phillip Wirth Date: Tue, 10 Dec 2024 13:56:07 +0100 Subject: [PATCH 1/4] BC-8528 disable /stats for etherpad --- .../roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 b/ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 index baee99513..397ef4c0e 100644 --- a/ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 +++ b/ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 @@ -52,6 +52,10 @@ data: index index.html index.htm; } + location /stats { + return 404; + } + #error_page 404 /404.html; # redirect server error pages to the static page /50x.html # From 3c87046aa930e283492ffbe4871055e755e602d5 Mon Sep 17 00:00:00 2001 From: Phillip Wirth Date: Tue, 10 Dec 2024 13:59:14 +0100 Subject: [PATCH 2/4] merge etherpad and ehterpad_nginx role --- .../defaults/main.yml | 0 ansible/roles/dof_etherpad/tasks/main.yml | 27 ++++++++++++++++++- .../templates/nginx-configmap-files.yml.j2} | 0 .../templates/nginx-deployment.yml.j2} | 0 .../templates/nginx-svc.yml.j2} | 0 .../roles/dof_etherpad_nginx/meta/main.yml | 9 ------- .../roles/dof_etherpad_nginx/tasks/main.yml | 25 ----------------- 7 files changed, 26 insertions(+), 35 deletions(-) rename ansible/roles/{dof_etherpad_nginx => dof_etherpad}/defaults/main.yml (100%) rename ansible/roles/{dof_etherpad_nginx/templates/configmap-files.yml.j2 => dof_etherpad/templates/nginx-configmap-files.yml.j2} (100%) rename ansible/roles/{dof_etherpad_nginx/templates/deployment.yml.j2 => dof_etherpad/templates/nginx-deployment.yml.j2} (100%) rename ansible/roles/{dof_etherpad_nginx/templates/svc.yml.j2 => dof_etherpad/templates/nginx-svc.yml.j2} (100%) delete mode 100644 ansible/roles/dof_etherpad_nginx/meta/main.yml delete mode 100644 ansible/roles/dof_etherpad_nginx/tasks/main.yml diff --git a/ansible/roles/dof_etherpad_nginx/defaults/main.yml b/ansible/roles/dof_etherpad/defaults/main.yml similarity index 100% rename from ansible/roles/dof_etherpad_nginx/defaults/main.yml rename to 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 index 82c45ace7..47c53282c 100644 --- 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 - \ No newline at end of file + + - 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/ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 b/ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 similarity index 100% rename from ansible/roles/dof_etherpad_nginx/templates/configmap-files.yml.j2 rename to ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 diff --git a/ansible/roles/dof_etherpad_nginx/templates/deployment.yml.j2 b/ansible/roles/dof_etherpad/templates/nginx-deployment.yml.j2 similarity index 100% rename from ansible/roles/dof_etherpad_nginx/templates/deployment.yml.j2 rename to ansible/roles/dof_etherpad/templates/nginx-deployment.yml.j2 diff --git a/ansible/roles/dof_etherpad_nginx/templates/svc.yml.j2 b/ansible/roles/dof_etherpad/templates/nginx-svc.yml.j2 similarity index 100% rename from ansible/roles/dof_etherpad_nginx/templates/svc.yml.j2 rename to ansible/roles/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 deleted file mode 100644 index f2f2b374e..000000000 --- a/ansible/roles/dof_etherpad_nginx/meta/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -galaxy_info: - role_name: dof_etherpad_nginx - author: Schul-Cloud Verbund - description: role for the dof_etherpad_nginx - company: Schul-Cloud Verbund - license: license (AGPLv3) - min_ansible_version: 2.8 - galaxy_tags: [] -dependencies: [] diff --git a/ansible/roles/dof_etherpad_nginx/tasks/main.yml b/ansible/roles/dof_etherpad_nginx/tasks/main.yml deleted file mode 100644 index a15378e74..000000000 --- a/ansible/roles/dof_etherpad_nginx/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ - - name: Service - kubernetes.core.k8s: - kubeconfig: ~/.kube/config - namespace: "{{ NAMESPACE }}" - template: svc.yml.j2 - tags: - - service - - - name: Configmap Files - kubernetes.core.k8s: - kubeconfig: ~/.kube/config - namespace: "{{ NAMESPACE }}" - template: configmap-files.yml.j2 - apply: yes - tags: - - configmap - - - name: Deployment - kubernetes.core.k8s: - kubeconfig: ~/.kube/config - namespace: "{{ NAMESPACE }}" - template: deployment.yml.j2 - tags: - - deployment - \ No newline at end of file From fb28dc93819b28adecfa33c60eaaa674a0eb0410 Mon Sep 17 00:00:00 2001 From: Phillip Wirth Date: Tue, 10 Dec 2024 14:05:52 +0100 Subject: [PATCH 3/4] BC-8528 disable /stats for etherpad --- .../dof_etherpad/templates/nginx-configmap-files.yml.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 b/ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 index 397ef4c0e..0cd72f438 100644 --- a/ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 +++ b/ansible/roles/dof_etherpad/templates/nginx-configmap-files.yml.j2 @@ -47,15 +47,15 @@ data: proxy_buffering off; } + location /etherpad/stats { + return 404; + } + location / { root /usr/share/nginx/html; index index.html index.htm; } - location /stats { - return 404; - } - #error_page 404 /404.html; # redirect server error pages to the static page /50x.html # From 4e3c88ed5dd5353b07e6630334f1cb4d1c8564b8 Mon Sep 17 00:00:00 2001 From: Phillip Wirth Date: Tue, 10 Dec 2024 14:08:26 +0100 Subject: [PATCH 4/4] removed role from playbooks --- ansible/playbook.yml | 1 - ansible/playbook_rollout.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/ansible/playbook.yml b/ansible/playbook.yml index ad74f37f1..ec41b3e33 100644 --- 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 index ce2f7b11b..a20da2111 100644 --- 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