From 90226faf984c3223d6d654fd5d38f969e34d5a32 Mon Sep 17 00:00:00 2001 From: "SmartHomeBeginner.com" Date: Fri, 22 Nov 2019 11:34:51 -0500 Subject: [PATCH] updates --- .gitignore | 1 + CHANGELOG.md | 4 +++ README.md | 4 ++- docker-compose-obsolete.yml | 60 +++++++++++++++++++++++++++++++ docker-compose.yml | 71 +++++++++++++++++++++---------------- 5 files changed, 109 insertions(+), 31 deletions(-) mode change 100644 => 100755 .gitignore create mode 100755 docker-compose-obsolete.yml diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index d724d90..eb89946 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ !.gitignore !docker-compose.yml !docker-compose-vpn.yml +!docker-compose-obsolete.yml !.env.example !README.md !CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index c4b2fda..f9ca2dd 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ * Add nut-upsd, mariadb/pma, HealthChecks, FileRun, smtp-to-telegram * Replace or remove Transmission/qBittorrent (duplicate functionality) +## November 22, 2019 +* Replaced Emby with Jellyfin +* Added Postgres database for StatPing + ## November 21, 2019 * Added Autoindex * Addded TellyTV for IPTV proxy for plex diff --git a/README.md b/README.md index 132925f..f181aa8 100755 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ We will try to keep this repo up-to-date. For now, here are the apps currently i * phpMyAdmin - Database management * InfluxDB - Database for sensor data +* Postgres - Database * Grafana - Graphical data visualization for InfluxDB data * Varken - Monitor Plex, Sonarr, Radarr, and Other Data @@ -58,7 +59,8 @@ We will try to keep this repo up-to-date. For now, here are the apps currently i ### MEDIA SERVER * Plex - Media Server -* Emby - Media Server +* Jellyfin - Media Server +* Emby - Media Server (OBSOLETE) * Tautulli - Previously PlexPy. Plex statistics and monitoring * Plex-Sync - For Syncing watched status between plex servers * Telly Tv- IPTV proxy for Plex diff --git a/docker-compose-obsolete.yml b/docker-compose-obsolete.yml new file mode 100755 index 0000000..deb165f --- /dev/null +++ b/docker-compose-obsolete.yml @@ -0,0 +1,60 @@ +version: "3.7" + +################ THESE ARE APPS I USED TO USE BUT NOT ANYMORE ########### + +########################### NETWORKS +networks: + traefik_proxy: + external: + name: traefik_proxy + default: + driver: bridge + +########################### SERVICES +services: + +# Emby - Media Server + embyms: + image: emby/embyserver:latest + container_name: embyms + hostname: embyms + restart: unless-stopped + networks: + - traefik_proxy + ports: + - "${EMBY_PORT}:8096/tcp" + - "8920:8920/tcp" + volumes: + - /etc/localtime:/etc/localtime:ro + - ${USERDIR}/docker/embyms:/config + - ${USERDIR}/Downloads/emby_tmp:/transcode + - /media:/nas + - ${USERDIR}/Downloads:/downloads + environment: + TZ: ${TZ} + HOSTNAME: "nucEmby" + UID: ${PUID} + GID: ${PGID} + labels: + traefik.enable: "true" + traefik.backend: embyms + traefik.protocol: http + traefik.port: 8096 + traefik.frontend.rule: Host:nucemby.${DOMAINNAME} + traefik.frontend.headers.SSLHost: nucemby.${DOMAINNAME} + traefik.docker.network: traefik_proxy + traefik.frontend.passHostHeader: "true" + traefik.frontend.headers.SSLForceHost: "true" + traefik.frontend.headers.SSLRedirect: "true" + traefik.frontend.headers.browserXSSFilter: "true" + traefik.frontend.headers.contentTypeNosniff: "true" + traefik.frontend.headers.forceSTSHeader: "true" + traefik.frontend.headers.STSSeconds: 315360000 + traefik.frontend.headers.STSIncludeSubdomains: "true" + traefik.frontend.headers.STSPreload: "true" + traefik.frontend.headers.customResponseHeaders: X-Robots-Tag:noindex,nofollow,nosnippet,noarchive,notranslate,noimageindex + traefik.frontend.headers.frameDeny: "true" + traefik.frontend.headers.customFrameOptionsValue: 'allow-from https:${DOMAINNAME}' +# traefik.frontend.auth.forward.address: "http://oauth:4181" +# traefik.frontend.auth.forward.authResponseHeaders: X-Forwarded-User +# traefik.frontend.auth.forward.trustForwardHeader: "true" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index bf8d7b3..2f865b3 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -428,6 +428,19 @@ services: - ${USERDIR}/docker/influxdb/db:/var/lib/influxdb # command: -config /etc/influxdb/influxdb.conf +# Postgres - Database + postgres: + image: postgres + container_name: postgres + hostname: postgres + restart: always + volumes: + - ${USERDIR}/docker/postgres:/var/lib/postgresql/data + environment: + POSTGRES_PASSWORD: ${STATPING_DB_PASS} + POSTGRES_USER: ${STATPING_DB_USER} + POSTGRES_DB: ${STATPING_DB} + # Grafana - Graphical data visualization for InfluxDB data grafana: image: grafana/grafana @@ -907,35 +920,36 @@ services: # traefik.frontend.auth.forward.authResponseHeaders: X-Forwarded-User # traefik.frontend.auth.forward.trustForwardHeader: "true" -# Emby - Media Server - embyms: - image: emby/embyserver:latest - container_name: embyms - hostname: embyms +# Jellyfin - Media Server + jellyfin: + image: jellyfin/jellyfin:latest + container_name: jellyfin + hostname: jellyfin restart: unless-stopped networks: - traefik_proxy + - default +# network_mode: container:vpn-rutorrent ports: - - "${EMBY_PORT}:8096/tcp" - - "8920:8920/tcp" - volumes: - - /etc/localtime:/etc/localtime:ro - - ${USERDIR}/docker/embyms:/config - - ${USERDIR}/Downloads/emby_tmp:/transcode - - /media:/nas - - ${USERDIR}/Downloads:/downloads + - "8096:8096" + - "8920:8920" environment: + PUID: ${PUID} + PGID: ${PGID} TZ: ${TZ} - HOSTNAME: "nucEmby" - UID: ${PUID} - GID: ${PGID} + UMASK_SET: 022 + volumes: + - ${USERDIR}/docker/jellyfin:/config + - /dev/shm:/ram_transcode + - /media:/nas +# - /media:/nas:ro # Run in ro mode while upgrading JF labels: traefik.enable: "true" - traefik.backend: embyms + traefik.backend: jellyfin traefik.protocol: http traefik.port: 8096 - traefik.frontend.rule: Host:nucemby.${DOMAINNAME} - traefik.frontend.headers.SSLHost: nucemby.${DOMAINNAME} + traefik.frontend.rule: Host:jelly.${DOMAINNAME} + traefik.frontend.headers.SSLHost: jelly.${DOMAINNAME} traefik.docker.network: traefik_proxy traefik.frontend.passHostHeader: "true" traefik.frontend.headers.SSLForceHost: "true" @@ -1614,25 +1628,22 @@ services: networks: - traefik_proxy - default -# ports: -# - "4480:8080" + ports: + - "${STATPING_PORT}:8080" volumes: - ${USERDIR}/docker/statping:/app environment: - DB_CONN: mysql - DB_HOST: ${DB_HOST} - DB_PORT: ${DB_PORT} + VIRTUAL_HOST: localhost + VIRTUAL_PORT: 8080 + DB_CONN: postgres + DB_HOST: postgres DB_USER: ${STATPING_DB_USER} DB_PASS: ${STATPING_DB_PASS} DB_DATABASE: ${STATPING_DB} IS_DOCKER: "true" DISABLE_LOGS: "false" - NAME: Demo - DESCRIPTION: This is an awesome page - DOMAIN: https:${DOMAINNAME} - ADMIN_USER: admin - ADMIN_PASSWORD: admin - ADMIN_EMAIL: ${MY_EMAIL} + NAME: StatPing + DESCRIPTION: Monitor web services labels: traefik.enable: "true" traefik.backend: statping