From 92dcffb253cb63cdbc0160f3a86fbd91b4039a96 Mon Sep 17 00:00:00 2001
From: Jonne Hass <mrzyx@mrzyx.de>
Date: Wed, 7 Sep 2011 13:26:41 +0200
Subject: [PATCH] prefer config/script_server.yml over
config/script_server_config.yml until we remove the support for the later
completly
---
script/get_config.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/script/get_config.rb b/script/get_config.rb
index 87a75142d4..6af4ec78a0 100755
--- a/script/get_config.rb
+++ b/script/get_config.rb
@@ -22,11 +22,11 @@ if ARGV.length >= 1
setting_name = ARGV[0]
if Rails.env == 'script_server' # load from the special script_server_config.yml file
require 'yaml'
- script_server_config_file = File.join(Rails.root, 'config', 'script_server_config.yml')
- if File.exists? script_server_config_file
+ script_server_config_file = File.join(Rails.root, 'config', 'script_server.yml')
+ unless File.exists? script_server_config_file
$stderr.puts "Deprecation warning: config/script_server_config.yml has been renamed to config/script_server.yml"
else
- script_server_config_file = File.join(Rails.root, 'config', 'script_server.yml')
+ script_server_config_file = File.join(Rails.root, 'config', 'script_server_config.yml')
end
begin
print YAML.load_file(script_server_config_file)['script_server'][setting_name]
--
GitLab