fixing install scripts

PiLot.sln

@@ -90,6 +90,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "installScripts", "installSc
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{1125EB22-4B62-4888-BD40-64C09E1A0F88}"
 	ProjectSection(SolutionItems) = preProject
+		installScripts\resources\backupClient.service = installScripts\resources\backupClient.service
 		installScripts\resources\gpsLogger.service = installScripts\resources\gpsLogger.service
 		installScripts\resources\index.html = installScripts\resources\index.html
 		installScripts\resources\liveClient.service = installScripts\resources\liveClient.service
@@ -98,7 +99,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{
 		installScripts\resources\photosWatcher.service = installScripts\resources\photosWatcher.service
 		installScripts\resources\pilotApi.service = installScripts\resources\pilotApi.service
 		installScripts\resources\pilotBackupApi.service = installScripts\resources\pilotBackupApi.service
-		installScripts\resources\pilotBackupClient.service = installScripts\resources\pilotBackupClient.service
 		installScripts\resources\restoreIptables.service = installScripts\resources\restoreIptables.service
 		installScripts\resources\restoreIptables.sh = installScripts\resources\restoreIptables.sh
 		installScripts\resources\sensorsLogger.service = installScripts\resources\sensorsLogger.service

PiLotAPICore/app.default.config

@@ -4,7 +4,7 @@
 		<add key="dataDir" value="/var/opt/pilot" />
 		<add key="logLevel" value="INFO" />
 		<add key="logfilePath" value="/var/log/pilot" />
-		<add key="services" value="gpsLogger, photosWatcher, sensorsLogger, liveClient" />
+		<add key="services" value="gpsLogger, photosWatcher, sensorsLogger, liveClient, backupClient" />
 		<add key="gpsTimeThreshold" value="60" />
 	</appSettings>
 </configuration>

PiLotAPICore/config/publishingTargets.default.json

@@ -0,0 +1,10 @@
+[
+	{
+		"name": "website",
+		"displayName": "My Website",
+		"apiUrl": "http://pilot.mywebsite.org/pilotapi/api/v1",
+		"webUrl": "http://pilot.mywebsite.org",
+		"username": "test",
+		"password": "8888"
+	}
+]  

PiLotPhotosWatcher/PiLotPhotosWatcher.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>PiLot.PhotosWatcher</AssemblyName>
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+		<RootNamespace>PiLot.PhotosWatcher</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

PiLotWeb/js/View/Tools.js

@@ -189,7 +189,7 @@ PiLot.View.Tools = (function () {
 				startDate = startDate.toLuxon();
 			} else {
 				startDate = RC.Date.DateOnly.fromObject(this.boatTime.now()).toLuxon();
-				endDate = this.boatTime.now();
+				endDate = this.boatTime.now().plus({ minutes: 1 });
 			}
 			this.calStartDate.date(startDate);
 			this.calStartDate.showDate();

createInstallPackage.bat

@@ -4,6 +4,8 @@ xcopy /s /r /i installScripts\* pilotinstall\
 mkdir pilotinstall\resources\pilotapi
 mkdir pilotinstall\resources\pilotapi\config
 mkdir pilotinstall\resources\pilotapi\data\global
+mkdir pilotinstall\resources\pilotapi\data\logbook
+mkdir pilotinstall\resources\pilotapi\data\routes
 dotnet build PiLotApiCore -o pilotinstall\resources\pilotapi -c release -r linux-arm --no-self-contained
 copy /y pilotinstall\resources\pilotapi\app.default.config pilotinstall\resources\pilotapi\PiLot.API.dll.config
 del /s /q pilotinstall\resources\pilotapi\app.*.config
@@ -14,6 +16,8 @@ copy pilotinstall\resources\pilotapi\config\sensors.default.json pilotinstall\re
 del  pilotinstall\resources\pilotapi\config\sensors.*.json
 copy pilotinstall\resources\pilotapi\config\tileSources.default.json pilotinstall\resources\pilotapi\config\tileSources.json
 del  pilotinstall\resources\pilotapi\config\tileSources.*.json
+copy pilotinstall\resources\pilotapi\config\publishingTargets.default.json pilotinstall\resources\pilotapi\config\publishingTargets.json
+del  pilotinstall\resources\pilotapi\config\publishingTargets.*.json
 copy pilotinstall\resources\pilotapi\config\authorization.default.json pilotinstall\resources\pilotapi\config\authorization.json
 del  pilotinstall\resources\pilotapi\config\authorization.*.json
 copy pilotinstall\resources\pilotapi\config\users.default.json pilotinstall\resources\pilotapi\config\users.json

installScripts/03-install-pilotweb.sh

@@ -6,24 +6,25 @@ fi
 
 # prepare directories
 mkdir -p /var/opt/pilot			#PiLot data directory
-chown pi:root /var/opt/pilot
 mkdir -p /var/log/pilot			#PiLot log directory
 chown pi:root /var/log/pilot
 mkdir -p /opt/pilotapi			#PiLot binaries
 mkdir -p /etc/pilot				#PiLot config directory
 
 # set up API
 cp -r resources/pilotapi/* /opt/pilotapi/
-mv resources/pilotapi/data/* /var/opt/pilot/
-rm resources/pilotapi/data/
+mv -r opt/pilotapi/data/* /var/opt/pilot/
+rm -r /opt/pilotapi/data
+chown -R pi:root /var/opt/pilot
+
 # add config links in /etc/pilot
-ln /var/opt/pilot/PiLot.API.dll.config /etc/pilot/pilotapi.config
-ln /var/opt/pilot/config/authorization.json /etc/pilot/authorization.json
-ln /var/opt/pilot/config/users.json /etc/pilot/users.json
-ln /var/opt/pilot/config/publishingTargets.json /etc/pilot/publishingTargets.json
-ln /var/opt/pilot/config/sensors.json /etc/pilot/sensors.json
-ln /var/opt/pilot/config/tileSources.json /etc/pilot/tileSources.json
-ln -s /var/opt/pilot/config/boats /etc/pilot/boats
+ln /opt/pilotapi/PiLot.API.dll.config /etc/pilot/pilotapi.config
+ln /opt/pilotapi/config/authorization.json /etc/pilot/authorization.json
+ln /opt/pilotapi/config/users.json /etc/pilot/users.json
+ln /opt/pilotapi/config/publishingTargets.json /etc/pilot/publishingTargets.json
+ln /opt/pilotapi/config/sensors.json /etc/pilot/sensors.json
+ln /opt/pilotapi/config/tileSources.json /etc/pilot/tileSources.json
+ln -s /opt/pilotapi/config/boats /etc/pilot/boats
 # set up API service
 cp resources/pilotApi.service /etc/systemd/system/pilotApi.service
 chmod 446 /etc/systemd/system/pilotApi.service
@@ -36,9 +37,8 @@ mkdir -p /var/www/html/pilot
 cp -r resources/pilotweb/* /var/www/html/pilot/
 cp /var/www/html/index.html backup/
 cp resources/index.html /var/www/html/
-mkdir /var/www/html/tiles
-mkdir /var/www/html/tiles/openstreetmap
-mkdir /var/www/html/tiles/openseamap
+mkdir -p /var/www/html/tiles/openstreetmap
+mkdir -p /var/www/html/tiles/openseamap
 chown -R pi:root /var/www/html/tiles
 mkdir /var/www/html/library
 chown -R pi:root /var/www/html/library

installScripts/06-install-photoswatcher.sh

@@ -5,13 +5,20 @@ if [ `whoami` != root ]; then
     exit
 fi
 
-mkdir /home/pi/PhotoImport
+# create directories
+mkdir /home/pi/PhotoImport			# Photo import directory
 chown pi:pi /home/pi/PhotoImport
-mkdir /var/opt/pilot/photos
+mkdir -p /var/opt/pilot/photos		# Data directory for photos
 chown pi:pi /var/opt/pilot/photos
-mkdir /opt/pilotphotoswatcher/
+mkdir /opt/pilotphotoswatcher/		# Application binaries
+
+# install application
 cp -r resources/pilotphotoswatcher/* /opt/pilotphotoswatcher/
 
+# create config link in /etc/pilot
+ln /opt/pilotphotoswatcher/PiLot.PhotosWatcher.dll.config /etc/pilot/pilotPhotosWatcher.config
+
+# install service
 cp resources/photosWatcher.service /etc/systemd/system/photosWatcher.service
 systemctl daemon-reload
 systemctl enable photosWatcher

installScripts/07-install-sensorsLogger.sh

@@ -5,9 +5,16 @@ if [ `whoami` != root ]; then
     exit
 fi
 
-mkdir /opt/pilotsensors/
+# create directories
+mkdir /opt/pilotsensors/		# application binaries
+
+# install application
 cp -r resources/pilotsensors/* /opt/pilotsensors/
 
+# create config links in /etc/pilot
+ln /opt/pilotsensors/PiLot.Sensors.dll.config /etc/pilot/pilotSensors.config
+
+# configure and enable service
 cp resources/sensorsLogger.service /etc/systemd/system/sensorsLogger.service
 systemctl daemon-reload
 systemctl enable sensorsLogger

installScripts/08-install-backupAPI.sh

@@ -14,6 +14,7 @@ mkdir -p /etc/pilotbackupapi			# PiLot backup API config
 
 # set up Backup API
 cp -r resources/pilotbackupapi/* /opt/pilotbackupapi/
+
 # create config links in /etc/pilotbackupapi
 ln /opt/pilotbackupapi/PiLot.Backup.API.dll.config /etc/pilotbackupapi/pilotbackupapi.config
 ln /opt/pilotbackupapi/config/authorization.json /etc/pilotbackupapi/authorization.json

installScripts/09-install-backupClient.sh

@@ -20,9 +20,9 @@ ln /opt/pilotbackupclient/PiLot.Backup.Client.dll.config /etc/pilot/pilotBackupC
 ln /opt/pilotbackupclient/config.json /etc/pilot/backupConfig.json
 
 # install service
-cp resources/pilotBackupClient.service /etc/systemd/system/pilotBackupClient.service
+cp resources/backupClient.service /etc/systemd/system/backupClient.service
 systemctl daemon-reload
-systemctl enable pilotBackupClient
-systemctl start pilotBackupClient
+systemctl enable backupClient
+systemctl start backupClient
 
 echo Done

installScripts/10-install-liveclient.sh

@@ -5,10 +5,14 @@ if [ `whoami` != root ]; then
     exit
 fi
 
-mkdir /opt/pilotliveclient/
+# create directory
+mkdir /opt/pilotliveclient/		# application binaries
+
+# install application
 cp -r resources/pilotliveclient/* /opt/pilotliveclient/
 
+# configure service, don't enable or start
 cp resources/liveClient.service /etc/systemd/system/liveClient.service
 systemctl daemon-reload
 
-echo Done. Please update /opt/liveclient/config.json
+echo Done. Please update /etc/pilot/liveClient.config

installScripts/resources/pilotBackupClient.service → installScripts/resources/backupClient.service

@@ -6,7 +6,7 @@ Type=simple
 WorkingDirectory=/opt/pilotbackupclient
 ExecStart=/opt/pilotbackupclient/PiLot.Backup.Client
 Restart=always
-RestartSec=2
+RestartSec=300
 User=pi
 Environment=DOTNET_ROOT=/opt/dotnet
 

installScripts/resources/nginx.conf

@@ -20,5 +20,5 @@ server {
 		autoindex on;
 	}
 
-	includes locations/*;
+	include locations/*;
 }

py/gpsLogger.py

@@ -2,6 +2,7 @@
 import urllib3
 import json
 from time import strftime, strptime, time, mktime, sleep
+import calendar
 
 def readPosition(record):
 	data = None