Merge with master

2020-10-15 20:53:37 +02:00 · 2020-10-15 20:53:37 +02:00 · 58ca4471c9
parent 2809df3a97 a79a034b28
commit 58ca4471c9
21 changed files with 255 additions and 21 deletions
--- a/.env
+++ b/.env
@ -1,5 +1,7 @@
-DIR=/home/simon/docker/data
-DOMAIN=localhost
+UID=1000
+GID=1000
+DIR=/srv/docker
+DOMAIN=milvert.com


 MYSQL_USERNAME=root
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,7 +1,6 @@
 version: '3'

 services:
-
  zigbee2mqtt:
    container_name: zigbee2mqtt
    networks:
@ -9,10 +8,13 @@ services:
    image: koenkk/zigbee2mqtt
    volumes:
      - ${DIR}/zigbee2matt:/app/data
+      - ${DIR}/zigbee2mqtt_node_log:/root/.npm
    devices:
      - /dev/ttyUSB0:/dev/ttyACM0
    restart: always
    environment:
+      - UID=1000
+      - GID=1000
      - TZ=Europe/Stockholm

  mqtt:
@ -25,11 +27,14 @@ services:
    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"
@ -58,6 +63,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"


--- a/mosquitto/mosquitto.conf
+++ b/mosquitto/mosquitto.conf
@ -1,7 +1,18 @@
-persistence true
-persistence_location /mosquitto/data/
-log_dest file /mosquitto/log/mosquitto.log
+pid_file /var/run/mosquitto.pid

+persistence true
+persistence_location /mqtt/data/
+
+user mosquitto
+
+# Port to use for the default listener.
+port 1883
+
+
+log_dest file /mqtt/log/mosquitto.log
+log_dest stdout
+
+include_dir /mqtt/config

 listener 1883

--- 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:
--- a/syncthing/config/cert.pem
+++ 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-----
--- a/syncthing/config/config.xml
+++ b/syncthing/config/config.xml
@ -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>
--- a/syncthing/config/csrftokens.txt
+++ b/syncthing/config/csrftokens.txt
@ -0,0 +1,4 @@
+WsxEs7QECkQJyNh6z9AcKFNFVXWdg4xN
+Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb
+mnkA97ovEvhSkcKXoDirtjVhwUAsc5iC
+Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb
--- a/syncthing/config/https-cert.pem
+++ 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-----
--- a/syncthing/config/https-key.pem
+++ 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-----
--- a/syncthing/config/index-v0.14.0.db/000007.ldb
+++ b/syncthing/config/index-v0.14.0.db/000007.ldb
--- a/syncthing/config/index-v0.14.0.db/000008.ldb
+++ b/syncthing/config/index-v0.14.0.db/000008.ldb
--- a/syncthing/config/index-v0.14.0.db/000009.log
+++ b/syncthing/config/index-v0.14.0.db/000009.log
--- a/syncthing/config/index-v0.14.0.db/CURRENT
+++ b/syncthing/config/index-v0.14.0.db/CURRENT
@ -0,0 +1 @@
+MANIFEST-000010
--- a/syncthing/config/index-v0.14.0.db/CURRENT.bak
+++ b/syncthing/config/index-v0.14.0.db/CURRENT.bak
@ -0,0 +1 @@
+MANIFEST-000000
--- a/syncthing/config/index-v0.14.0.db/LOCK
+++ b/syncthing/config/index-v0.14.0.db/LOCK
--- a/syncthing/config/index-v0.14.0.db/LOG
+++ 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
--- a/syncthing/config/index-v0.14.0.db/MANIFEST-000010
+++ b/syncthing/config/index-v0.14.0.db/MANIFEST-000010
--- a/syncthing/config/key.pem
+++ b/syncthing/config/key.pem
@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDATt4bT/HcpqlA6terTY1DKFAMma7I24b1b0OJJxsm0kzD3c1KFwCCO
+y9On4T7H3+GgBwYFK4EEACKhZANiAAT6YI7+fYUirirBS/bM2jall+MK1hGhEukI
+UfJXbXe9x0aAzuzzR8dEjeaF9rzwmOGZ8VLaINI99aLv8HcVKple4VkTDfGUfh75
+PjybOxNh+zeAXALWFVU97Km5kIvXbxM=
+-----END EC PRIVATE KEY-----
--- a/web/milvert.com/conf/milvert.com.conf
+++ b/web/milvert.com/conf/milvert.com.conf
@ -0,0 +1,15 @@
+server {
+
+  server_name milvert.com www.milvert.com;
+
+  root /html;
+
+  error_log /var/log/nginx/milvert.com.error.log;
+  access_log /var/log/nginx/milvert.com.access.log;
+
+  listen 80 default_server;
+  listen [::]:80 default_server;
+
+
+
+}
--- a/web/milvert.com/html/index.html
+++ b/web/milvert.com/html/index.html
@ -0,0 +1,47 @@
+<html>
+<head>
+<title>milvert.com</title>
+<meta name="google-site-verification" content="QAr7wTVWOBHuNIQyz_xkhAZ6ja8KhW8Zw7MU7ygZMoE" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Imagetoolbar" content="no">
+
+<style type="text/css">
+/* pushes the page to the full capacity of the viewing area */
+html {height:100%;}
+body {height:100%; margin:0; padding:0;}
+/* prepares the background image to full capacity of the viewing area */
+#bg {position:fixed; top:0; left:0; ; height:100%;}
+/* places the content ontop of the background image */
+#content {position:relative; z-index:1;}
+</style>
+<!--[if IE 6]>
+<style type="text/css">
+/* some css fixes for IE browsers */
+html {overflow-y:hidden;}
+body {overflow-y:auto;}
+#bg {position:absolute; z-index:-1;}
+#content {position:static;}
+</style>
+<![endif]-->
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-28178678-1']);
+ _gaq.push(['_setDomainName', 'milvert.com']);
+ _gaq.push(['_trackPageview']);
+ (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+
+
+</head>
+
+<body>
+<div id="bg"><img src="web.jpg"  height="100%" alt=""></div>
+</body>
+</html>
+
+
--- a/web/milvert.com/html/web.jpg
+++ b/web/milvert.com/html/web.jpg