Merge branch 'master' into feature/packages-4075

application/forms/Config/Authentication/AutologinBackendForm.php

@@ -53,8 +53,10 @@ class AutologinBackendForm extends Form
             'strip_username_regexp',
             array(
                 'label'         => t('Filter Pattern'),
-                'description'   => t('The regular expression to use to strip specific parts off from usernames. Leave empty if you do not want to strip off anything'),
-                'value'         => '/\@[^$]+$/',
+                'description'   => t(
+                    'The regular expression to use to strip specific parts off from usernames.'
+                    . ' Leave empty if you do not want to strip off anything'
+                ),
                 'validators'    => array(
                     new Zend_Validate_Callback(function ($value) {
                         return @preg_match($value, '') !== false;

application/forms/Config/Resource/LivestatusResourceForm.php

@@ -44,7 +44,7 @@ class LivestatusResourceForm extends Form
                 'required'      => true,
                 'label'         => t('Socket'),
                 'description'   => t('The path to your livestatus socket used for querying monitoring data'),
-                'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
+                'value'         => '/var/run/icinga2/cmd/livestatus'
             )
         );