psadmin_plus 0.0.7 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/psa +1 -0
  3. data/lib/psadmin_plus.rb +62 -17
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c5bea0d7536994143d1b28eb77cfa1d4d2d245d1
4
- data.tar.gz: d018bfdb4ac02509dc9cf391fe6857190bc91097
3
+ metadata.gz: 397ca607a420faaa6d3dcf4228288bde4bc2111f
4
+ data.tar.gz: 9950cef3a48d6a30ec48a444e77f2abd5f15ed49
5
5
  SHA512:
6
- metadata.gz: e17768a9ff8ac8352d33b522e691e19a2ad4d1e316156d2d2b2a88e3b47d18278df7233277f948dcf11a5029dcbcdd8cbc98fbedff3240d15fff304266719c21
7
- data.tar.gz: a48e5720aa77cdf56adf97f7cc55b5cc03907c62d6c68058ea881f7c0ca1a1fb998ba2b335fbd94e90aa9175ff9965564222786c3f8cd8f5fbee6cf1b661ff02
6
+ metadata.gz: 2dd31bc25f3e44481be080348f4481e9545c4b3e2db5953d00651e637fe3e0d985000d27eac7ba1b25b4aba1aab5d44b1eb20370c699f37a0c96cfe0b9ca2a93
7
+ data.tar.gz: 3c2ab60f6550dcff753ab5e4e90cf9c730ff0100862a55ea8a86f958be4676f00e92597f327150a75e3d878cfd0bbd1fff8fad17ec2f923aaded7baa8e5029db
data/bin/psa CHANGED
@@ -41,6 +41,7 @@ PS_HEALTH_TEXT = ENV['PS_HEALTH_TEXT'] || "true"
41
41
  PS_PSA_SUDO = ENV['PS_PSA_SUDO'] || "on"
42
42
  PS_PSADMIN_PATH = "#{OS_CONST}" == "linux" ? "#{env('PS_HOME')}/bin" : "cmd /c #{env('PS_HOME')}/appserv"
43
43
  PS_WIN_SERVICES = ENV['PS_WIN_SERVICES'] || "false"
44
+ PS_TRAIL_SERVICE = ENV['PS_TRAIL_SERVICE'] || "false"
44
45
  PS_MULTI_HOME = ENV['PS_MULTI_HOME'] || "false"
45
46
  PS_PSA_DEBUG = ENV['PS_PSA_DEBUG'] || "false"
46
47
 
data/lib/psadmin_plus.rb CHANGED
@@ -257,31 +257,56 @@ def do_start(type, domain)
257
257
  app_service_name = ENV['APP_SERVICE_NAME'] || "Psft*App*#{domain}*"
258
258
  prcs_service_name = ENV['PRCS_SERVICE_NAME'] || "Psft*Prcs*#{domain}*"
259
259
 
260
+ start_app_cmd = "#{PS_PSADMIN_PATH}/psadmin -c boot -d #{domain}"
261
+ start_app_service_cmd = "start-service #{app_service_name}"
262
+ start_prcs_cmd = "#{PS_PSADMIN_PATH}/psadmin -p start -d #{domain}"
263
+ start_prcs_service_cmd = "start-service #{prcs_service_name}"
264
+ start_web_cmd = "#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}"
265
+ start_web_service_cmd = "start-service #{web_service_name}"
266
+
260
267
  case type
261
268
  when "app"
262
269
  case "#{PS_WIN_SERVICES}"
263
- when "true"
264
- do_cmd("start-service #{app_service_name}")
270
+ when "tux"
271
+ when "app"
272
+ when "all"
273
+ do_cmd(start_app_service_cmd)
265
274
  else
266
- do_cmd("#{PS_PSADMIN_PATH}/psadmin -c boot -d #{domain}")
275
+ do_cmd(start_app_cmd)
276
+ case "#{PS_TRAIL_SERVICE}"
277
+ when "true"
278
+ do_cmd(start_app_service_cmd)
279
+ end
267
280
  end
268
281
  when "prcs"
269
282
  case "#{PS_WIN_SERVICES}"
270
- when "true"
271
- do_cmd("start-service #{prcs_service_name}")
283
+ when "tux"
284
+ when "prcs"
285
+ when "all"
286
+ do_cmd(start_prcs_service_cmd)
272
287
  else
