diff options
| author | Jonne Haß <me@jhass.eu> | 2015-05-19 12:06:37 +0300 |
|---|---|---|
| committer | Jonne Haß <me@jhass.eu> | 2015-05-19 12:07:03 +0300 |
| commit | 898e8d591291e194985a01ec24584bbbfb0d33e1 (patch) | |
| tree | 9ec3e5bda2fffc00c85c79277424c64c27d5a0d7 /script | |
| parent | 5a3b62d8014b9ce085fab28f8e14f310d16a3403 (diff) | |
Remove deprecated port setting
Diffstat (limited to 'script')
| -rwxr-xr-x | script/server | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/script/server b/script/server index 466b4ef0f..0144e244f 100755 --- a/script/server +++ b/script/server @@ -103,7 +103,6 @@ fi os=$(uname -s) vars=$(bin/bundle exec ruby ./script/get_config.rb \ - port=server.port \ single_process_mode=environment.single_process_mode? \ embed_sidekiq_worker=server.embed_sidekiq_worker \ workers=server.sidekiq_workers \ @@ -119,12 +118,6 @@ then export DB fi -if [ -z "$PORT" -a -n "$port" ] -then - warning "Setting port via configuration is deprecated, set listen instead. See the updated config/diaspora.yml.example." - PORT="$port" -fi - args="$@" for arg in $(echo $args | awk '{ for (i = 1; i <= NF; i++) print $i}') do @@ -139,7 +132,7 @@ then services=$(chk_service $PORT) if [ -n "$services" ] then - fatal "Port $port is already in use.\n\t$services" + fatal "Port $PORT is already in use.\n\t$services" fi fi |