Updated

Cale-Torino · Oct 10, 2021 · 135e77a · 135e77a
1 parent d6cf0f2
commit 135e77a
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 66 deletions.
diff --git a/WPF/.vs/FreeTAKServer_Manager_WPF/v16/.suo b/WPF/.vs/FreeTAKServer_Manager_WPF/v16/.suo
diff --git a/WPF/FreeTAKServer_Manager_WPF/FTSConfig.yaml b/WPF/FreeTAKServer_Manager_WPF/FTSConfig.yaml
@@ -1,33 +1,33 @@
 Addresses:
-  #FTS_COT_PORT: 8087
-  #FTS_SSLCOT_PORT: 8089
+  FTS_COT_PORT: 8087
+  FTS_SSLCOT_PORT: 8089
   FTS_DP_ADDRESS: 0.0.0.0
   FTS_USER_ADDRESS: 0.0.0.0
-  #FTS_API_PORT: 19023
-  #FTS_FED_PORT: 9000
-  #FTS_API_ADDRESS: 0.0.0.0
+  FTS_API_PORT: 19023
+  FTS_FED_PORT: 9000
+  FTS_API_ADDRESS: 0.0.0.0
 FileSystem:
-  FTS_DB_PATH: /opt/FreeTAKServer.db
-  #FTS_COT_TO_DB: True
-  FTS_MAINPATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer
-  #FTS_CERTS_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs
-  #FTS_EXCHECK_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/ExCheck
-  #FTS_EXCHECK_TEMPLATE_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/ExCheck/template
-  #FTS_EXCHECK_CHECKLIST_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/ExCheck/checklist
-  #FTS_DATAPACKAGE_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/FreeTAKServerDataPackageFolder
-  #FTS_LOGFILE_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/Logs
+  FTS_DB_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\FreeTAKServer.db'
+  FTS_COT_TO_DB: True
+  FTS_MAINPATH: '</text>Lib\\site-packages\\FreeTAKServer'
+  FTS_CERTS_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\certs'
+  FTS_EXCHECK_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\ExCheck'
+  FTS_EXCHECK_TEMPLATE_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\ExCheck\\template'
+  FTS_EXCHECK_CHECKLIST_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\ExCheck\\checklist'
+  FTS_DATAPACKAGE_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\FreeTAKServerDataPackageFolder'
+  FTS_LOGFILE_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\Logs'
 Certs:
-  #FTS_SERVER_KEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.key
-  #FTS_SERVER_PEMDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.pem
-  #FTS_TESTCLIENT_PEMDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/Client.pem
-  #FTS_TESTCLIENT_KEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/Client.key
-  #FTS_UNENCRYPTED_KEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.key.unencrypted
-  #FTS_SERVER_P12DIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.p12
-  #FTS_CADIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/ca.pem
-  #FTS_CAKEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/ca.key
-  #FTS_FEDERATION_CERTDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.pem
-  #FTS_FEDERATION_KEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.key
-  #FTS_CRLDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/FTS_CRL.json
-  #FTS_FEDERATION_KEYPASS: demopassfed
-  #FTS_CLIENT_CERT_PASSWORD: demopasscert
-  #FTS_WEBSOCKET_KEY: YourWebsocketKey
+  FTS_SERVER_KEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.key'
+  FTS_SERVER_PEMDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.pem'
+  FTS_TESTCLIENT_PEMDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\Client.pem'
+  FTS_TESTCLIENT_KEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\Client.key'
+  FTS_UNENCRYPTED_KEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.key.unencrypted'
+  FTS_SERVER_P12DIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.p12'
+  FTS_CADIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\ca.pem'
+  FTS_CAKEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\ca.key'
+  FTS_FEDERATION_CERTDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.pem'
+  FTS_FEDERATION_KEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.key'
+  FTS_CRLDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\FTS_CRL.json'
+  FTS_FEDERATION_KEYPASS: 'defaultpass'
+  FTS_CLIENT_CERT_PASSWORD: 'supersecret'
+  FTS_WEBSOCKET_KEY: 'YourWebsocketKey'
diff --git a/WPF/FreeTAKServer_Manager_WPF/Forms/MainWindow.xaml.cs b/WPF/FreeTAKServer_Manager_WPF/Forms/MainWindow.xaml.cs
@@ -161,21 +161,27 @@ private void replaceText()
             try
             {
                 //Replace the text `</text>` with the formatted Python path for windows in both config files
+                string YamlConfigfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\FTSConfig.yaml";
                 string configfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI\config.py";
                 string MainConfigfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\controllers\configuration\\MainConfig.py";
-                if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile)))
+                if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile)) && Directory.Exists(Path.GetDirectoryName(YamlConfigfile)))
                 {
-                    string _configfile = File.ReadAllText(configfile, Encoding.UTF8);
-                    string _MainConfigfile = File.ReadAllText(MainConfigfile, Encoding.UTF8);
+                    string _configfile = File.ReadAllText(configfile, Encoding.UTF8);//Read config.py file text
+                    string _MainConfigfile = File.ReadAllText(MainConfigfile, Encoding.UTF8);//Read MainConfig.py file text
+                    string _YamlConfigfile = File.ReadAllText(YamlConfigfile, Encoding.UTF8);//Read FTSConfig.yaml file text
                     string PythonPath = Properties.Settings.Default.Pythondir.Replace(@"\", @"\\");
 
-                    _MainConfigfile = _MainConfigfile.Replace("</text>", PythonPath);
+                    _MainConfigfile = _MainConfigfile.Replace("</text>", PythonPath);// Replace `</text>` with the directory
                     _MainConfigfile = Regex.Replace(_MainConfigfile, @"\<ref.*?\</ref\>", "");
-                    File.WriteAllText(MainConfigfile, _MainConfigfile);
+                    File.WriteAllText(MainConfigfile, _MainConfigfile);//Write all to file
 
-                    _configfile = _configfile.Replace("</text>", PythonPath);
+                    _configfile = _configfile.Replace("</text>", PythonPath);// Replace `</text>` with the directory
                     _configfile = Regex.Replace(_configfile, @"\<ref.*?\</ref\>", "");
-                    File.WriteAllText(configfile, _configfile);
+                    File.WriteAllText(configfile, _configfile);//Write all to file
+
+                    _YamlConfigfile = _YamlConfigfile.Replace("</text>", PythonPath);// Replace `</text>` with the directory
+                    _YamlConfigfile = Regex.Replace(_YamlConfigfile, @"\<ref.*?\</ref\>", "");
+                    File.WriteAllText(YamlConfigfile, _YamlConfigfile);//Write all to file
                 }
 
             }
