rename config/script_server_config.yml to config/script_server.yml to…

… remove redundancy
diaspora · Sep 7, 2011 · b38cf47 · b38cf47
1 parent 670127a
commit b38cf47
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/config/script_server_config.yml.example → config/script_server.yml.example b/config/script_server_config.yml.example → config/script_server.yml.example
diff --git a/script/get_config.rb b/script/get_config.rb
@@ -23,6 +23,11 @@ def self.env
   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
+      $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')
+    end
     begin
       print YAML.load_file(script_server_config_file)['script_server'][setting_name]
     rescue

diff --git a/script/server b/script/server
@@ -11,6 +11,7 @@ cd $(dirname $(readlink -e $0))/..
 
 # Check if script_server.yml exists
 if [ ! -e 'config/script_server.yml' ]; then
+    echo "INFO: config/script_server_config.yml has been renamed to config/script_server.yml" >&2
     echo 'FATAL: config/script_server.yml is missing! Copy over config/script_server.yml.example to config/script_server.yml and edit it properly!' >&2
     exit 69
 fi