update

3 files changed, 26 insertions, 19 deletions

diff --git a/terminaldweller.com/cgit/bootstrap/Dockerfile b/terminaldweller.com/cgit/bootstrap/Dockerfile
index 73e757a..fe212dd 100644
--- a/terminaldweller.com/cgit/bootstrap/Dockerfile
+++ b/terminaldweller.com/cgit/bootstrap/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.16
 RUN apk update && apk add --no-cache git cronie busybox-initscripts
-RUN rc-service crond start && rc-update add crond
+# RUN rc-service crond start && rc-update add crond
 COPY ./bootstrap.sh /bootstrap.sh 
 COPY ./docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./crontab /etc/crontabs/root
diff --git a/terminaldweller.com/cgit/docker-compose.yaml b/terminaldweller.com/cgit/docker-compose.yaml
index 4635764..55484ed 100644
--- a/terminaldweller.com/cgit/docker-compose.yaml
+++ b/terminaldweller.com/cgit/docker-compose.yaml
@@ -17,7 +17,8 @@ services:
     image: bootstrap
     build:
       context: ./bootstrap
-    networks:bootstrapnet
+    networks:
+      - bootstrapnet
     volumes:
       - storage:/etc/gitrepos/
     entrypoint: ["/docker-entrypoint.sh"]
diff --git a/terminaldweller.com/haproxy/haproxy.cfg b/terminaldweller.com/haproxy/haproxy.cfg
index d9ae9e3..6b2e93d 100644
--- a/terminaldweller.com/haproxy/haproxy.cfg
+++ b/terminaldweller.com/haproxy/haproxy.cfg
@@ -90,6 +90,7 @@ frontend https
   acl mail-host-s req.ssl_sni -i mail.terminaldweller.com
   acl chat-host-s req.ssl_sni -i chat.terminaldweller.com
   acl blog-host-s req.ssl_sni -i blog.terminaldweller.com
+  acl jericho-host-s req.ssl_sni -i jericho.terminaldweller.com
   acl api-host-s req.ssl_sni -i api.terminaldweller.com
   acl mila-api-host-s req.ssl_sni -i mila.terminaldweller.com
   acl searx-host-s req.ssl_sni -i searx.terminaldweller.com
@@ -100,6 +101,7 @@ frontend https
   #Conditions
   use_backend mail-backend-s if mail-host-s
   #use_backend chat-backend-s if chat-host-s
+  use_backend jericho-backend-s if jericho-host-s
   use_backend blog-backend-s if blog-host-s
   #use_backend api-crypto-backend-s if api-host-s crypto-api-acl
   use_backend api-crypto-backend-s if api-host-s
@@ -218,7 +220,7 @@ backend certbot-backend
 backend blog-backend
   mode http
   option forwardfor
-  server blog-host 192.99.102.52:9000 check
+  server blog-host 192.99.102.52:9001 check
 backend blog-backend-cert
   mode http
   option forwardfor
@@ -229,7 +231,11 @@ backend cloud-one-cert
   server cloud-one-host 130.185.121.80:80
 backend blog-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
+  server blog-host 192.99.102.52:9000 check
+backend jericho-backend-s
+  mode tcp
+  option tcp-check
   server blog-host 192.99.102.52:9000 check
 
 backend mail-backend
@@ -238,7 +244,7 @@ backend mail-backend
   server mail-host 185.126.202.69:80
 backend mail-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server mail-host 185.126.202.69:443 check
 backend mail-backend-imap
   mode http
@@ -246,7 +252,7 @@ backend mail-backend-imap
   server mail-host 185.126.202.69:143 check
 backend mail-backend-imaps
   mode tcp
-#option ssl-hello-chk
+#option tcp-check
   server mail-host 185.126.202.69:993 check
 backend mail-backend-pop3
   mode http
@@ -254,19 +260,19 @@ backend mail-backend-pop3
   server mail-host 185.126.202.69:110 check
 backend mail-backend-pop3s
   mode tcp
-#option ssl-hello-chk
+#option tcp-check
   server mail-host 185.126.202.69:995 check
 backend mail-backend-smtp
   mode tcp
-#option ssl-hello-chk
+#option tcp-check
   server mail-host 185.126.202.69:25 check
 backend mail-backend-smtps
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server mail-host 185.126.202.69:465 check
 backend mail-backend-submission
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server mail-host 185.126.202.69:587
 
 backend api-backend
@@ -275,7 +281,7 @@ backend api-backend
   server api-host 192.99.102.52:8008 check
 backend api-crypto-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server api-host 192.99.102.52:8008
 backend api-crypto-backend-cert
   mode http
@@ -283,7 +289,7 @@ backend api-crypto-backend-cert
   server api-host 192.99.102.52:80
 backend api-mila-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server api-mila-host 130.185.121.80:19019
 backend api-mila-backend-cert
   mode http
@@ -298,15 +304,15 @@ backend chat-backend-admin
 #  server chat-host 130.185.121.80:5222
 backend chat-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server chat-host 130.185.121.80:5443
 backend chat-backend-c2s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server chat-host 130.185.121.80:5222
 backend chat-auth-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server chat-host 130.185.121.80:5223
 #backend chat-cert-backend
 #  mode http
@@ -320,22 +326,22 @@ backend searx-backend
   server searx-host 130.185.121.80:8080
 backend searx-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server searx-host-s 130.185.121.80:8081 maxconn 10
 
 backend cargo-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server cargo-host-s 130.185.121.80:7777
 
 backend editor-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server cargo-host-s 192.99.102.52:7080
 
 backend editorsave-backend-s
   mode tcp
-  option ssl-hello-chk
+  option tcp-check
   server cargo-host-s 192.99.102.52:9080
 
 backend rssgen-backend