Merge branch 'staging' of github.com:bunkerity/bunkerweb into staging

bunkerity · Dec 4, 2023 · 588d04c · 588d04c
2 parents 0d5ea43 + 1fbd3dd
commit 588d04c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/examples/behind-reverse-proxy/setup-linux.sh b/examples/behind-reverse-proxy/setup-linux.sh
@@ -18,8 +18,11 @@ cp haproxy.cfg /etc/haproxy
 sed -i "s/*:8080/*:80/" /etc/haproxy/haproxy.cfg
 sed -i "s/mybunker/127.0.0.1/" /etc/haproxy/haproxy.cfg
 systemctl stop bunkerweb
-sleep 10
 systemctl stop haproxy
+if [ -f /lib/systemd/system/haproxy.service ] ; then
+	sed -i 's/^BindReadOnlyPaths/#BindReadOnlyPaths/' /lib/systemd/system/haproxy.service
+	systemctl daemon-reload
+fi
 systemctl start haproxy
 if [ $? -ne 0 ] ; then
 	systemctl status haproxy

diff --git a/examples/kubernetes-configs/kubernetes.yml b/examples/kubernetes-configs/kubernetes.yml
@@ -78,7 +78,7 @@ metadata:
   name: cfg-bunkerweb-app2-server-http
   annotations:
     bunkerweb.io/CONFIG_TYPE: "server-http"
-    bunkerweb.io/SERVER_NAME: "app2.example.com"
+    bunkerweb.io/CONFIG_SITE: "app2.example.com"
 data:
   myconf: |
     location /app2 {
@@ -94,7 +94,7 @@ metadata:
   name: cfg-bunkerweb-app3-server-http
   annotations:
     bunkerweb.io/CONFIG_TYPE: "server-http"
-    bunkerweb.io/SERVER_NAME: "app3.example.com"
+    bunkerweb.io/CONFIG_SITE: "app3.example.com"
 data:
   myconf: |
     location /app3 {

diff --git a/examples/proxy-protocol/setup-linux.sh b/examples/proxy-protocol/setup-linux.sh
@@ -20,6 +20,10 @@ sed -i "s/*:8443/*:443/g" /etc/haproxy/haproxy.cfg
 sed -i "s/mybunker/127.0.0.1/g" /etc/haproxy/haproxy.cfg
 systemctl stop bunkerweb
 systemctl stop haproxy
+if [ -f /lib/systemd/system/haproxy.service ] ; then
+	sed -i 's/^BindReadOnlyPaths/#BindReadOnlyPaths/' /lib/systemd/system/haproxy.service
+	systemctl daemon-reload
+fi
 systemctl start haproxy
 
 echo "hello" > /var/www/html/index.html