adminix 0.1.11 → 0.1.12
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 +4 -4
- data/lib/adminix/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0dfcfe33d324883a3c8407fa513f19c6a23a2bb6
|
|
4
|
+
data.tar.gz: 2001bda469fd2fdf5c4436b023bd2c37f61292c9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dddac92d3281c99c580bb60f38a0ee4aa1a2e2ea3a7449ad7214b921f91eb5cf3d89539d8b8dea976fb44529b1f822bdfcc286b53026335a3751527e30b15c50
|
|
7
|
+
data.tar.gz: 9aaeb3e7008133201986add94321899fb91bf478e0d5a3d8bbdeec8d7621e0b0efd880def956c81fb064303af8dbfcb8b23026f217f9305fe4e6af76c35ba02f
|
data/lib/adminix/config.rb
CHANGED
|
@@ -21,9 +21,9 @@ module Adminix
|
|
|
21
21
|
def self.setup(opts)
|
|
22
22
|
conf = self.instance
|
|
23
23
|
|
|
24
|
-
conf.service_id = opts[:service_id]
|
|
24
|
+
conf.service_id = opts[:service_id] || ENV['ADMINIX_SERVICE_ID']
|
|
25
25
|
conf.service_name = opts[:service_name]
|
|
26
|
-
conf.secret_key = opts[:secret_key]
|
|
26
|
+
conf.secret_key = opts[:secret_key] || ENV['ADMINIX_SECRET_KEY']
|
|
27
27
|
|
|
28
28
|
conf.export
|
|
29
29
|
end
|
|
@@ -55,9 +55,9 @@ module Adminix
|
|
|
55
55
|
hs = JSON.parse(content)
|
|
56
56
|
|
|
57
57
|
self.service_name = hs['service_name']
|
|
58
|
-
self.service_id = hs['service_id']
|
|
58
|
+
self.service_id = hs['service_id'] || ENV['ADMINIX_SERVICE_ID']
|
|
59
59
|
self.service_address = hs['service_address']
|
|
60
|
-
self.secret_key = hs['secret_key']
|
|
60
|
+
self.secret_key = hs['secret_key'] || ENV['ADMINIX_SECRET_KEY']
|
|
61
61
|
self.host = hs['host'] || ENV['ADMINIX_CONFIG_HOST'] || DEFAULT_HOST
|
|
62
62
|
self.options = hs['options'] || []
|
|
63
63
|
self.commands = hs['commands'] || []
|
data/lib/adminix/version.rb
CHANGED