diff --git a/ZitiUpdateService/App.config b/ZitiUpdateService/App.config
index 193aecc6..bc30bb6b 100644
--- a/ZitiUpdateService/App.config
+++ b/ZitiUpdateService/App.config
@@ -1,6 +1,10 @@
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ZitiUpdateService/UpdateService.cs b/ZitiUpdateService/UpdateService.cs
index fa622d09..f8a9262f 100644
--- a/ZitiUpdateService/UpdateService.cs
+++ b/ZitiUpdateService/UpdateService.cs
@@ -13,13 +13,15 @@ using System.Net;
using System.Timers;
using System.Management.Automation;
using System.Xml;
+using System.Configuration;
+using System.Collections.Specialized;
namespace ZitiUpdateService {
public partial class UpdateService : ServiceBase {
private string _version = "";
private bool _isNew = true;
- private int _majorVersion = 1;
+ /// private int _majorVersion = 1;
private string _versionUrl = "https://netfoundry.jfrog.io/netfoundry/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/maven-metadata.xml";
private string _serviceUrl = "https://netfoundry.jfrog.io/netfoundry/ziti-maven-snapshot/ziti-tunnel-win/amd64/windows/ziti-tunnel-win/${version}/ziti-tunnel-win-${version}.zip";
private System.Timers.Timer _checkTimer = new System.Timers.Timer();
@@ -27,6 +29,7 @@ namespace ZitiUpdateService {
private string _rootDirectory = "";
private string _logDirectory = "";
private bool _isJustStopped = true;
+ private string _versionType = "release";
ServiceController controller;
public UpdateService() {
@@ -34,6 +37,8 @@ namespace ZitiUpdateService {
}
protected override void OnStart(string[] args) {
+ if (ConfigurationManager.AppSettings.Get("UpdateUrl")!=null) _versionUrl = ConfigurationManager.AppSettings.Get("UpdateUrl");
+ if (ConfigurationManager.AppSettings.Get("Version") !=null) _versionType = ConfigurationManager.AppSettings.Get("Version");
_rootDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "NetFoundry");
if (!Directory.Exists(_rootDirectory)) Directory.CreateDirectory(_rootDirectory);
_logDirectory = Path.Combine(_rootDirectory, "Logs");
@@ -90,7 +95,7 @@ namespace ZitiUpdateService {
var result = readStream.ReadToEnd();
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.LoadXml(result);
- XmlNode node = xmlDoc.SelectSingleNode("metadata/versioning/release");
+ XmlNode node = xmlDoc.SelectSingleNode("metadata/versioning/"+ _versionType);
string version = node.InnerText;
Log("Version Checked: " + version+" on "+_version);
if (version != _version) {
diff --git a/ZitiUpdateService/ZitiUpdateService.csproj b/ZitiUpdateService/ZitiUpdateService.csproj
index 2bc88441..896f9f87 100644
--- a/ZitiUpdateService/ZitiUpdateService.csproj
+++ b/ZitiUpdateService/ZitiUpdateService.csproj
@@ -75,6 +75,7 @@
+
@@ -108,7 +109,9 @@
-
+
+ Always
+