simon
/
Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added syncthing

This commit is contained in:
Simon 2020-06-30 21:28:01 +02:00
parent e044785bcb
commit 60bbb03053
17 changed files with 200 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
docker-compose.yml
View File

@ -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:

14
static_config.yml
View File

@ -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:

11
syncthing/config/cert.pem Normal file
View File

@ -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-----

86
syncthing/config/config.xml Normal file
View File

@ -0,0 +1,86 @@
<configuration version="30">
<folder id="default" label="Default Folder" path="/config/Sync" type="sendreceive" rescanIntervalS="3600" fsWatcherEnabled="true" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
<filesystemType>basic</filesystemType>
<device id="LCLVHOG-GNMFY3Q-LLH6WHN-N4DZ6EU-LSBMYB3-XNOB7TX-PZYCDQJ-SARUSAU" introducedBy=""></device>
<minDiskFree unit="%">1</minDiskFree>
<versioning></versioning>
<copiers>0</copiers>
<pullerMaxPendingKiB>0</pullerMaxPendingKiB>
<hashers>0</hashers>
<order>random</order>
<ignoreDelete>false</ignoreDelete>
<scanProgressIntervalS>0</scanProgressIntervalS>
<pullerPauseS>0</pullerPauseS>
<maxConflicts>-1</maxConflicts>
<disableSparseFiles>false</disableSparseFiles>
<disableTempIndexes>false</disableTempIndexes>
<paused>false</paused>
<weakHashThresholdPct>25</weakHashThresholdPct>
<markerName>.stfolder</markerName>
<copyOwnershipFromParent>false</copyOwnershipFromParent>
<modTimeWindowS>0</modTimeWindowS>
<maxConcurrentWrites>2</maxConcurrentWrites>
<disableFsync>false</disableFsync>
<blockPullOrder>standard</blockPullOrder>
</folder>
<device id="LCLVHOG-GNMFY3Q-LLH6WHN-N4DZ6EU-LSBMYB3-XNOB7TX-PZYCDQJ-SARUSAU" name="9bee8b2bc881" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
<address>dynamic</address>
<paused>false</paused>
<autoAcceptFolders>false</autoAcceptFolders>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<maxRequestKiB>0</maxRequestKiB>
</device>
<gui enabled="true" tls="false" debugging="false">
<address>127.0.0.1:8384</address>
<apikey>vxYF9jYeAWW36MaCbbobgCeVGzy5euiY</apikey>
<theme>default</theme>
</gui>
<ldap></ldap>
<options>
<listenAddress>default</listenAddress>
<globalAnnounceServer>default</globalAnnounceServer>
<globalAnnounceEnabled>true</globalAnnounceEnabled>
<localAnnounceEnabled>true</localAnnounceEnabled>
<localAnnouncePort>21027</localAnnouncePort>
<localAnnounceMCAddr>[ff12::8384]:21027</localAnnounceMCAddr>
<maxSendKbps>0</maxSendKbps>
<maxRecvKbps>0</maxRecvKbps>
<reconnectionIntervalS>60</reconnectionIntervalS>
<relaysEnabled>true</relaysEnabled>
<relayReconnectIntervalM>10</relayReconnectIntervalM>
<startBrowser>true</startBrowser>
<natEnabled>true</natEnabled>
<natLeaseMinutes>60</natLeaseMinutes>
<natRenewalMinutes>30</natRenewalMinutes>
<natTimeoutSeconds>10</natTimeoutSeconds>
<urAccepted>-1</urAccepted>
<urSeen>3</urSeen>
<urUniqueID></urUniqueID>
<urURL>https://data.syncthing.net/newdata</urURL>
<urPostInsecurely>false</urPostInsecurely>
<urInitialDelayS>1800</urInitialDelayS>
<restartOnWakeup>true</restartOnWakeup>
<autoUpgradeIntervalH>12</autoUpgradeIntervalH>
<upgradeToPreReleases>false</upgradeToPreReleases>
<keepTemporariesH>24</keepTemporariesH>
<cacheIgnoredFiles>false</cacheIgnoredFiles>
<progressUpdateIntervalS>5</progressUpdateIntervalS>
<limitBandwidthInLan>false</limitBandwidthInLan>
<minHomeDiskFree unit="%">1</minHomeDiskFree>
<releasesURL>https://upgrades.syncthing.net/meta.json</releasesURL>
<overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect>
<tempIndexMinBlocks>10</tempIndexMinBlocks>
<trafficClass>0</trafficClass>
<defaultFolderPath>~</defaultFolderPath>
<setLowPriority>true</setLowPriority>
<maxFolderConcurrency>0</maxFolderConcurrency>
<crashReportingURL>https://crash.syncthing.net/newcrash</crashReportingURL>
<crashReportingEnabled>true</crashReportingEnabled>
<stunKeepaliveStartS>180</stunKeepaliveStartS>
<stunKeepaliveMinS>20</stunKeepaliveMinS>
<stunServer>default</stunServer>
<databaseTuning>auto</databaseTuning>
<maxConcurrentIncomingRequestKiB>0</maxConcurrentIncomingRequestKiB>
</options>
</configuration>

