Updating install stuff (not yet tested)

RCgmbh · Feb 26, 2023 · 0e75d31 · 0e75d31
1 parent 9cdaf63
commit 0e75d31
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 34 deletions.
diff --git a/PiLot.sln b/PiLot.sln
@@ -76,7 +76,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "installScripts", "installSc
 	ProjectSection(SolutionItems) = preProject
 		installScripts\00-install-samba.sh = installScripts\00-install-samba.sh
 		installScripts\01-install-ap.sh = installScripts\01-install-ap.sh
-		installScripts\02-install-netcore.sh = installScripts\02-install-netcore.sh
+		installScripts\02-install-platform.sh = installScripts\02-install-platform.sh
 		installScripts\03-install-pilotweb.sh = installScripts\03-install-pilotweb.sh
 		installScripts\04-install-gps-1.sh = installScripts\04-install-gps-1.sh
 		installScripts\05-install-gps-2.sh = installScripts\05-install-gps-2.sh
@@ -125,6 +125,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sqlScripts", "sqlScripts",
 		sqlScripts\poiData.sql = sqlScripts\poiData.sql
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sql", "sql", "{F2617496-F4C9-4007-9CBB-F57DFECD823E}"
+	ProjectSection(SolutionItems) = preProject
+		sqlScripts\pilotDb.sql = sqlScripts\pilotDb.sql
+		sqlScripts\poi.sql = sqlScripts\poi.sql
+		sqlScripts\poiData.sql = sqlScripts\poiData.sql
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -205,6 +212,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{1125EB22-4B62-4888-BD40-64C09E1A0F88} = {746AFF13-8152-4EE2-99D7-C5B8D0ED0207}
+		{F2617496-F4C9-4007-9CBB-F57DFECD823E} = {1125EB22-4B62-4888-BD40-64C09E1A0F88}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DFF59E6D-1CB2-45D7-9337-DF815740F907}

diff --git a/PiLotAPICore/app.default.config b/PiLotAPICore/app.default.config
@@ -2,7 +2,7 @@
 <configuration>
 	<appSettings>
 		<add key="dataDir" value="/var/opt/pilot" />
-		<add key="connectionString" value="host=localhost; port=5433; Database=pilot; Username=pilotweb; Password=***; " />
+		<add key="connectionString" value="host=localhost; port=5432; Database=pilot; Username=pilotweb; Password=sailor; " />
 		<add key="logLevel" value="INFO" />
 		<add key="logfilePath" value="/var/log/pilot" />
 		<add key="services" value="gpsLogger, photosWatcher, sensorsLogger, liveClient, backupClient" />

diff --git a/installScripts/02-install-netcore.sh b/installScripts/02-install-netcore.sh
diff --git a/installScripts/02-install-platform.sh b/installScripts/02-install-platform.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+if [ `whoami` != root ]; then
+    echo Please run this script using sudo
+    exit
+fi
+wget  https://download.visualstudio.microsoft.com/download/pr/cf567026-a29a-41aa-bc3a-e4e1ad0df480/0925d411e8e09e31ba7a39a3eb0e29af/aspnetcore-runtime-6.0.8-linux-arm.tar.gz
+mkdir -p /opt/dotnet
+tar -zxf aspnetcore-runtime-6.0.8-linux-arm.tar.gz -C /opt/dotnet
+#wget https://download.visualstudio.microsoft.com/download/pr/9f538111-c9a9-443e-a8e0-7cd8b3433904/49bc583c459098228a31d37a6dc71034/aspnetcore-runtime-7.0.3-linux-arm.tar.gz
+#mkdir -p /opt/dotnet
+#tar -zxf aspnetcore-runtime-7.0.3-linux-arm.tar.gz -C /opt/dotnet
+ln -s /opt/dotnet/dotnet /usr/bin
+
+#postgres
+ apt install postgresql -y
+ apt install postgis -y
+ su postgres
diff --git a/installScripts/03-install-pilotweb.sh b/installScripts/03-install-pilotweb.sh
@@ -12,10 +12,11 @@ mkdir -p /opt/pilotapi			#PiLot binaries
 mkdir -p /etc/pilot				#PiLot config directory
 
 # set up DB
-# su postgres
-# psql -d pilot -f /home/pi/repos/PiLot/sqlScripts/poi.sql
-# psql -d pilot -f /home/pi/repos/PiLot/sqlScripts/poiData.sql
-# exit
+su postgres
+psql -d pilot -f /home/pi/pilotinstall/resources/sql/pilotDb.sql
+psql -d pilot -f /home/pi/pilotinstall/resources/sql/poi.sql
+psql -d pilot -f /home/pi/pilotinstall/resources/sql/poiData.sql
+exit
 
 # set up API
 cp -r resources/pilotapi/* /opt/pilotapi/

diff --git a/pilotinstall_dev.tar.gz b/pilotinstall_dev.tar.gz
diff --git a/sqlScripts/pilotDb.sql b/sqlScripts/pilotDb.sql
@@ -7,7 +7,6 @@ CREATE DATABASE pilot
     CONNECTION LIMIT = -1
     IS_TEMPLATE = False;
 
-/* todo: change db! */
+\c pilot
 CREATE EXTENSION postgis;
