Merge branch 'main' into feature/tailscale-exitnode

blueprints/adguardhome/docker-compose.yml

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

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"
-    ports:
-      - 80
-      - 443
+      UPTIME_APP_API_BASE_URL: "https://${DOMAIN}/api/v1"
     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
-      - REDIS_HOST=redis
-
+      - DB_CONNECTION_STRING=mongodb://checkmate-mongodb:27017/uptime_db
+      - 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
+
   redis:
     image: bluewaveuptime/uptime_redis:latest
     restart: always
-    ports:
-      - 6379
+    hostname: checkmate-redis
     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

@@ -1,13 +1,19 @@
 [variables]
 main_domain = "${domain}"
+db_password = "${password:32}"
+minio_password = "${password:32}"
+rabbitmq_user = "${username}"
+rabbitmq_pass = "${password:32}"
+secret_key = "${base64:48}"
 
 [config]
 env = [
-"Domain=${main_domain}",
+"Domain=${domain}",
+"WEB_URL=${Domain}",
 "PGHOST=plane-db",
 "PGDATABASE=plane",
-"POSTGRES_USER={username}",
-"POSTGRES_PASSWORD={password:32}",
+"POSTGRES_USER=${username}",
+"POSTGRES_PASSWORD=${db_password}",
 "POSTGRES_DB=plane",
 "POSTGRES_PORT=5432",
 "PGDATA=/var/lib/postgresql/data",
@@ -15,10 +21,10 @@ env = [
 "REDIS_PORT=6379",
 "REDIS_URL=redis://plane-redis:6379/",
 "MINIO_ROOT_USER=access-key",
-"MINIO_ROOT_PASSWORD=password:32",
+"MINIO_ROOT_PASSWORD=${minio_password}",
 "AWS_REGION=",
-"AWS_ACCESS_KEY_ID={username}",
-"AWS_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD}",
+"AWS_ACCESS_KEY_ID=${MINIO_ROOT_USER}",
+"AWS_SECRET_ACCESS_KEY=${minio_password}",
 "AWS_S3_ENDPOINT_URL=http://plane-minio:9000",
 "AWS_S3_BUCKET_NAME=uploads",
 "NGINX_PORT=80",
@@ -26,20 +32,19 @@ env = [
 "FILE_SIZE_LIMIT=5242880",
 "RABBITMQ_HOST=plane-mq",
 "RABBITMQ_PORT=5672",
-"RABBITMQ_DEFAULT_USER={username}",
-"RABBITMQ_DEFAULT_PASS={password:32}",
+"RABBITMQ_DEFAULT_USER=rabbitmq_user",
+"RABBITMQ_DEFAULT_PASS=${rabbitmq_pass}",
 "RABBITMQ_DEFAULT_VHOST=plane",
 "RABBITMQ_VHOST=plane",
 "API_BASE_URL=http://api:8000",
-"WEB_URL=${main_domain}",
 "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",
-"SECRET_KEY={base64:48}",
+"SECRET_KEY=${secret_key}",
 "AMQP_URL=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@plane-mq:5672/plane",
 "API_KEY_RATE_LIMIT=60/minute",
 "MINIO_ENDPOINT_SSL=0"