Merge pull request #216 from Stefal/dev_2.3.4

Dev 2.3.4

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## [2.3.4] - 2022-04-01
+### Fixed 
+ - Failure with some python dependancies. #215
+ - More fixes with Gpsd service restart. #94
+
 ## [2.3.3] - 2022-02-28
 ### Fixed
 - Fix the Rinex conversion failure. #206

rtkbase_update.sh

@@ -152,6 +152,22 @@ upd_2.3.2() {
     sed -i '/^Restart=always.*/a RestartSec=30' /etc/systemd/system/gpsd.service
   fi
   systemctl daemon-reload
+  upd_2.3.3 "$@"
+}
+
+upd_2.3.3() {
+#Overriding gpsd.service with custom dependency
+cp /lib/systemd/system/gpsd.service /etc/systemd/system/gpsd.service
+sed -i 's/^After=.*/After=str2str_tcp.service/' /etc/systemd/system/gpsd.service
+sed -i '/^# Needed with chrony/d' /etc/systemd/system/gpsd.service
+#Add restart condition
+grep -qi '^Restart=' /etc/systemd/system/gpsd.service || sed -i '/^ExecStart=.*/a Restart=always' /etc/systemd/system/gpsd.service
+grep -qi '^RestartSec=' /etc/systemd/system/gpsd.service || sed -i '/^Restart=always.*/a RestartSec=30' /etc/systemd/system/gpsd.service
+#Add ExecStartPre condition to not start gpsd if str2str_tcp is not running. See https://github.com/systemd/systemd/issues/1312
+grep -qi '^ExecStartPre=' /etc/systemd/system/gpsd.service || sed -i '/^ExecStart=.*/i ExecStartPre=systemctl is-active str2str_tcp.service' /etc/systemd/system/gpsd.service
+
+systemctl daemon-reload
+systemctl restart gpsd
 }
 
 # standard update

settings.conf.default

@@ -2,7 +2,7 @@
 
 [general]
 # Version
-version=2.3.3
+version=2.3.4
 # Rtkbase upgrade mandatory "checkpoint"
 checkpoint_version=2.4.0
 # User who runs str2str_file service

tools/install.sh

@@ -102,20 +102,18 @@ install_gpsd_chrony() {
       #Setting correct input for gpsd
       sed -i 's/^DEVICES=.*/DEVICES="tcp:\/\/127.0.0.1:5015"/' /etc/default/gpsd
       #Adding example for using pps
-      grep -q 'DEVICES="tcp:/120.0.0.1:5015 /dev/pps0' /etc/default/gpsd || sed -i '/^DEVICES=.*/a #DEVICES="tcp:\/\/127.0.0.1:5015 \/dev\/pps0"' /etc/default/gpsd
+      grep -qi 'DEVICES="tcp:/120.0.0.1:5015 /dev/pps0' /etc/default/gpsd || sed -i '/^DEVICES=.*/a #DEVICES="tcp:\/\/127.0.0.1:5015 \/dev\/pps0"' /etc/default/gpsd
       #gpsd should always run, in read only mode
       sed -i 's/^GPSD_OPTIONS=.*/GPSD_OPTIONS="-n -b"/' /etc/default/gpsd
       #Overriding gpsd.service with custom dependency
       cp /lib/systemd/system/gpsd.service /etc/systemd/system/gpsd.service
       sed -i 's/^After=.*/After=str2str_tcp.service/' /etc/systemd/system/gpsd.service
-      if grep -qxF '^BindsTo=' /etc/systemd/system/gpsd.service
-      then
-        #Change the BindsTo value
-        sed -i 's/^BindsTo=.*/BindsTo=str2str_tcp.service/' /etc/systemd/system/gpsd.service
-      else
-        #Add the BindsTo value
-        sed -i '/^After=.*/i BindsTo=str2str_tcp.service' /etc/systemd/system/gpsd.service
-      fi
+      sed -i '/^# Needed with chrony/d' /etc/systemd/system/gpsd.service
+      #Add restart condition
+      grep -qi '^Restart=' /etc/systemd/system/gpsd.service || sed -i '/^ExecStart=.*/a Restart=always' /etc/systemd/system/gpsd.service
+      grep -qi '^RestartSec=' /etc/systemd/system/gpsd.service || sed -i '/^Restart=always.*/a RestartSec=30' /etc/systemd/system/gpsd.service
+      #Add ExecStartPre condition to not start gpsd if str2str_tcp is not running. See https://github.com/systemd/systemd/issues/1312
+      grep -qi '^ExecStartPre=' /etc/systemd/system/gpsd.service || sed -i '/^ExecStart=.*/i ExecStartPre=systemctl is-active str2str_tcp.service' /etc/systemd/system/gpsd.service
 
       #Reload systemd services and enable chrony and gpsd
       systemctl daemon-reload

web_app/requirements.txt

@@ -1,3 +1,5 @@
+jinja2==3.0.3
+werkzeug==2.0.2
 cryptography==3.3.2
 itsdangerous==1.1.0
 Flask==1.1.2