diff options
| -rw-r--r-- | dictionary.txt | 1 | ||||
| -rw-r--r-- | services/docker/nginx/configs/templates/root.conf.template | 5 | ||||
| -rw-r--r-- | services/templates/docker-compose.yaml.template | 15 | ||||
| -rw-r--r-- | services/templates/envs/2fauth.env.template | 15 |
4 files changed, 1 insertions, 35 deletions
diff --git a/dictionary.txt b/dictionary.txt index dee097e..8df3201 100644 --- a/dictionary.txt +++ b/dictionary.txt @@ -9,7 +9,6 @@ aarch64 esmtp healthcheck -2fauth certbot roundcube roundcubemail diff --git a/services/docker/nginx/configs/templates/root.conf.template b/services/docker/nginx/configs/templates/root.conf.template index e3e93ad..4cc9a51 100644 --- a/services/docker/nginx/configs/templates/root.conf.template +++ b/services/docker/nginx/configs/templates/root.conf.template @@ -6,11 +6,6 @@ server { root /srv/www; } - location /2fa/ { - include common/proxy-common; - proxy_pass http://2fauth:8000/; - } - location /git/ { include common/proxy-common; client_max_body_size 5G; diff --git a/services/templates/docker-compose.yaml.template b/services/templates/docker-compose.yaml.template index 6194c78..14d8ed4 100644 --- a/services/templates/docker-compose.yaml.template +++ b/services/templates/docker-compose.yaml.template @@ -90,19 +90,6 @@ services: ipv4_address: "172.21.5.5" restart: on-failure:3 - 2fauth: - image: "2fauth/2fauth" - pull_policy: always - hostname: 2fauth - env_file: - - "./@@CRUPEST_GENERATED_DIR@@/envs/2fauth.env" - volumes: - - "./data/2fauth:/2fauth" - networks: - default: - ipv4_address: "172.21.5.6" - restart: "on-failure:3" - v2ray: pull_policy: build build: @@ -115,7 +102,7 @@ services: - "./@@CRUPEST_GENERATED_DIR@@/envs/v2ray.env" networks: default: - ipv4_address: "172.21.5.7" + ipv4_address: "172.21.5.6" restart: "on-failure:3" auto-backup: diff --git a/services/templates/envs/2fauth.env.template b/services/templates/envs/2fauth.env.template deleted file mode 100644 index de2ad3a..0000000 --- a/services/templates/envs/2fauth.env.template +++ /dev/null @@ -1,15 +0,0 @@ -APP_NAME=2FAuth-crupest -APP_TIMEZONE=UTC -SITE_OWNER=@@CRUPEST_EMAIL@@ -APP_KEY=@@CRUPEST_2FAUTH_APP_KEY@@ -APP_URL=@@CRUPEST_ROOT_URL@@/2fa -APP_SUBDIRECTORY=2fa -MAIL_MAILER=smtp -MAIL_HOST=@@CRUPEST_MAIL_SERVER_DOMAIN@@ -MAIL_PORT=465 -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@@ -TRUSTED_PROXIES=* |