diff options
| author | Yuqian Yang <crupest@crupest.life> | 2025-02-19 01:46:25 +0800 |
|---|---|---|
| committer | Yuqian Yang <crupest@crupest.life> | 2025-02-19 01:46:25 +0800 |
| commit | ac21570aa3468a316b747cfbd8241ccdfe6039b3 (patch) | |
| tree | 84ee278c990f2493e475677452ab5c329e4ee6dc | |
| parent | 84b7a6454f3aefba3e1e96b22ac3f4710b6ce238 (diff) | |
| download | crupest-ac21570aa3468a316b747cfbd8241ccdfe6039b3.tar.gz crupest-ac21570aa3468a316b747cfbd8241ccdfe6039b3.tar.bz2 crupest-ac21570aa3468a316b747cfbd8241ccdfe6039b3.zip | |
feat(2fa): move to root domain subpath.
| -rw-r--r-- | templates/docker-compose.yaml.template | 3 | ||||
| -rw-r--r-- | templates/nginx/conf.d/2fa.conf.template | 17 | ||||
| -rw-r--r-- | templates/nginx/conf.d/root.conf.template | 5 |
3 files changed, 7 insertions, 18 deletions
diff --git a/templates/docker-compose.yaml.template b/templates/docker-compose.yaml.template index 532585b..fdf0d11 100644 --- a/templates/docker-compose.yaml.template +++ b/templates/docker-compose.yaml.template @@ -169,7 +169,8 @@ services: - APP_TIMEZONE=UTC - SITE_OWNER=crupest@crupest.life - APP_KEY=${CRUPEST_2FAUTH_APP_KEY} - - APP_URL=https://2fa.${CRUPEST_DOMAIN} + - APP_URL=https://${CRUPEST_DOMAIN}/2fa + - APP_SUBDIRECTORY=2fa - MAIL_MAILER=smtp - MAIL_HOST=mail.crupest.life - MAIL_PORT=465 diff --git a/templates/nginx/conf.d/2fa.conf.template b/templates/nginx/conf.d/2fa.conf.template deleted file mode 100644 index 278e4a1..0000000 --- a/templates/nginx/conf.d/2fa.conf.template +++ /dev/null @@ -1,17 +0,0 @@ -server { - server_name 2fa.${CRUPEST_DOMAIN}; - include common/https-listen; - - location / { - include common/proxy-common; - proxy_pass http://2fauth:8000/; - } -} - -server { - server_name 2fa.${CRUPEST_DOMAIN}; - include common/http-listen; - - include common/https-redirect; - include common/acme-challenge; -} diff --git a/templates/nginx/conf.d/root.conf.template b/templates/nginx/conf.d/root.conf.template index a0b08f8..b5f12ef 100644 --- a/templates/nginx/conf.d/root.conf.template +++ b/templates/nginx/conf.d/root.conf.template @@ -6,6 +6,11 @@ server { root /srv/www; } + location /2fa/ { + include common/proxy-common; + proxy_pass http://2fauth:8000/; + } + location /_$CRUPEST_V2RAY_PATH { if ($http_upgrade != "websocket") { return 404; |