diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml index f4a223a..ebc86ca 100644 --- a/homeassistant/docker-compose.yaml +++ b/homeassistant/docker-compose.yaml @@ -10,9 +10,23 @@ services: - /run/dbus:/run/dbus:ro restart: unless-stopped privileged: true - networks: - - net + esphome: + container_name: esphome + image: ghcr.io/esphome/esphome + volumes: + - ./esphome/config:/config + - /etc/localtime:/etc/localtime:ro + restart: always + privileged: true + ports: + - 6052:6052 + environment: + - USERNAME=fakeowl1 + - PASSWORD=XGSAwP20YHForF + devices: + - /dev/ttyACM0:/dev/ttyACM0 + mosquitto: image: eclipse-mosquitto hostname: mosquitto @@ -25,6 +39,3 @@ services: - ./mosquitto:/etc/mosquitto - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf - ./mosquitto/passwd:/etc/mosquitto/passwd -networks: - net: - external: true diff --git a/homeassistant/esphome/config/.gitignore b/homeassistant/esphome/config/.gitignore new file mode 100644 index 0000000..d8b4157 --- /dev/null +++ b/homeassistant/esphome/config/.gitignore @@ -0,0 +1,5 @@ +# Gitignore settings for ESPHome +# This is an example and may include too much for your use-case. +# You can modify this file to suit your needs. +/.esphome/ +/secrets.yaml diff --git a/homeassistant/esphome/config/sensor.yaml b/homeassistant/esphome/config/sensor.yaml new file mode 100644 index 0000000..7ae28b9 --- /dev/null +++ b/homeassistant/esphome/config/sensor.yaml @@ -0,0 +1,16 @@ +esphome: + name: esp32-s2-1 + friendly_name: esp32-s2-1 + +esp32: + board: lolin_s2_mini + variant: esp32s2 + framework: + type: esp-idf + +wifi: + ssid: PGS44 + password: 06578381 + +api: +logger: diff --git a/jellyfin/docker-compose.yaml b/jellyfin/docker-compose.yaml index a0a9afe..8a29ff8 100644 --- a/jellyfin/docker-compose.yaml +++ b/jellyfin/docker-compose.yaml @@ -3,7 +3,7 @@ services: image: jellyfin/jellyfin user: "1000:1000" ports: - - 8096 + - 8096:8096 volumes: - ./config:/config - ./cache:/cache @@ -16,27 +16,27 @@ services: - PUID=1000 - PGID=1000 - TZ=Europe/Kyiv - networks: - - net restart: 'unless-stopped' sonarr: image: lscr.io/linuxserver/sonarr:latest container_name: sonarr + ports: + - 8989:8989 environment: - PUID=1000 - PGID=1000 - TZ=Europe/Kyiv volumes: - - ./sonarr/config:/config:z - - /media/hda1/jellyfin:/data:z #Access to the entire /media - networks: - - net + - ./sonarr/config:/config + - /media/hda1/jellyfin:/data restart: unless-stopped radarr: image: lscr.io/linuxserver/radarr:latest container_name: radarr + ports: + - 7878:7878 environment: - PUID=1000 - PGID=1000 @@ -44,13 +44,13 @@ services: volumes: - ./radarr/config:/config:z - /media/hda1/jellyfin:/data:z #Access to the entire /media - networks: - - net restart: unless-stopped jackett: image: lscr.io/linuxserver/jackett:latest container_name: jackett + ports: + - 9117:9117 environment: - PUID=1000 - PGID=1000 @@ -60,10 +60,4 @@ services: volumes: - ./config:/config - ./blackhole:/downloads - networks: - - net restart: unless-stopped - -networks: - net: - external: true diff --git a/nginx/configs/nginx/conf.d/homeassistant.conf b/nginx/configs/nginx/conf.d/homeassistant.conf index 32926bd..2bc8d3d 100644 --- a/nginx/configs/nginx/conf.d/homeassistant.conf +++ b/nginx/configs/nginx/conf.d/homeassistant.conf @@ -1,25 +1,24 @@ server { listen 80; + listen [::]:80; # Remove '#' in the next line to enable IPv6 # listen [::]:443 ssl http2; - server_name hass.fakeowl1.local; + server_name hass.fakeowl1.com; + + location /.well-known/acme-challenge/ { + root /var/www/certbot/; + } location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - proxy_pass http://192.168.1.158:8123/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + return 301 https://$server_name:443$request_uri; } } server { listen 443 ssl; - # Remove '#' in the next line to enable IPv6 listen [::]:443 ssl; + server_name hass.fakeowl1.com; ssl_certificate /etc/letsencrypt/live/hass.fakeowl1.com/fullchain.pem; @@ -28,7 +27,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; - proxy_pass http://192.168.1.158:8123/; + proxy_pass http://192.168.1.158:8123; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/nginx/configs/nginx/conf.d/jackett.conf b/nginx/configs/nginx/conf.d/jackett.conf index 2ce4fe0..fe190e3 100644 --- a/nginx/configs/nginx/conf.d/jackett.conf +++ b/nginx/configs/nginx/conf.d/jackett.conf @@ -5,7 +5,7 @@ server { server_name jackett.homeserver.local; location / { - proxy_pass http://jackett:9117; + proxy_pass http://192.168.1.158:9117; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; diff --git a/nginx/configs/nginx/conf.d/jellyfin.conf b/nginx/configs/nginx/conf.d/jellyfin.conf index 16326e5..f40a1e8 100644 --- a/nginx/configs/nginx/conf.d/jellyfin.conf +++ b/nginx/configs/nginx/conf.d/jellyfin.conf @@ -67,7 +67,7 @@ server { location / { # Proxy main Jellyfin traffic - proxy_pass http://jellyfin:8096; + proxy_pass http://192.168.1.158:8096; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -82,7 +82,7 @@ server { # location block for /web - This is purely for aesthetics so /web/#!/ works instead of having to go to /web/index.html/#!/ location = /web { # Proxy main Jellyfin traffic - proxy_pass http://jellyfin:8096/web/index.html; + proxy_pass http://192.168.1.158:8096/web/index.html; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -93,7 +93,7 @@ server { location /jellyfin/socket { # Proxy Jellyfin Websockets traffic - proxy_pass http://jellyfin:8096; + proxy_pass http://192.168.1.158:8096; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -162,7 +162,7 @@ server { location / { # Proxy main Jellyfin traffic - proxy_pass http://jellyfin:8096; + proxy_pass http://192.168.1.158:8096; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -177,7 +177,7 @@ server { # location block for /web - This is purely for aesthetics so /web/#!/ works instead of having to go to /web/index.html/#!/ location = /web { # Proxy main Jellyfin traffic - proxy_pass http://jellyfin:8096/web/index.html; + proxy_pass http://192.168.1.158:8096/web/index.html; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -188,7 +188,7 @@ server { location /jellyfin/socket { # Proxy Jellyfin Websockets traffic - proxy_pass http://jellyfin:8096; + proxy_pass http://192.168.1.158:8096; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/nginx/configs/nginx/conf.d/nextcloud.conf b/nginx/configs/nginx/conf.d/nextcloud.conf index 8669f6d..b0c0cc5 100644 --- a/nginx/configs/nginx/conf.d/nextcloud.conf +++ b/nginx/configs/nginx/conf.d/nextcloud.conf @@ -1,14 +1,3 @@ -server { - listen 80; - listen [::]:80; - server_name nextcloud.homeserver.local; - - location / { - return 301 http://$server_name:443$request_uri; - } -} - - server { listen 80; listen [::]:80; @@ -125,7 +114,7 @@ server { #Avoid sending the security headers twice fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; - fastcgi_pass nextcloud:9000; + fastcgi_pass 192.168.1.158:9000; fastcgi_intercept_errors on; fastcgi_request_buffering off; } diff --git a/nginx/configs/nginx/conf.d/radarr.conf b/nginx/configs/nginx/conf.d/radarr.conf index 3d5c698..e07da4f 100644 --- a/nginx/configs/nginx/conf.d/radarr.conf +++ b/nginx/configs/nginx/conf.d/radarr.conf @@ -15,6 +15,6 @@ server { proxy_redirect off; proxy_http_version 1.1; - proxy_pass http://radarr:7878; + proxy_pass http://192.168.1.158:7878; } } diff --git a/nginx/configs/nginx/conf.d/sonarr.conf b/nginx/configs/nginx/conf.d/sonarr.conf index 3f2004b..877cc9e 100644 --- a/nginx/configs/nginx/conf.d/sonarr.conf +++ b/nginx/configs/nginx/conf.d/sonarr.conf @@ -15,6 +15,6 @@ server { proxy_redirect off; proxy_http_version 1.1; - proxy_pass http://sonarr:8989; + proxy_pass http://192.168.1.158:8989; } } diff --git a/nginx/configs/nginx/conf.d/transmission.conf b/nginx/configs/nginx/conf.d/transmission.conf index e9d1b20..72d60f3 100644 --- a/nginx/configs/nginx/conf.d/transmission.conf +++ b/nginx/configs/nginx/conf.d/transmission.conf @@ -4,7 +4,7 @@ server { server_name torrent.homeserver.local; location / { - proxy_pass http://transmission:9091; + proxy_pass http://192.168.1.158:9091; proxy_http_version 1.1; # headers recognized by qBittorrent diff --git a/nginx/docker-compose.yaml b/nginx/docker-compose.yaml index 3536401..07c76e7 100644 --- a/nginx/docker-compose.yaml +++ b/nginx/docker-compose.yaml @@ -14,9 +14,3 @@ services: - ../nextcloud/nextcloud:/var/www/html:ro - ../myschoolproj:/var/www/myschoolproj build: . - networks: - - net - -networks: - net: - external: true diff --git a/transmission/docker-compose.yaml b/transmission/docker-compose.yaml index 213685b..fc36b8f 100644 --- a/transmission/docker-compose.yaml +++ b/transmission/docker-compose.yaml @@ -2,22 +2,15 @@ services: transmission: image: lscr.io/linuxserver/transmission:latest container_name: transmission + ports: + - 9091:9091 + - 51413:51413 + - 51413:51413/udp environment: - PUID=1000 - PGID=1000 - TZ=Etc/UTC volumes: - ./data:/config - - /media/hda1/Torrents:/downloads - - /media/hda1/jellyfin:/downloads/jellyfin:rw - #ports: - # - 9091:9091 - # - 51413:51413 - # - 51413:51413/udp - networks: - - net + - /media/hda1/jellyfin:/downloads:rw restart: unless-stopped - -networks: - net: - external: true