@@ -363,7 +369,8 @@ private void Installserver_button_Click(object sender, RoutedEventArgs e)
             //Install the server by sending install commands via the cmd
             string configfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI\config.py";
             string MainConfigfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\controllers\configuration\MainConfig.py";
-            if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile)))
+            string YamlConfigfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\FTSConfig.yaml";
+            if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile)) && Directory.Exists(Path.GetDirectoryName(YamlConfigfile)))
             {
                 MessageBox.Show("Server is already installed", "", MessageBoxButton.OK, MessageBoxImage.Information);
                 Logger.WriteLine(" *** Server is already installed  [MainForm] ***");

diff --git a/WPF/FreeTAKServer_Manager_WPF/FreeTAKServer_Manager_WPF.csproj b/WPF/FreeTAKServer_Manager_WPF/FreeTAKServer_Manager_WPF.csproj
@@ -126,6 +126,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="app.manifest" />
+    <None Include="FTSConfig.yaml" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/WinForms/.vs/FreeTAKServer_Manager/v16/.suo b/WinForms/.vs/FreeTAKServer_Manager/v16/.suo
diff --git a/WinForms/FreeTAKServer_Manager/FTSConfig.yaml b/WinForms/FreeTAKServer_Manager/FTSConfig.yaml
@@ -1,33 +1,33 @@
 Addresses:
-  #FTS_COT_PORT: 8087
-  #FTS_SSLCOT_PORT: 8089
+  FTS_COT_PORT: 8087
+  FTS_SSLCOT_PORT: 8089
   FTS_DP_ADDRESS: 0.0.0.0
   FTS_USER_ADDRESS: 0.0.0.0
-  #FTS_API_PORT: 19023
-  #FTS_FED_PORT: 9000
-  #FTS_API_ADDRESS: 0.0.0.0
+  FTS_API_PORT: 19023
+  FTS_FED_PORT: 9000
+  FTS_API_ADDRESS: 0.0.0.0
 FileSystem:
-  FTS_DB_PATH: /opt/FreeTAKServer.db
-  #FTS_COT_TO_DB: True
-  FTS_MAINPATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer
-  #FTS_CERTS_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs
-  #FTS_EXCHECK_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/ExCheck
-  #FTS_EXCHECK_TEMPLATE_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/ExCheck/template
-  #FTS_EXCHECK_CHECKLIST_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/ExCheck/checklist
-  #FTS_DATAPACKAGE_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/FreeTAKServerDataPackageFolder
-  #FTS_LOGFILE_PATH: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/Logs
+  FTS_DB_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\FreeTAKServer.db'
+  FTS_COT_TO_DB: True
+  FTS_MAINPATH: '</text>Lib\\site-packages\\FreeTAKServer'
+  FTS_CERTS_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\certs'
+  FTS_EXCHECK_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\ExCheck'
+  FTS_EXCHECK_TEMPLATE_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\ExCheck\\template'
+  FTS_EXCHECK_CHECKLIST_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\ExCheck\\checklist'
+  FTS_DATAPACKAGE_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\FreeTAKServerDataPackageFolder'
+  FTS_LOGFILE_PATH: '</text>Lib\\site-packages\\FreeTAKServer\\Logs'
 Certs:
-  #FTS_SERVER_KEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.key
-  #FTS_SERVER_PEMDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.pem
-  #FTS_TESTCLIENT_PEMDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/Client.pem
-  #FTS_TESTCLIENT_KEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/Client.key
-  #FTS_UNENCRYPTED_KEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.key.unencrypted
-  #FTS_SERVER_P12DIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.p12
-  #FTS_CADIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/ca.pem
-  #FTS_CAKEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/ca.key
-  #FTS_FEDERATION_CERTDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.pem
-  #FTS_FEDERATION_KEYDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/server.key
-  #FTS_CRLDIR: /usr/local/lib/python3.8/dist-packages/FreeTAKServer/certs/FTS_CRL.json
-  #FTS_FEDERATION_KEYPASS: demopassfed
-  #FTS_CLIENT_CERT_PASSWORD: demopasscert
-  #FTS_WEBSOCKET_KEY: YourWebsocketKey
+  FTS_SERVER_KEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.key'
+  FTS_SERVER_PEMDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.pem'
+  FTS_TESTCLIENT_PEMDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\Client.pem'
+  FTS_TESTCLIENT_KEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\Client.key'
+  FTS_UNENCRYPTED_KEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.key.unencrypted'
+  FTS_SERVER_P12DIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.p12'
+  FTS_CADIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\ca.pem'
+  FTS_CAKEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\ca.key'
+  FTS_FEDERATION_CERTDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.pem'
+  FTS_FEDERATION_KEYDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\server.key'
+  FTS_CRLDIR: '</text>Lib\\site-packages\\FreeTAKServer\\certs\\FTS_CRL.json'
+  FTS_FEDERATION_KEYPASS: 'defaultpass'
+  FTS_CLIENT_CERT_PASSWORD: 'supersecret'
+  FTS_WEBSOCKET_KEY: 'YourWebsocketKey'
diff --git a/WinForms/FreeTAKServer_Manager/Forms/MainForm.cs b/WinForms/FreeTAKServer_Manager/Forms/MainForm.cs
@@ -152,15 +152,21 @@ private void replaceText()
         {
             try
             {
+                string YamlConfigfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\FTSConfig.yaml";
                 string configfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI\config.py";
                 string MainConfigfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\controllers\configuration\MainConfig.py";
                 //If the files exist replace `</text>`
-                if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile))) 
+                if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile)) && Directory.Exists(Path.GetDirectoryName(YamlConfigfile))) 
                 {
                     string _configfile = File.ReadAllText(configfile, Encoding.UTF8);//Read config.py file text
                     string _MainConfigfile = File.ReadAllText(MainConfigfile, Encoding.UTF8);//Read MainConfig.py file text
+                    string _YamlConfigfile = File.ReadAllText(YamlConfigfile, Encoding.UTF8);//Read FTSConfig.yaml file text
                     string PythonPath = Properties.Settings.Default.Pythondir.Replace(@"\", @"\\");//Replace directory `\` with `\\`
 
+                    _YamlConfigfile = _YamlConfigfile.Replace("</text>", PythonPath);// Replace `</text>` with the directory
+                    _YamlConfigfile = Regex.Replace(_YamlConfigfile, @"\<ref.*?\</ref\>", "");
+                    File.WriteAllText(YamlConfigfile, _YamlConfigfile);//Write all to file
+
                     _MainConfigfile = _MainConfigfile.Replace("</text>", PythonPath);// Replace `</text>` with the directory
                     _MainConfigfile = Regex.Replace(_MainConfigfile, @"\<ref.*?\</ref\>", "");
                     File.WriteAllText(MainConfigfile, _MainConfigfile);//Write all to file
@@ -439,8 +445,9 @@ private void Installserver_button_Click(object sender, EventArgs e)
         {
             string configfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI\config.py";
             string MainConfigfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\controllers\configuration\MainConfig.py";
+            string YamlConfigfile = Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\FTSConfig.yaml";
             //Install the requirements file, the server and the UI
-            if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile)))
+            if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile)) && Directory.Exists(Path.GetDirectoryName(YamlConfigfile)))
             {
                 MessageBox.Show("Server is already installed", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 Logger.WriteLine(" *** Server is already installed  [MainForm] ***");
@@ -455,6 +462,7 @@ private void Installserver_button_Click(object sender, EventArgs e)
                     // /c pip install -r requirements.txt&&python -m pip install FreeTAKServer[ui]==1.8.1
                     // /c pip python -m pip install FreeTAKServer[ui]==1.7.5
                     int _Install = CMD_Instance.SendCMDCommandNormal("/c pip install -r requirements.txt&&python -m pip install FreeTAKServer[ui]==1.9.1.5", Application.StartupPath);
+                    File.Copy(Application.StartupPath + @"\FTSConfig.yaml", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\FTSConfig.yaml", true);
                     File.Copy(Application.StartupPath+ @"\config.py", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI\config.py", true);
                     File.Copy(Application.StartupPath+ @"\MainConfig.py", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\controllers\configuration\MainConfig.py", true);
                     replaceText();

diff --git a/WinForms/FreeTAKServer_Manager/FreeTAKServer_Manager.csproj b/WinForms/FreeTAKServer_Manager/FreeTAKServer_Manager.csproj
@@ -127,6 +127,7 @@
       <DependentUpon>ReadMe_Form.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.manifest" />
+    <None Include="FTSConfig.yaml" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>