Merge branch 'master' into openstreetbugs

[rails.git] / config / example.application.yml

diff --git a/config/example.application.yml b/config/example.application.yml
index 69665ae953d36ce48362cd49f6f80c68bb7ea257..c795fc0d9e4966b219d9c54ce7ea8b3142dbc3c8 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,8 +1,11 @@
-standard_settings: &standard_settings
+defaults: &defaults
   # The server URL
   server_url: "www.openstreetmap.org"
   # The generator
   generator: "OpenStreetMap server"
+  copyright_owner: "OpenStreetMap and contributors"
+  attribution_url: "http://www.openstreetmap.org/copyright"
+  license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
   # Sender addresses for emails
   email_from: "OpenStreetMap <webmaster@openstreetmap.org>"
   email_return_path: "bounces@openstreetmap.org"
@@ -40,6 +43,8 @@ standard_settings: &standard_settings
   max_messages_per_hour: 60
   # Domain for handling message replies
   #messages_domain: "messages.openstreetmap.org"
+  # Geonames authentication details
+  #geonames_username: ""
   # Quova authentication details
   #quova_username: ""
   #quova_password: ""
@@ -57,8 +62,8 @@ standard_settings: &standard_settings
   # Location of GPX traces and images
   gpx_trace_dir: "/home/osm/traces"
   gpx_image_dir: "/home/osm/images"
-  # Location of data for file columns
-  #file_column_root: ""
+  # Location of data for attachments
+  attachments_dir: ":rails_root/public/attachments"
   # Log file to use
   #log_path: ""
   # List of memcache servers to use for caching
@@ -78,12 +83,13 @@ standard_settings: &standard_settings
   # Piwik details
   #piwik_location: "piwik.openstreetmap.org"
   #piwik_site: 1
+  #piwik_signup_goal: 1
 
 development:
-  <<: *standard_settings
+  <<: *defaults
 
 production:
-  <<: *standard_settings
+  <<: *defaults
 
 test:
-  <<: *standard_settings
+  <<: *defaults