-
-CREATE USER pilotweb WITH PASSWORD 'sailor';
+CREATE USER pilotweb WITH PASSWORD 'sailor';
diff --git a/sqlScripts/poiData.sql b/sqlScripts/poiData.sql
@@ -13,23 +13,26 @@ DELETE FROM poi_features;
 DELETE FROM poi_categories;
 
 /* INSERT CATEGORIES */
+SELECT insert_poi_category (null, 'hint', '{"de": "Hinweis", "en": "Hint"}', 'css:icon-info2');
+SELECT insert_poi_category (null, 'stay', '{"de": "Aufenthalt", "en": "Stay"}', 'css:icon-moon');
+SELECT insert_poi_category (null, 'obstacle', '{"de": "Hindernis", "en": "Obstacle"}', 'css:icon-warning2');
+SELECT insert_poi_category (null, 'supply', '{"de": "Versorgung", "en": "Supply"}', 'css:icon-shipping');
+SELECT insert_poi_category (null, 'measuringstation', '{"de": "Messstation", "en": "Measuring station"}', 'css:icon-meter2');
+SELECT insert_poi_category (null, 'pleasure', '{"de": "Freude", "en": "Pleasure"}', 'css:icon-heart');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='pleasure'), 'sight', '{"de": "Sehenswürdigkeit", "en": "Sight"}', 'css:icon-eye');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='stay'), 'toilet', '{"de": "Toilette", "en": "Toilet"}', 'css:icon-man-woman');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='stay'), 'marina', '{"de": "Marina", "en": "Marina"}', 'svg:marina.svg');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='stay'), 'mooring', '{"de": "Anlegestelle", "en": "Mooring"}', 'svg:mooring.svg');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='pleasure'), 'nicePlace', '{"de": "Schönes Plätzchen", "en": "Nice Place"}', 'css:icon-sun');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='obstacle'), 'bridge', '{"de": "Brücke", "en": "Bridge"}', 'svg:bridge.svg');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='supply'), 'gazstation', '{"de": "Tankstelle", "en": "Gaz station"}', 'svg:gazstation.svg');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='supply'), 'health', '{"de": "Gesundheit", "en": "Health"}', 'css:icon-health');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='obstacle'), 'impediment', '{"de": "Einschränkung", "en": "Impediment"}', 'css:icon-power');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='obstacle'), 'lock', '{"de": "Schleuse", "en": "Lock"}', 'svg:lock.svg');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='supply'), 'restaurant', '{"de": "Restaurant", "en": "Restaurant"}', 'css:icon-spoon-knife');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='shop'), 'shop', '{"de": "Geschäft", "en": "Shop"}', 'css:icon-cart');
+SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='pleasure'), 'anchorage', '{"de": "Ankerstelle", "en": "Anchorage"}', 'css:icon-anchor');
 
-SELECT insert_poi_category(null, 'event', '{"de": "Ereignis", "en": "Event"}', 'css:icon-pin');
-SELECT insert_poi_category(null, 'object', '{"de": "Objekt", "en": "Object"}', 'css:icon-location');
-SELECT insert_poi_category(null, 'information', '{"de": "Information", "en": "Information"}', 'css:icon-info2');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'health', '{"de": "Gesundheit", "en": "Health"}', 'css:icon-health');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'lock', '{"de": "Schleuse", "en": "Lock"}', 'svg:lock.svg');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'marina', '{"de": "Marina", "en": "Marina"}', 'svg:marina.svg');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'gazstation', '{"de": "Tankstelle", "en": "Gaz station"}', 'svg:gazstation.svg');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'mooring', '{"de": "Anlegestelle", "en": "Mooring"}', 'svg:mooring.svg');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'anchorage', '{"de": "Ankerstelle", "en": "Anchorage"}', 'css:icon-anchor');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'toilet', '{"de": "Toilette", "en": "Toilet"}', 'css:icon-man-woman');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'restaurant', '{"de": "Restaurant", "en": "Restaurant"}', 'css:icon-spoon-knife');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'shop', '{"de": "Geschäft", "en": "Shop"}', 'css:icon-cart');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'obstacle', '{"de": "Hindernis", "en": "Obstacle"}', 'css:icon-warning2');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'measuringstation', '{"de": "Messstation", "en": "Measuring station"}', 'css:icon-meter2');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'sight', '{"de": "Sehenswürdigkeit", "en": "Sight"}', 'css:icon-eye');
-SELECT insert_poi_category ((SELECT id FROM poi_categories WHERE name='object'), 'nicePlace', '{"de": "Schönes Plätzchen", "en": "Nice place"}', 'css:icon-sun');
 
 
 /* INSERT FEATURES */