mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-12 16:57:39 -05:00
Merge branch 'master' into donate
This commit is contained in:
@@ -21,7 +21,6 @@ RUN apt-get update \
|
||||
|
||||
# Add main NGINX config
|
||||
COPY *.conf /etc/nginx/
|
||||
COPY ${STAGE}/certs/ /etc/nginx/certs/
|
||||
|
||||
# Add virtual hosts
|
||||
COPY ${STAGE}/vhosts/ /etc/nginx/conf.d/
|
||||
|
||||
8
nginx-proxy/cert/vhosts/site.template
Normal file
8
nginx-proxy/cert/vhosts/site.template
Normal file
@@ -0,0 +1,8 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name account.${DOMAIN_NAME} api.${DOMAIN_NAME} admin.${DOMAIN_NAME} www.${DOMAIN_NAME} ${DOMAIN_NAME};
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
# Copy your certs here
|
||||
@@ -27,6 +27,10 @@ server {
|
||||
|
||||
server_name ${DOMAIN_NAME} www.${DOMAIN_NAME};
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location /static {
|
||||
proxy_pass http://frontend:3000;
|
||||
access_log off;
|
||||
@@ -63,6 +67,10 @@ server {
|
||||
|
||||
server_name api.${DOMAIN_NAME};
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location /marcsip/upload {
|
||||
deny all;
|
||||
}
|
||||
@@ -100,6 +108,10 @@ server {
|
||||
|
||||
server_name account.${DOMAIN_NAME};
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://account:3009;
|
||||
proxy_http_version 1.1;
|
||||
@@ -127,6 +139,10 @@ server {
|
||||
|
||||
server_name admin.${DOMAIN_NAME};
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://admin:3008;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
# Copy your certs here
|
||||
@@ -1,8 +1,14 @@
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
|
||||
server_name ${DOMAIN_NAME} www.${DOMAIN_NAME};
|
||||
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location /static {
|
||||
proxy_pass http://frontend:3000;
|
||||
access_log off;
|
||||
@@ -30,6 +36,10 @@ server {
|
||||
|
||||
server_name account.${DOMAIN_NAME};
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://account:3009;
|
||||
include /etc/nginx/proxy.conf;
|
||||
@@ -42,6 +52,10 @@ server {
|
||||
|
||||
server_name admin.${DOMAIN_NAME};
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://admin:3008;
|
||||
include /etc/nginx/proxy.conf;
|
||||
@@ -54,6 +68,10 @@ server {
|
||||
|
||||
server_name api.${DOMAIN_NAME};
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://backend:3005;
|
||||
include /etc/nginx/proxy.conf;
|
||||
|
||||
Reference in New Issue
Block a user