Fix form_for arguments

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

diff --git a/config/example.application.yml b/config/example.application.yml
index cf7565856883570d8fd960f1762e2850e26a4efa..e102fc1a23af11dc664775709ef76aeb8cd09626 100644 (file)
--- 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
   # The server URL
   server_url: "www.openstreetmap.org"
   # The generator


@@ -57,6 +57,8 @@ standard_settings: &standard_settings
   gpx_image_dir: "/home/osm/images"
   # Location of data for file columns
   #file_column_root: ""
   gpx_image_dir: "/home/osm/images"
   # Location of data for file columns
   #file_column_root: ""

+  # Log file to use
+  #log_path: ""

   # List of memcache servers to use for caching
   #memcache_servers: []
   # Enable legacy OAuth 1.0 support
   # 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
   #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:
 
 development:

-  <<: *standard_settings
+  <<: *defaults

 
 production:
 
 production:

-  <<: *standard_settings
+  <<: *defaults

 
 test:
 
 test:

-  <<: *standard_settings
+  <<: *defaults