Merge branch 'master' of ../application-blanche

[zf2.biz/galerie.git] / config / application.config.php

diff --git a/config/application.config.php b/config/application.config.php
index ece654c..9f36ab0 100644 (file)
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -1,14 +1,17 @@
 <?php
 return array(
-    'module_paths' => array(
-        realpath(dirname(__DIR__) . '/module'),
-        realpath(dirname(__DIR__) . '/vendor'),
-    ),
     'modules' => array(
         'Application',
+        'Auth',
+        'Galerie',
     ),
-    'module_listener_options' => array( 
-        'config_cache_enabled' => false,
-        'cache_dir'            => realpath(dirname(__DIR__) . '/data/cache'),
+    'module_listener_options' => array(
+        'config_glob_paths'    => array(
+            'config/autoload/{,*.}{global,local}.php',
+        ),
+        'module_paths' => array(
+            './module',
+            './vendor',
+        ),
     ),
 );