From f8df5fd5477b0c32f4f2496270827d7c8afa277d Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 24 Jan 2022 01:07:32 -0500 Subject: [PATCH 01/42] First attempt at proxying foundry. --- nginx-reverse-proxy/default.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 4872720..4168d82 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -116,6 +116,20 @@ server { error_log /var/log/nginx/ha-error.log; } +# Foundry config +server { + listen 80; + server_name foundry.colindiem.com; + + location / { + include /etc/nginx/includes/proxy.conf; + proxy_pass http://192.168.1.12:30000/; + } + + access_log /var/log/nginx/foundry-access.log combined; + error_log /var/log/nginx/foundry-error.log error; +} + # Default server { listen 80 default_server; From b3c7299bd383ba2c512f33bce1e082b27e797c47 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 24 Jan 2022 01:10:10 -0500 Subject: [PATCH 02/42] Commenting out motioneye. --- nginx-reverse-proxy/default.conf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 4168d82..1e6629f 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -55,18 +55,18 @@ error_log /var/log/nginx/gitea-error.log error; } # Motioneye config -server { - listen 80; - server_name eye.colindiem.com; +# server { +# listen 80; +# server_name eye.colindiem.com; - location / { - include /etc/nginx/includes/proxy.conf; - proxy_pass http://motioneye:8765; - } +# location / { +# include /etc/nginx/includes/proxy.conf; +# proxy_pass http://motioneye:8765; +# } - access_log /var/log/nginx/motioneye-access.log combined; - error_log /var/log/nginx/motioneye-error.log error; -} +# access_log /var/log/nginx/motioneye-access.log combined; +# error_log /var/log/nginx/motioneye-error.log error; +# } # Nextcloud config server { From 59ba581e8145e95e8173f459bfbb7edebcd7b168 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 24 Jan 2022 01:47:44 -0500 Subject: [PATCH 03/42] Tweaking settings for foundry. --- nginx-reverse-proxy/default.conf | 1 + start.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 1e6629f..2a7e9c0 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -119,6 +119,7 @@ server { # Foundry config server { listen 80; + listen 443; server_name foundry.colindiem.com; location / { diff --git a/start.sh b/start.sh index cda1c0c..6c02479 100644 --- a/start.sh +++ b/start.sh @@ -19,11 +19,11 @@ docker-compose up -d cd /home/ubuntu/ echo "Done" -echo "Starting MotionEye..." -cd motioneye/ -docker-compose up -d -cd /home/ubuntu/ -echo "Done" +# echo "Starting MotionEye..." +# cd motioneye/ +# docker-compose up -d +# cd /home/ubuntu/ +# echo "Done" echo "Starting blog..." cd web/blog/ From eba9364059b0e98df0c9cc348a143498913c4835 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 24 Jan 2022 01:52:33 -0500 Subject: [PATCH 04/42] Trying a 301 redirect. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 2a7e9c0..67368ba 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -124,7 +124,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; - proxy_pass http://192.168.1.12:30000/; + return 301 http://192.168.1.12:30000/; } access_log /var/log/nginx/foundry-access.log combined; From 92864c10468cfb3e6064e0e19f03aa36bd709114 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 24 Jan 2022 02:05:12 -0500 Subject: [PATCH 05/42] redirect is probably not the solution. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 67368ba..2a7e9c0 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -124,7 +124,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; - return 301 http://192.168.1.12:30000/; + proxy_pass http://192.168.1.12:30000/; } access_log /var/log/nginx/foundry-access.log combined; From 77134bd8a01f8fe893935cabad398ae7d00005c3 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 24 Jan 2022 02:11:20 -0500 Subject: [PATCH 06/42] Let's try a pseudo https approach. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 2a7e9c0..9ea1390 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -124,7 +124,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; - proxy_pass http://192.168.1.12:30000/; + proxy_pass http://192.168.1.12:443/; } access_log /var/log/nginx/foundry-access.log combined; From eacf649e6b573dff46d338c65c9260deac86845e Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 24 Jan 2022 02:15:21 -0500 Subject: [PATCH 07/42] More tom foolery. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 9ea1390..2a7e9c0 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -124,7 +124,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; - proxy_pass http://192.168.1.12:443/; + proxy_pass http://192.168.1.12:30000/; } access_log /var/log/nginx/foundry-access.log combined; From da03f8268cfbe0746313e4645ce14a2ab718b998 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 24 Jan 2022 02:35:35 -0500 Subject: [PATCH 08/42] need headers for web sockets. --- nginx-reverse-proxy/default.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 2a7e9c0..ae103f6 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -125,6 +125,9 @@ server { location / { include /etc/nginx/includes/proxy.conf; proxy_pass http://192.168.1.12:30000/; + + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; } access_log /var/log/nginx/foundry-access.log combined; From 4182e0d3e608156c365a6df5fc63e2241d222595 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 11:21:04 -0500 Subject: [PATCH 09/42] Changing Home Assistant instances. --- nginx-reverse-proxy/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index ae103f6..7868536 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -102,14 +102,14 @@ server { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://homeassistant:8123; + proxy_pass http://homeassistant.local:8123; } location /api/websocket { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://homeassistant:8123/api/websocket; + proxy_pass http://homeassistant.local:8123/api/websocket; } access_log /var/log/nginx/ha-access.log; From a66ff127de58bf52b9411649dd335604801e9b28 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 11:44:20 -0500 Subject: [PATCH 10/42] Let's try by internal ip. --- nginx-reverse-proxy/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 7868536..c5d34bb 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -102,14 +102,14 @@ server { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://homeassistant.local:8123; + proxy_pass http://192.168.1.9:8123; } location /api/websocket { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://homeassistant.local:8123/api/websocket; + proxy_pass http://192.168.1.9:8123/api/websocket; } access_log /var/log/nginx/ha-access.log; From c082391e59406d97c15af1d6e7fe3492e13bd5e5 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 12:40:12 -0500 Subject: [PATCH 11/42] Reverting to original config. --- nginx-reverse-proxy/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index c5d34bb..ae103f6 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -102,14 +102,14 @@ server { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://192.168.1.9:8123; + proxy_pass http://homeassistant:8123; } location /api/websocket { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://192.168.1.9:8123/api/websocket; + proxy_pass http://homeassistant:8123/api/websocket; } access_log /var/log/nginx/ha-access.log; From 6d4025df532a4c46eeeb4bbed2d08f11ec7ac007 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 12:48:05 -0500 Subject: [PATCH 12/42] Trying the ip forward for ha again. --- nginx-reverse-proxy/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index ae103f6..c5d34bb 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -102,14 +102,14 @@ server { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://homeassistant:8123; + proxy_pass http://192.168.1.9:8123; } location /api/websocket { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://homeassistant:8123/api/websocket; + proxy_pass http://192.168.1.9:8123/api/websocket; } access_log /var/log/nginx/ha-access.log; From bc068356cdbb954921f19ff4ff21e5b2b5d864b2 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 12:52:34 -0500 Subject: [PATCH 13/42] Adding x-forwarded-for --- nginx-reverse-proxy/default.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index c5d34bb..3cd35b4 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -100,6 +100,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_pass http://192.168.1.9:8123; @@ -107,6 +108,7 @@ server { location /api/websocket { include /etc/nginx/includes/proxy.conf; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_pass http://192.168.1.9:8123/api/websocket; From 83cf5f0f09173295ea2bcbf3fa1bbcfdcba203f8 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 16:42:11 -0500 Subject: [PATCH 14/42] Let's try the homeassistant.local url again. --- nginx-reverse-proxy/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 3cd35b4..00f4cf8 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -103,7 +103,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://192.168.1.9:8123; + proxy_pass http://homeassistant.local:8123; } location /api/websocket { @@ -111,7 +111,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://192.168.1.9:8123/api/websocket; + proxy_pass http://homeassistant.local:8123/api/websocket; } access_log /var/log/nginx/ha-access.log; From 87cf6baaf020482950197e0a1defecb7d14fccf4 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 16:45:38 -0500 Subject: [PATCH 15/42] Adding host header again. --- nginx-reverse-proxy/default.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 00f4cf8..8ee1a55 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -100,6 +100,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; + proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; @@ -108,6 +109,7 @@ server { location /api/websocket { include /etc/nginx/includes/proxy.conf; + proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; From c4c66d871d79b5fbcb81384bdca63bf1f94b8acd Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 16:48:46 -0500 Subject: [PATCH 16/42] Forgot to look at the proxy conf. --- nginx-reverse-proxy/default.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 8ee1a55..7868536 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -100,8 +100,6 @@ server { location / { include /etc/nginx/includes/proxy.conf; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_pass http://homeassistant.local:8123; @@ -109,8 +107,6 @@ server { location /api/websocket { include /etc/nginx/includes/proxy.conf; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_pass http://homeassistant.local:8123/api/websocket; From 343c634fb5270169cdea0c2ca93954c5504a0fba Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 17:12:22 -0500 Subject: [PATCH 17/42] homeassistant.local will never work because it's a microdns hostname. --- nginx-reverse-proxy/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 7868536..c5d34bb 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -102,14 +102,14 @@ server { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://homeassistant.local:8123; + proxy_pass http://192.168.1.9:8123; } location /api/websocket { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://homeassistant.local:8123/api/websocket; + proxy_pass http://192.168.1.9:8123/api/websocket; } access_log /var/log/nginx/ha-access.log; From b4742e781896cd7e5b4b7c8421ee118b92b50fa8 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Wed, 2 Feb 2022 17:23:16 -0500 Subject: [PATCH 18/42] Removing Home Assistant. --- homeassistant/docker-compose.yml | 18 ------------------ start.sh | 6 ------ stop.sh | 2 +- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 homeassistant/docker-compose.yml diff --git a/homeassistant/docker-compose.yml b/homeassistant/docker-compose.yml deleted file mode 100644 index af27a40..0000000 --- a/homeassistant/docker-compose.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: '3' -services: - homeassistant: - image: homeassistant/raspberrypi4-homeassistant:stable - container_name: homeassistant - restart: unless-stopped - expose: - - '8123' - volumes: - - /etc/localtime:/etc/localtime:ro - - ./config:/config - networks: - - homeassistant - -networks: - homeassistant: - external: - name: homeassistant \ No newline at end of file diff --git a/start.sh b/start.sh index 6c02479..b727024 100644 --- a/start.sh +++ b/start.sh @@ -31,12 +31,6 @@ docker-compose up -d cd /home/ubuntu/ echo "Done" -echo "Starting Home Assistant..." -cd homeassistant/ -docker-compose up -d -cd /home/ubuntu/ -echo "Done" - echo "Starting reverse proxy..." cd nginx-reverse-proxy/ docker-compose up -d diff --git a/stop.sh b/stop.sh index 3031233..f554d85 100644 --- a/stop.sh +++ b/stop.sh @@ -1,3 +1,3 @@ #!/bin/bash echo "Stopping all of the containers" -docker stop bitwarden motioneye gitea gitea_db_1 blog homeassistant rev-proxy \ No newline at end of file +docker stop bitwarden gitea gitea_db_1 blog rev-proxy \ No newline at end of file From 6db5f4484b52f3bd32bf74c4e06eab3ef6356403 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Sun, 6 Feb 2022 21:18:52 -0500 Subject: [PATCH 19/42] Remove / from foundry proxy_pass. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index c5d34bb..c9bbae9 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -124,7 +124,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; - proxy_pass http://192.168.1.12:30000/; + proxy_pass http://192.168.1.12:30000; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; From f16062a5dff1ab1f8e38c47db0cea450f18c9e95 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Sun, 6 Feb 2022 21:43:52 -0500 Subject: [PATCH 20/42] Let's try a new port. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index c9bbae9..6d4c45c 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -124,7 +124,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; - proxy_pass http://192.168.1.12:30000; + proxy_pass http://192.168.1.12:40000; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; From fb19b27552e2090bfcc08e666244a0feaa21768d Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 21 Feb 2022 18:06:04 -0500 Subject: [PATCH 21/42] Adding bookstack config. --- nginx-reverse-proxy/default.conf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 6d4c45c..4750041 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -134,6 +134,25 @@ server { error_log /var/log/nginx/foundry-error.log error; } +# Bookstack config +server { + listen 80; + listen 443; + server_name wiki.colindiem.com; + + location / { + include /etc/nginx/includes/proxy.conf; + proxy_pass http://192.168.1.9:2665; + + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Conntection "Upgrade"; + } + + access_log /var/log/nginx/wikiaccess.log combined; + error_log /var/log/nginx/wiki-error.log error; + +} + # Default server { listen 80 default_server; From a0a2c8e02425ede7ad4ed58f1e84ed1fb6e530a2 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Tue, 15 Mar 2022 20:34:42 -0400 Subject: [PATCH 22/42] Adding restart to blog and rev-proxy. --- nginx-reverse-proxy/docker-compose.yml | 1 + web/blog/docker-compose.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/nginx-reverse-proxy/docker-compose.yml b/nginx-reverse-proxy/docker-compose.yml index 31fa485..018b05e 100644 --- a/nginx-reverse-proxy/docker-compose.yml +++ b/nginx-reverse-proxy/docker-compose.yml @@ -2,6 +2,7 @@ version: '2' services: proxy: container_name: rev-proxy + restart: unless-stopped build: ./ networks: - blog diff --git a/web/blog/docker-compose.yaml b/web/blog/docker-compose.yaml index 484b02a..6e913e7 100644 --- a/web/blog/docker-compose.yaml +++ b/web/blog/docker-compose.yaml @@ -3,6 +3,7 @@ version: "3.3" services: blog: container_name: blog + restart: unless-stopped image: nginx:1.16.0-alpine volumes: - "./public:/usr/share/nginx/html/" From 2f6752c94629ae4fef6017e0a140dcfe088fb3b3 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Sun, 20 Mar 2022 20:25:07 -0400 Subject: [PATCH 23/42] Updating conf for foundry. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 4750041..4a47050 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -124,7 +124,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; - proxy_pass http://192.168.1.12:40000; + proxy_pass http://192.168.1.249:40001; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; From aab77ca1cc37fc524177525bc5c5ec615caf195a Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 11 Apr 2022 08:08:58 -0400 Subject: [PATCH 24/42] Updated HA ip. --- nginx-reverse-proxy/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 4a47050..7613d2e 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -102,14 +102,14 @@ server { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://192.168.1.9:8123; + proxy_pass http://192.168.1.204:8123; } location /api/websocket { include /etc/nginx/includes/proxy.conf; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://192.168.1.9:8123/api/websocket; + proxy_pass http://192.168.1.204:8123/api/websocket; } access_log /var/log/nginx/ha-access.log; From 0e38b282f559e1dcde6aea592445b3fca127f949 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Fri, 22 Apr 2022 21:16:32 -0400 Subject: [PATCH 25/42] Forgot to update bookstack ip. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 7613d2e..48a5060 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -142,7 +142,7 @@ server { location / { include /etc/nginx/includes/proxy.conf; - proxy_pass http://192.168.1.9:2665; + proxy_pass http://192.168.1.204:2665; proxy_set_header Upgrade $http_upgrade; proxy_set_header Conntection "Upgrade"; From 337c9b9812513f47f5974c473981789fdd92200e Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 1 Aug 2022 23:09:14 -0400 Subject: [PATCH 26/42] adds config for minecraft. --- nginx-reverse-proxy/default.conf | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 7613d2e..9babd91 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -145,7 +145,7 @@ server { proxy_pass http://192.168.1.9:2665; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Conntection "Upgrade"; + proxy_set_header Connection "Upgrade"; } access_log /var/log/nginx/wikiaccess.log combined; @@ -153,6 +153,24 @@ server { } +# Minecraft server config +server { + listen 80; + listen 443; + server_name mc.colindiem.com; + + location / { + include /etc/nginx/includes/proxy.conf; + proxy_pass http://192.168.1.249:25565; + + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade" + } + + access_log /var/log/nginx/minecraft_access.log combined; + error_log /var/log/nginx/minecraft_error.log error; +} + # Default server { listen 80 default_server; From 1051233b487546ac5e47d6b0d24dd4d053c4f5c3 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 1 Aug 2022 23:21:03 -0400 Subject: [PATCH 27/42] adds a missed } in minecraft config. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 2bb2d8f..193cb13 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -164,7 +164,7 @@ server { proxy_pass http://192.168.1.249:25565; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade" + proxy_set_header Connection "Upgrade"; } access_log /var/log/nginx/minecraft_access.log combined; From fe4c1df88ff7a9d82be7c7aa428a9f21652aa717 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Fri, 19 Aug 2022 21:32:19 +0000 Subject: [PATCH 28/42] Adding changes from actual server. --- nginx-reverse-proxy/backend-not-found.html | 1 + nginx-reverse-proxy/default.conf | 2 +- nginx-reverse-proxy/includes/proxy.conf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/backend-not-found.html b/nginx-reverse-proxy/backend-not-found.html index bebb95c..990232e 100644 --- a/nginx-reverse-proxy/backend-not-found.html +++ b/nginx-reverse-proxy/backend-not-found.html @@ -2,5 +2,6 @@ Proxy Backend Not Found

