psadmin_plus 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5bea0d7536994143d1b28eb77cfa1d4d2d245d1
-  data.tar.gz: d018bfdb4ac02509dc9cf391fe6857190bc91097
+  metadata.gz: 397ca607a420faaa6d3dcf4228288bde4bc2111f
+  data.tar.gz: 9950cef3a48d6a30ec48a444e77f2abd5f15ed49
 SHA512:
-  metadata.gz: e17768a9ff8ac8352d33b522e691e19a2ad4d1e316156d2d2b2a88e3b47d18278df7233277f948dcf11a5029dcbcdd8cbc98fbedff3240d15fff304266719c21
-  data.tar.gz: a48e5720aa77cdf56adf97f7cc55b5cc03907c62d6c68058ea881f7c0ca1a1fb998ba2b335fbd94e90aa9175ff9965564222786c3f8cd8f5fbee6cf1b661ff02
+  metadata.gz: 2dd31bc25f3e44481be080348f4481e9545c4b3e2db5953d00651e637fe3e0d985000d27eac7ba1b25b4aba1aab5d44b1eb20370c699f37a0c96cfe0b9ca2a93
+  data.tar.gz: 3c2ab60f6550dcff753ab5e4e90cf9c730ff0100862a55ea8a86f958be4676f00e92597f327150a75e3d878cfd0bbd1fff8fad17ec2f923aaded7baa8e5029db

data/bin/psa

@@ -41,6 +41,7 @@ PS_HEALTH_TEXT      = ENV['PS_HEALTH_TEXT'] || "true"
 PS_PSA_SUDO         = ENV['PS_PSA_SUDO'] || "on"
 PS_PSADMIN_PATH     = "#{OS_CONST}" == "linux" ? "#{env('PS_HOME')}/bin" : "cmd /c #{env('PS_HOME')}/appserv"
 PS_WIN_SERVICES     = ENV['PS_WIN_SERVICES'] || "false"
+PS_TRAIL_SERVICE    = ENV['PS_TRAIL_SERVICE'] || "false"
 PS_MULTI_HOME       = ENV['PS_MULTI_HOME'] || "false"
 PS_PSA_DEBUG        = ENV['PS_PSA_DEBUG']  || "false"
 

data/lib/psadmin_plus.rb

@@ -257,31 +257,56 @@ def do_start(type, domain)
     app_service_name    = ENV['APP_SERVICE_NAME'] || "Psft*App*#{domain}*"
     prcs_service_name   = ENV['PRCS_SERVICE_NAME'] || "Psft*Prcs*#{domain}*"
 
+    start_app_cmd = "#{PS_PSADMIN_PATH}/psadmin -c boot -d #{domain}"
+    start_app_service_cmd = "start-service #{app_service_name}"
+    start_prcs_cmd = "#{PS_PSADMIN_PATH}/psadmin -p start -d #{domain}"
+    start_prcs_service_cmd = "start-service #{prcs_service_name}"   
+    start_web_cmd = "#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}"
+    start_web_service_cmd = "start-service #{web_service_name}"
+
     case type
     when "app"
         case "#{PS_WIN_SERVICES}"
-        when "true"
-            do_cmd("start-service #{app_service_name}")
+        when "tux"
+        when "app"
+        when "all"
+            do_cmd(start_app_service_cmd)
         else
-            do_cmd("#{PS_PSADMIN_PATH}/psadmin -c boot -d #{domain}")
+            do_cmd(start_app_cmd)
+            case "#{PS_TRAIL_SERVICE}"
+            when "true"
+                do_cmd(start_app_service_cmd)
+            end
         end
     when "prcs"
         case "#{PS_WIN_SERVICES}"
-        when "true"
-            do_cmd("start-service #{prcs_service_name}")
+        when "tux"
+        when "prcs"
+        when "all"
+            do_cmd(start_prcs_service_cmd)
         else
