Move Potlatch configuration to a separate initialiser file.

diff --git a/config/environment.rb b/config/environment.rb
index 6cf8b261dc652b4dc6e670ad295ec39f3a24b269..e6af619eb82b03aaaf8400db39ea951dbba227b6 100644 (file)
--- 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
   # 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 (file)
index 0000000..8809471
--- /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