Update coreybutler#204 coreybutler#217 coreybutler#236

jmai00 · May 29, 2019 · e537a44 · e537a44
1 parent bf0cf09
commit e537a44
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/daemon.js b/lib/daemon.js
@@ -399,6 +399,7 @@ var daemon = function(config){
         account: null,
         password: null,
         domain: process.env.COMPUTERNAME,
+        allowServiceLogon: true,
         mungeCredentialsAfterInstall: true
       }
     },

diff --git a/lib/winsw.js b/lib/winsw.js
@@ -120,14 +120,14 @@ module.exports = {
     }
 
     // optionally set the service logon credentials
-    if (config.logOnAs && config.logOnAs.account && config.logOnAs.password &&
-      config.logOnAs.domain)
+    if (config.logOnAs)
     {
       xml.push({
         serviceaccount: [
-          {domain: config.logOnAs.domain},
-          {user: config.logOnAs.account},
-          {password: config.logOnAs.password}
+          {domain: config.logOnAs.domain || 'NT AUTHORITY'},
+          {user: config.logOnAs.account  || 'LocalSystem'},
+          {password: config.logOnAs.password || ''},
+          {allowservicelogon: config.logOnAs.allowServiceLogon}
         ]
       });
     }

diff --git a/lib/wrapper.js b/lib/wrapper.js
@@ -187,6 +187,7 @@ var killkid = function(){
 process.on('exit', killkid);
 process.on("SIGINT", killkid);
 process.on("SIGTERM", killkid);
+process.on("SIGKILL", killkid);
 
 // Launch the process
 launch('info', 'Starting ' + argv.f);