psadmin_plus 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e4f004072143dcceec33f19bf0c955ca802def3
-  data.tar.gz: d4c444e6f95614d2af04aae2eacf3ea615e707a6
+SHA256:
+  metadata.gz: f9e50fadeb47fc6959bfef534bb1fb031c85dc7051291ccbf914df38731351e6
+  data.tar.gz: 54aefd4d1ed463119baf1450a9feec43dc46db9e11c83843d4d790b536ac7278
 SHA512:
-  metadata.gz: 81fd49adf9bc1f06ec09fe36bc6b5ffb27d307175f82695894800a257bb854faf8a9e7ff2d062b00c7c28e5473212d4e691de53c533cf026cd9dae76323ad86b
-  data.tar.gz: 338c75a0a247a97ac5b360f853410c32ca356afbe6c08a61b1835ab3d986f043c21f2d39108b5e338fe89d4d130b3b925462517d03de607e2daf7856ee2f0c7a
+  metadata.gz: a8255d51419c37a7cd16696202434131f4861d5a1f647dfc1558268801942cc72689e5ed6f4f492c10e64c941e732e42cc38c2af9c758d39b0dcf8e6194e5a45
+  data.tar.gz: 76cd40f2fb74de8824add86573a2766feed4f269039b9095e176fc4e71c8a5182a7bc2d885c05b5cd1d1deb8fbcdd7c44fbce7f2444b4c9d4519e2b8886bafee

data/bin/psa

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'psadmin_plus'
-#require_relative '../lib/psadmin_plus.rb'
 
 # options
 opts_c   = ARGV.shift || "help"
@@ -99,6 +98,9 @@ commands.each do |c|
                 when "configure"
                     do_cmd_banner(c,t,d)
                     do_configure(t,d)
+                when "reconfigure"
+                    do_cmd_banner(c,t,d)
+                    do_reconfigure(t,d)
                 when "purge"
                     do_cmd_banner(c,t,d)
                     do_purge(t,d)

data/lib/psadmin_plus.rb

@@ -18,6 +18,7 @@ def do_help
     puts "    stop           poolrm, if enabled, stop the domain"
     puts "    restart        stop and start the domain"
     puts "    purge          clear domain cache"
+    puts "    reconfigure    stop, configure, and start the domain"
     puts "    bounce         stop, flush, purge, configure and start the domain"
     puts "    kill           force stop the domain"
     puts "    configure      configure the domain"
@@ -97,6 +98,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 +269,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 +288,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 +300,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
@@ -462,6 +471,12 @@ def do_restart(type, domain)
     do_start(type, domain)
 end
 
+def do_reconfigure(type, domain)
+    do_stop(type, domain)
+    do_configure(type, domain)
+    do_start(type, domain)
+end
+
 def do_bounce(type, domain)
     do_stop(type, domain)
     do_purge(type, domain)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psadmin_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.4
 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: 2021-01-04 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