psadmin_plus 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08053857b9d46dfc80c308ea92265216f267c7da
-  data.tar.gz: 81df426b700e5bb882bf93f7fd7979fdaa22d03d
+  metadata.gz: c5bea0d7536994143d1b28eb77cfa1d4d2d245d1
+  data.tar.gz: d018bfdb4ac02509dc9cf391fe6857190bc91097
 SHA512:
-  metadata.gz: 87bec5891e6a3bb8952ba9485a24c3ef8ccf05746117ab98b242dcd829a546d6e6bf448ca0f11b6e41d95fd37b7919a306e77e0bc029137ae45e45ab083f42ee
-  data.tar.gz: 9efbe7b0ccdb11fbca9fc24be60a6bc8d59fd0e1653c06b0f3395b654a039769ce24edf12bf8ad005a404e75e2229489de1aa0cc2f385dc9bcbfeb1a4e47f25b
+  metadata.gz: e17768a9ff8ac8352d33b522e691e19a2ad4d1e316156d2d2b2a88e3b47d18278df7233277f948dcf11a5029dcbcdd8cbc98fbedff3240d15fff304266719c21
+  data.tar.gz: a48e5720aa77cdf56adf97f7cc55b5cc03907c62d6c68058ea881f7c0ca1a1fb998ba2b335fbd94e90aa9175ff9965564222786c3f8cd8f5fbee6cf1b661ff02

data/bin/psa

@@ -4,9 +4,10 @@ require 'psadmin_plus'
 #require_relative '../lib/psadmin_plus.rb'
 
 # options
-opts_c = ARGV.shift || "help"
-opts_t = ARGV.shift || "all"
-opts_d = ARGV.shift || "all"
+opts_c   = ARGV.shift || "help"
+opts_t   = ARGV.shift || "all"
+opts_d   = ARGV.shift || "all"
+opt_cfg  = ARGV.shift
 
 commands = opts_c.split(',')
 types = opts_t.split(',')
@@ -15,6 +16,8 @@ domains = opts_d.split(',')
 if types.include? "all" then types = ['app','prcs','web'] end
 if domains.include? "all" then all_domains = true end
 
+
+
 # setup environment
 PS_PSA_CONF = ENV['PS_PSA_CONF'] || "#{ENV['HOME']}/.psa.conf"
 if File.exists?(PS_PSA_CONF) then
@@ -29,13 +32,17 @@ if File.exists?(PS_PSA_CONF) then
 end
 
 # constants
-OS_CONST = os
-PS_RUNTIME_USER = ENV['PS_RUNTIME_USER'] || "psadm2"
-PS_POOL_MGMT = ENV['PS_POOL_MGMT'] || "on"
-PS_HEALTH_FILE = ENV['PS_HEALTH_FILE'] || "health.html"
-PS_HEALTH_TIME = ENV['PS_HEALTH_TIME'] || "60"
-PS_PSA_SUDO = ENV['PS_PSA_SUDO'] || "on"
-PS_PSADMIN_PATH = "#{OS_CONST}" == "linux" ? "#{env('PS_HOME')}/bin" : "cmd /c #{env('PS_HOME')}/appserv"
+OS_CONST            = os
+PS_RUNTIME_USER     = ENV['PS_RUNTIME_USER'] || "psadm2"
+PS_POOL_MGMT        = ENV['PS_POOL_MGMT'] || "on"
+PS_HEALTH_FILE      = ENV['PS_HEALTH_FILE'] || "health.html"
+PS_HEALTH_TIME      = ENV['PS_HEALTH_TIME'] || "60"
+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_MULTI_HOME       = ENV['PS_MULTI_HOME'] || "false"
+PS_PSA_DEBUG        = ENV['PS_PSA_DEBUG']  || "false"
 
 # validation
 # check runtime user

data/lib/psadmin_plus.rb

@@ -50,24 +50,49 @@ def do_is_runtime_user_win
 end
 
 def env(var)
