Merge pull request #1317 from forkcms/protected-installer

Only load the installer route when Fork is not installed.
forkcms · Nov 10, 2015 · 6e2747f · 6e2747f
2 parents aead785 + 37fd663
commit 6e2747f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/app/config/config_install.yml b/app/config/config_install.yml
@@ -4,7 +4,7 @@ imports:
 framework:
     secret:          %kernel.secret%
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: "%kernel.root_dir%/config/routing_install.yml"
         strict_requirements: ~
     form:            ~
     csrf_protection: ~

diff --git a/app/config/config_test.yml b/app/config/config_test.yml
@@ -7,6 +7,8 @@ framework:
         storage_id: session.storage.mock_file
     profiler:
         collect: false
+    router:
+        resource: "%kernel.root_dir%/config/routing_install.yml"
 
 web_profiler:
     toolbar: false

diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -1,6 +1,3 @@
-installer:
-    resource: "@ForkCMSInstallerBundle/Resources/config/routing.yml"
-
 backend:
     path: /private/{_locale}/{module}/{action}
     defaults:

diff --git a/app/config/routing_install.yml b/app/config/routing_install.yml
@@ -0,0 +1,6 @@
+installer:
+    resource: "@ForkCMSInstallerBundle/Resources/config/routing.yml"
+
+# default routes
+_main:
+    resource: routing.yml