4
syncthing/config/csrftokens.txt Normal file
View File

@ -0,0 +1,4 @@
WsxEs7QECkQJyNh6z9AcKFNFVXWdg4xN
Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb
mnkA97ovEvhSkcKXoDirtjVhwUAsc5iC
Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb

11
syncthing/config/https-cert.pem Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN CERTIFICATE-----
MIIBoDCCASagAwIBAgIIWX3HVi6JAikwCgYIKoZIzj0EAwIwFzEVMBMGA1UEAxMM
OWJlZThiMmJjODgxMB4XDTIwMDYzMDAwMDAwMFoXDTIyMDkyODAwMDAwMFowFzEV
MBMGA1UEAxMMOWJlZThiMmJjODgxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEBTfW
blOAa5FSqb/pwzMNDdrSIhX6HjoYIgm7IV/xf1o5TL0+PF6CTFBxL3sHpwAsx3xD
PbSGMpX0eLjCAlGkmGoZanYyUb0d91lmDY1jH7hXplaj494y8GoEcwKCvcmJoz8w
PTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
MAwGA1UdEwEB/wQCMAAwCgYIKoZIzj0EAwIDaAAwZQIxAOLNbfE5awUQwKftZ75n
upNDGLeWxWgNHti6G2+nlaLeJJZlIwL5kC82dDuuV2HH4wIwIlfnthBwxrFGNN9q
/Dexa6Ahnz44wgNHY+MjHkfg8sd7NVHrjo7VXnSUQuuZHzKo
-----END CERTIFICATE-----

6
syncthing/config/https-key.pem Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN EC PRIVATE KEY-----
MIGkAgEBBDAiY/SHClITBPOcQtItkOwJbPYlwHy/+dHNsZ5MnD1DXZs7NqIOWW6n
zY+/Pvi0sUugBwYFK4EEACKhZANiAAQFN9ZuU4BrkVKpv+nDMw0N2tIiFfoeOhgi
CbshX/F/WjlMvT48XoJMUHEvewenACzHfEM9tIYylfR4uMICUaSYahlqdjJRvR33
WWYNjWMfuFemVqPj3jLwagRzAoK9yYk=
-----END EC PRIVATE KEY-----

BIN
syncthing/config/index-v0.14.0.db/000007.ldb Normal file
View File

Binary file not shown.

BIN
syncthing/config/index-v0.14.0.db/000008.ldb Normal file
View File

Binary file not shown.

BIN
syncthing/config/index-v0.14.0.db/000009.log Normal file
View File

Binary file not shown.

1
syncthing/config/index-v0.14.0.db/CURRENT Normal file
View File

@ -0,0 +1 @@
MANIFEST-000010

1
syncthing/config/index-v0.14.0.db/CURRENT.bak Normal file
View File

@ -0,0 +1 @@
MANIFEST-000000

0
syncthing/config/index-v0.14.0.db/LOCK Normal file
View File

41
syncthing/config/index-v0.14.0.db/LOG Normal file
View File

@ -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

BIN
syncthing/config/index-v0.14.0.db/MANIFEST-000010 Normal file
View File

Binary file not shown.

6
syncthing/config/key.pem Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN EC PRIVATE KEY-----
MIGkAgEBBDATt4bT/HcpqlA6terTY1DKFAMma7I24b1b0OJJxsm0kzD3c1KFwCCO
y9On4T7H3+GgBwYFK4EEACKhZANiAAT6YI7+fYUirirBS/bM2jall+MK1hGhEukI
UfJXbXe9x0aAzuzzR8dEjeaF9rzwmOGZ8VLaINI99aLv8HcVKple4VkTDfGUfh75
PjybOxNh+zeAXALWFVU97Km5kIvXbxM=
-----END EC PRIVATE KEY-----

5
zigbee2mqtt/configuration.yaml
View File

@ -29,6 +29,8 @@ devices:
'0x001788010452ec91':
friendly_name: Philips Lily 4
retain: false
'0x00178801045185ad':
friendly_name: Philips Lily 5
'0x000d6ffffe61e2f8':
friendly_name: '0x000d6ffffe61e2f8'
retain: false
@ -60,8 +62,7 @@ devices:
friendly_name: Julstjärna 2
'0x086bd7fffe38fe88':
friendly_name: Julstjärna 3
'0x00178801045185ad':
friendly_name: Philips Lily 5
groups:
'1':
friendly_name: Kök