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/** 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 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 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/light-install.sh b/light-install.sh index ad14c59..b1d69aa 100644 --- a/light-install.sh +++ b/light-install.sh @@ -23,9 +23,8 @@ 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" 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/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 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/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 4872720..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; @@ -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 { @@ -102,20 +102,75 @@ 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.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://homeassistant:8123/api/websocket; + proxy_pass http://192.168.1.204:8123/api/websocket; } access_log /var/log/nginx/ha-access.log; error_log /var/log/nginx/ha-error.log; } +# Foundry config +server { + listen 80; + listen 443; + server_name foundry.colindiem.com; + + location / { + include /etc/nginx/includes/proxy.conf; + proxy_pass http://192.168.1.249:40001; + + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + } + + access_log /var/log/nginx/foundry-access.log combined; + 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.204:2665; + + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + } + + access_log /var/log/nginx/wikiaccess.log combined; + error_log /var/log/nginx/wiki-error.log error; + +} + +# 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; diff --git a/nginx-reverse-proxy/docker-compose.yml b/nginx-reverse-proxy/docker-compose.yml index 31fa485..8c74664 100644 --- a/nginx-reverse-proxy/docker-compose.yml +++ b/nginx-reverse-proxy/docker-compose.yml @@ -2,10 +2,11 @@ version: '2' services: proxy: container_name: rev-proxy + restart: unless-stopped build: ./ networks: - blog - - bitwarden + - vaultwarden - gitea - motioneye - homeassistant @@ -17,9 +18,9 @@ networks: blog: external: name: blog_default - bitwarden: + vaultwarden: external: - name: bitwarden_default + name: vaultwarden_default gitea: external: name: gitea @@ -28,4 +29,4 @@ networks: name: motioneye homeassistant: external: - name: homeassistant \ No newline at end of file + name: homeassistant 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; 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/ diff --git a/start.sh b/start.sh index cda1c0c..c33d6fa 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" @@ -19,24 +19,12 @@ 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 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..2ef1491 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 vaultwarden gitea gitea_db_1 blog rev-proxy \ No newline at end of file diff --git a/bitwarden/docker-compose.yml b/vaultwarden/docker-compose.yml similarity index 74% rename from bitwarden/docker-compose.yml rename to vaultwarden/docker-compose.yml index 70467d7..44b4683 100644 --- a/bitwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -1,13 +1,13 @@ version: '3' services: - bitwarden: - container_name: bitwarden - image: bitwardenrs/server + vaultwarden: + container_name: vaultwarden + image: vaultwarden/server restart: always volumes: - ./data:/data expose: - - '80' + - 80 environment: WEBSOCKET_ENABLED: 'true' SIGNUPS_ALLOWED: 'true' 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/"