X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9c1a3e47086b53592aafa9452a2a666d5c972f0d..7feb0d14c6860bb88961366531fea8fb7aa9a100:/config/example.application.yml

diff --git a/config/example.application.yml b/config/example.application.yml
index abcd1ce41..cf18ab557 100644
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,4 +1,4 @@
-standard_settings: &standard_settings
+defaults: &defaults
   # The server URL
   server_url: "www.openstreetmap.org"
   # The generator
@@ -38,6 +38,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: ""
@@ -55,8 +57,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
@@ -73,12 +75,16 @@ standard_settings: &standard_settings
   require_terms_seen: false
   # Whether to require users to agree to the CTs before editing
   require_terms_agreed: false
+  # 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