Merge branch 'master' into donate

This commit is contained in:
Luke Berndt
2024-02-22 22:12:49 -05:00
committed by GitHub
23 changed files with 2997 additions and 281 deletions

View File

@@ -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/

View 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;
}
}

View File

@@ -1 +0,0 @@
# Copy your certs here

View File

@@ -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;

View File

@@ -1 +0,0 @@
# Copy your certs here

View File

@@ -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;