-   result = "#{OS_CONST}" == "linux" ? "${#{var}}" : "$env:#{var}"
+   result = "#{OS_CONST}" == "linux" ? "${#{var}}" : "%#{var}%"
 end
 
-def do_cmd(cmd, print = true)
+def do_cmd(cmd, print = true, powershell = true)
     case "#{OS_CONST}"
     when "linux"
         if do_is_runtime_user_nix
+            case "#{PS_PSA_DEBUG}"
+            when true
+                p "Command: #{cmd}"
+            end
             out = `#{cmd}`
         else
             if "#{PS_PSA_SUDO}" == "on"
+                case "#{PS_PSA_DEBUG}"
+                when true
+                    p "Command: sudo su - #{PS_RUNTIME_USER} -c '#{cmd}'"
+                end
                 out = `sudo su - #{PS_RUNTIME_USER} -c '#{cmd}'`
             else
                 print "#{PS_RUNTIME_USER} "
+                case "#{PS_PSA_DEBUG}"
+                when true
+                    p "Command: su - #{PS_RUNTIME_USER} -c '#{cmd}'"
+                end
                 out = `su - #{PS_RUNTIME_USER} -c '#{cmd}'`
             end
         end
     when "windows"
-        out = `powershell -NoProfile -Command "#{cmd}"`
+        case powershell
+        when true
+            case "#{PS_PSA_DEBUG}"
+            when true
+                p "Command: powershell -NoProfile -Command \"#{cmd}\""
+            end
+            out = `powershell -NoProfile -Command "#{cmd}"`
+        else
+            case "#{PS_PSA_DEBUG}"
+            when true
+                p "Command: #{cmd}"
+            end
+            out = `#{cmd}`
+        end
     else
         out = "Invalid OS"
     end
@@ -80,32 +105,62 @@ def do_cmd_banner(c,t,d)
 end
 
 def find_apps_nix
-    apps = do_cmd("find #{env('PS_CFG_HOME')}/appserv/*/psappsrv.ubx",false).split(/\n+/)
+    case "#{PS_MULTI_HOME}"
+    when "false"
+        apps = do_cmd("find #{env('PS_CFG_HOME')}/appserv/*/psappsrv.ubx",false).split(/\n+/)
+    else
+        apps = do_cmd("find #{PS_MULTI_HOME}/*/appserv/*/psappsrv.ubx",false).split(/\n+/)
+    end
     apps.map! {|app| app.split("/")[-2]}
 end
 
 def find_prcss_nix
-    prcss = do_cmd("find #{env('PS_CFG_HOME')}/appserv/prcs/*/psprcsrv.ubx",false).split(/\n+/)
+    case "#{PS_MULTI_HOME}"
+    when "false"
+        prcss = do_cmd("find #{env('PS_CFG_HOME')}/appserv/prcs/*/psprcsrv.ubx",false).split(/\n+/)
+    else 
+        prcss = do_cmd("find #{PS_MULTI_HOME}/*/appserv/prcs/*/psprcsrv.ubx",false).split(/\n+/)
+    end
     prcss.map! {|prcs| prcs.split("/")[-2]}
 end
 
 def find_webs_nix
-    webs = do_cmd("find #{env('PS_CFG_HOME')}/webserv/*/piaconfig -maxdepth 0",false).split(/\n+/)
+    case "#{PS_MULTI_HOME}"
+    when "false"
+        webs = do_cmd("find #{env('PS_CFG_HOME')}/webserv/*/piaconfig -maxdepth 0",false).split(/\n+/)
+    else
+        webs = do_cmd("find #{PS_MULTI_HOME}/*/webserv/*/piaconfig -maxdepth 0",false).split(/\n+/)
+    end
     webs.map! {|web| web.split("/")[-2]}
 end
 
 def find_apps_win
