From 60bbb0305394d84acf59e5dbebf316eb2de6400c Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Tue, 30 Jun 2020 21:28:01 +0200 Subject: [PATCH] Added syncthing --- docker-compose.yml | 39 ++++++-- static_config.yml | 14 --- 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 0 -> 333 bytes syncthing/config/index-v0.14.0.db/000008.ldb | Bin 0 -> 176 bytes syncthing/config/index-v0.14.0.db/000009.log | Bin 0 -> 53 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/LOCK | 0 syncthing/config/index-v0.14.0.db/LOG | 41 +++++++++ .../config/index-v0.14.0.db/MANIFEST-000010 | Bin 0 -> 231 bytes syncthing/config/key.pem | 6 ++ zigbee2mqtt/configuration.yaml | 5 +- 17 files changed, 200 insertions(+), 25 deletions(-) create mode 100644 syncthing/config/cert.pem create mode 100644 syncthing/config/config.xml create mode 100644 syncthing/config/csrftokens.txt create mode 100644 syncthing/config/https-cert.pem create mode 100644 syncthing/config/https-key.pem create mode 100644 syncthing/config/index-v0.14.0.db/000007.ldb create mode 100644 syncthing/config/index-v0.14.0.db/000008.ldb create mode 100644 syncthing/config/index-v0.14.0.db/000009.log create mode 100644 syncthing/config/index-v0.14.0.db/CURRENT create mode 100644 syncthing/config/index-v0.14.0.db/CURRENT.bak create mode 100644 syncthing/config/index-v0.14.0.db/LOCK create mode 100644 syncthing/config/index-v0.14.0.db/LOG create mode 100644 syncthing/config/index-v0.14.0.db/MANIFEST-000010 create mode 100644 syncthing/config/key.pem diff --git a/docker-compose.yml b/docker-compose.yml index 7d082c3..d5a08ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,22 @@ 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 + restart: unless-stopped milvert-nginx: container_name: milvert-nginx @@ -18,8 +34,6 @@ services: # 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" @@ -30,13 +44,15 @@ services: container_name: zigbee2mqtt networks: - backend - image: koenkk/zigbee2mqtt:1.8.0 + image: koenkk/zigbee2mqtt:1.13.0 volumes: - ${DIR}/zigbee2matt:/app/data + - ${DIR}/zigbee2mqtt_node_log:/root/.npm devices: - - /dev/ttyACM-zigbee:/dev/ttyACM0 - restart: always + - /dev/ttyACM1:/dev/ttyACM0 environment: + - UID=1000 + - GID=1000 - TZ=Europe/Stockholm grafana: @@ -98,10 +114,11 @@ services: - "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 @@ -110,9 +127,10 @@ services: - "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.8 + image: eclipse-mosquitto:1.6.10 container_name: mqtt networks: - frontend @@ -121,10 +139,12 @@ services: ports: - "1883:1883" - "9001:9001" + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Stockholm volumes: - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf - - ${DIR}/mosquitto/data:/mosquitto/data - - ${DIR}/mosquitto/log:/mosquitto/log labels: - "traefik.http.routers.mqtt.rule=Host(`mqtt.${DOMAIN}`)" - "traefik.http.routers.mqtt.entrypoints=mqtt" @@ -153,6 +173,7 @@ services: - "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: diff --git a/static_config.yml b/static_config.yml index 3b407db..1d14b7d 100644 --- a/static_config.yml +++ b/static_config.yml @@ -32,15 +32,6 @@ http: tls: certResolver: milvert - redirect: - rule: "HostRegexp(`{host:.+}`)" # This catches all - middlewares: - - redirect - service: redirectfake-service - entryPoints: - - web - priority: 50 - services: lampa-service: @@ -53,11 +44,6 @@ http: servers: - url: "http://10.0.0.3:5178" - redirectfake-service: - loadBalancer: - servers: - - url: "http://fake" - middlewares: redirect: redirectScheme: diff --git a/syncthing/config/cert.pem b/syncthing/config/cert.pem new file mode 100644 index 0000000..354e95c --- /dev/null +++ b/syncthing/config/cert.pem @@ -0,0 +1,11 @@ +-----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 new file mode 100644 index 0000000..1390524 --- /dev/null +++ b/syncthing/config/config.xml @@ -0,0 +1,86 @@ + + + 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 new file mode 100644 index 0000000..6d9fa51 --- /dev/null +++ b/syncthing/config/csrftokens.txt @@ -0,0 +1,4 @@ +WsxEs7QECkQJyNh6z9AcKFNFVXWdg4xN +Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb +mnkA97ovEvhSkcKXoDirtjVhwUAsc5iC +Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb diff --git a/syncthing/config/https-cert.pem b/syncthing/config/https-cert.pem new file mode 100644 index 0000000..e01a177 --- /dev/null +++ b/syncthing/config/https-cert.pem @@ -0,0 +1,11 @@ +-----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 new file mode 100644 index 0000000..688ddb0 --- /dev/null +++ b/syncthing/config/https-key.pem @@ -0,0 +1,6 @@ +-----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 new file mode 100644 index 0000000000000000000000000000000000000000..5db079d12b84e1136efff7b82f10edc9d591e609 GIT binary patch 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_> literal 0 HcmV?d00001 diff --git a/syncthing/config/index-v0.14.0.db/000009.log b/syncthing/config/index-v0.14.0.db/000009.log new file mode 100644 index 0000000000000000000000000000000000000000..408d2bea48b7bf1e6e8cfb7a310ee701390b8784 GIT binary patch literal 53 zcmaz(yCzYOfsvO10vLf5qX0`vYFc7xPDxH;aY=A;Vje$8nD1I|`%|uo#XJlZ05R_k AB>(^b literal 0 HcmV?d00001 diff --git a/syncthing/config/index-v0.14.0.db/CURRENT b/syncthing/config/index-v0.14.0.db/CURRENT new file mode 100644 index 0000000..3051f81 --- /dev/null +++ b/syncthing/config/index-v0.14.0.db/CURRENT @@ -0,0 +1 @@ +MANIFEST-000010 diff --git a/syncthing/config/index-v0.14.0.db/CURRENT.bak b/syncthing/config/index-v0.14.0.db/CURRENT.bak new file mode 100644 index 0000000..feda7d6 --- /dev/null +++ b/syncthing/config/index-v0.14.0.db/CURRENT.bak @@ -0,0 +1 @@ +MANIFEST-000000 diff --git a/syncthing/config/index-v0.14.0.db/LOCK b/syncthing/config/index-v0.14.0.db/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/syncthing/config/index-v0.14.0.db/LOG b/syncthing/config/index-v0.14.0.db/LOG new file mode 100644 index 0000000..0e57ddd --- /dev/null +++ b/syncthing/config/index-v0.14.0.db/LOG @@ -0,0 +1,41 @@ +=============== 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 new file mode 100644 index 0000000000000000000000000000000000000000..aca4d183f8448ac51aef9d9e9d6e353d62f635b9 GIT binary patch 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