update config

config/authelia/configuration.yml

@@ -712,6 +712,7 @@ notifier:
   ##        (only works for unauthenticated connections)
   ##   - validate the SMTP server x509 certificate during the TLS handshake against the hosts trusted certificates
   ##     (configure in tls section)
+
   smtp:
     username: godopu16@gmail.com #your email address
     password: cdjdagxrmywcbaqf #your email password

config/coredns/Corefile

@@ -0,0 +1,15 @@
+.:53 {
+    hosts {
+        192.168.0.9 famtech.priv
+        192.168.0.9 consul.famtech.priv
+        192.168.0.9 etri.priv
+        ttl 300
+        fallthrough
+    }
+    forward . 155.230.10.2
+    log
+    cache
+    errors
+    reload 20s
+    whoami
+}

config/traefik/router.yaml

@@ -48,6 +48,42 @@ http:
       tls:
         certresolver: https-resolver
 
+    to-famtech:
+      rule: Host(`famtech.godopu.com`)
+      service: famtech-app
+      entrypoints: http
+      middlewares: https-redirect
+    to-famtech-secure:
+      rule: Host(`famtech.godopu.com`)
+      service: famtech-app
+      entrypoints: https
+      tls:
+        certresolver: https-resolver
+
+    to-etri:
+      rule: Host(`etri.godopu.com`)
+      service: etri-app
+      entrypoints: http
+      middlewares: https-redirect
+    to-etri-secure:
+      rule: Host(`etri.godopu.com`)
+      service: etri-app
+      entrypoints: https
+      tls:
+        certresolver: https-resolver
+
+    to-mqtt:
+      rule: Host(`mqtt.godopu.com`)
+      service: mqtt-broker
+      entrypoints: http
+      middlewares: https-redirect
+    to-mqtt-secure:
+      rule: Host(`mqtt.godopu.com`)
+      service: mqtt-broker
+      entrypoints: https
+      tls:
+        certresolver: https-resolver
+
   middlewares: 
     https-redirect:
       redirectscheme:
@@ -59,13 +95,35 @@ http:
       loadBalancer:
         servers:
           - url: http://traefik:8080
-
     iot-ws:
       loadBalancer:
         servers:
           - url: http://iot-web-server:4000
-
     authelia:
       loadBalancer:
           servers:
-            - url: http://authelia-app:9091
+            - url: http://authelia-app:9091
+    famtech-app:
+      loadBalancer:
+          servers:
+            - url: http://192.168.0.9:9880
+    etri-app:
+      loadBalancer:
+          servers:
+            - url: http://192.168.0.9:3000
+    mqtt-broker:
+      loadBalancer:
+          servers:
+            - url: http://192.168.0.9:9880
+
+# tcp:
+#   routers:
+#     to-rdp:
+#       entryPoints:
+#         - "tcp"
+#       service: rdp-app 
+#   services:
+#     rdp-app:
+#       loadBalancer:
+#           servers:
+#             - url: tcp://vpn.godopu.com:8080

docker-compose.yaml

@@ -26,19 +26,23 @@ services:
       - "traefik.enable=true"
 
   iot-web-server:
+    # build: ./webserver
+    image: hub.godopu.com/pu-webserver:latest
     hostname: iot-web-server
-    build: ./webserver
-    image: iot-web-server/v0.1
     networks:
       - lab-net
     container_name: iot-web-server
     restart: always
+    depends_on:
+      - authelia-app
+      - traefik
     volumes:
       - "/home/sjkoh/www:/home/www"
 
   openvscode-server:
     image: gitpod/openvscode-server:latest
     container_name: "openvscode-server"
+    restart: unless-stopped
     hostname: openvscode-server
     networks:
       - lab-net

homepage

@@ -0,0 +1 @@
+Subproject commit e7296d2b5e44d6648a743ffc4c018ca4b77c6802