Proxy Backend Not Found

+

This is a test.

diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 2bb2d8f..193cb13 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -164,7 +164,7 @@ server { proxy_pass http://192.168.1.249:25565; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade" + proxy_set_header Connection "Upgrade"; } access_log /var/log/nginx/minecraft_access.log combined; diff --git a/nginx-reverse-proxy/includes/proxy.conf b/nginx-reverse-proxy/includes/proxy.conf index 716d590..71d773a 100644 --- a/nginx-reverse-proxy/includes/proxy.conf +++ b/nginx-reverse-proxy/includes/proxy.conf @@ -1,6 +1,6 @@ proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; proxy_buffering off; proxy_request_buffering off; From 059727bfdd432e33879e1aa8536ad0bc6707a357 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Thu, 2 Feb 2023 20:57:34 -0500 Subject: [PATCH 29/42] adds access logging to nginx. --- nginx-reverse-proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index 193cb13..b293f6e 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -189,7 +189,7 @@ location / { return 404; } -access_log off; +access_log /var/log/nginx/access.log access; log_not_found off; error_log /var/log/nginx/error.log error; } From 4909b260925a0103885af1b675f740a77541c526 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 17 Apr 2023 03:27:47 +0000 Subject: [PATCH 30/42] updates rev-proxy to use vaultwarden instead of bitwarden. --- nginx-reverse-proxy/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-reverse-proxy/default.conf b/nginx-reverse-proxy/default.conf index b293f6e..fae7543 100644 --- a/nginx-reverse-proxy/default.conf +++ b/nginx-reverse-proxy/default.conf @@ -30,7 +30,7 @@ include /etc/nginx/includes/ssl.conf; location / { include /etc/nginx/includes/proxy.conf; -proxy_pass http://bitwarden; +proxy_pass http://vaultwarden; } access_log /var/log/nginx/bitwarden-access.log combined; @@ -189,7 +189,7 @@ location / { return 404; } -access_log /var/log/nginx/access.log access; +access_log off; log_not_found off; error_log /var/log/nginx/error.log error; } From cf81ac5cb2b735df5264d2762ad4e8601f3306e9 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Sun, 16 Apr 2023 23:30:15 -0400 Subject: [PATCH 31/42] Updates start.sh to use vaultwarden instead of bitwarden. --- start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start.sh b/start.sh index b727024..7a579b8 100644 --- a/start.sh +++ b/start.sh @@ -7,8 +7,8 @@ cd nginx-reverse-proxy/ docker-compose build cd /home/ubuntu/ -echo "Starting Bitwarden..." -cd bitwarden/ +echo "Starting Vaultwarden..." +cd vaultwarden/ docker-compose up -d cd /home/ubuntu/ echo "Done" From ff612e8ae8b1082d61ab60a8f95e7eaf0a7807b4 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Sun, 16 Apr 2023 23:32:51 -0400 Subject: [PATCH 32/42] updates install script to say vaultwarden instead of bitwarden. --- light-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/light-install.sh b/light-install.sh index ad14c59..5949415 100644 --- a/light-install.sh +++ b/light-install.sh @@ -23,7 +23,7 @@ echo ">>Done" echo "Don't forget to edit /etc/hosts to add the new sites 172.31.30.78 blog -172.31.30.78 bitwarden +172.31.30.78 vaultwarden 172.31.30.78 gitea 172.31.30.78 motioneye 172.31.30.78 homeassistant" From 4889faeee98d6d26423529d8aa86f445b9e94891 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Sun, 16 Apr 2023 23:41:48 -0400 Subject: [PATCH 33/42] Updates stop script to use vaultwarden instead of bitwarden. --- stop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stop.sh b/stop.sh index f554d85..2ef1491 100644 --- a/stop.sh +++ b/stop.sh @@ -1,3 +1,3 @@ #!/bin/bash echo "Stopping all of the containers" -docker stop bitwarden gitea gitea_db_1 blog rev-proxy \ No newline at end of file +docker stop vaultwarden gitea gitea_db_1 blog rev-proxy \ No newline at end of file From afccf894a1ec2da9fd5241d904bad1dee2a28cf1 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 17 Apr 2023 03:42:59 +0000 Subject: [PATCH 34/42] Updates docker-compose to rename bitwarden network to vaultwarden. --- nginx-reverse-proxy/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nginx-reverse-proxy/docker-compose.yml b/nginx-reverse-proxy/docker-compose.yml index 018b05e..8c74664 100644 --- a/nginx-reverse-proxy/docker-compose.yml +++ b/nginx-reverse-proxy/docker-compose.yml @@ -6,7 +6,7 @@ services: build: ./ networks: - blog - - bitwarden + - vaultwarden - gitea - motioneye - homeassistant @@ -18,9 +18,9 @@ networks: blog: external: name: blog_default - bitwarden: + vaultwarden: external: - name: bitwarden_default + name: vaultwarden_default gitea: external: name: gitea @@ -29,4 +29,4 @@ networks: name: motioneye homeassistant: external: - name: homeassistant \ No newline at end of file + name: homeassistant From 51ffe79823359ce78ec2ec90b1abd321b64057e9 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Sun, 16 Apr 2023 23:44:28 -0400 Subject: [PATCH 35/42] Updates the gitignore for vaultwarden/data --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fdcdebc..63e549c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ nginx-reverse-proxy/ssl bitwarden/data +vaultwarden/data web/** !web/blog web/blog/** From 674708ef35a14e4ad0efd8e225c3fa1af320aefe Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 17 Apr 2023 03:45:24 +0000 Subject: [PATCH 36/42] Adds vaultwarden config. --- vaultwarden/docker-compose.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 vaultwarden/docker-compose.yml diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml new file mode 100644 index 0000000..44b4683 --- /dev/null +++ b/vaultwarden/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3' +services: + vaultwarden: + container_name: vaultwarden + image: vaultwarden/server + restart: always + volumes: + - ./data:/data + expose: + - 80 + environment: + WEBSOCKET_ENABLED: 'true' + SIGNUPS_ALLOWED: 'true' + ADMIN_TOKEN: +m/eot+LzKSgr8xKFVJdbu6WpX2l4Esql7dxMOd1G/RB+6+6hQq+2CmqvJ5VHCKJ From b5f2e74bd0dfe48ef4ca1479bbdbe8423811488b Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 17 Apr 2023 03:47:15 +0000 Subject: [PATCH 37/42] Adds reboot script and attempt to make a service file. --- my_services.service | 8 ++++++++ reboot.sh | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 my_services.service create mode 100644 reboot.sh diff --git a/my_services.service b/my_services.service new file mode 100644 index 0000000..7e208de --- /dev/null +++ b/my_services.service @@ -0,0 +1,8 @@ +[Unit] +Description=Launch Service for my self-hosted services. + +[Service] +ExecStart=/home/ubuntu/start.sh & + +[Install] +WantedBy=multi-user.target diff --git a/reboot.sh b/reboot.sh new file mode 100644 index 0000000..637549c --- /dev/null +++ b/reboot.sh @@ -0,0 +1,19 @@ +#!/bin/bash +clear +cd /home/ubuntu/ + +cd vaultwarden/ +docker-compose up -d +cd /home/ubuntu/ + +cd gitea/ +docker-compose up -d +cd /home/ubuntu/ + +cd web/blog/ +docker-compose up -d +cd /home/ubuntu/ + +cd nginx-reverse-proxy/ +docker-compose up -d +cd /home/ubuntu/ From edd157d241f02cd087b4d12b819a8b4fb3e2b893 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Sun, 16 Apr 2023 23:53:19 -0400 Subject: [PATCH 38/42] Updates gitea to use the latest docker image. --- gitea/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index f7c6faf..dc23e6b 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -7,7 +7,7 @@ networks: services: server: - image: gitea/gitea:1.13.6 + image: gitea/gitea:latest container_name: gitea environment: - USER_UID=1000 From 4d90ebd03310c8c1eb3a6798e11b9cbb743ef364 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 17 Apr 2023 04:02:15 +0000 Subject: [PATCH 39/42] Removes old bitwarden directory. --- bitwarden/docker-compose.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 bitwarden/docker-compose.yml diff --git a/bitwarden/docker-compose.yml b/bitwarden/docker-compose.yml deleted file mode 100644 index 70467d7..0000000 --- a/bitwarden/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '3' -services: - bitwarden: - container_name: bitwarden - image: bitwardenrs/server - restart: always - volumes: - - ./data:/data - expose: - - '80' - environment: - WEBSOCKET_ENABLED: 'true' - SIGNUPS_ALLOWED: 'true' - ADMIN_TOKEN: +m/eot+LzKSgr8xKFVJdbu6WpX2l4Esql7dxMOd1G/RB+6+6hQq+2CmqvJ5VHCKJ From d77a8d21218bdf71e3b2852ec2841dfad7fc73dd Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 17 Apr 2023 04:04:24 +0000 Subject: [PATCH 40/42] Removes old motioneye directory. I like Frigate better. --- motioneye/docker-compose.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 motioneye/docker-compose.yml diff --git a/motioneye/docker-compose.yml b/motioneye/docker-compose.yml deleted file mode 100644 index 24ca3c5..0000000 --- a/motioneye/docker-compose.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: "3.5" -services: - motioneye: - image: ccrisan/motioneye:master-armhf - container_name: motioneye - networks: - - motioneye - expose: - - "8081" - - "8765" - volumes: - - etc_motioneye:/etc/motioneye - - var_lib_motioneye:/var/lib/motioneye - -volumes: - etc_motioneye: - var_lib_motioneye: - -networks: - motioneye: - external: - name: motioneye \ No newline at end of file From 4325b1dda5f43229df264b5eb4c80f0e8ce60ee0 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 17 Apr 2023 00:05:41 -0400 Subject: [PATCH 41/42] Removes unneeded motioneye stuff. --- light-install.sh | 1 - start.sh | 6 ------ 2 files changed, 7 deletions(-) diff --git a/light-install.sh b/light-install.sh index 5949415..b1d69aa 100644 --- a/light-install.sh +++ b/light-install.sh @@ -25,7 +25,6 @@ echo "Don't forget to edit /etc/hosts to add the new sites 172.31.30.78 blog 172.31.30.78 vaultwarden 172.31.30.78 gitea -172.31.30.78 motioneye 172.31.30.78 homeassistant" echo "Also, get the blog code deployed to the git instance and pull it back down here to get the blog running." echo "The blog is tricky, because it needs the theme to work, don't forget to clone that as well." diff --git a/start.sh b/start.sh index 7a579b8..c33d6fa 100644 --- a/start.sh +++ b/start.sh @@ -19,12 +19,6 @@ docker-compose up -d cd /home/ubuntu/ echo "Done" -# echo "Starting MotionEye..." -# cd motioneye/ -# docker-compose up -d -# cd /home/ubuntu/ -# echo "Done" - echo "Starting blog..." cd web/blog/ docker-compose up -d From ecfb2ecef94098133b9dc4c076db3a0ded1596a0 Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Mon, 17 Apr 2023 00:08:49 -0400 Subject: [PATCH 42/42] Adds a readme to help future me. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..98451f3 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# Steps to reinstall +- Clone this repo onto new server +- Run light-install.sh +- Update the hosts file as mentioned in the output of the light-install +- Run start.sh + +That should do it. \ No newline at end of file