diff options
| author | Alec Leamas <leamas.alec@gmail.com> | 2010-12-21 02:52:02 +0300 |
|---|---|---|
| committer | Alec Leamas <leamas.alec@gmail.com> | 2010-12-21 03:13:15 +0300 |
| commit | 9cd08bac67e268f6c0a0361c2bcaeb41b03055c9 (patch) | |
| tree | de02f4feb1ab8506e65fdb065a133477657452ae /config/app_config.yml.example | |
| parent | 42c602df2f29b78350d3160685f5171d47e3e835 (diff) | |
Extended sub-uri support.
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
Diffstat (limited to 'config/app_config.yml.example')
| -rw-r--r-- | config/app_config.yml.example | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/app_config.yml.example b/config/app_config.yml.example index 5d2617fd6..da05a5749 100644 --- a/config/app_config.yml.example +++ b/config/app_config.yml.example @@ -4,7 +4,7 @@ default: - # Hostname of this host, as seen from the internet. + # Url of this host, as seen from the internet. pod_url: "http://localhost:3000" # Set this to true in order to close signups. Users will still be @@ -68,12 +68,12 @@ default: #google analytics key, if false, it won't include the javascript google_a_site: false - + #piwik integration if not set, no javascript included - piwik_id: + piwik_id: # the site url in raw format (e.g. pikwik.examplehost.com) - piwik_url: - + piwik_url: + #cloudfiles username and api-key, used for backups cloudfiles_username: 'example' |