adminix 0.1.45 → 0.1.46
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/adminix/config.rb +5 -1
- data/lib/adminix/service.rb +3 -3
- data/lib/adminix/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: eca1ac870ae55fd3ea4e4b13d294fcb5443ff3d324182d9242ae3d53c007d7c8
|
4
|
+
data.tar.gz: 0efd6e6da49cd2b87e7d9e728cd92ede48713cdec077ac2afae453814e9acb5d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d0b0a864b131b9bd583b7bcc646feafa3f859a7a1686c125f7ecfefc58a11822f5fbfa0322ab6e7f922ec2cc992f39b52c9ea4c2a19f8d1417f0476dd1a1b4ca
|
7
|
+
data.tar.gz: d4ccc7f9ea4109b54d004a5cce99578b2e952a4083ad2d0973859aa8955c29ec9aba73aeb01ec834b349993ecba5d5b6022d4692d2f565da64fa130b73510f70
|
data/lib/adminix/config.rb
CHANGED
@@ -30,7 +30,8 @@ module Adminix
|
|
30
30
|
watcher_start: 'sudo systemctl start adminix.service',
|
31
31
|
watcher_stop: 'sudo systemctl stop adminix.service',
|
32
32
|
process_start: 'sudo systemctl start adminix_process.service',
|
33
|
-
process_stop: 'sudo systemctl stop adminix_process.service'
|
33
|
+
process_stop: 'sudo systemctl stop adminix_process.service',
|
34
|
+
run_script: '~/.config/adminix/scripts/run_script'
|
34
35
|
}
|
35
36
|
@watch_log_files = []
|
36
37
|
@error_notifier_enabled = ENV['ADMINIX_ERROR_NOTIFIER'].nil? ? true : ENV['ADMINIX_ERROR_NOTIFIER'] == 'true'
|
@@ -65,6 +66,9 @@ module Adminix
|
|
65
66
|
process_start: scripts['process_start'],
|
66
67
|
process_stop: scripts['process_stop']
|
67
68
|
}
|
69
|
+
unless scripts['run_script'].nil?
|
70
|
+
@scripts[:run_script] = scripts['run_script']
|
71
|
+
end
|
68
72
|
|
69
73
|
@watch_log_files = data['watch_logs'] || []
|
70
74
|
|
data/lib/adminix/service.rb
CHANGED
@@ -141,15 +141,15 @@ module Adminix
|
|
141
141
|
# TODO frontend fix attribute args
|
142
142
|
args.each { |hs| script.gsub!("%{#{hs[0]}}", hs[1]) }
|
143
143
|
|
144
|
-
export_envs = options_to_envs_inline
|
145
|
-
script = "cd #{config.working_dir} && #{export_envs} && #{script}"
|
144
|
+
# export_envs = options_to_envs_inline
|
145
|
+
# script = "cd #{config.working_dir} && #{export_envs} && #{script}"
|
146
146
|
|
147
147
|
system.log "Executing command: "
|
148
148
|
system.log "-----------------------------------"
|
149
149
|
system.log script
|
150
150
|
system.log "-----------------------------------"
|
151
151
|
|
152
|
-
output = system.eval(script)
|
152
|
+
output = system.eval("#{config.scripts[:run_script]} #{script}")
|
153
153
|
|
154
154
|
system.log "Command execution output: "
|
155
155
|
system.log "-----------------------------------"
|
data/lib/adminix/version.rb
CHANGED