From 95c4ce723d5d5a3383fa61141a32d9a24f4a38d0 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Fri, 5 Aug 2022 17:04:32 +0200 Subject: [PATCH] enable bad behavior on default server and various k8s fixes --- confs/default-server-http.conf | 3 +++ core/badbehavior/badbehavior.lua | 4 ++++ core/whitelist/confs/default-server-http/whitelist.conf | 1 + examples/drupal/cleanup-kubernetes.sh | 3 ++- examples/wordpress/cleanup-kubernetes.sh | 3 ++- examples/wordpress/kubernetes.yml | 2 +- 6 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 core/whitelist/confs/default-server-http/whitelist.conf diff --git a/confs/default-server-http.conf b/confs/default-server-http.conf index 5cef58634..413720c67 100644 --- a/confs/default-server-http.conf +++ b/confs/default-server-http.conf @@ -1,5 +1,8 @@ server { + # reason variable + set $reason ''; + server_name _; # HTTP listen diff --git a/core/badbehavior/badbehavior.lua b/core/badbehavior/badbehavior.lua index 8c0cdde11..457e9539d 100644 --- a/core/badbehavior/badbehavior.lua +++ b/core/badbehavior/badbehavior.lua @@ -72,4 +72,8 @@ function _M:log() return true, "success" end +function _M:log_default() + return _M:log() +end + return _M diff --git a/core/whitelist/confs/default-server-http/whitelist.conf b/core/whitelist/confs/default-server-http/whitelist.conf new file mode 100644 index 000000000..32e1a56a2 --- /dev/null +++ b/core/whitelist/confs/default-server-http/whitelist.conf @@ -0,0 +1 @@ +set $is_whitelisted ''; \ No newline at end of file diff --git a/examples/drupal/cleanup-kubernetes.sh b/examples/drupal/cleanup-kubernetes.sh index eef800d92..1a695e194 100755 --- a/examples/drupal/cleanup-kubernetes.sh +++ b/examples/drupal/cleanup-kubernetes.sh @@ -5,4 +5,5 @@ if [ $(id -u) -ne 0 ] ; then exit 1 fi -helm delete drupal \ No newline at end of file +helm delete drupal +kubectl delete pvc data-drupal-mariadb-0 \ No newline at end of file diff --git a/examples/wordpress/cleanup-kubernetes.sh b/examples/wordpress/cleanup-kubernetes.sh index 35944e343..3f0761178 100755 --- a/examples/wordpress/cleanup-kubernetes.sh +++ b/examples/wordpress/cleanup-kubernetes.sh @@ -5,4 +5,5 @@ if [ $(id -u) -ne 0 ] ; then exit 1 fi -helm delete wordpress \ No newline at end of file +helm delete wordpress +kubectl delete pvc data-wordpress-mariadb-0 \ No newline at end of file diff --git a/examples/wordpress/kubernetes.yml b/examples/wordpress/kubernetes.yml index 814600168..63086ae09 100644 --- a/examples/wordpress/kubernetes.yml +++ b/examples/wordpress/kubernetes.yml @@ -10,7 +10,7 @@ spec: - host: www.example.com http: paths: - path: / + - path: / pathType: Prefix backend: service: