From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 Jul 2008 18:05:22 +0000 (+0000)
Subject: Move Potlatch configuration to a separate initialiser file.
X-Git-Tag: live~8251^2~6
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/49637fed70c3cee22646c3f63ebbdc7261c07102?ds=sidebyside;hp=0283bd4f1ae426175933973bdcad09d1ec2d3f69

Move Potlatch configuration to a separate initialiser file.
---

diff --git a/config/environment.rb b/config/environment.rb
index 6cf8b261d..e6af619eb 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -74,10 +74,3 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 end
-
-# This has to be after the above block for some reason (doesnt pull in /lib/osm.rb?)
-POTLATCH_PRESETS = Potlatch::Potlatch.get_presets()
-
-# Use SQL (faster) or Rails (more elegant) for common Potlatch reads
-# getway speedup is approximately x2, whichways approximately x7
-POTLATCH_USE_SQL = true
diff --git a/config/initializers/potlatch.rb b/config/initializers/potlatch.rb
new file mode 100644
index 000000000..880947148
--- /dev/null
+++ b/config/initializers/potlatch.rb
@@ -0,0 +1,6 @@
+# Load presets
+POTLATCH_PRESETS = Potlatch::Potlatch.get_presets()
+
+# Use SQL (faster) or Rails (more elegant) for common Potlatch reads
+# getway speedup is approximately x2, whichways approximately x7
+POTLATCH_USE_SQL = true