feat(service): mv config to docker imagei, better pri/pub git.

12 files changed, 0 insertions, 134 deletions

diff --git a/services/templates/nginx/common/acme-challenge b/services/templates/nginx/common/acme-challenge
deleted file mode 100644
index 26054b8..0000000
--- a/services/templates/nginx/common/acme-challenge
+++ /dev/null
@@ -1,3 +0,0 @@
-location /.well-known/acme-challenge {
-    root /srv/acme;
-}
diff --git a/services/templates/nginx/common/http-listen b/services/templates/nginx/common/http-listen
deleted file mode 100644
index 76cb18d..0000000
--- a/services/templates/nginx/common/http-listen
+++ /dev/null
@@ -1,2 +0,0 @@
-listen 80;
-listen [::]:80;
diff --git a/services/templates/nginx/common/https-listen b/services/templates/nginx/common/https-listen
deleted file mode 100644
index db2f68e..0000000
--- a/services/templates/nginx/common/https-listen
+++ /dev/null
@@ -1,3 +0,0 @@
-listen 443 ssl;
-listen [::]:443 ssl;
-http2 on;
diff --git a/services/templates/nginx/common/https-redirect b/services/templates/nginx/common/https-redirect
deleted file mode 100644
index 56d095d..0000000
--- a/services/templates/nginx/common/https-redirect
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {
-    return 301 https://$host$request_uri;
-}
diff --git a/services/templates/nginx/common/proxy-common b/services/templates/nginx/common/proxy-common
deleted file mode 100644
index 4193548..0000000
--- a/services/templates/nginx/common/proxy-common
+++ /dev/null
@@ -1,7 +0,0 @@
-proxy_http_version 1.1;
-proxy_set_header Upgrade $http_upgrade;
-proxy_set_header Connection $connection_upgrade;
-proxy_set_header Host $host;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;
-proxy_set_header X-Real-IP $remote_addr;
diff --git a/services/templates/nginx/conf.d/code.conf.template b/services/templates/nginx/conf.d/code.conf.template
deleted file mode 100644
index 35f74d8..0000000
--- a/services/templates/nginx/conf.d/code.conf.template
+++ /dev/null
@@ -1,6 +0,0 @@
-server {
-    server_name code.@@CRUPEST_DOMAIN@@;
-    include common/http-listen;
-
-    include common/acme-challenge;
-}
diff --git a/services/templates/nginx/conf.d/forbid_unknown_domain.conf b/services/templates/nginx/conf.d/forbid_unknown_domain.conf
deleted file mode 100644
index 515942b..0000000
--- a/services/templates/nginx/conf.d/forbid_unknown_domain.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    listen 443 ssl default_server;
-    listen [::]:443 ssl default_server;
-    http2 on;
-
-    return 444;
-}
diff --git a/services/templates/nginx/conf.d/mail.conf.template b/services/templates/nginx/conf.d/mail.conf.template
deleted file mode 100644
index c115c2e..0000000
--- a/services/templates/nginx/conf.d/mail.conf.template
+++ /dev/null
@@ -1,29 +0,0 @@
-server {
-    server_name mail.@@CRUPEST_DOMAIN@@;
-    include common/https-listen;
-    
-    location = /robots.txt {
-        root /srv/mail;
-    }
-
-    location / {
-        include common/proxy-common;
-        proxy_pass http://roundcubemail:80/;
-    }
-
-    location /rspamd/ {
-        include common/proxy-common;
-        proxy_pass http://mailserver:11334/;
-    }
-
-    client_max_body_size 5G;
-}
-
-
-server {
-    server_name mail.@@CRUPEST_DOMAIN@@;
-    include common/http-listen;
-
-    include common/https-redirect;
-    include common/acme-challenge;
-}
diff --git a/services/templates/nginx/conf.d/root.conf.template b/services/templates/nginx/conf.d/root.conf.template
deleted file mode 100644
index 28c2fea..0000000
--- a/services/templates/nginx/conf.d/root.conf.template
+++ /dev/null
@@ -1,45 +0,0 @@
-server {
-    server_name @@CRUPEST_DOMAIN@@;
-    include common/https-listen;
-
-    location / {
-        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;
-        proxy_pass http://git-server:3636;
-    }
-
-    location = /github {
-        return 301 @@CRUPEST_GITHUB@@;
-    }
-
-    location = /github/ {
-        return 301 @@CRUPEST_GITHUB@@;
-    }
-
-    location /_@@CRUPEST_V2RAY_PATH@@ {
-        if ($http_upgrade != "websocket") {
-            return 404;
-        }
-
-        proxy_redirect off;
-        include common/proxy-common;
-        proxy_pass http://v2ray:10000;
-    }
-}
-
-server {
-    server_name @@CRUPEST_DOMAIN@@;
-    include common/http-listen;
-
-    include common/https-redirect;
-    include common/acme-challenge;
-}
diff --git a/services/templates/nginx/conf.d/ssl.conf.template b/services/templates/nginx/conf.d/ssl.conf.template
deleted file mode 100644
index 181a1af..0000000
--- a/services/templates/nginx/conf.d/ssl.conf.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file contains important security parameters. If you modify this file
-# manually, Certbot will be unable to automatically provide future security
-# updates. Instead, Certbot will print and log an error message with a path to
-# 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_session_cache shared:le_nginx_SSL:10m;
-ssl_session_timeout 1440m;
-ssl_session_tickets off;
-
-ssl_protocols TLSv1.2 TLSv1.3;
-ssl_prefer_server_ciphers off;
-
-ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
diff --git a/services/templates/nginx/conf.d/timeline.conf.template b/services/templates/nginx/conf.d/timeline.conf.template
deleted file mode 100644
index df4edf8..0000000
--- a/services/templates/nginx/conf.d/timeline.conf.template
+++ /dev/null
@@ -1,6 +0,0 @@
-server {
-    server_name timeline.@@CRUPEST_DOMAIN@@;
-    include common/http-listen;
-
-    include common/acme-challenge;
-}
diff --git a/services/templates/nginx/conf.d/websocket.conf b/services/templates/nginx/conf.d/websocket.conf
deleted file mode 100644
index 32af4c3..0000000
--- a/services/templates/nginx/conf.d/websocket.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    ''      close;
-}