-    apps = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/appserv/*/psappsrv.ubx | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    case "#{PS_MULTI_HOME}"
+    when "false"
+        apps = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/appserv/*/psappsrv.ubx | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    else
+        apps = do_cmd("(get-childitem #{PS_MULTI_HOME}/*/appserv/*/psappsrv.ubx | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    end
     apps.map! {|app| app.split('\\')[-2]}
 end
 
 def find_prcss_win
-    prcss = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/appserv/prcs/*/psprcsrv.ubx | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    case "#{PS_MULTI_HOME}"
+    when "false"
+        prcss = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/appserv/prcs/*/psprcsrv.ubx | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    else
+        prcss = do_cmd("(get-childitem #{PS_MULTI_HOME}/*/appserv/prcs/*/psprcsrv.ubx | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    end
     prcss.map! {|prcs| prcs.split("\\")[-2]}
 end
 
 def find_webs_win
-    webs = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/webserv/*/piaconfig | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    case "#{PS_MULTI_HOME}"
+    when "false"
+        webs = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/webserv/*/piaconfig | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    else
+        webs = do_cmd("(get-childitem #{PS_MULTI_HOME}/*/webserv/*/piaconfig | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
+    end
     webs.map! {|web| web.split("\\")[-2]}
 end
 
@@ -133,13 +188,19 @@ def do_list
     puts "---"
     print "hostname:        " ; do_cmd('hostname')
     print "ps-home:         " ; do_cmd('echo ' + env('PS_HOME'))
-    print "ps-cfg-home:     " ; do_cmd('echo ' + env('PS_CFG_HOME'))
+    if PS_MULTI_HOME == "false" 
+        print "ps-cfg-home:     " ; do_cmd('echo ' + env('PS_CFG_HOME'))
+    end
     puts ""
     puts "PS_RUNTIME_USER: #{PS_RUNTIME_USER}"
     puts "PS_PSA_SUDO:     #{PS_PSA_SUDO}"
     puts "PS_POOL_MGMT:    #{PS_POOL_MGMT}"
     puts "PS_HEALTH_FILE:  #{PS_HEALTH_FILE}"
     puts "PS_HEALTH_TIME:  #{PS_HEALTH_TIME}"
+    puts "PS_HEALTH_TEXT:  #{PS_HEALTH_TEXT}"
+    puts "PS_WIN_SERVICES: #{PS_WIN_SERVICES}"
+    puts "PS_MULT_HOME:    #{PS_MULTI_HOME}"
+    puts "PS_PSA_DEBUG:    #{PS_PSA_DEBUG}"
     puts "" 
     puts "app:"
     find_apps.each do |a|
@@ -159,11 +220,19 @@ def do_list
 end
 
 def do_summary
+    if "#{PS_MULTI_HOME}" != "false"
+        ENV['PS_CFG_HOME'] = "#{PS_MULTI_HOME}/#{domain}"
+    end
+
     do_cmd("#{PS_PSADMIN_PATH}/psadmin -envsummary")
     #do_status("web","all")
 end
 
 def do_status(type, domain)
+    if "#{PS_MULTI_HOME}" != "false"
+        ENV['PS_CFG_HOME'] = "#{PS_MULTI_HOME}/#{domain}"
+    end
+
     case type
     when "app"
         do_cmd("#{PS_PSADMIN_PATH}/psadmin -c sstatus -d #{domain}")
@@ -180,31 +249,83 @@ def do_status(type, domain)
 end
 
 def do_start(type, domain)
+    if "#{PS_MULTI_HOME}" != "false"
+        ENV['PS_CFG_HOME'] = "#{PS_MULTI_HOME}/#{domain}"
+    end
+
+    web_service_name    = ENV['WEB_SERVICE_NAME'] || "Psft*Pia*#{domain}*"
+    app_service_name    = ENV['APP_SERVICE_NAME'] || "Psft*App*#{domain}*"
+    prcs_service_name   = ENV['PRCS_SERVICE_NAME'] || "Psft*Prcs*#{domain}*"
+
     case type
     when "app"
-        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c boot -d #{domain}")
+        case "#{PS_WIN_SERVICES}"
+        when "true"
+            do_cmd("start-service #{app_service_name}")
+        else
+            do_cmd("#{PS_PSADMIN_PATH}/psadmin -c boot -d #{domain}")
+        end
     when "prcs"
-        do_cmd("#{PS_PSADMIN_PATH}/psadmin -p start -d #{domain}")
+        case "#{PS_WIN_SERVICES}"
+        when "true"
+            do_cmd("start-service #{prcs_service_name}")
+        else
+            do_cmd("#{PS_PSADMIN_PATH}/psadmin -p start -d #{domain}")
+        end
     when "web"
-        do_cmd("#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}")
+        case "#{OS_CONST}"
+        when "linux"
+            do_cmd("#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}")
+        when "windows"
+            case "#{PS_WIN_SERVICES}"
+            when "true"
+                do_cmd("start-service #{web_service_name}")
+            else
+                do_cmd("#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}", true, false)
+            end
+        end
+        do_pooladd(type,domain)
     else
         puts "Invalid type, see psa help"
     end
 end
 
 def do_stop(type, domain)
+    if "#{PS_MULTI_HOME}" != "false"
+        ENV['PS_CFG_HOME'] = "#{PS_MULTI_HOME}/#{domain}"
+    end
+    
+    web_service_name    = ENV['WEB_SERVICE_NAME'] || "Psft*Pia*#{domain}*"
+    app_service_name    = ENV['APP_SERVICE_NAME'] || "Psft*App*#{domain}*"
+    prcs_service_name   = ENV['PRCS_SERVICE_NAME'] || "Psft*Prcs*#{domain}*"
+
     case type
     when "app"
-        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c shutdown -d #{domain}")
+        case "#{PS_WIN_SERVICES}"
+        when "true"
+            do_cmd("stop-service #{app_service_name}")
+        else
+            do_cmd("#{PS_PSADMIN_PATH}/psadmin -c shutdown -d #{domain}")
+        end
     when "prcs"
-        do_cmd("#{PS_PSADMIN_PATH}/psadmin -p stop -d #{domain}")
+        case "#{PS_WIN_SERVICES}"
+        when "true"
+            do_cmd("stop-service #{prcs_service_name}")
+        else
+            do_cmd("#{PS_PSADMIN_PATH}/psadmin -p stop -d #{domain}")
+        end
     when "web"
+        do_poolrm(type,domain)
         case "#{OS_CONST}"
         when "linux"
             do_cmd("${PS_CFG_HOME?}/webserv/#{domain}/bin/stopPIA.sh")
         when "windows"
-            # do_cmd("#{PS_PSADMIN_PATH}/psadmin -w shutdown! -d #{domain}".gsub('/','\\'))
-            do_cmd("cmd /c ${env:PS_CFG_HOME}/webserv/#{domain}/bin/stopPIA.cmd".gsub('/','\\'))
+            case "#{PS_WIN_SERVICES}"
+            when "true"
+                do_cmd("stop-service #{web_service_name}")
+            else
+                do_cmd("#{PS_PSADMIN_PATH}/psadmin -w shutdown -d #{domain}", true, false)
+            end
         end
     else
         puts "Invalid type, see psa help"
@@ -212,19 +333,32 @@ def do_stop(type, domain)
 end
 
 def do_kill(type, domain)
+    if "#{PS_MULTI_HOME}" != "false"
+        ENV['PS_CFG_HOME'] = "#{PS_MULTI_HOME}/#{domain}"
+    end
+
     case type
     when "app"
         do_cmd("#{PS_PSADMIN_PATH}/psadmin -c shutdown! -d #{domain}")
     when "prcs"
         do_cmd("#{PS_PSADMIN_PATH}/psadmin -p kill -d #{domain}")
     when "web"
-        return # web kill n/a
+        case "#{OS_CONST}"
+        when "windows"
+            do_cmd("(gwmi win32_process | where {$_.Name -eq 'Java.exe'} | where {$_.CommandLine -match '#{domain}'}).ProcessId  -ErrorAction SilentlyContinue | % { stop-process $_ -force } -ErrorAction SilentlyContinue")
+        when "linux"
+            return #kill n/a
+        end
     else
         puts "Invalid type, see psa help"
     end
 end
 
 def do_configure(type, domain)
+    if "#{PS_MULTI_HOME}" != "false"
+        ENV['PS_CFG_HOME'] = "#{PS_MULTI_HOME}/#{domain}"
+    end
+
     case type
     when "app"
         do_cmd("#{PS_PSADMIN_PATH}/psadmin -c configure -d #{domain}")
@@ -238,6 +372,10 @@ def do_configure(type, domain)
 end
 
 def do_purge(type, domain)
+    if "#{PS_MULTI_HOME}" != "false"
+        ENV['PS_CFG_HOME'] = "#{PS_MULTI_HOME}/#{domain}"
+    end
+
     case type
     when "app"
         do_cmd("#{PS_PSADMIN_PATH}/psadmin -c purge -d #{domain}")
@@ -249,7 +387,7 @@ def do_purge(type, domain)
             do_cmd("rm -rf ${PS_CFG_HOME?}/webserv/#{domain}/applications/peoplesoft/PORTAL*/*/cache*/")
             puts "web cache purged"
         when "windows"
-            do_cmd("Remove-Item $(Get-ChildItem ${env:PS_CFG_HOME}/webserv/#{domain}/applications/peoplesoft/PORTAL*/*/cache*/ | ?{ $_.PSIsContainer}) -recurse -force".gsub('/','\\'))
+            do_cmd("Remove-Item $(Get-ChildItem ${env:PS_CFG_HOME}/webserv/#{domain}/applications/peoplesoft/PORTAL*/*/cache*/ | ?{ $_.PSIsContainer}) -recurse -force -ErrorAction SilentlyContinue".gsub('/','\\'))
         end
     else
         puts "Invalid type, see psa help"
@@ -257,6 +395,10 @@ def do_purge(type, domain)
 end
 
 def do_flush(type, domain)
+    if "#{PS_MULTI_HOME}" != "false"
+        ENV['PS_CFG_HOME'] = "#{PS_MULTI_HOME}/#{domain}"
+    end
+
     case type
     when "app"
         do_cmd("#{PS_PSADMIN_PATH}/psadmin -c cleanipc -d #{domain}")
@@ -284,9 +426,9 @@ end
 
 def do_pooladd(type, domain)
     if PS_POOL_MGMT == "on" then
-        # Change this function to match your pool member addtion process
+        # Change PS_HEALTH_TEXT and PS_HEALTH_FILE variables to match your system
         puts "Adding web domain to load balanced pool..."
-        do_cmd("echo 'true' > #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{PS_HEALTH_FILE}")
+        do_cmd("echo '#{PS_HEALTH_TEXT}' > #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{PS_HEALTH_FILE}")
         sleep(PS_HEALTH_TIME.to_i)
         puts "...domain added to pool."
         puts ""
@@ -297,13 +439,13 @@ end
 
 def do_poolrm(type,domain)
     if PS_POOL_MGMT == "on" then
-        # Change this function to match your pool member removal process
+        # Change PS_HEALTH_TEXT and PS_HEALTH_FILE variables to match your system
         puts "Removing domain from load balanced pool..."
         case "#{OS_CONST}"
         when "linux"
             do_cmd("rm -f #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{PS_HEALTH_FILE}")
         when "windows"
-            do_cmd("remove-item -force #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{PS_HEALTH_FILE}")
+            do_cmd("remove-item -force #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{PS_HEALTH_FILE} -ErrorAction SilentlyContinue")
         else
             puts " badOS - #{OS_CONST}"
         end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: psadmin_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kyle Benson
+- Dan Iverson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies: []
 description: A psadmin helper tool
 email: kyle@psadmin.io
@@ -17,8 +18,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/psadmin_plus.rb
 - bin/psa
+- lib/psadmin_plus.rb
 homepage: https://github.com/psadmin-io/psadmin-plus
 licenses:
 - MIT
@@ -29,17 +30,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: psadmin plus