-            do_cmd("#{PS_PSADMIN_PATH}/psadmin -p start -d #{domain}")
+            do_cmd(start_prcs_cmd)
+            case "#{PS_TRAIL_SERVICE}"
+            when "true"
+                do_cmd(start_prcs_service_cmd)
+            end
         end
     when "web"
         case "#{OS_CONST}"
         when "linux"
-            do_cmd("#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}")
+            do_cmd(start_web_cmd)
         when "windows"
             case "#{PS_WIN_SERVICES}"
-            when "true"
-                do_cmd("start-service #{web_service_name}")
+            when "web"
+            when "all"
+                do_cmd(start_web_service_cmd)
             else
-                do_cmd("#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}", true, false)
+                # Run command outside of powershell with 'false' parameter
+                do_cmd(start_web_cmd, true, false)
+                case "#{PS_TRAIL_SERVICE}"
+                when "true"
+                    do_cmd(start_web_service_cmd)
+                end
             end
         end
         do_pooladd(type,domain)
@@ -299,32 +324,52 @@ def do_stop(type, domain)
     app_service_name    = ENV['APP_SERVICE_NAME'] || "Psft*App*#{domain}*"
     prcs_service_name   = ENV['PRCS_SERVICE_NAME'] || "Psft*Prcs*#{domain}*"
 
+    stop_app_cmd = "#{PS_PSADMIN_PATH}/psadmin -c shutdown -d #{domain}"
+    stop_app_service_cmd = "stop-service #{app_service_name}"
+    stop_prcs_cmd = "#{PS_PSADMIN_PATH}/psadmin -p stop -d #{domain}"
+    stop_prcs_service_cmd = "stop-service #{prcs_service_name}"   
+    stop_web_cmd_lnx = "${PS_CFG_HOME?}/webserv/#{domain}/bin/stopPIA.sh"
+    stop_web_cmd_win = "#{PS_PSADMIN_PATH}/psadmin -w shutdown -d #{domain}"
+    stop_web_service_cmd = "stop-service #{web_service_name}"
+
     case type
     when "app"
         case "#{PS_WIN_SERVICES}"
         when "true"
-            do_cmd("stop-service #{app_service_name}")
+            do_cmd(stop_app_service_cmd)
         else
-            do_cmd("#{PS_PSADMIN_PATH}/psadmin -c shutdown -d #{domain}")
+            do_cmd(stop_app_cmd)
+            case "#{PS_TRAIL_SERVICE}"
+            when "true"
+                do_cmd(stop_app_service_cmd)
+            end
         end
     when "prcs"
         case "#{PS_WIN_SERVICES}"
         when "true"
-            do_cmd("stop-service #{prcs_service_name}")
+            do_cmd(stop_prcs_service_cmd)
         else
-            do_cmd("#{PS_PSADMIN_PATH}/psadmin -p stop -d #{domain}")
+            do_cmd(stop_prcs_cmd)
+            case "#{PS_TRAIL_SERVICE}"
+            when "true"
+                do_cmd(stop_prcs_service_cmd)
+            end
         end
     when "web"
         do_poolrm(type,domain)
         case "#{OS_CONST}"
         when "linux"
-            do_cmd("${PS_CFG_HOME?}/webserv/#{domain}/bin/stopPIA.sh")
+            do_cmd(stop_web_cmd_lnx)
         when "windows"
             case "#{PS_WIN_SERVICES}"
             when "true"
-                do_cmd("stop-service #{web_service_name}")
+                do_cmd(stop_web_service_cmd)
             else
-                do_cmd("#{PS_PSADMIN_PATH}/psadmin -w shutdown -d #{domain}", true, false)
+                do_cmd(stop_web_cmd_win, true, false)
+                case "#{PS_TRAIL_SERVICE}"
+                when "true"
+                    do_cmd(stop_web_service_cmd)
+                end
             end
         end
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psadmin_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Kyle Benson