From 8d827a89dc5bfa3d4ed9ce8dae21c1604c79b7af Mon Sep 17 00:00:00 2001 From: Dan Iverson Date: Mon, 23 May 2022 09:40:20 -0500 Subject: [PATCH 1/4] Fix typo in README for PS_TRAIL_SERVICE --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 958a208..a3a8397 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ 1. `APP_SERVICE_NAME` 1. `PRCS_SERVICE_NAME` * The override names must include `#{domain}` somewhere in the name. That is used by `psadmin-plus` to call the correct domain. E.g, `WEB_SERVICE_NAME="#{domain}-pia"` -* `PS_TRAIL_SERVICES` +* `PS_TRAIL_SERVICE` * On Windows, you can use this option to set the Windows service after starting/stopping a domain via psadmin. This lets you start/stop and view the domain output but keep the Windows service status in sync. * Options are: `true`, `false` * If note set, default is `false` From 8ab17d13f608a6c595e680b5a184d7d127f2e5a4 Mon Sep 17 00:00:00 2001 From: Dan Iverson Date: Mon, 23 May 2022 10:26:31 -0500 Subject: [PATCH 2/4] Change env var output to use '=' so you can copy/paste into .psa.conf --- lib/psadmin_plus.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/psadmin_plus.rb b/lib/psadmin_plus.rb index 431eea0..60b516e 100644 --- a/lib/psadmin_plus.rb +++ b/lib/psadmin_plus.rb @@ -194,16 +194,16 @@ def do_list 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_PARALLEL_BOOT: #{PS_PARALLEL_BOOT}" - puts "PS_PSA_DEBUG: #{PS_PSA_DEBUG}" + 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_PARALLEL_BOOT = #{PS_PARALLEL_BOOT}" + puts "PS_PSA_DEBUG = #{PS_PSA_DEBUG}" puts "" puts "app:" find_apps.each do |a| From 5e2c63a6e4047da1ecf023c9afe4060101314e37 Mon Sep 17 00:00:00 2001 From: Dan Iverson Date: Mon, 23 May 2022 10:37:13 -0500 Subject: [PATCH 3/4] Rebase from Github branch --- lib/psadmin_plus.rb | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/lib/psadmin_plus.rb b/lib/psadmin_plus.rb index a81d12a..0f0cbd5 100644 --- a/lib/psadmin_plus.rb +++ b/lib/psadmin_plus.rb @@ -222,17 +222,27 @@ def do_list puts "ps-cfg-home base: #{PS_MULTI_HOME}#{PS_MULTI_DELIMIT}*" 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_RUNTIME_USER = #{PS_RUNTIME_USER}" + puts "PS_PSA_SUDO = #{PS_PSA_SUDO}" + puts "PS_HOOK_INTERP = #{PS_HOOK_INTERP}" + puts "PS_HOOK_PRE = #{PS_HOOK_PRE}" + puts "PS_HOOK_POST = #{PS_HOOK_POST}" + puts "PS_HOOK_START = #{PS_HOOK_START}" + puts "PS_HOOK_STOP = #{PS_HOOK_STOP}" + 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_TRAIL_SERVICE = #{PS_TRAIL_SERVICE}" + puts "PS_MULT_HOME = #{PS_MULTI_HOME}" puts "PS_PARALLEL_BOOT = #{PS_PARALLEL_BOOT}" +<<<<<<< HEAD puts "PS_PSA_DEBUG = #{PS_PSA_DEBUG}" +======= + puts "PS_PSA_DEBUG = #{PS_PSA_DEBUG}" +>>>>>>> 14b95a0 (Add more env vars, fix alignment) puts "" puts "app:" find_apps.each do |a| From 1ca9fa0006de6a2e2909f03b7783987014da0013 Mon Sep 17 00:00:00 2001 From: Dan Iverson Date: Tue, 24 May 2022 21:18:54 -0500 Subject: [PATCH 4/4] Fix merge --- lib/psadmin_plus.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/psadmin_plus.rb b/lib/psadmin_plus.rb index 0f0cbd5..d70b4b5 100644 --- a/lib/psadmin_plus.rb +++ b/lib/psadmin_plus.rb @@ -237,12 +237,7 @@ def do_list puts "PS_TRAIL_SERVICE = #{PS_TRAIL_SERVICE}" puts "PS_MULT_HOME = #{PS_MULTI_HOME}" puts "PS_PARALLEL_BOOT = #{PS_PARALLEL_BOOT}" -<<<<<<< HEAD - puts "PS_PSA_DEBUG = #{PS_PSA_DEBUG}" - -======= puts "PS_PSA_DEBUG = #{PS_PSA_DEBUG}" ->>>>>>> 14b95a0 (Add more env vars, fix alignment) puts "" puts "app:" find_apps.each do |a|