SecurdenRDP related changes added,

cedrozor · Apr 27, 2020 · e1164c2 · e1164c2
1 parent 4f083a8
commit e1164c2
Show file tree

Hide file tree

Showing 10 changed files with 420 additions and 194 deletions.
diff --git a/Myrtille.Services/Myrtille.Services.csproj b/Myrtille.Services/Myrtille.Services.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Myrtille.Services</RootNamespace>
-    <AssemblyName>Myrtille.Services</AssemblyName>
+    <AssemblyName>SecurdenRDP</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -31,7 +31,8 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>myrtille.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>

diff --git a/Myrtille.Services/Program.cs b/Myrtille.Services/Program.cs
@@ -94,11 +94,12 @@ private static void Main(string[] args)
             // database (enterprise mode)
             ConfigureEnterpriseDatabase();
 
+            /*
             if (!Environment.UserInteractive)
             {
                 Run(new Program());
             }
-            else
+            else*/
             {
                 var consoleTraceListener = new ConsoleTraceListener();
                 consoleTraceListener.Filter = new EventTypeFilter(SourceLevels.Information);

diff --git a/Myrtille.Services/ServicesInstaller.cs b/Myrtille.Services/ServicesInstaller.cs
@@ -71,7 +71,7 @@ public override void Install(
                 process.StartInfo.FileName = string.Format(@"{0}\WindowsPowerShell\v1.0\powershell.exe", Environment.Is64BitOperatingSystem && !Environment.Is64BitProcess ? Environment.SystemDirectory.ToLower().Replace("system32", "sysnative") : Environment.SystemDirectory);
                 process.StartInfo.Arguments = "-ExecutionPolicy Bypass" +
                     " -Command \"& '" + Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "Myrtille.Services.Install.ps1") + "'" +
-                    " -BinaryPath '" + Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "Myrtille.Services.exe") + "'" +
+                    " -BinaryPath '" + Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "SecurdenRDP.exe") + "'" +
                     " -DebugMode " + (debug ? "1" : "0") +
                     " | Tee-Object -FilePath '" + Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "log", "Myrtille.Services.Install.log") + "'" + "\"";
 
@@ -86,7 +86,7 @@ public override void Install(
 
                 // load config
                 var config = new XmlDocument();
-                var configPath = Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "Myrtille.Services.exe.config");
+                var configPath = Path.Combine(Path.GetFullPath(Context.Parameters["targetdir"]), "bin", "SecurdenRDP.exe.config");
                 config.Load(configPath);
 
                 var navigator = config.CreateNavigator();

diff --git a/Myrtille.Services/app.config b/Myrtille.Services/app.config
@@ -28,7 +28,7 @@
       <appender-ref ref="LogFileAppender" />
     </root>
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="..\log\Myrtille.Services.log" />
+      <param name="File" value="..\..\logs\SecurdenRDP.log" />
       <param name="AppendToFile" value="true" />
       <rollingStyle value="Size" />
       <maxSizeRollBackups value="10" />
@@ -111,47 +111,47 @@
         <endpoint address="" binding="wsDualHttpBinding" bindingConfiguration="wsDualHttpBindingCallback" contract="Myrtille.Services.Contracts.IRemoteSessionProcess" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8080/Myrtille/RemoteSessionProcess" />
+            <add baseAddress="http://localhost:5625/Myrtille/RemoteSessionProcess" />
           </baseAddresses>
         </host>
       </service>
       <service name="Myrtille.Services.FileStorage" behaviorConfiguration="ServiceBehavior">
         <endpoint address="" binding="basicHttpBinding" bindingConfiguration="basicHttpBindingFileStream" contract="Myrtille.Services.Contracts.IFileStorage" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8080/Myrtille/FileStorage" />
+            <add baseAddress="http://localhost:5625/Myrtille/FileStorage" />
           </baseAddresses>
         </host>
       </service>
       <service name="Myrtille.Services.PrinterService" behaviorConfiguration="ServiceBehavior">
         <endpoint address="" binding="basicHttpBinding" bindingConfiguration="basicHttpBindingFileStream" contract="Myrtille.Services.Contracts.IPrinterService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8080/Myrtille/PrinterService" />
+            <add baseAddress="http://localhost:5625/Myrtille/PrinterService" />
           </baseAddresses>
         </host>
       </service>
       <service name="Myrtille.Services.MFAAuthentication" behaviorConfiguration="ServiceBehavior">
         <endpoint address="" binding="basicHttpBinding" contract="Myrtille.Services.Contracts.IMFAAuthentication" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8080/Myrtille/MFAAuthentication" />
+            <add baseAddress="http://localhost:5625/Myrtille/MFAAuthentication" />
           </baseAddresses>
         </host>
       </service>
       <service name="Myrtille.Services.EnterpriseService" behaviorConfiguration="ServiceBehavior">
         <endpoint address="" binding="basicHttpBinding" contract="Myrtille.Services.Contracts.IEnterpriseService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8080/Myrtille/EnterpriseService" />
+            <add baseAddress="http://localhost:5625/Myrtille/EnterpriseService" />
           </baseAddresses>
         </host>
       </service>
       <service name="Myrtille.Services.ApplicationPoolService" behaviorConfiguration="ServiceBehavior">
         <endpoint address="" binding="basicHttpBinding" contract="Myrtille.Services.Contracts.IApplicationPoolService" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8080/Myrtille/ApplicationPoolService" />
+            <add baseAddress="http://localhost:5625/Myrtille/ApplicationPoolService" />
           </baseAddresses>
         </host>
       </service>