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

This commit is contained in:
florian 2023-12-04 20:00:15 +01:00
commit 588d04c7de
No known key found for this signature in database
GPG Key ID: 93EE47CC3D061500
3 changed files with 10 additions and 3 deletions

View File

@ -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

View File

@ -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 {

View File

@ -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