psadmin_plus 0.1.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 47ce42a7db4acd97417692af8913cfc3319f77cb
-  data.tar.gz: 5f773efd97773eb911b6ba56aa623eda105f71eb
+SHA256:
+  metadata.gz: 1b131e3db46750b3e5bca783ef3ea2c0f99c2abaa7d809c0dbd667f67e77252f
+  data.tar.gz: f9cd54cf1507085abd557c3229d538e4325a6c0f0938a7be2d8cf364f448bd70
 SHA512:
-  metadata.gz: '08aad82614e197ebd1f0ce216175d1bacc71023c3e49ae2d4d3643d9640ad958c880ea86b7891efcec8ab6db7bb6c61eef790d4e8d2d5af3ba4645ef3a6ab71d'
-  data.tar.gz: 37ce1d7b1e8295b9fbb450f142339e8a266318dc59625bcfc22ca014d5b777e230cbdcf91e4a8dfd68ea79d77ec61c627778202ad61eb654da14e544f826a4c2
+  metadata.gz: 4d48fdae790a0f0245a8d19addad355f897a27650d537a0b1f879fa6bc3d1fa905a6cd820dfdc0626f567b379570b875039e9b85d651c1d54efa5934e4b80e95
+  data.tar.gz: e45d8e1be2e0fdc5410245c0087769befe6651735cfaadc64f26f1f86374f5338496e349f609ea9c69b2bc0e1aad70275b531ce976727f64221508653fbedbb5

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,13 +268,15 @@ 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_lnx = "${PS_CFG_HOME?}/webserv/#{domain}/bin/startPIA.sh"
+    start_web_cmd_win = "#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}"
     start_web_service_cmd = "start-service #{web_service_name}"
 
+    # 10-08-2020 Dale Haman: Changing the logic used on PS_WIN_SERVICES, it will never be tux, app or all.
     case type
     when "app"
         case "#{PS_WIN_SERVICES}"
-        when "tux", "app", "all"
+        when "true", "tux", "app", "all"
             do_cmd(start_app_service_cmd)
         else
             do_cmd(start_app_cmd)
@@ -284,7 +287,7 @@ def do_start(type, domain)
         end
     when "prcs"
         case "#{PS_WIN_SERVICES}"
-        when "tux", "prcs", "all"
+        when "true", "tux", "prcs", "all"
             do_cmd(start_prcs_service_cmd)
         else
             do_cmd(start_prcs_cmd)
@@ -296,16 +299,21 @@ 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_lnx)
+                sleep 5.0
+            end
         when "windows"
             case "#{PS_WIN_SERVICES}"
-            when "web", "all"
+            when "true", "web", "all"
                 do_cmd(start_web_service_cmd)
             else
                 # Run command outside of powershell with 'false' parameter
-                do_cmd(start_web_cmd, true, false)
+                do_cmd(start_web_cmd_win, true, false)
                 case "#{PS_TRAIL_SERVICE}"
-                when "true"
+                when "true", "web", "all"
                     do_cmd(start_web_service_cmd)
                 end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psadmin_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 2.0.3
 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: 2020-10-13 00:00:00.000000000 Z
 dependencies: []
 description: A psadmin helper tool
 email: kyle@psadmin.io
@@ -39,8 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: psadmin plus