diff --git a/data/nginx/app.conf b/data/nginx/app.conf index 3a83ca4..1ccec4d 100644 --- a/data/nginx/app.conf +++ b/data/nginx/app.conf @@ -1,117 +1,5 @@ proxy_read_timeout 600; -server { - listen 80; - server_name dittmar.dev; - - location / { - return 301 https://$host$request_uri; - } - - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } -} - -server { - listen 80; - server_name git.dittmar.dev; - - location / { - return 301 https://$host$request_uri; - } - - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } -} - -server { - listen 80; - server_name cantropee.dittmar.dev; - - location / { - return 301 https://$host$request_uri; - } - - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } -} - -server { - listen 443 ssl; - server_name dittmar.dev; - - ssl_certificate /etc/letsencrypt/live/dittmar.dev/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dittmar.dev/privkey.pem; - - include /etc/letsencrypt/options-ssl-nginx.conf; - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - - proxy_pass http://home-app:3000; - } - - - location /vault { - return 302 /vault/; - } - location /vault/ { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - - proxy_pass http://10.222.0.2:80/; - } - - location /trilium { - return 302 /trilium/; - } - location /trilium/ { - proxy_set_header Host $host; - proxy_pass http://trilium:8080/; - } - location /panorama { - root /usr/share/nginx/html; - } -} - -server { - listen 443 ssl; - server_name git.dittmar.dev; - - ssl_certificate /etc/letsencrypt/live/dittmar.dev/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dittmar.dev/privkey.pem; - - include /etc/letsencrypt/options-ssl-nginx.conf; - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - - proxy_pass http://10.222.0.2:3000; - } -} - -server { - listen 443 ssl; - server_name cantropee.dittmar.dev; - - ssl_certificate /etc/letsencrypt/live/dittmar.dev/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dittmar.dev/privkey.pem; - - include /etc/letsencrypt/options-ssl-nginx.conf; - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - - proxy_pass http://cantropee:3000; - } -} - +include sites/dittmar.dev +include sites/git.dittmar.dev +include sites/cantropee.dittmar.dev diff --git a/data/nginx/sites/cantropee.dittmar.dev b/data/nginx/sites/cantropee.dittmar.dev new file mode 100644 index 0000000..b5fa675 --- /dev/null +++ b/data/nginx/sites/cantropee.dittmar.dev @@ -0,0 +1,30 @@ +server { + listen 80; + server_name cantropee.dittmar.dev; + + location / { + return 301 https://$host$request_uri; + } + + location /.well-known/acme-challenge/ { + root /var/www/certbot; + } +} + +server { + listen 443 ssl; + server_name cantropee.dittmar.dev; + + ssl_certificate /etc/letsencrypt/live/dittmar.dev/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/dittmar.dev/privkey.pem; + + include /etc/letsencrypt/options-ssl-nginx.conf; + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; + + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + + proxy_pass http://10.222.0.2:4467; + } +} diff --git a/data/nginx/sites/dittmar.dev b/data/nginx/sites/dittmar.dev new file mode 100644 index 0000000..c517d5e --- /dev/null +++ b/data/nginx/sites/dittmar.dev @@ -0,0 +1,52 @@ +server { + listen 80; + server_name dittmar.dev; + + location / { + return 301 https://$host$request_uri; + } + + location /.well-known/acme-challenge/ { + root /var/www/certbot; + } +} + +server { + listen 443 ssl; + server_name dittmar.dev; + + ssl_certificate /etc/letsencrypt/live/dittmar.dev/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/dittmar.dev/privkey.pem; + + include /etc/letsencrypt/options-ssl-nginx.conf; + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; + + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + + proxy_pass http://home-app:3000; + } + + + location /vault { + return 302 /vault/; + } + location /vault/ { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + + proxy_pass http://10.222.0.2:80/; + } + + location /trilium { + return 302 /trilium/; + } + location /trilium/ { + proxy_set_header Host $host; + proxy_pass http://trilium:8080/; + } + location /panorama { + root /usr/share/nginx/html; + } +} diff --git a/data/nginx/sites/git.dittmar.dev b/data/nginx/sites/git.dittmar.dev new file mode 100644 index 0000000..35fee47 --- /dev/null +++ b/data/nginx/sites/git.dittmar.dev @@ -0,0 +1,30 @@ +server { + listen 80; + server_name git.dittmar.dev; + + location / { + return 301 https://$host$request_uri; + } + + location /.well-known/acme-challenge/ { + root /var/www/certbot; + } +} + +server { + listen 443 ssl; + server_name git.dittmar.dev; + + ssl_certificate /etc/letsencrypt/live/dittmar.dev/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/dittmar.dev/privkey.pem; + + include /etc/letsencrypt/options-ssl-nginx.conf; + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; + + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + + proxy_pass http://10.222.0.2:3000; + } +}