Change folder layout

services/.gitignore

@@ -1,6 +0,0 @@
-*/volumes/*/*
-!*/volumes/*/README.md
-!*/volumes/*/.gitkeep
-*/secrets/*
-!*/secrets/README.md
-!.gitignore

services/gotify/secrets/README.md

@@ -1,4 +0,0 @@
-Contains the file `admin_password`
-
-Environment variable file for the default admin password, this is because gotify doesn't support docker secrets yet
-https://github.com/gotify/server/issues/392

services/gotify/volumes/data/.gitignore

@@ -1 +0,0 @@
-!entrypoint.sh

services/gotify/volumes/data/entrypoint.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# usage: file_env VAR [DEFAULT]
-#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
-# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
-#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
-file_env() {
-	local var="$1"
-	local fileVar="${var}_FILE"
-	local def="${2:-}"
-	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-		mysql_error "Both $var and $fileVar are set (but are exclusive)"
-	fi
-	local val="$def"
-	if [ "${!var:-}" ]; then
-		val="${!var}"
-	elif [ "${!fileVar:-}" ]; then
-		val="$(< "${!fileVar}")"
-	fi
-	export "$var"="$val"
-	unset "$fileVar"
-}
-
-cd /app
-
-file_env 'GOTIFY_DEFAULTUSER_PASS'
-
-./gotify-app "$@"

services/portainer/secrets/README.md

@@ -1,2 +0,0 @@
-Contains the file `portainer_password`
-More on https://docs.portainer.io/advanced/cli#method-2-creating-the-account-using-a-file

services/traefik/configs/traefik.yml

@@ -1,32 +0,0 @@
-providers:
-  docker:
-    endpoint: tcp://docker:2375
-    exposedByDefault: false
-    network: traefik
-    defaultRule: Host(`{{ index .Labels "com.docker.compose.service" }}.{{ env `NASCOMPOSE_TRAEFIK_DOMAIN` }}`)
-  file:
-    directory: /etc/traefik/dynamic/
-
-serverstransport:
-  insecureskipverify: true
-
-api: {}
-accessLog: {}
-
-entryPoints:
-  web:
-    address: :80
-    http:
-      redirections:
-        entryPoint:
-          to: websecure
-          scheme: https
-  websecure:
-    address: :443
-    http:
-      tls: {}
-      middlewares:
-        - hsts@file
-
-global:
-  sendAnonymousUsage: false

services/traefik/secrets/README.md

@@ -1,7 +0,0 @@
-Contains the file `htpasswd`
-
-Username/password to login on traefik, see https://v2.doc.traefik.io/traefik/middlewares/http/basicauth/#usersfile
-
-
-`treefik.cert`  & `traefik.key`
-Self-Signed certificate for Trafik default setup

services/traefik/volumes/config/.gitignore

@@ -1 +0,0 @@
-!*

services/traefik/volumes/config/hsts.yml

@@ -1,9 +0,0 @@
-http:
-  middlewares:
-    hsts:
-      headers:
-        frameDeny: true
-        browserXssFilter: true
-        stsSeconds: 31536000 # 1 year
-        stsPreload: true
-        stsIncludeSubdomains: true

services/traefik/volumes/config/tls.yml

@@ -1,6 +0,0 @@
-tls:
-  stores:
-    default:
-      defaultCertificate:
-        certFile: /run/secrets/traefik_tls_cert
-        keyFile: /run/secrets/traefik_tls_key

services/traefik/volumes/config/traefik.yml

@@ -1,11 +0,0 @@
-http:
-  routers:
-    traefik:
-      rule: Host(`traefik.{{ env `NASCOMPOSE_TRAEFIK_DOMAIN` }}`)
-      service: api@internal
-      middlewares:
-        - traefik-auth
-  middlewares:
-    traefik-auth:
-      basicAuth:
-        usersFile: /run/secrets/traefik_password

services/transmission/secrets/README.md

@@ -1,7 +0,0 @@
-Contains the file `openvpn_creads`
-
-Credentials to connect to openvpn
-
-Contains the file `rpc_creads`
-
-Credentials to connect to transmission

services/transmission/volumes/scripts/.gitignore

@@ -1,7 +0,0 @@
-!/openvpn-pre-start.sh
-!/openvpn-post-config.sh
-!/transmission-pre-start.sh
-!/transmission-post-start.sh
-!/routes-post-start.sh
-!/transmission-pre-stop.sh
-!/transmission-post-stop.sh

services/transmission/volumes/scripts/openvpn-post-config.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Workaround for https://github.com/haugene/docker-transmission-openvpn/pull/2480
-if [[ -f /run/secrets/rpc_creds ]]; then
-  export TRANSMISSION_RPC_USERNAME=$(head -1 /run/secrets/rpc_creds)
-  export TRANSMISSION_RPC_PASSWORD=$(tail -1 /run/secrets/rpc_creds)
-fi
-echo "${TRANSMISSION_RPC_USERNAME}" > /config/transmission-credentials.txt
-echo "${TRANSMISSION_RPC_PASSWORD}" >> /config/transmission-credentials.txt

services/watchtower/secrets/README.md

@@ -1,2 +0,0 @@
-Contains the file `gotify_token`
-More on https://crazymax.dev/diun/notif/gotify/