gaptool-server 0.5.2 → 0.5.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/routes/main.rb +4 -4
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dd57d4d6f85dea91f18e234fb8a99571a476dd4a
|
|
4
|
+
data.tar.gz: 7fcd4d8e43efdcdec7c06ede29ba8157683f49d3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e9d2c1a5af6fd30f503c0e98a68c6d2b8848298e19b8e87e99f0a5efebde2481666feb0d65c5ab9448d22bebb2e924ba02115b238b79993a3ee6c77c8273f45a
|
|
7
|
+
data.tar.gz: 1001b8eff1a606c67a934dc0996f4b96ef9c91ea8dd583b0cd71a7e1759c1d8dfb379a64a8434a62a4831f96e7e6362408ff9193d68b5e848ee76777601a905a
|
data/lib/routes/main.rb
CHANGED
|
@@ -78,11 +78,11 @@ class GaptoolServer < Sinatra::Application
|
|
|
78
78
|
AWS.config(:access_key_id => $redis.hget('config', 'aws_id'), :secret_access_key => $redis.hget('config', 'aws_secret'), :ec2_endpoint => "ec2.#{data['zone'].chop}.amazonaws.com")
|
|
79
79
|
@ec2 = AWS::EC2.new
|
|
80
80
|
host_key = "instance:#{data['role']}:#{data['environment']}:#{data['secret']}"
|
|
81
|
-
host_data = redis.hgetall(host_key)
|
|
81
|
+
host_data = $redis.hgetall(host_key)
|
|
82
82
|
unless host_data
|
|
83
83
|
error 403
|
|
84
84
|
end
|
|
85
|
-
@instance = @ec2.instances[host_data['
|
|
85
|
+
@instance = @ec2.instances[host_data['instance_id']]
|
|
86
86
|
hostname = @instance.dns_name
|
|
87
87
|
$redis.del(host_key)
|
|
88
88
|
@apps = []
|
|
@@ -97,8 +97,8 @@ class GaptoolServer < Sinatra::Application
|
|
|
97
97
|
data.merge!("instance" => @instance.id)
|
|
98
98
|
hash2redis("host:#{data['role']}:#{data['environment']}:#{@instance.id}", data)
|
|
99
99
|
|
|
100
|
-
@chef_repo =
|
|
101
|
-
@chef_branch =
|
|
100
|
+
@chef_repo = host_data['chef_repo'] && !host_data['chef_repo'].empty? ? host_data['chef_repo'] : $redis.hget('config', 'chefrepo')
|
|
101
|
+
@chef_branch = host_data['chef_branch'] && !host_data['chef_branch'].empty? ? host_data['chef_branch'] : $redis.hget('config', 'chefbranch')
|
|
102
102
|
@initkey = $redis.hget('config', 'initkey')
|
|
103
103
|
@json = {
|
|
104
104
|
'hostname' => hostname,
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: gaptool-server
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Matt Bailey
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-09-
|
|
12
|
+
date: 2014-09-10 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: sinatra
|