X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c738c964aa3ceb2dd1dcd44a94b735753235b595..5564bcabbfc5db4b790a340e49155b864ec9c8cd:/config/example.application.yml

diff --git a/config/example.application.yml b/config/example.application.yml
index cf7565856..420278a1f 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
@@ -55,8 +55,10 @@ 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
   #memcache_servers: []
   # Enable legacy OAuth 1.0 support
@@ -69,12 +71,18 @@ standard_settings: &standard_settings
   #potlatch2_key: ""
   # Whether to require users to view the CTs before continuing to edit...
   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