Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-8528 disable /stats for etherpad #1055

Merged
merged 6 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ansible/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
- hydra
- erwin-idm
- oidcmock
- dof_etherpad_nginx
- dof_etherpad
- clamav
- schulcloud-server-core
Expand Down
1 change: 0 additions & 1 deletion ansible/playbook_rollout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 26 additions & 1 deletion ansible/roles/dof_etherpad/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ data:
proxy_buffering off;
}

location /etherpad/stats {
return 404;
}

location / {
root /usr/share/nginx/html;
index index.html index.htm;
Expand Down
9 changes: 0 additions & 9 deletions ansible/roles/dof_etherpad_nginx/meta/main.yml

This file was deleted.

25 changes: 0 additions & 25 deletions ansible/roles/dof_etherpad_nginx/tasks/main.yml

This file was deleted.

Loading