Fix some remaining issues

- Changed "this.fail" to "this.test.fail" in frontend regression test 4606
- Restored default timezone "Europe/Berlin"
- Added "var/log/*.log" to .gitignore
- Updated default.pp so that the user apache is part of the vagrant group

refs #4606
refs #4605
refs #4640

.gitignore

@@ -31,3 +31,6 @@ config/enabledModules/
 
 # User preferences
 config/preferences/*.ini
+
+# Application logfiles
+var/log/*.log

.vagrant-puppet/manifests/default.pp

@@ -42,7 +42,7 @@ user { 'icinga':
 }
 
 user { 'apache':
-  groups  => 'icinga-cmd',
+  groups  => ['icinga-cmd', 'vagrant'],
   require => [ Class['apache'], Group['icinga-cmd'] ]
 }
 
@@ -471,13 +471,13 @@ exec { 'create-pgsql-icingaweb-db':
 
 exec { 'populate-icingaweb-mysql-db-accounts':
   unless  => 'mysql -uicingaweb -picinga icingaweb -e "SELECT * FROM account;" &> /dev/null',
-  command => 'mysql -uicingaweb -picinga icingaweb < /vagrant/etc/schema/users.mysql.sql',
+  command => 'mysql -uicingaweb -picinga icingaweb < /vagrant/etc/schema/accounts.mysql.sql',
   require => [ Exec['create-mysql-icingaweb-db'] ]
 }
 
 exec { 'populate-icingweba-pgsql-db-accounts':
   unless  => 'psql -U icingaweb -d icingaweb -c "SELECT * FROM account;" &> /dev/null',
-  command => 'sudo -u postgres psql -U icingaweb -d icingaweb -f /vagrant/etc/schema/users.pgsql.sql',
+  command => 'sudo -u postgres psql -U icingaweb -d icingaweb -f /vagrant/etc/schema/accounts.pgsql.sql',
   require => [ Exec['create-pgsql-icingaweb-db'] ]
 }
 

config/config.ini

@@ -1,32 +1,34 @@
 [global]
-environment         = "development"        
-timezone            = "Europe/Minsk"       
-indexModule         = "monitoring"         
-indexController     = "dashboard"          
+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"              
+dateFormat          = "d/m/Y"
+timeFormat          = "g:i A"
+
 
 [logging]
 ; General log
-enable              = 1                    
-type                = "stream"             
-verbose             = "1"                  
+enable              = "1"
+type                = "stream"
+verbose             = "1"
 target              = "{app}/var/log/icinga.log"
 
 ; For development and debug purposes: Logs additional (non critical) events to a
 ; seperate log
-debug.enable        = 1                    
-debug.type          = "stream"             
+debug.enable        = "1"
+debug.type          = "stream"
 debug.target        = "{app}/var/log/icinga.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]

test/frontend/regression/regression-4606.js

@@ -74,7 +74,7 @@ casper.then(function() {
             'Assert a success text to appear in the general form'
         );
     }, function() {
-        this.fail("No success text appeared in the general form");
+        this.test.fail("No success text appeared in the general form");
     });
 });