rhc 0.69.3 → 0.69.6
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/rhc-create-app +3 -1
- data/lib/rhc-common.rb +13 -9
- metadata +4 -4
data/bin/rhc-create-app
CHANGED
@@ -252,7 +252,6 @@ Host *.#{libra_domain}
|
|
252
252
|
IdentityFile ~/.ssh/libra_id_rsa
|
253
253
|
VerifyHostKeyDNS yes
|
254
254
|
StrictHostKeyChecking no
|
255
|
-
PasswordAuthentication no
|
256
255
|
UserKnownHostsFile ~/.ssh/libra_known_hosts
|
257
256
|
|
258
257
|
SSH
|
@@ -355,6 +354,9 @@ while attempt < RHC::Maxretries
|
|
355
354
|
if (type == :php)
|
356
355
|
page = 'health_check.php'
|
357
356
|
end
|
357
|
+
if (type == :perl)
|
358
|
+
page = 'health_check.pl'
|
359
|
+
end
|
358
360
|
url = URI.parse("http://#{my_url}/#{page}")
|
359
361
|
begin
|
360
362
|
response = @http.get_response(url)
|
data/lib/rhc-common.rb
CHANGED
@@ -39,6 +39,7 @@ module RHC
|
|
39
39
|
|
40
40
|
TYPES = {
|
41
41
|
'php-5.3.2' => :php,
|
42
|
+
'perl-5.10.1' => :perl,
|
42
43
|
'rack-1.1.0' => :rack,
|
43
44
|
'wsgi-3.2.1' => :wsgi,
|
44
45
|
'jbossas-7.0.0' => :jbossas
|
@@ -298,14 +299,14 @@ _home_conf = File.expand_path('~/.openshift')
|
|
298
299
|
@config_path = File.exists?(_linux_cfg) ? _linux_cfg : _gem_cfg
|
299
300
|
|
300
301
|
FileUtils.mkdir_p _home_conf unless File.directory?(_home_conf)
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
302
|
+
local_config_path = File.expand_path(@local_config_path)
|
303
|
+
if !File.exists? local_config_path
|
304
|
+
FileUtils.touch local_config_path
|
305
|
+
puts ""
|
306
|
+
puts "Created local config file: " + local_config_path
|
307
|
+
puts "express.conf contains user configuration and can be transferred across clients."
|
308
|
+
puts ""
|
309
|
+
end
|
309
310
|
|
310
311
|
begin
|
311
312
|
@global_config = ParseConfig.new(@config_path)
|
@@ -326,7 +327,10 @@ else
|
|
326
327
|
end
|
327
328
|
|
328
329
|
#
|
329
|
-
# Check for local var in
|
330
|
+
# Check for local var in
|
331
|
+
# 1) ~/.openshift/express.conf
|
332
|
+
# 2) /etc/openshift/express.conf
|
333
|
+
# 3) $GEM/../conf/express.conf
|
330
334
|
#
|
331
335
|
def get_var(var)
|
332
336
|
@local_config.get_value(var) ? @local_config.get_value(var) : @global_config.get_value(var)
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rhc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 263
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 69
|
9
|
-
-
|
10
|
-
version: 0.69.
|
9
|
+
- 6
|
10
|
+
version: 0.69.6
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Red Hat
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2011-05-
|
18
|
+
date: 2011-05-16 00:00:00 -05:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|