aboutsummaryrefslogtreecommitdiff
path: root/services/templates
diff options
context:
space:
mode:
Diffstat (limited to 'services/templates')
-rw-r--r--services/templates/disabled/docker-compose.yaml21
-rw-r--r--services/templates/disabled/nginx/code.conf.template20
-rw-r--r--services/templates/docker-compose.yaml.template15
-rw-r--r--services/templates/envs/2fauth.env.template15
4 files changed, 1 insertions, 70 deletions
diff --git a/services/templates/disabled/docker-compose.yaml b/services/templates/disabled/docker-compose.yaml
index 565ca49..0cd2256 100644
--- a/services/templates/disabled/docker-compose.yaml
+++ b/services/templates/disabled/docker-compose.yaml
@@ -1,22 +1,4 @@
services:
- debian-dev:
- pull_policy: build
- build:
- context: ./docker/debian-dev
- dockerfile: Dockerfile
- pull: true
- args:
- - USER=crupest
- tags:
- - "crupest/debian-dev:latest"
- container_name: debian-dev
- init: true
- command: [ "/bootstrap/start/code-server.bash" ]
- volumes:
- - ./data/debian-dev:/data
- - debian-dev-home:/home/crupest
- restart: on-failure:3
-
timeline:
image: crupest/timeline:latest
pull_policy: always
@@ -27,6 +9,3 @@ services:
- TIMELINE_DisableAutoBackup=true
volumes:
- ./data/timeline:/root/timeline
-
-volumes:
- debian-dev-home:
diff --git a/services/templates/disabled/nginx/code.conf.template b/services/templates/disabled/nginx/code.conf.template
deleted file mode 100644
index 0abe042..0000000
--- a/services/templates/disabled/nginx/code.conf.template
+++ /dev/null
@@ -1,20 +0,0 @@
-server {
- server_name code.@@CRUPEST_DOMAIN@@;
- include common/https-listen;
-
- location / {
- include common/proxy-common;
- proxy_pass http://debian-dev:8080/;
- }
-
- client_max_body_size 5G;
-}
-
-
-server {
- server_name code.@@CRUPEST_DOMAIN@@;
- include common/http-listen;
-
- include common/https-redirect;
- include common/acme-challenge;
-}
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=*