psadmin_plus 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8056966af1d96cab37eef2b3d1ce8443d591e7a20fd19241c2b7c341ca8138d
-  data.tar.gz: 0e1328ef04150ffdfb075d4f03a8fdd79bf0d93adb7a4a9c6f00c1787c48fb8d
+  metadata.gz: e3445fe6fb73cd8ff73f5bb50683da9f7026b34189ad67ab8a5d275912fd78e0
+  data.tar.gz: 4d9b587a041e904fce87da1dc320d50d32ddfa4791c7562083047527ed2c5a61
 SHA512:
-  metadata.gz: a9e9faa7ccd27456f442d6be195b9a1e6e90653f57f4f6dfd65534a23ade6f9174cd6d0d32a2eb6e9579cf07e436e3a8ceb88d6de01b725f5cf2d9abdf93b5b4
-  data.tar.gz: 5b36b16f29c20c79d52756c1bd2cda3f4207826345087097716a42ea5e6dd72229ed28939bfc7b54c2f6f4b6e1abcf613800189aa9e15ef583978b4f46eab971
+  metadata.gz: a6aa58f655c7629ef21813306a1fea351db343dcc54650bf85fe4d13f9481ffc637650bd6da4f3e9ccf4a9aec5b3b2c5f62653d80f9ff96cdfe9da088ee0a005
+  data.tar.gz: a6c8dd6186e7a8d938df4efcf38b468cff63485f4382bd381f9f17cb0fabea338f5e2a14aa59576495b65adc77f6dcfc0fddd208a1d67e5322445d9d9de8df9d

data/lib/psadmin_plus.rb

@@ -97,6 +97,7 @@ def do_cmd(cmd, print = true, powershell = true)
         out = "Invalid OS"
     end
     print ? (puts out) : result = out 
+    out
 end
 
 def do_cmd_banner(c,t,d)
@@ -267,7 +268,7 @@ def do_start(type, 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_cmd = "${PS_CFG_HOME?}/webserv/#{domain}/bin/startPIA.sh"
     start_web_service_cmd = "start-service #{web_service_name}"
 
     case type
@@ -296,7 +297,12 @@ def do_start(type, domain)
     when "web"
         case "#{OS_CONST}"
         when "linux"
-            do_cmd(start_web_cmd)
+            if File.exist?("#{ENV['PS_CFG_HOME']}/webserv/#{domain}/servers/PIA/tmp/PIA.lok")
+                puts "Domain #{domain} already started"
+            else
+                do_cmd(start_web_cmd)
+                sleep 5.0
+            end
         when "windows"
             case "#{PS_WIN_SERVICES}"
             when "web", "all"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psadmin_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Kyle Benson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies: []
 description: A psadmin helper tool
 email: kyle@psadmin.io