Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/psadmin_plus.rb +8 -2
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
---
2
2
SHA256:
3
- metadata.gz: b8056966af1d96cab37eef2b3d1ce8443d591e7a20fd19241c2b7c341ca8138d
4
- data.tar.gz: 0e1328ef04150ffdfb075d4f03a8fdd79bf0d93adb7a4a9c6f00c1787c48fb8d
3
+ metadata.gz: e3445fe6fb73cd8ff73f5bb50683da9f7026b34189ad67ab8a5d275912fd78e0
4
+ data.tar.gz: 4d9b587a041e904fce87da1dc320d50d32ddfa4791c7562083047527ed2c5a61
5
5
SHA512:
6
- metadata.gz: a9e9faa7ccd27456f442d6be195b9a1e6e90653f57f4f6dfd65534a23ade6f9174cd6d0d32a2eb6e9579cf07e436e3a8ceb88d6de01b725f5cf2d9abdf93b5b4
7
- data.tar.gz: 5b36b16f29c20c79d52756c1bd2cda3f4207826345087097716a42ea5e6dd72229ed28939bfc7b54c2f6f4b6e1abcf613800189aa9e15ef583978b4f46eab971
6
+ metadata.gz: a6aa58f655c7629ef21813306a1fea351db343dcc54650bf85fe4d13f9481ffc637650bd6da4f3e9ccf4a9aec5b3b2c5f62653d80f9ff96cdfe9da088ee0a005
7
+ data.tar.gz: a6c8dd6186e7a8d938df4efcf38b468cff63485f4382bd381f9f17cb0fabea338f5e2a14aa59576495b65adc77f6dcfc0fddd208a1d67e5322445d9d9de8df9d
data/lib/psadmin_plus.rb CHANGED
@@ -97,6 +97,7 @@ def do_cmd(cmd, print = true, powershell = true)
97
97
out = "Invalid OS"
98
98
end
99
99
print ? (puts out) : result = out
100
+ out
100
101
end
101
102
102
103
def do_cmd_banner(c,t,d)
@@ -267,7 +268,7 @@ def do_start(type, domain)
267
268
start_app_service_cmd = "start-service #{app_service_name}"
268
269
start_prcs_cmd = "#{PS_PSADMIN_PATH}/psadmin -p start -d #{domain}"
269
270
start_prcs_service_cmd = "start-service #{prcs_service_name}"
270
- start_web_cmd = "#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}"
271
+ start_web_cmd = "${PS_CFG_HOME?}/webserv/#{domain}/bin/startPIA.sh"
271
272
start_web_service_cmd = "start-service #{web_service_name}"
272
273
273
274
case type
@@ -296,7 +297,12 @@ def do_start(type, domain)
296
297
when "web"
297
298
case "#{OS_CONST}"
298
299
when "linux"
299
- do_cmd(start_web_cmd)
300
+ if File.exist?("#{ENV['PS_CFG_HOME']}/webserv/#{domain}/servers/PIA/tmp/PIA.lok")
301
+ puts "Domain #{domain} already started"
302
+ else
303
+ do_cmd(start_web_cmd)
304
+ sleep 5.0
305
+ end
300
306
when "windows"
301
307
case "#{PS_WIN_SERVICES}"
302
308
when "web", "all"
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: 2.0.1
4
+ version: 2.0.2
5
5
platform: ruby
6
6
authors:
7
7
- Kyle Benson
@@ -9,7 +9,7 @@ authors:
9
9
autorequire:
10
10
bindir: bin
11
11
cert_chain: []
12
- date: 2018-08-29 00:00:00.000000000 Z
12
+ date: 2019-08-13 00:00:00.000000000 Z
13
13
dependencies: []
14
14
description: A psadmin helper tool
15
15
email: kyle@psadmin.io