merge upstream

blueprints/adguardhome/docker-compose.yml

@@ -4,18 +4,17 @@ services:
     image: adguard/adguardhome:latest
     restart: unless-stopped
     ports:
-      - "53:53/tcp"
+      - "53:53/tcp" # DNS
-      - "53:53/udp"
+      - "53:53/udp" # DNS
-      - "784:784/udp"
+      - "67:67/udp" # DHCP Server
-      - "853:853/tcp"
+      - "68:68/tcp" # DHCP Client
-      - "853:853/udp"
+      - "853:853/tcp" # DNS over TLS, DNS-over-QUIC
-      - "8853:8853/udp"
+      - "853:853/udp" # DNS over TLS, DNS-over-QUIC
-      - "5443:5443/tcp"
+      - "6060:6060/tcp" # HTTP (pprof)
-      - "5443:5443/udp"
     volumes:
       - adguardhome-work:/opt/adguardhome/work
       - adguardhome-conf:/opt/adguardhome/conf
 
 volumes:
   adguardhome-work: {}
-  adguardhome-conf: {} 
+  adguardhome-conf: {}

blueprints/backrest/template.yml

@@ -8,4 +8,4 @@ config:
       host: ${main_domain}
   env:
     - TZ=Europe/Paris
-  mounts: []
+  mounts: []

blueprints/checkmate/docker-compose.yml

@@ -3,40 +3,37 @@ services:
     image: bluewaveuptime/uptime_client:latest
     restart: always
     environment:
-      UPTIME_APP_API_BASE_URL: "http://${DOMAIN}/api/v1"
+      UPTIME_APP_API_BASE_URL: "https://${DOMAIN}/api/v1"
-    ports:
-      - 80
-      - 443
     depends_on:
       - server
 
   server:
     image: bluewaveuptime/uptime_server:latest
     restart: always
-    ports:
-      - 5000
     depends_on:
       - redis
       - mongodb
     environment:
-      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
+      - DB_CONNECTION_STRING=mongodb://checkmate-mongodb:27017/uptime_db
-      - REDIS_HOST=redis
+      - REDIS_HOST=checkmate-redis
-
+      - SYSTEM_EMAIL_HOST=${EMAIL_HOST}
+      - SYSTEM_EMAIL_PORT=${EMAIL_PORT}
+      - SYSTEM_EMAIL_ADDRESS=${EMAIL_ADDRESS}
+      - SYSTEM_EMAIL_PASSWORD=${EMAIL_PASSWORD}
     # volumes:
-    # - /var/run/docker.sock:/var/run/docker.sock:ro
+    #   - /var/run/docker.sock:/var/run/docker.sock:ro
+
   redis:
     image: bluewaveuptime/uptime_redis:latest
     restart: always
-    ports:
+    hostname: checkmate-redis
-      - 6379
     volumes:
       - ../files/redis/data:/data
-
+  
   mongodb:
     image: bluewaveuptime/uptime_database_mongo:latest
     restart: always
+    hostname: checkmate-mongodb
     volumes:
       - ../files/mongo/data:/data/db
     command: ["mongod", "--quiet"]
-    ports:
-      - 27017

blueprints/lowcoder/template.toml

@@ -5,7 +5,7 @@ encryption_salt = "${password:32}"
 api_secret = "${password:32}"
 
 [config]
-[config.domains]
+[[config.domains]]
 serviceName = "lowcoder-api-service"
 port = 3000
 host = "${main_domain}"

blueprints/plane/template.toml

@@ -8,8 +8,13 @@ secret_key = "${base64:48}"
 
 [config]
 env = [
+<<<<<<< HEAD
 "Domain=${main_domain}",
 "WEB_URL=${main_domain}",
+=======
+"Domain=${domain}",
+"WEB_URL=${Domain}",
+>>>>>>> upstream/main
 "PGHOST=plane-db",
 "PGDATABASE=plane",
 "POSTGRES_USER=${username}",
@@ -40,7 +45,7 @@ env = [
 "DEBUG=0",
 "SENTRY_DSN=",
 "SENTRY_ENVIRONMENT=production",
-"CORS_ALLOWED_ORIGINS=",
+"CORS_ALLOWED_ORIGINS=https://${Domain}",
 "GUNICORN_WORKERS=1",
 "USE_MINIO=1",
 "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane",