From 80478ff9cd0ec27d0866ef1893ebc3a519544f9d Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Sat, 21 Nov 2020 20:37:01 +0100 Subject: [PATCH] Refactor docker to docker-compose.{service}.yml --- .env | 7 +- .gitmodules | 3 + diabets_app | 1 + docker-compose.database.yml | 61 ++++++ docker-compose.home.yml | 35 +++ docker-compose.nextclouod.yml | 27 +++ docker-compose.per.yml | 61 ++++++ docker-compose.service.yml | 146 +++++++++++++ docker-compose.web.yml | 90 ++++++++ docker-compose.yml | 204 +----------------- nextcloud/docker-compose.yml | 9 +- static_config.yml | 17 ++ syncthing/config/cert.pem | 11 - syncthing/config/config.xml | 86 -------- syncthing/config/csrftokens.txt | 4 - syncthing/config/https-cert.pem | 11 - syncthing/config/https-key.pem | 6 - syncthing/config/index-v0.14.0.db/000007.ldb | Bin 333 -> 0 bytes syncthing/config/index-v0.14.0.db/000008.ldb | Bin 176 -> 0 bytes syncthing/config/index-v0.14.0.db/000009.log | Bin 53 -> 0 bytes syncthing/config/index-v0.14.0.db/CURRENT | 1 - syncthing/config/index-v0.14.0.db/CURRENT.bak | 1 - syncthing/config/index-v0.14.0.db/LOG | 41 ---- .../config/index-v0.14.0.db/MANIFEST-000010 | Bin 231 -> 0 bytes syncthing/config/key.pem | 6 - traefik.yml | 10 + .../LOCK => zigbee_home_2/configuration.yaml | 0 zigbee_home_2/configuration_home_2.yaml | 9 +- zigbee_home_2/coordinator_backup.json | 14 +- zigbee_home_2/database.db | 20 +- zigbee_home_2/state.json | 2 +- 31 files changed, 490 insertions(+), 393 deletions(-) create mode 100644 .gitmodules create mode 160000 diabets_app create mode 100644 docker-compose.database.yml create mode 100644 docker-compose.home.yml create mode 100644 docker-compose.nextclouod.yml create mode 100644 docker-compose.per.yml create mode 100644 docker-compose.service.yml create mode 100644 docker-compose.web.yml delete mode 100644 syncthing/config/cert.pem delete mode 100644 syncthing/config/config.xml delete mode 100644 syncthing/config/csrftokens.txt delete mode 100644 syncthing/config/https-cert.pem delete mode 100644 syncthing/config/https-key.pem delete mode 100644 syncthing/config/index-v0.14.0.db/000007.ldb delete mode 100644 syncthing/config/index-v0.14.0.db/000008.ldb delete mode 100644 syncthing/config/index-v0.14.0.db/000009.log delete mode 100644 syncthing/config/index-v0.14.0.db/CURRENT delete mode 100644 syncthing/config/index-v0.14.0.db/CURRENT.bak delete mode 100644 syncthing/config/index-v0.14.0.db/LOG delete mode 100644 syncthing/config/index-v0.14.0.db/MANIFEST-000010 delete mode 100644 syncthing/config/key.pem rename syncthing/config/index-v0.14.0.db/LOCK => zigbee_home_2/configuration.yaml (100%) mode change 100644 => 100755 diff --git a/.env b/.env index e8263a7..0cbed7c 100644 --- a/.env +++ b/.env @@ -2,16 +2,21 @@ UID=1000 GID=1000 DIR=/srv/docker DOMAIN=milvert.com +DOMAIN_PEEK=peekskog.se MYSQL_USERNAME=root MYSQL_PASSWORD=qwerty +MYSQL_ROOT_PASSWORD=bajsa POSTGRES_USER=root POSTGRES_PASSWORD=qwerty PGADMIN_DEFAULT_EMAIL=kalle@asd.com PGADMIN_DEFAULT_PASSWORD=bajsa -PUID=1000 +INFLUX_ADMIN=simon +INFLUX_ADMIN_PASSWORD=bajsa123 + +jUID=1000 PGID=1000 TZ=Europe/Stockholm diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..30c9d69 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "diabets_app"] + path = diabets_app + url = git@milvert.com:simon/diabets_app.git diff --git a/diabets_app b/diabets_app new file mode 160000 index 0000000..75ba28f --- /dev/null +++ b/diabets_app @@ -0,0 +1 @@ +Subproject commit 75ba28f3afa2b0c4baab06823411f02e1dea5f20 diff --git a/docker-compose.database.yml b/docker-compose.database.yml new file mode 100644 index 0000000..9d6172a --- /dev/null +++ b/docker-compose.database.yml @@ -0,0 +1,61 @@ + +version: '3' + +services: + db: + image: mariadb:10.5.6 + container_name: mariaDB + restart: always + environment: + - PUID=1000 + - PGID=1000 + networks: + - backend + - frontend + volumes: + - ${DIR}/database:/var/lib/mysql:rw + ports: + - "3307:3306" + labels: + - "traefik.enable=false" + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USERNAME} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + + web_db: + image: adminer + container_name: adminer + restart: always + networks: + - frontend + - backend + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.webdb-mid.ipwhitelist.sourcerange=127.0.0.1/32, 10.0.0.1/24" + - "traefik.http.routers.webdb-secure.middlewares=webdb-mid" + - "traefik.http.routers.webdb-secure.entrypoints=web-secure" + - "traefik.http.routers.webdb-secure.rule=Host(`webdb.${DOMAIN}`)" + - "traefik.http.routers.webdb-secure.tls.certresolver=milvert" + - "traefik.http.routers.webdb-secure.tls=true" + - "traefik.http.services.webdb-service.loadbalancer.server.port=8080" + depends_on: + - db + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USERNAME} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - PMA_ARBITRARY=1 + depends_on: + - db + + ports: + - 8000:8080 + + +networks: + frontend: + external: true + backend: + external: false + diff --git a/docker-compose.home.yml b/docker-compose.home.yml new file mode 100644 index 0000000..5baa2b3 --- /dev/null +++ b/docker-compose.home.yml @@ -0,0 +1,35 @@ + +version: '3' + +services: + node-red: + image: nodered/node-red:1.2.2 + container_name: "node-red" + networks: + - backend + environment: + - TZ=Europe/Stockholm + ports: + - "1881:1880" + #devices: + #- /dev/ttyAMA0 + restart: unless-stopped + user: ${UID} + volumes: + - ${DIR}/nodered:/data + labels: + - "traefik.enable=true" + - "traefik.http.services.node-red-service.loadbalancer.server.port=1880" + - "traefik.http.routers.node-red.rule=Host(`nodered.${DOMAIN}`)" + - "traefik.http.routers.node-red-secure.entrypoints=web-secure" + - "traefik.http.routers.node-red-secure.rule=Host(`nodered.${DOMAIN}`)" + - "traefik.http.routers.node-red-secure.tls.certresolver=milvert" + - "traefik.http.routers.node-red-secure.tls=true" + + +networks: + frontend: + external: true + backend: + external: false + diff --git a/docker-compose.nextclouod.yml b/docker-compose.nextclouod.yml new file mode 100644 index 0000000..f9e670d --- /dev/null +++ b/docker-compose.nextclouod.yml @@ -0,0 +1,27 @@ +version: '3' + +services: + + nextcloud: + image: linuxserver/nextcloud + container_name: nextcloud + environment: + - PUID=1000 + - PGID=1000 + - TZ=${TZ} + volumes: + - ${DIR}/nextcloud/config:/config + - /srv/owncloud:/data + networks: + - backend + - frontend + ports: + - 4430:443 + restart: unless-stopped + +networks: + frontend: + external: true + backend: + external: false + diff --git a/docker-compose.per.yml b/docker-compose.per.yml new file mode 100644 index 0000000..2a72ce3 --- /dev/null +++ b/docker-compose.per.yml @@ -0,0 +1,61 @@ +version: '3' + +services: + wordpress: + container_name: peek + depends_on: + - db_peek + image: wordpress:5.5.3-apache + volumes: + - /srv/docker/peekskog/wp:/var/www/html + ports: + - "8001:80" + networks: + - frontend + - backend + restart: always + environment: + WORDPRESS_DB_HOST: db_peek:3306 + WORDPRESS_DB_USER: wordpress + WORDPRESS_DB_PASSWORD: peekskog + labels: + - "traefik.enable=true" + - "traefik.http.routers.peek-secure.entrypoints=web-secure" + - "traefik.http.routers.peek-secure.rule=Host(`${DOMAIN_PEEK}`)" + - "traefik.http.routers.peek-secure.tls.certresolver=milvert" + - "traefik.http.routers.peek-secure.tls=true" + + db_peek: + container_name: db_peek + image: mysql:5.7 + volumes: + - /srv/docker/peekskog/db:/var/lib/mysql + restart: always + networks: + - frontend + - backend + environment: + MYSQL_ROOT_PASSWORD: peekskog + MYSQL_DATABASE: wordpress + MYSQL_USER: wordpress + MYSQL_PASSWORD: peekskog + + phpmyadmin_peek: + depends_on: + - db_peek + image: phpmyadmin/phpmyadmin + container_name: phpmyadmin_peek + restart: always + networks: + - backend + ports: + - '8007:80' + environment: + PMA_HOST: db_peek + +networks: + frontend: + external: true + backend: + external: false + diff --git a/docker-compose.service.yml b/docker-compose.service.yml new file mode 100644 index 0000000..1b1909f --- /dev/null +++ b/docker-compose.service.yml @@ -0,0 +1,146 @@ +version: '3' + +services: + + zigbee_home_2: + container_name: zigbee_home_2 + networks: + - backend + image: koenkk/zigbee2mqtt:1.15.0 + volumes: + - ./zigbee_home_2:/app/data + - ./zigbee_home_2/configuration_home_2.yaml:/app/data/configuration.yaml + devices: + - /dev/ttyUSB-zigbee_home_2:/dev/ttyACM0 + environment: + - UID=1000 + - GID=1000 + - TZ=Europe/Stockholm + + zigbee2mqtt: + container_name: zigbee2mqtt + networks: + - backend + image: koenkk/zigbee2mqtt:1.15.0 + volumes: + - ${DIR}/zigbee2matt:/app/data + - ${DIR}/zigbee2mqtt_node_log:/root/.npm + devices: + - /dev/ttyACM1:/dev/ttyACM0 + environment: + - UID=1000 + - GID=1000 + - TZ=Europe/Stockholm + + grafana: + image: grafana/grafana:7.3.1 + container_name: grafana + networks: + - backend + volumes: + # Data persistency + # sudo mkdir -p /srv/docker/grafana/data; chown 472:472 /srv/docker/grafana/data + - "${DIR}/grafana:/var/lib/grafana" + labels: + - "traefik.enable=true" + - "traefik.http.routers.grafana-secure.entrypoints=web-secure" + - "traefik.http.routers.grafana-secure.rule=Host(`data.${DOMAIN}`)" + - "traefik.http.routers.grafana-secure.tls.certresolver=milvert" + - "traefik.http.routers.grafana-secure.tls=true" + + influx: + image: influxdb:1.8 + container_name: influxdb + networks: + - backend + restart: always + volumes: + - ${DIR}/influx-data:/var/lib/influxdb + environment: + - INFLUXDB_DB=db0 + - INFLUXDB_ADMIN_USER=${INFLUX_ADMIN} + - INFLUXDB_ADMIN_PASSWORD=${INFLUX_ADMIN_PASSWORD} + labels: + - "traefik.enable=true" + - "traefik.http.services.influx-service.loadBalancer.server.port=8086" + - "traefik.http.routers.influx.entryPoints=influx" + - "traefik.http.routers.influx-secure.rule=host(`influx.${DOMAIN}`)" + + chronograf: + image: chronograf:latest + container_name: chronograf + networks: + - backend + volumes: + - ${DIR}/chronograf:/var/lib/chronograf + depends_on: + - influx + environment: + - INFLUXDB_URL=http://influxdb:8086 + - INFLUXDB_USERNAME=${INFLUX_ADMIN} + - INFLUXDB_PASSWORD=${INFLUX_ADMIN_PASSWORD} + labels: + - "traefik.enable=true" + - "traefik.http.services.chrongraf-service.loadBalancer.server.port=8888" + - "traefik.http.routers.chrongraf-secure.entryPoints=web-secure" + - "traefik.http.routers.chrongraf-secure.rule=host(`chrono.${DOMAIN}`)" + - "traefik.http.routers.chrongraf-secure.tls.certresolver=milvert" + - "traefik.http.routers.chrongraf-secure.tls=true" + + gitea: + image: gitea/gitea:1.12 + container_name: gitea + networks: + - backend + restart: always + environment: + - USER_UID=1001 + - USER_GID=1005 + volumes: + #- /var/lib/gitea:/data + - ${DIR}/gitea:/data + - /home/git/.ssh:/data/git/.ssh + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + ports: + - "127.0.0.1:2222:22" + - "3000:3000" + labels: + - "traefik.enable=true" + - "traefik.http.services.gitea-service.loadbalancer.server.port=3000" + - "traefik.http.routers.gitea-secure.entrypoints=web-secure" + - "traefik.http.routers.gitea-secure.rule=Host(`gitea.${DOMAIN}`)" + - "traefik.http.routers.gitea-secure.tls.certresolver=milvert" + - "traefik.http.routers.gitea-secure.tls=true" + + + mqtt: + image: eclipse-mosquitto:1.6.10 + container_name: mqtt + networks: + - frontend + - backend + restart: always + ports: + - "1883:1883" + - "9001:9001" + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Stockholm + volumes: + - ./mosquitto/mosquitto.conf:/mqtt/mosquitto.conf + - ${DIR}/mqtt/data:/mqtt/data + - ${DIR}/mqtt/log:/mqtt/log + labels: + - "traefik.http.routers.mqtt.rule=Host(`mqtt.${DOMAIN}`)" + - "traefik.http.routers.mqtt.entrypoints=mqtt" + - "traefik.http.services.mqtt-service.loadbalancer.server.port=9001" + - "traefik.enable=true" + +networks: + frontend: + external: true + backend: + external: false + diff --git a/docker-compose.web.yml b/docker-compose.web.yml new file mode 100644 index 0000000..40342c1 --- /dev/null +++ b/docker-compose.web.yml @@ -0,0 +1,90 @@ +version: '3' + +services: + milvert: + container_name: milvert + image: nginx:latest + restart: always + networks: + - backend + - frontend + ports: + - 8004:80 + labels: + - "traefik.enable=true" + - "traefik.http.routers.milvert.com-secure.entrypoints=web-secure" + - "traefik.http.routers.milvert.com-secure.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.milvert.com-secure.tls.certresolver=milvert" + - "traefik.http.routers.milvert.com-secure.tls=true" + #- "traefik.http.routers.milvert-secure.priority=1" + volumes: + - "${DIR}/milvert-nginx/conf:/etc/nginx/conf.d" + - "${DIR}/milvert-nginx/html:/html" + + whoami: + # A container that exposes an API to show its IP address + container_name: whoami + image: containous/whoami + networks: + - backend + labels: + - "traefik.enable=true" + - "traefik.http.routers.whoami-secure.entrypoints=web-secure" + - "traefik.http.routers.whoami-secure.rule=Host(`whoami.${DOMAIN}`)" + - "traefik.http.routers.whoami-secure.tls.certresolver=milvert" + - "traefik.http.routers.whoami-secure.tls=true" + + diak: + image: diak:1.0 + build: ./diabets_app/client + container_name: diak + networks: + - backend + - frontend + ports: + - 8003:80 + #devices: + #- path to device:path to device + restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.routers.diak-secure.entrypoints=web-secure" + - "traefik.http.routers.diak-secure.rule=Host(`diak.${DOMAIN}`)" + - "traefik.http.routers.diak-secure.tls.certresolver=milvert" + - "traefik.http.routers.diak-secure.tls=true" + + + + syncthing: + image: linuxserver/syncthing + container_name: syncthing + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Stockholm + - UMASK_SET=022 + volumes: + - /mnt/johanna_backup/syncthing/config:/config + - /mnt/johanna_backup/data1:/data1 + - /mnt/johanna_backup/data2:/data2 + ports: + - 8384:8384 + - 22000:22000 + - 21027:21027/udp + networks: + - frontend + - backend + restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.routers.sync_johanna-secure.entrypoints=web-secure" + - "traefik.http.routers.sync_johanna-secure.rule=Host(`sync.${DOMAIN}`)" + - "traefik.http.routers.sync_johanna-secure.tls.certresolver=milvert" + - "traefik.http.routers.sync_johanna-secure.tls=true" + +networks: + frontend: + external: true + backend: + external: false + diff --git a/docker-compose.yml b/docker-compose.yml index f50dc74..bb45964 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,213 +1,11 @@ version: '3' services: - syncthing: - image: linuxserver/syncthing - container_name: syncthing - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Stockholm - - UMASK_SET=022 - volumes: - - ./syncthing/config:/config - - /mnt/johanna_backup:/data1 - ports: - - 8384:8384 - - 22000:22000 - - 21027:21027/udp - networks: - - frontend - - backend - restart: unless-stopped - - milvert-nginx: - container_name: milvert-nginx - image: nginx:latest - restart: always - networks: - - backend - labels: - - "traefik.enable=true" - - #HTTPS - - "traefik.http.routers.milvert-secure.entrypoints=web-secure" - - "traefik.http.routers.milvert-secure.rule=Host(`www.${DOMAIN}`, `${DOMAIN}`)" - - "traefik.http.routers.milvert-secure.priority=1" - # SSL - - "traefik.http.routers.milvert-secure.tls.certresolver=milvert" - - "traefik.http.routers.milvert-secure.tls=true" - volumes: - - "${DIR}/milvert-nginx/conf:/etc/nginx/conf.d" - - "${DIR}/milvert-nginx/html:/html" - - - - zigbee2mqtt: - container_name: zigbee2mqtt - networks: - - backend - image: koenkk/zigbee2mqtt:1.13.0 - volumes: - - ${DIR}/zigbee2matt:/app/data - - ${DIR}/zigbee2mqtt_node_log:/root/.npm - devices: - - /dev/ttyACM1:/dev/ttyACM0 - environment: - - UID=1000 - - GID=1000 - - TZ=Europe/Stockholm - - grafana: - image: grafana/grafana:6.4.2 - container_name: grafana - networks: - - backend - volumes: - # Data persistency - # sudo mkdir -p /srv/docker/grafana/data; chown 472:472 /srv/docker/grafana/data - - "${DIR}/grafana:/var/lib/grafana" - labels: - - "traefik.enable=true" - - "traefik.http.routers.grafana.rule=Host(`grafana.${DOMAIN}`)" - - "traefik.http.routers.grafana.entrypoints=web" - - "traefik.http.services.grafana-service.loadbalancer.server.port=3000" - - influx: - image: influxdb:1.7 - container_name: influxdb - networks: - - backend - labels: - - "traefik.http.routers.influx.entryPoints=port8086" - - "traefik.http.routers.influx.rule=host(`influx.${DOMAIN}`)" - - "traefik.http.services.influx-service.loadBalancer.server.port=8086" - restart: always - volumes: - - ${DIR}/influx-data:/var/lib/influxdb - environment: - - INFLUXDB_DB=SOME_DB_NAME # set any other to create database on initialization - - INFLUXDB_HTTP_ENABLED=true - - INFLUXDB_HTTP_AUTH_ENABLED=true - - - INFLUXDB_ADMIN_USER=SECURE_USERNAME - - INFLUXDB_ADMIN_PASSWORD=SECURE_PASS - - gitea: - image: gitea/gitea:1.12 - container_name: gitea - networks: - - backend - restart: always - environment: - - USER_UID=1001 - - USER_GID=1005 - volumes: - #- /var/lib/gitea:/data - - ${DIR}/gitea:/data - - /home/git/.ssh:/data/git/.ssh - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - ports: - - "127.0.0.1:2222:22" - - "3000:3000" - labels: - - "traefik.enable=true" - - "traefik.http.services.gitea-service.loadbalancer.server.port=3000" - - "traefik.http.routers.gitea-secure.entrypoints=web-secure" - - "traefik.http.routers.gitea-secure.rule=Host(`gitea.${DOMAIN}`)" - - "traefik.http.routers.gitea-secure.tls.certresolver=milvert" - - "traefik.http.routers.gitea-secure.tls=true" - - whoami: - # A container that exposes an API to show its IP address - container_name: whoami - image: containous/whoami - networks: - - backend - labels: - - "traefik.enable=true" - - "traefik.http.routers.whoami-secure.entrypoints=web-secure" - - "traefik.http.routers.whoami-secure.rule=Host(`whoami.${DOMAIN}`)" - - "traefik.http.routers.whoami-secure.tls.certresolver=milvert" - - "traefik.http.routers.whoami-secure.tls=true" - - mqtt: - image: eclipse-mosquitto:1.6.10 - container_name: mqtt - networks: - - frontend - - backend - restart: always - ports: - - "1883:1883" - - "9001:9001" - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Stockholm - volumes: - - ./mosquitto/mosquitto.conf:/mqtt/mosquitto.conf - - ${DIR}/mqtt/data:/mqtt/data - - ${DIR}/mqtt/log:/mqtt/log - labels: - - "traefik.http.routers.mqtt.rule=Host(`mqtt.${DOMAIN}`)" - - "traefik.http.routers.mqtt.entrypoints=mqtt" - - "traefik.http.services.mqtt-service.loadbalancer.server.port=9001" - - "traefik.enable=true" - - node-red: - image: nodered/node-red:latest - container_name: "node-red" - networks: - - backend - environment: - - TZ=Europe/Stockholm - ports: - - "1881:1880" - #devices: - #- /dev/ttyAMA0 - restart: unless-stopped - user: ${UID} - volumes: - - ${DIR}/nodered:/data - labels: - - "traefik.http.routers.node-red.rule=Host(`nodered.${DOMAIN}`)" - - "traefik.http.routers.node-red.entrypoints=web" - - "traefik.http.services.node-red-service.loadbalancer.server.port=1880" - - "traefik.http.routers.node-red-secure.entrypoints=web-secure" - - "traefik.http.routers.node-red-secure.rule=Host(`nodered.${DOMAIN}`)" - - "traefik.http.routers.node-red-secure.tls.certresolver=milvert" - - "traefik.http.routers.node-red-secure.tls=true" - - "traefik.enable=true" - - domoticz: - image: linuxserver/domoticz - container_name: domoticz - networks: - - backend - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Stockholm - #- WEBROOT=domoticz #optional - volumes: - - ${DIR}/domoticz:/config - ports: - - 8081:8080 - #devices: - #- path to device:path to device - restart: unless-stopped - labels: - - "traefik.http.routers.domo.rule=Host(`domo.${DOMAIN}`)" - - "traefik.http.routers.domo.entrypoints=web" - - "traefik.http.services.domo-service.loadbalancer.server.port=8080" - - "traefik.enable=true" reverse-proxy: # The official v2.0 Traefik docker image - image: traefik:v2.1 + image: traefik:v2.3 container_name: "traefik" networks: - backend diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 84042e0..8c8b835 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -6,16 +6,17 @@ services: image: linuxserver/nextcloud container_name: nextcloud environment: - - PUID=1000 - - PGID=1000 + - PUID=33 + - PGID=33 - TZ=${TZ} volumes: - ${DIR}/nextcloud/config:/config - - ${DIR}/data:/data + - /srv/owncloud:/data networks: - backend + - frontend ports: - - 443:443 + - 4430:443 restart: unless-stopped networks: diff --git a/static_config.yml b/static_config.yml index 1d14b7d..d1e74d7 100644 --- a/static_config.yml +++ b/static_config.yml @@ -32,6 +32,14 @@ http: tls: certResolver: milvert + redirecttohttps: + rule: "HostRegexp(`{host:.+}`)" + middlewares: + - httpsredirect + service: noop + entryPoints: + - web + priority: 1 services: lampa-service: @@ -44,9 +52,18 @@ http: servers: - url: "http://10.0.0.3:5178" + noop: + loadBalancer: + servers: + - url: "http://localhost" + + middlewares: redirect: redirectScheme: permanent: true scheme: https + httpsredirect: + redirectScheme: + scheme: https diff --git a/syncthing/config/cert.pem b/syncthing/config/cert.pem deleted file mode 100644 index 354e95c..0000000 --- a/syncthing/config/cert.pem +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBmzCCASCgAwIBAgIIZwfh5D2Qk8cwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ -c3luY3RoaW5nMB4XDTIwMDYzMDAwMDAwMFoXDTQwMDYyNTAwMDAwMFowFDESMBAG -A1UEAxMJc3luY3RoaW5nMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE+mCO/n2FIq4q -wUv2zNo2pZfjCtYRoRLpCFHyV213vcdGgM7s80fHRI3mhfa88JjhmfFS2iDSPfWi -7/B3FSqZXuFZEw3xlH4e+T48mzsTYfs3gFwC1hVVPeypuZCL128Toz8wPTAOBgNV -HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud -EwEB/wQCMAAwCgYIKoZIzj0EAwIDaQAwZgIxANBE+eHniXGRlaxdTmi0lYgPal5C -CcM8EtugjyvFtbHLlMX37Mp/Ti+ab7iM0ttoeAIxAMs8X2yfIuBlRYz04z/X0PKD -EWVksNGoOcu5VigMmzAESWVYh0WbyM53ZfgzBeVAPg== ------END CERTIFICATE----- diff --git a/syncthing/config/config.xml b/syncthing/config/config.xml deleted file mode 100644 index 1390524..0000000 --- a/syncthing/config/config.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - basic - - 1 - - 0 - 0 - 0 - random - false - 0 - 0 - -1 - false - false - false - 25 - .stfolder - false - 0 - 2 - false - standard - - -
dynamic
- false - false - 0 - 0 - 0 - - -
127.0.0.1:8384
- vxYF9jYeAWW36MaCbbobgCeVGzy5euiY - default - - - - default - default - true - true - 21027 - [ff12::8384]:21027 - 0 - 0 - 60 - true - 10 - true - true - 60 - 30 - 10 - -1 - 3 - - https://data.syncthing.net/newdata - false - 1800 - true - 12 - false - 24 - false - 5 - false - 1 - https://upgrades.syncthing.net/meta.json - false - 10 - 0 - ~ - true - 0 - https://crash.syncthing.net/newcrash - true - 180 - 20 - default - auto - 0 - - diff --git a/syncthing/config/csrftokens.txt b/syncthing/config/csrftokens.txt deleted file mode 100644 index 6d9fa51..0000000 --- a/syncthing/config/csrftokens.txt +++ /dev/null @@ -1,4 +0,0 @@ -WsxEs7QECkQJyNh6z9AcKFNFVXWdg4xN -Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb -mnkA97ovEvhSkcKXoDirtjVhwUAsc5iC -Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb diff --git a/syncthing/config/https-cert.pem b/syncthing/config/https-cert.pem deleted file mode 100644 index e01a177..0000000 --- a/syncthing/config/https-cert.pem +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBoDCCASagAwIBAgIIWX3HVi6JAikwCgYIKoZIzj0EAwIwFzEVMBMGA1UEAxMM -OWJlZThiMmJjODgxMB4XDTIwMDYzMDAwMDAwMFoXDTIyMDkyODAwMDAwMFowFzEV -MBMGA1UEAxMMOWJlZThiMmJjODgxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEBTfW -blOAa5FSqb/pwzMNDdrSIhX6HjoYIgm7IV/xf1o5TL0+PF6CTFBxL3sHpwAsx3xD -PbSGMpX0eLjCAlGkmGoZanYyUb0d91lmDY1jH7hXplaj494y8GoEcwKCvcmJoz8w -PTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwCgYIKoZIzj0EAwIDaAAwZQIxAOLNbfE5awUQwKftZ75n -upNDGLeWxWgNHti6G2+nlaLeJJZlIwL5kC82dDuuV2HH4wIwIlfnthBwxrFGNN9q -/Dexa6Ahnz44wgNHY+MjHkfg8sd7NVHrjo7VXnSUQuuZHzKo ------END CERTIFICATE----- diff --git a/syncthing/config/https-key.pem b/syncthing/config/https-key.pem deleted file mode 100644 index 688ddb0..0000000 --- a/syncthing/config/https-key.pem +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MIGkAgEBBDAiY/SHClITBPOcQtItkOwJbPYlwHy/+dHNsZ5MnD1DXZs7NqIOWW6n -zY+/Pvi0sUugBwYFK4EEACKhZANiAAQFN9ZuU4BrkVKpv+nDMw0N2tIiFfoeOhgi -CbshX/F/WjlMvT48XoJMUHEvewenACzHfEM9tIYylfR4uMICUaSYahlqdjJRvR33 -WWYNjWMfuFemVqPj3jLwagRzAoK9yYk= ------END EC PRIVATE KEY----- diff --git a/syncthing/config/index-v0.14.0.db/000007.ldb b/syncthing/config/index-v0.14.0.db/000007.ldb deleted file mode 100644 index 5db079d12b84e1136efff7b82f10edc9d591e609..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmcb~6v80E&ytdwmROool9O0m5}cfv$H>XR%ILw!z`($Ftv73zdDfBF3>6H5>};$O z0zg4VRz@}!1_oX$9tJ@Mc1}SKpb)Pr2MezPqaz0cBL}Ax!~ZHq1`Y;ZGu8^Al$QXP zRu`i}l?lU!{}UJ+fPh2b)Xzr`7Vf#xC&nPh#+8!fo0%6}nU`FWk(rksmReMtnV-kV z%-OC|W~gVTXTZ$Q5ymUQz{DxR%gDpcD8-@3Vd0sVl3A3RT;lE=l9`*z$a;#CQ6uhm z@h(PTwt}M6GC^ks7EUP>uzo|Jn;Ag9Vf-^OAfH19&Sf*1KS5lCfs>h=@jp;I!#j{7 dh|0L*|Mz@m{FW@di1%osP7o)O` zXI@HXQEGCDyK_ipZYm=es}3upPTcR}uRzrdAT5la16Y|jWZ+yjllc?GL>M@kxEcR* eGO92H!DXKF=P-wJrHO(B2!Zh54c#iG?zaI_S0E_> diff --git a/syncthing/config/index-v0.14.0.db/000009.log b/syncthing/config/index-v0.14.0.db/000009.log deleted file mode 100644 index 408d2bea48b7bf1e6e8cfb7a310ee701390b8784..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmaz(yCzYOfsvO10vLf5qX0`vYFc7xPDxH;aY=A;Vje$8nD1I|`%|uo#XJlZ05R_k AB>(^b diff --git a/syncthing/config/index-v0.14.0.db/CURRENT b/syncthing/config/index-v0.14.0.db/CURRENT deleted file mode 100644 index 3051f81..0000000 --- a/syncthing/config/index-v0.14.0.db/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000010 diff --git a/syncthing/config/index-v0.14.0.db/CURRENT.bak b/syncthing/config/index-v0.14.0.db/CURRENT.bak deleted file mode 100644 index feda7d6..0000000 --- a/syncthing/config/index-v0.14.0.db/CURRENT.bak +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000000 diff --git a/syncthing/config/index-v0.14.0.db/LOG b/syncthing/config/index-v0.14.0.db/LOG deleted file mode 100644 index 0e57ddd..0000000 --- a/syncthing/config/index-v0.14.0.db/LOG +++ /dev/null @@ -1,41 +0,0 @@ -=============== Jun 30, 2020 (CEST) =============== -19:17:45.425828 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed -19:17:45.439384 db@open opening -19:17:45.441530 version@stat F·[] S·0B[] Sc·[] -19:17:45.447873 db@janitor F·2 G·0 -19:17:45.447904 db@open done T·8.491229ms -19:17:46.886797 memdb@flush N·3 S·97B -19:17:46.895029 memdb@flush created L0@3 N·3 S·186B "\ndb..ion,v3":"\nla..ime,v1" -19:17:46.895113 version@stat F·[1] S·186B[186B] Sc·[0.25] -19:17:46.902955 memdb@flush committed F·1 T·16.085023ms -19:17:46.903047 journal@remove removed @1 -19:17:46.903085 table@compaction range L-1 "":"" -19:17:46.903111 table@compaction L0·1 -> L1·0 S·186B Q·3 -19:17:46.911317 table@build created L1@4 N·3 S·186B "\ndb..ion,v3":"\nla..ime,v1" -19:17:46.911396 version@stat F·[0 1] S·186B[0B 186B] Sc·[0.00 0.00] -19:17:46.919371 table@compaction committed F~ S~ Ke·0 D·0 T·16.225129ms -19:17:46.919556 table@remove removed @3 -19:18:45.469927 memdb@flush N·6 S·222B -19:18:45.483100 memdb@flush created L0@6 N·6 S·259B "\x04de..can,v9":"\npr..ion,v4" -19:18:45.483187 version@stat F·[1 1] S·445B[259B 186B] Sc·[0.25 0.00] -19:18:45.491263 memdb@flush committed F·1 T·21.239974ms -19:18:45.491363 journal@remove removed @2 -19:18:45.491402 table@compaction range L-1 "":"" -19:18:45.491429 table@compaction L0·1 -> L1·1 S·445B Q·9 -19:18:45.499511 table@build created L1@7 N·9 S·333B "\x04de..can,v9":"\npr..ion,v4" -19:18:45.499611 version@stat F·[0 1] S·333B[0B 333B] Sc·[0.00 0.00] -19:18:45.508033 table@compaction committed F-1 S-112B Ke·0 D·0 T·16.563551ms -19:18:45.508223 table@remove removed @6 -19:18:45.508284 table@remove removed @4 -21:22:01.085584 db@close closing -21:22:01.086015 db@close done T·428.699µs -=============== Jun 30, 2020 (CEST) =============== -21:22:11.681870 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed -21:22:11.682759 version@stat F·[0 1] S·333B[0B 333B] Sc·[0.00 0.00] -21:22:11.682825 db@open opening -21:22:11.682972 journal@recovery F·1 -21:22:11.690589 journal@recovery recovering @5 -21:22:11.698723 memdb@flush created L0@8 N·2 S·176B "\x04de..can,v11":"\nla..ime,v10" -21:22:11.711560 version@stat F·[1 1] S·509B[176B 333B] Sc·[0.25 0.00] -21:22:11.734535 db@janitor F·4 G·0 -21:22:11.734580 db@open done T·51.737909ms diff --git a/syncthing/config/index-v0.14.0.db/MANIFEST-000010 b/syncthing/config/index-v0.14.0.db/MANIFEST-000010 deleted file mode 100644 index aca4d183f8448ac51aef9d9e9d6e353d62f635b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmexz=33$d21Z7yoYb<^oRlOzr^=Gl^338?=ltA)#G=HK{30e!W^NW9Rt6ESf}+&2 zu+*aB%=|n?76ve2XW-btD8Z7FnwD6aQ<9TdToRm|n8(Nsk(K5GiFoFvWEQ0+m$*BJ YWag$aa#5_4k^L+ark$J+bFn%T07