Update project folder variable.

net-daemon · Jul 13, 2020 · cd4b573 · cd4b573
1 parent 303e793
commit cd4b573
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -20,7 +20,7 @@
 		"HOMEASSISTANT__TOKEN": "${localEnv:HOMEASSISTANT__TOKEN}",
 		"HOMEASSISTANT__HOST": "${localEnv:HOMEASSISTANT__HOST}",
 		"HOMEASSISTANT__PORT": "${localEnv:HOMEASSISTANT__PORT}",
-		"HASS_LOGLEVEL": "${localEnv:HASS_LOGLEVEL}",
+		"LOGGING__MINIMUMLEVEL": "${localEnv:LOGGING__MINIMUMLEVEL}",
 		"NETDAEMON__GENERATEENTITIES": "${localEnv:NETDAEMON__GENERATEENTITIES}",
 		"NETDAEMON__SOURCEFOLDER": "${localEnv:NETDAEMON__SOURCEFOLDER}"
 	},

diff --git a/Docker/rootfs/etc/services.d/NetDaemon/run b/Docker/rootfs/etc/services.d/NetDaemon/run
@@ -9,9 +9,9 @@ set -e
 declare runtype="Service"
 declare daemondir="/daemon"
 
-cd "${HASS_RUN_PROJECT_FOLDER}" || echo -e "\\033[31mCould not change directory to run project\\033[0m" >&2
+cd "${NETDAEMON__PROJECTFOLDER}" || echo -e "\\033[31mCould not change directory to run project\\033[0m" >&2
 
-if [[ "${PWD}" != "${HASS_RUN_PROJECT_FOLDER}" ]]; then
+if [[ "${PWD}" != "${NETDAEMON__PROJECTFOLDER}" ]]; then
     exit 1
 fi
 

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ COPY ./Docker/rootfs/etc/services.d/NetDaemon/run /rundaemon
 ENV \
     DOTNET_NOLOGO=true \
     DOTNET_CLI_TELEMETRY_OPTOUT=true \
-    HASS_RUN_PROJECT_FOLDER=/usr/src/Service \
+    NETDAEMON__PROJECTFOLDER=/usr/src/Service \
     HOMEASSISTANT__HOST=localhost \
     HOMEASSISTANT__PORT=8123 \
     HOMEASSISTANT__TOKEN=NOT_SET \

diff --git a/src/DaemonRunner/DaemonRunner/Service/Configuration/NetDaemonSettings.cs b/src/DaemonRunner/DaemonRunner/Service/Configuration/NetDaemonSettings.cs
@@ -4,5 +4,6 @@ public class NetDaemonSettings
     {
         public bool? GenerateEntities { get; set; } = false;
         public string? SourceFolder { get; set; } = null;
+        public string? ProjectFolder { get; set; } = string.Empty;
     }
 }
diff --git a/src/Service/Program.cs b/src/Service/Program.cs
@@ -47,16 +47,16 @@ private static async Task ReadHassioConfig()
                     SerilogConfigurator.SetMinimumLogLevel(hassAddOnSettings.LogLevel);
 
                 if (hassAddOnSettings.GenerateEntitiesOnStart is object)
-                    Environment.SetEnvironmentVariable("NetDaemon__GenerateEntities", hassAddOnSettings.GenerateEntitiesOnStart.ToString());
+                    Environment.SetEnvironmentVariable("NETDAEMON__GENERATEENTITIES", hassAddOnSettings.GenerateEntitiesOnStart.ToString());
 
                 if (hassAddOnSettings.LogMessages is object && hassAddOnSettings.LogMessages == true)
                     Environment.SetEnvironmentVariable("HASSCLIENT_MSGLOGLEVEL", "Default");
 
                 if (hassAddOnSettings.ProjectFolder is object && string.IsNullOrEmpty(hassAddOnSettings.ProjectFolder) == false)
-                    Environment.SetEnvironmentVariable("HASS_RUN_PROJECT_FOLDER", hassAddOnSettings.ProjectFolder);
+                    Environment.SetEnvironmentVariable("NETDAEMON__PROJECTFOLDER", hassAddOnSettings.ProjectFolder);
 
                 // We are in Hassio so hard code the path
-                Environment.SetEnvironmentVariable("NetDaemon__AppFolder", "/config/netdaemon");
+                Environment.SetEnvironmentVariable("NETDAEMON__APPFOLDER", "/config/netdaemon");
             }
             catch (Exception e)
             {

diff --git a/src/Service/appsettings.json b/src/Service/appsettings.json
@@ -10,6 +10,7 @@
     },
     "NetDaemon": {
         "SourceFolder": "",
-        "GenerateEntities": false
+        "GenerateEntities": false,
+        "ProjectFolder": "" 
     }
 }