[config] suppression du runtime directory, utilisation de /var/lib/pyheatpump

config/pre-exec.sh

@@ -1,19 +1,30 @@
 #!/bin/sh
+REPO_DIR=/opt/pyHeatpump
+LIB_DIR=/var/lib/pyheatpump
+
 
-# If directory exists don't run the script
 # cd /opt/pyheatpump git clone https://git.yannweb.net/cli/pyHeatpump.git
-[ ! -d /opt/pyHeatpump/ ] && echo "Missing /opt/pyHeatpump/" && exit 1;
-[ ! -d /run/pyheatpump/ ] && echo "Missing /run/pyheatpump/" && exit 1;
+[ ! -d $REPO_DIR ] \
+  && echo "Missing $REPO_DIR" \
+  && exit 1;
 
-[ -f /run/pyheatpump/pyheatpump.sqlite3 ] && [ -f /run/pyheatpump/pyheatpump.ini ] \
-        && echo "Incorrect runtime directory" && exit 1;
+[ ! -d /var/lib/pyheatpump ] && mkdir --mode 0700 /var/lib/pyheatpump
+# If files already exist don't var/lib the script
+[ -f $LIB_DIR/pyheatpump.sqlite3 ] && [ -f $LIB_DIR/pyheatpump.ini ] \
+  && exit 0;
 
 # Database initialization
-sqlite3 -init /opt/pyHeatpump/db/pyheatpump.sql /run/pyheatpump/pyheatpump.sqlite3 .quit \
+if [ ! -f $LIB_DIR/pyheatpump.sqlite3 ];
+then
+  sqlite3 -init $REPO_DIR/db/pyheatpump.sql $LIB_DIR/pyheatpump.sqlite3 .quit \
     || (echo "Failed to initialize database" && exit 1);
+fi
 
 # Default configuration setup
-cp /opt/pyHeatpump/config/pyheatpump.prod.ini.dist /run/pyheatpump/pyheatpump.ini \
+if [ ! -f $LIB_DIR/pyheatpump.ini ];
+then
+  cp $REPO_DIR/config/pyheatpump.prod.ini.dist $LIB_DIR/pyheatpump.ini \
     || (echo "Failed to initialized configuration file" && exit 1);
+fi
 
 exit 0;

config/pyheatpump_supervise.service

@@ -4,11 +4,11 @@ Wants=dev-rs485.device
 
 [Service]
 Type=simple
-RuntimeDirectory=pyheatpump
-WorkingDirectory=/run/pyheatpump
+StateDirectory=pyheatpump
+WorkingDirectory=/var/lib/pyheatpump
 Environment="LOGLEVEL=INFO"
 ExecStartPre=/opt/pyHeatpump/config/pre-exec.sh
 ExecStart=/usr/bin/env pyheatpump supervise --since
 KillMode=mixed
 TimeoutStopSec=30sec
-PrivateTmp=true
+PrivateTmp=false