From cd2ae0450a132f469abd0695a0f30f5727e66292 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Aug 2013 14:15:20 +0200
Subject: [PATCH] Config: Hint that moduleFolder directive is currently not in
 use

refs #3776
---
 application/forms/Config/GeneralForm.php      |  5 ++-
 config/config.ini                             | 36 +++++++++++--------
 .../Web/Controller/ActionController.php       |  2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index cd30a3b8f1..5489a830f8 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -191,7 +191,10 @@ private function addModuleSettings(Zend_Config $cfg)
             array(
                 'label'     => 'Module Folder',
                 'required'  => true,
-                'helptext'  => 'Use this folder to activate modules (must be writable by your webserver)',
+                'helptext'  => 'The moduleFolder directive is currently not used anywhere but '
+                    . 'configureable via the frontend and ini. With feature #4607 moduleFolder '
+                    . 'will be replaced with a configuration directive for locations of '
+                    . 'installed modules',
                 'value'     => $cfg->get('moduleFolder', $this->getConfigDir() . '/config/enabledModules')
             )
         );
diff --git a/config/config.ini b/config/config.ini
index 1f57302d0d..e10e68a6fa 100755
--- a/config/config.ini
+++ b/config/config.ini
@@ -1,30 +1,36 @@
 [global]
-environment = development
-timezone    = "Europe/Berlin"
-indexModule = monitoring
-indexController = dashboard
-moduleFolder = "/etc/icinga2-web/enabledModules"
-dateFormat = "d/m/Y"
-timeFormat = "g:i A"
+environment         = "development"        
+timezone            = "Europe/Berlin"      
+indexModule         = "monitoring"         
+indexController     = "dashboard"          
+; The moduleFolder directive is currently not used anywhere but configureable
+; via the frontend and this file. With feature #4607 moduleFolder will
+; be replaced with a configuration directive for locations of
+; installed modules
+moduleFolder        = "/etc/icinga2-web/enabledModules"
+dateFormat          = "d/m/Y"              
+timeFormat          = "g:i A"              
 
 [logging]
 ; General log
-enable  = 1
-type    = stream
-verbose = 1
-target  = /tmp/icinga2.log
+enable              = "1"                  
+type                = "stream"             
+verbose             = "1"                  
+target              = "/tmp/icinga2.log"   
 
 ; For development and debug purposes: Logs additional (non critical) events to a
 ; seperate log
-debug.enable = 1
-debug.type   = stream
-debug.target = /tmp/icinga2.debug.log
+debug.enable        = "1"                  
+debug.type          = "stream"             
+debug.target        = "/tmp/icinga2.debug.log"
 
 ; Use ini store to store preferences on local disk
 [preferences]
-type=ini
+type                = "ini"                
 
 ; Use database to store preference into mysql or postgres
 ;[preferences]
 ;type=db
 ;resource=icingaweb-mysql
+
+configPath          = "/vagrant/config/preferences"
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 799d677472..d5b06b61d0 100755
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -75,7 +75,7 @@ class ActionController extends ZfController
     protected $modifiesSession = false;
 
     /**
-     * True if authentication suceeded, otherwise false
+     * True if authentication succeeded, otherwise false
      *
      * @var bool
      */