9cd08bac67
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink in public when using sub-uri. Various clean-up, removing thin and socket port settings from server.sh (these are now taken from pod_uri and socket_port). Basic functionality when setting a sub_uri like http://example.org/diaspora now seems OK. Closes .http://joindiaspora.com/issues/737, and partially http://joindiaspora.com/issues/391. Ports are yet to be defined and handled in this context. Conflicts: app/views/layouts/application.html.haml config/routes.rb
23 lines
655 B
Bash
Executable file
23 lines
655 B
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# Get value from APP_CONFIG
|
|
#
|
|
# Usage get_env [key ...]
|
|
|
|
path=$( readlink -fn $0) && cd $(dirname $path)/.. || exit 2
|
|
|
|
if [[ ! -e tmp/environment || tmp/environment -ot config/app_config.yml ]]
|
|
then
|
|
ruby > tmp/environment << 'EOT'
|
|
require File.join('config', 'environment.rb')
|
|
APP_CONFIG.each { |key, value| puts key.to_s + "\t" + value.to_s }
|
|
puts "pod_uri.host\t" + APP_CONFIG[:pod_uri].host.to_s
|
|
puts "pod_uri.path\t" + APP_CONFIG[:pod_uri].path.to_s
|
|
puts "pod_uri.port\t" + APP_CONFIG[:pod_uri].port.to_s
|
|
EOT
|
|
fi
|
|
|
|
for key in $@; do
|
|
awk -v key=$key '{ if ($1 == key ) print $2 }' < tmp/environment
|
|
done
|
|
|