From 3857df3f03eaaf8165ebe2d3d075c96715516b64 Mon Sep 17 00:00:00 2001 From: Stephan Porada Date: Sun, 13 Mar 2022 10:51:30 +0100 Subject: [PATCH] Add grocy and remove unused services --- .gitignore | 3 ++ grocy/docker-compose.yml | 34 ++++++++++++++++++++++ grocy/live.env.tpl | 50 +++++++++++++++++++++++++++++++++ nginx-rtmp/README.md | 1 - nginx-rtmp/docker-compose.yml | 8 ------ owncast/README.md | 3 -- owncast/docker-compose.yml | 31 -------------------- owncast/live.env.tpl | 0 silverstrike/README.md | 0 silverstrike/docker-compose.yml | 38 ------------------------- silverstrike/live.env.tpl | 12 -------- traefik/docker-compose.yml | 4 +-- 12 files changed, 89 insertions(+), 95 deletions(-) create mode 100644 grocy/docker-compose.yml create mode 100644 grocy/live.env.tpl delete mode 100644 nginx-rtmp/README.md delete mode 100644 nginx-rtmp/docker-compose.yml delete mode 100644 owncast/README.md delete mode 100644 owncast/docker-compose.yml delete mode 100644 owncast/live.env.tpl delete mode 100644 silverstrike/README.md delete mode 100644 silverstrike/docker-compose.yml delete mode 100644 silverstrike/live.env.tpl diff --git a/.gitignore b/.gitignore index dad0abf..ce6c7ad 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ loolwsd.xml **/redis/ **/html/ **/volumes/ + +# Excepted files still trocked even if they are in the folders above +!*/data/data/config.php diff --git a/grocy/docker-compose.yml b/grocy/docker-compose.yml new file mode 100644 index 0000000..947d1dc --- /dev/null +++ b/grocy/docker-compose.yml @@ -0,0 +1,34 @@ +version: '3.5' + +networks: + default: + external: + name: traefik_default + +services: + grocy-frontend: + image: lscr.io/linuxserver/grocy + container_name: grocy-app + restart: unless-stopped + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - ${GROCY_ROOT}/data:/config + environment: + - USER_UID=1000 + - USER_GID=1000 + env_file: live.env + labels: + # Watchtower + - "com.centurylinklabs.watchtower.enable=true" + # Routes + - "traefik.enable=true" + - "traefik.http.routers.grocy.entrypoints=websecure" + - "traefik.http.routers.grocy.rule=Host(`grocy.${DOMAIN}`)" + - "traefik.http.routers.grocy.tls=true" + - "traefik.http.routers.grocy.tls.certresolver=myresolver" + networks: + - default + ports: + - 9283:80 + diff --git a/grocy/live.env.tpl b/grocy/live.env.tpl new file mode 100644 index 0000000..5c60ae0 --- /dev/null +++ b/grocy/live.env.tpl @@ -0,0 +1,50 @@ +# Grocy Environment Variables + +# These environment variables affect PHP and the grocy application +# For a full list of grocy settings, see config-dist.php in the main grocy repo: +# +# https://github.com/grocy/grocy/blob/master/config-dist.php +# +# Grocy application settings must be prefixed with 'GROCY_'. +# +# For example, if we'd like to configure grocy to use Euros (EUR): +# +# Setting('CURRENCY', 'USD'); +# +# Then we would set GROCY_CURRENCY=EUR + + +## User-supplied Variables + +# These are environment variables that may be supplied by the user +# No values are supplied for these as part of this distribution + +# When you're ready to deploy grocy in production, set GROCY_MODE=production +# to enable user authentication +GROCY_MODE=production + + +## Distribution-supplied Variables + +# These are 'sensible defaults' provided as part of the grocy-docker +# distribution. + +# GROCY_CULTURE configures localization of the grocy application +# Supported locales: https://github.com/grocy/grocy/tree/master/localization +GROCY_CULTURE=de +GROCY_CURRENCY=EUR +GROCY_DEFAULT_LOCALE=de + +# Grocy Mode +GROCY_MODE=production + + +# PHP Environment variables +MAX_UPLOAD=50M +PHP_MAX_FILE_UPLOAD=200 +PHP_MAX_POST=100M +PHP_MEMORY_LIMIT=512M + +#Custom Settings +GROCY_ROOT=/home/compute/services/grocy +DOMAIN=domain.com diff --git a/nginx-rtmp/README.md b/nginx-rtmp/README.md deleted file mode 100644 index 683a1e5..0000000 --- a/nginx-rtmp/README.md +++ /dev/null @@ -1 +0,0 @@ -Not Traefik ready! diff --git a/nginx-rtmp/docker-compose.yml b/nginx-rtmp/docker-compose.yml deleted file mode 100644 index 20a9630..0000000 --- a/nginx-rtmp/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: "3.7" -services: - streaming: - image: tiangolo/nginx-rtmp - container_name: nginx-rtmp - ports: - - "1935:1935" - restart: unless-stopped diff --git a/owncast/README.md b/owncast/README.md deleted file mode 100644 index 8ef69ce..0000000 --- a/owncast/README.md +++ /dev/null @@ -1,3 +0,0 @@ -RTMPS traefik config inspired by this example: - -https://github.com/owncast/owncast/commit/b7ef15471577c5de0491995bb5e0f08a43bb2bb3 \ No newline at end of file diff --git a/owncast/docker-compose.yml b/owncast/docker-compose.yml deleted file mode 100644 index a2ba087..0000000 --- a/owncast/docker-compose.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: '3.5' - -networks: - default: - external: - name: traefik_default - -services: - owncast: - image: gabekangas/owncast:latest - restart: unless-stopped - container_name: owncast-app - env_file: live.env - networks: - - default - ports: - - "8080:8080" - volumes: - - ${OWNCAST_ROOT}/db:/db # Remove if you don't want chat persistant - command: /app/owncast -configFile=config.yaml -database=/db/chat.db - labels: - - "traefik.enable=true" - - "traefik.http.routers.owncast.rule=Host(`watch.${DOMAIN}`)" - - "traefik.http.routers.owncast.entrypoints=websecure" - - "traefik.http.routers.owncast.tls.certresolver=myresolver" - - "traefik.tcp.routers.rtmpcast.entrypoints=rtmp" - - "traefik.tcp.routers.rtmpcast.rule=HostSNI(`watch.${DOMAIN}`)" - - "traefik.tcp.routers.rtmpcast.service=rtmpcast" - - "traefik.tcp.routers.rtmpcast.tls=true" - - "traefik.tcp.routers.rtmpcast.tls.certresolver=myresolver" - - "traefik.tcp.services.rtmpcast.loadbalancer.server.port=1935" diff --git a/owncast/live.env.tpl b/owncast/live.env.tpl deleted file mode 100644 index e69de29..0000000 diff --git a/silverstrike/README.md b/silverstrike/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/silverstrike/docker-compose.yml b/silverstrike/docker-compose.yml deleted file mode 100644 index dbb42a4..0000000 --- a/silverstrike/docker-compose.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: '3.5' - -networks: - default: - external: - name: traefik_default - -services: - silverstrike-app: - env_file: live.env - image: simhnna/silverstrike - container_name: silverstrike-app - labels: - # Watchtower - - "com.centurylinklabs.watchtower.enable=true" - # Routes - - "traefik.enable=true" - - "traefik.http.routers.silverstrike.entrypoints=websecure" - - "traefik.http.routers.silverstrike.rule=Host(`silverstrike.${DOMAIN}`)" - - "traefik.http.routers.silverstrike.tls=true" - - "traefik.http.routers.silverstrike.tls.certresolver=myresolver" - networks: - - default - ports: - - 8100:8000 - restart: unless-stopped - - silverstrike-db: - env_file: live.env - image: postgres:14 - container_name: silverstrike-db - labels: - # Watchtower - - "com.centurylinklabs.watchtower.enable=true" - networks: - - default - volumes: - - ${SILVERSTRIKE_ROOT}/db:/var/lib/postgresql/data diff --git a/silverstrike/live.env.tpl b/silverstrike/live.env.tpl deleted file mode 100644 index 17d0bd1..0000000 --- a/silverstrike/live.env.tpl +++ /dev/null @@ -1,12 +0,0 @@ -# Silverstrike -ALLOWED_HOSTS='https://silverstrike.domain.com' -DATABASE_URL=postgres://dbuser:dbpassword@dbdockerhostname/dbname -SECRET_KEY=SUPER_SECRET_CHANGE_ME -SILVERSTRIKE_ROOT=/home/compute/services/silverstrike -DEBUG=False -DOMAIN=domain.com - -# Postgres -POSTGRES_DB=dbname -POSTGRES_USER=dbuser -POSTGRES_PASSWORD=dbpassword diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index c3c8f1f..3368320 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -118,7 +118,7 @@ services: - "--entrypoints.ts-udp.address=:9987/udp" - "--entrypoints.ts-tcp.address=:30033" # OSP rtmp entrypoints - - "--entrypoints.rtmp.address=:1935" + #- "--entrypoints.rtmp.address=:1935" # Use this CA server for testing # - "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - "--certificatesresolvers.myresolver.acme.email=${EMAIL}" @@ -157,7 +157,7 @@ services: #- "10011:10011" - "30033:30033" # OSP rtmp ports - - "1935:1935" + #- "1935:1935" volumes: # For certificate - "./volumes/letsencrypt/acme.json:/letsencrypt/acme.json"