feat(cru-py): use new template format.

9 files changed, 24 insertions, 24 deletions

diff --git a/templates/disabled/nginx/code.conf.template b/templates/disabled/nginx/code.conf.template
index 205c7ba..0abe042 100644
--- a/templates/disabled/nginx/code.conf.template
+++ b/templates/disabled/nginx/code.conf.template
@@ -1,5 +1,5 @@
 server {
-    server_name code.${CRUPEST_DOMAIN};
+    server_name code.@@CRUPEST_DOMAIN@@;
     include common/https-listen;
     
     location / {
@@ -12,7 +12,7 @@ server {
 
 
 server {
-    server_name code.${CRUPEST_DOMAIN};
+    server_name code.@@CRUPEST_DOMAIN@@;
     include common/http-listen;
 
     include common/https-redirect;
diff --git a/templates/disabled/nginx/timeline.conf.template b/templates/disabled/nginx/timeline.conf.template
index 551e0ae..ce7341b 100644
--- a/templates/disabled/nginx/timeline.conf.template
+++ b/templates/disabled/nginx/timeline.conf.template
@@ -1,7 +1,7 @@
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
-    server_name timeline.${CRUPEST_DOMAIN};
+    server_name timeline.@@CRUPEST_DOMAIN@@;
     
     location / {
         include common/reverse-proxy;
@@ -14,7 +14,7 @@ server {
 server {
     listen 80;
     listen [::]:80;
-    server_name timeline.${CRUPEST_DOMAIN};
+    server_name timeline.@@CRUPEST_DOMAIN@@;
 
     include common/https-redirect;
     include common/acme-challenge;
diff --git a/templates/docker-compose.yaml.template b/templates/docker-compose.yaml.template
index 06f9f3a..9005d5e 100644
--- a/templates/docker-compose.yaml.template
+++ b/templates/docker-compose.yaml.template
@@ -51,8 +51,8 @@ services:
       dockerfile: Dockerfile
       pull: true
       args:
-        - CRUPEST_DOMAIN=$CRUPEST_DOMAIN
-        - CRUPEST_EMAIL=$CRUPEST_EMAIL
+        - CRUPEST_DOMAIN=@@CRUPEST_DOMAIN@@
+        - CRUPEST_EMAIL=@@CRUPEST_EMAIL@@
         - CRUPEST_AUTO_CERTBOT_ADDITIONAL_PACKAGES=docker-cli
         - CRUPEST_AUTO_CERTBOT_POST_HOOK=docker restart nginx
       tags:
@@ -81,7 +81,7 @@ services:
     image: docker.io/mailserver/docker-mailserver:latest
     pull_policy: always
     container_name: mailserver
-    hostname: mail.$CRUPEST_DOMAIN
+    hostname: mail.@@CRUPEST_DOMAIN@@
     env_file: generated/mailserver.env
     # More information about the mail-server ports:
     # https://docker-mailserver.github.io/docker-mailserver/edge/config/security/understanding-the-ports/
@@ -116,7 +116,7 @@ services:
         - "git-server"
       pull: true
       args:
-        - ROOT_URL=https://${CRUPEST_DOMAIN}/git
+        - ROOT_URL=https://@@CRUPEST_DOMAIN@@/git
       tags:
         - "crupest/git-server:latest"
     hostname: git-server
@@ -153,17 +153,17 @@ services:
       - APP_NAME=2FAuth-crupest
       - APP_TIMEZONE=UTC
       - SITE_OWNER=crupest@crupest.life
-      - APP_KEY=${CRUPEST_2FAUTH_APP_KEY}
-      - APP_URL=https://${CRUPEST_DOMAIN}/2fa
+      - APP_KEY=@@CRUPEST_2FAUTH_APP_KEY@@
+      - APP_URL=https://@@CRUPEST_DOMAIN@@/2fa
       - APP_SUBDIRECTORY=2fa
       - MAIL_MAILER=smtp
       - MAIL_HOST=mail.crupest.life
       - MAIL_PORT=465
-      - MAIL_USERNAME=${CRUPEST_2FAUTH_MAIL_USERNAME}
-      - MAIL_PASSWORD=${CRUPEST_2FAUTH_MAIL_PASSWORD}
+      - MAIL_USERNAME=@@CRUPEST_2FAUTH_MAIL_USERNAME@@
+      - MAIL_PASSWORD=@@CRUPEST_2FAUTH_MAIL_PASSWORD@@
       - MAIL_ENCRYPTION=ssl
       - MAIL_FROM_NAME=2FAuth-crupest
-      - MAIL_FROM_ADDRESS=${CRUPEST_2FAUTH_MAIL_USERNAME}
+      - MAIL_FROM_ADDRESS=@@CRUPEST_2FAUTH_MAIL_USERNAME@@
       - TRUSTED_PROXIES=*
 
 volumes:
diff --git a/templates/nginx/conf.d/code.conf.template b/templates/nginx/conf.d/code.conf.template
index aa70ebc..35f74d8 100644
--- a/templates/nginx/conf.d/code.conf.template
+++ b/templates/nginx/conf.d/code.conf.template
@@ -1,5 +1,5 @@
 server {
-    server_name code.${CRUPEST_DOMAIN};
+    server_name code.@@CRUPEST_DOMAIN@@;
     include common/http-listen;
 
     include common/acme-challenge;
diff --git a/templates/nginx/conf.d/mail.conf.template b/templates/nginx/conf.d/mail.conf.template
index 40adf28..2eb53d7 100644
--- a/templates/nginx/conf.d/mail.conf.template
+++ b/templates/nginx/conf.d/mail.conf.template
@@ -1,5 +1,5 @@
 server {
-    server_name mail.${CRUPEST_DOMAIN};
+    server_name mail.@@CRUPEST_DOMAIN@@;
     include common/https-listen;
     
     location / {
@@ -17,7 +17,7 @@ server {
 
 
 server {
-    server_name mail.${CRUPEST_DOMAIN};
+    server_name mail.@@CRUPEST_DOMAIN@@;
     include common/http-listen;
 
     include common/https-redirect;
diff --git a/templates/nginx/conf.d/root.conf.template b/templates/nginx/conf.d/root.conf.template
index 93675ff..8cd9174 100644
--- a/templates/nginx/conf.d/root.conf.template
+++ b/templates/nginx/conf.d/root.conf.template
@@ -1,5 +1,5 @@
 server {
-    server_name ${CRUPEST_DOMAIN};
+    server_name @@CRUPEST_DOMAIN@@;
     include common/https-listen;
 
     location / {
@@ -16,7 +16,7 @@ server {
         proxy_pass http://git-server:80;
     }
 
-    location /_$CRUPEST_V2RAY_PATH {
+    location /_@@CRUPEST_V2RAY_PATH@@ {
         if ($http_upgrade != "websocket") {
             return 404;
         }
@@ -28,7 +28,7 @@ server {
 }
 
 server {
-    server_name ${CRUPEST_DOMAIN};
+    server_name @@CRUPEST_DOMAIN@@;
     include common/http-listen;
 
     include common/https-redirect;
diff --git a/templates/nginx/conf.d/ssl.conf.template b/templates/nginx/conf.d/ssl.conf.template
index 54205f1..181a1af 100644
--- a/templates/nginx/conf.d/ssl.conf.template
+++ b/templates/nginx/conf.d/ssl.conf.template
@@ -4,8 +4,8 @@
 # the up-to-date file that you will need to refer to when manually updating
 # this file. Contents are based on https://ssl-config.mozilla.org
 
-ssl_certificate /etc/letsencrypt/live/${CRUPEST_DOMAIN}/fullchain.pem;
-ssl_certificate_key /etc/letsencrypt/live/${CRUPEST_DOMAIN}/privkey.pem;
+ssl_certificate /etc/letsencrypt/live/@@CRUPEST_DOMAIN@@/fullchain.pem;
+ssl_certificate_key /etc/letsencrypt/live/@@CRUPEST_DOMAIN@@/privkey.pem;
 
 ssl_session_cache shared:le_nginx_SSL:10m;
 ssl_session_timeout 1440m;
diff --git a/templates/nginx/conf.d/timeline.conf.template b/templates/nginx/conf.d/timeline.conf.template
index a467594..df4edf8 100644
--- a/templates/nginx/conf.d/timeline.conf.template
+++ b/templates/nginx/conf.d/timeline.conf.template
@@ -1,5 +1,5 @@
 server {
-    server_name timeline.${CRUPEST_DOMAIN};
+    server_name timeline.@@CRUPEST_DOMAIN@@;
     include common/http-listen;
 
     include common/acme-challenge;
diff --git a/templates/v2ray-config.json.template b/templates/v2ray-config.json.template
index 33d3f16..c10eac2 100644
--- a/templates/v2ray-config.json.template
+++ b/templates/v2ray-config.json.template
@@ -7,7 +7,7 @@
             "settings": {
                 "clients": [
                     {
-                        "id": "$CRUPEST_V2RAY_TOKEN",
+                        "id": "@@CRUPEST_V2RAY_TOKEN@@",
                         "alterId": 0
                     }
                 ]
@@ -15,7 +15,7 @@
             "streamSettings": {
                 "network": "ws",
                 "wsSettings": {
-                    "path": "/_$CRUPEST_V2RAY_PATH"
+                    "path": "/_@@CRUPEST_V2RAY_PATH@@"
                 }
             }
         }