Added ability to set custom account when installing windows service

hibernating-rhinos · Sep 13, 2011 · 8255b18 · 8255b18
1 parent 9a269c0
commit 8255b18
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/Rhino.ServiceBus.Host/Actions/InstallAction.cs b/Rhino.ServiceBus.Host/Actions/InstallAction.cs
@@ -15,7 +15,17 @@ public void Execute(ExecutingOptions options)
                 Description = options.Name,
                 Context = new InstallContext()
             };
-
+
+            if (!string.IsNullOrEmpty(options.Account))
+            {
+                if (string.IsNullOrEmpty(options.Password))
+                {
+                    throw new InvalidOperationException("When /Action is Install and /Account is set /Password is required.");
+                }
+
+                installer.SetUserAccount(options.Account, options.Password);
+            }
+
 			installer.Context.Parameters.Add("assemblypath", GetType().Assembly.Location);
 
 			installer.Install(new Hashtable());

diff --git a/Rhino.ServiceBus.Host/ExecutingOptions.cs b/Rhino.ServiceBus.Host/ExecutingOptions.cs
@@ -14,6 +14,7 @@ public class ExecutingOptions
         [Argument(ArgumentType.Required, HelpText = "Service name", ShortName = "name")] public string Name;
 
         [Argument(ArgumentType.AtMostOnce, LongName = "Account")] public string Account;
+        [Argument(ArgumentType.AtMostOnce, HelpText="Password for account used when installing service")]public string Password;
 
         [Argument(ArgumentType.AtMostOnce, LongName = "Host")] public string Host;
         [Argument(ArgumentType.AtMostOnce, LongName = "BootStrapper")] public string BootStrapper;
@@ -26,12 +27,6 @@ public override string ToString()
                 .Append(Name)
 				.Append("\"");
 
-            if(string.IsNullOrEmpty(Account)==false)
-            {
-                sb.Append(" /Account:")
-                .Append(Account);
-            }
-
             if (string.IsNullOrEmpty(Host)==false)
             {
                 sb.Append(" \"/Host:")

diff --git a/Rhino.ServiceBus.Host/ProjectInstaller.cs b/Rhino.ServiceBus.Host/ProjectInstaller.cs
@@ -20,13 +20,12 @@ public string ServiceName
 			}
 		}
 
-	    public ServiceAccount Account
-	    {
-	        get
-	        {
-	            return serviceProcessInstaller1.Account;
-	        }
-	    }
+		public void SetUserAccount(string username, string password)
+		{
+			serviceProcessInstaller1.Account = ServiceAccount.User;
+			serviceProcessInstaller1.Username = username;
+			serviceProcessInstaller1.Password = password;
+		}
 
 		public ProjectInstaller()
 		{