273
- do_cmd("#{PS_PSADMIN_PATH}/psadmin -p start -d #{domain}")
288
+ do_cmd(start_prcs_cmd)
289
+ case "#{PS_TRAIL_SERVICE}"
290
+ when "true"
291
+ do_cmd(start_prcs_service_cmd)
292
+ end
274
293
  end
275
294
  when "web"
276
295
  case "#{OS_CONST}"
277
296
  when "linux"
278
- do_cmd("#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}")
297
+ do_cmd(start_web_cmd)
279
298
  when "windows"
280
299
  case "#{PS_WIN_SERVICES}"
281
- when "true"
282
- do_cmd("start-service #{web_service_name}")
300
+ when "web"
301
+ when "all"
302
+ do_cmd(start_web_service_cmd)
283
303
  else
284
- do_cmd("#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}", true, false)
304
+ # Run command outside of powershell with 'false' parameter
305
+ do_cmd(start_web_cmd, true, false)
306
+ case "#{PS_TRAIL_SERVICE}"
307
+ when "true"
308
+ do_cmd(start_web_service_cmd)
309
+ end
285
310
  end
286
311
  end
287
312
  do_pooladd(type,domain)
@@ -299,32 +324,52 @@ def do_stop(type, domain)
299
324
  app_service_name = ENV['APP_SERVICE_NAME'] || "Psft*App*#{domain}*"
300
325
  prcs_service_name = ENV['PRCS_SERVICE_NAME'] || "Psft*Prcs*#{domain}*"
301
326
 
327
+ stop_app_cmd = "#{PS_PSADMIN_PATH}/psadmin -c shutdown -d #{domain}"
328
+ stop_app_service_cmd = "stop-service #{app_service_name}"
329
+ stop_prcs_cmd = "#{PS_PSADMIN_PATH}/psadmin -p stop -d #{domain}"
330
+ stop_prcs_service_cmd = "stop-service #{prcs_service_name}"
331
+ stop_web_cmd_lnx = "${PS_CFG_HOME?}/webserv/#{domain}/bin/stopPIA.sh"
332
+ stop_web_cmd_win = "#{PS_PSADMIN_PATH}/psadmin -w shutdown -d #{domain}"
333
+ stop_web_service_cmd = "stop-service #{web_service_name}"
334
+
302
335
  case type
303
336
  when "app"
304
337
  case "#{PS_WIN_SERVICES}"
305
338
  when "true"
306
- do_cmd("stop-service #{app_service_name}")
339
+ do_cmd(stop_app_service_cmd)
307
340
  else
308
- do_cmd("#{PS_PSADMIN_PATH}/psadmin -c shutdown -d #{domain}")
341
+ do_cmd(stop_app_cmd)
342
+ case "#{PS_TRAIL_SERVICE}"
343
+ when "true"
344
+ do_cmd(stop_app_service_cmd)
345
+ end
309
346
  end
310
347
  when "prcs"
311
348
  case "#{PS_WIN_SERVICES}"
312
349
  when "true"
313
- do_cmd("stop-service #{prcs_service_name}")
350
+ do_cmd(stop_prcs_service_cmd)
314
351
  else
315
- do_cmd("#{PS_PSADMIN_PATH}/psadmin -p stop -d #{domain}")
352
+ do_cmd(stop_prcs_cmd)
353
+ case "#{PS_TRAIL_SERVICE}"
354
+ when "true"
355
+ do_cmd(stop_prcs_service_cmd)
356
+ end
316
357
  end
317
358
  when "web"
318
359
  do_poolrm(type,domain)
319
360
  case "#{OS_CONST}"
320
361
  when "linux"
321
- do_cmd("${PS_CFG_HOME?}/webserv/#{domain}/bin/stopPIA.sh")
362
+ do_cmd(stop_web_cmd_lnx)
322
363
  when "windows"
323
364
  case "#{PS_WIN_SERVICES}"
324
365
  when "true"
325
- do_cmd("stop-service #{web_service_name}")
366
+ do_cmd(stop_web_service_cmd)
326
367
  else
327
- do_cmd("#{PS_PSADMIN_PATH}/psadmin -w shutdown -d #{domain}", true, false)
368
+ do_cmd(stop_web_cmd_win, true, false)
369
+ case "#{PS_TRAIL_SERVICE}"
370
+ when "true"
371
+ do_cmd(stop_web_service_cmd)
372
+ end
328
373
  end
329
374
  end
330
375
  else
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: psadmin_plus
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kyle Benson