Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
b38cf476
Commit
b38cf476
authored
Sep 07, 2011
by
Jonne Hass
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename config/script_server_config.yml to config/script_server.yml to remove redundancy
parent
670127a1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
config/script_server.yml.example
config/script_server.yml.example
+0
-0
script/get_config.rb
script/get_config.rb
+5
-0
script/server
script/server
+1
-0
No files found.
config/script_server
_config
.yml.example
→
config/script_server.yml.example
View file @
b38cf476
File moved
script/get_config.rb
View file @
b38cf476
...
...
@@ -23,6 +23,11 @@ if ARGV.length >= 1
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
...
...
script/server
View file @
b38cf476
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment