diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index 63470cdfe..a2ebdffe0 100644
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -508,101 +508,101 @@
     require => Package["zabbix-proxy-${db}"],
     replace => true,
     content => epp('zabbix/zabbix_proxy.conf.epp', {
-          'allowroot'               => $allowroot,
-          'cachesize'               => $cachesize,
-          'configfrequency'         => $configfrequency,
-          'database_host'           => $database_host,
-          'database_name'           => $database_name,
-          'database_password'       => $database_password,
-          'database_port'           => $database_port,
-          'database_schema'         => $database_schema,
-          'database_socket'         => $database_socket,
-          'database_tlscafile'      => $database_tlscafile,
-          'database_tlscertfile'    => $database_tlscertfile,
-          'database_tlscipher'      => $database_tlscipher,
-          'database_tlscipher13'    => $database_tlscipher13,
-          'database_tlsconnect'     => $database_tlsconnect,
-          'database_tlskeyfile'     => $database_tlskeyfile,
-          'database_user'           => $database_user,
-          'datasenderfrequency'     => $datasenderfrequency,
-          'debuglevel'              => $debuglevel,
-          'enableremotecommands'    => $enableremotecommands,
-          'externalscripts'         => $externalscripts,
-          'fping6location'          => $fping6location,
-          'fpinglocation'           => $fpinglocation,
-          'heartbeatfrequency'      => $heartbeatfrequency,
-          'historycachesize'        => $historycachesize,
-          'historyindexcachesize'   => $historyindexcachesize,
-          'hostname'                => $hostname,
-          'housekeepingfrequency'   => $housekeepingfrequency,
-          'include_dir'             => $include_dir,
-          'javagateway'             => $javagateway,
-          'javagatewayport'         => $javagatewayport,
-          'listenip'                => $listenip,
-          'listenport'              => $listenport,
-          'loadmodule'              => $loadmodule,
-          'loadmodulepath'          => $loadmodulepath,
-          'localbuffer'             => $localbuffer,
-          'logfile'                 => $logfile,
-          'logfilesize'             => $logfilesize,
-          'logremotecommands'       => $logremotecommands,
-          'logslowqueries'          => $logslowqueries,
-          'logtype'                 => $logtype,
-          'mode'                    => $mode,
-          'offlinebuffer'           => $offlinebuffer,
-          'pidfile'                 => $pidfile,
-          'snmptrapper'             => $snmptrapper,
-          'snmptrapperfile'         => $snmptrapperfile,
-          'socketdir'               => $socketdir,
-          'sourceip'                => $sourceip,
-          'sshkeylocation'          => $sshkeylocation,
-          'sslcalocation_dir'       => $sslcalocation_dir,
-          'sslcertlocation_dir'     => $sslcertlocation_dir,
-          'sslkeylocation_dir'      => $sslkeylocation_dir,
-          'startdbsyncers'          => $startdbsyncers,
-          'startdiscoverers'        => $startdiscoverers,
-          'starthttppollers'        => $starthttppollers,
-          'startipmipollers'        => $startipmipollers,
-          'startjavapollers'        => $startjavapollers,
-          'startpingers'            => $startpingers,
-          'startpollers'            => $startpollers,
-          'startpollersunreachable' => $startpollersunreachable,
-          'startpreprocessors'      => $startpreprocessors,
-          'starttrappers'           => $starttrappers,
-          'startvmwarecollectors'   => $startvmwarecollectors,
-          'timeout'                 => $timeout,
-          'tlsaccept'               => $tlsaccept,
-          'tlscafile'               => $tlscafile,
-          'tlscertfile'             => $tlscertfile,
-          'tlscipherall'            => $tlscipherall,
-          'tlscipherall13'          => $tlscipherall13,
-          'tlsciphercert'           => $tlsciphercert,
-          'tlsciphercert13'         => $tlsciphercert13,
-          'tlscipherpsk'            => $tlscipherpsk,
-          'tlscipherpsk13'          => $tlscipherpsk13,
-          'tlsconnect'              => $tlsconnect,
-          'tlscrlfile'              => $tlscrlfile,
-          'tlskeyfile'              => $tlskeyfile,
-          'tlspskfile'              => $tlspskfile,
-          'tlspskidentity'          => $tlspskidentity,
-          'tlsservercertissuer'     => $tlsservercertissuer,
-          'tlsservercertsubject'    => $tlsservercertsubject,
-          'tmpdir'                  => $tmpdir,
-          'trappertimeout'          => $trappertimeout,
-          'unavaliabledelay'        => $unavaliabledelay,
-          'unreachabedelay'         => $unreachabedelay,
-          'unreachableperiod'       => $unreachableperiod,
-          'vaultdbpath'             => $vaultdbpath,
-          'vaulttoken'              => $vaulttoken,
-          'vaulturl'                => $vaulturl,
-          'vmwarecachesize'         => $vmwarecachesize,
-          'vmwarefrequency'         => $vmwarefrequency,
-          'vmwareperffrequency'     => $vmwareperffrequency,
-          'vmwaretimeout'           => $vmwaretimeout,
-          'zabbix_server_host'      => $zabbix_server_host,
-          'zabbix_server_port'      => $zabbix_server_port,
-          'zabbix_user'             => $zabbix::params::server_zabbix_user,
-          'zabbix_version'          => $zabbix_version,
+        'allowroot'               => $allowroot,
+        'cachesize'               => $cachesize,
+        'configfrequency'         => $configfrequency,
+        'database_host'           => $database_host,
+        'database_name'           => $database_name,
+        'database_password'       => $database_password,
+        'database_port'           => $database_port,
+        'database_schema'         => $database_schema,
+        'database_socket'         => $database_socket,
+        'database_tlscafile'      => $database_tlscafile,
+        'database_tlscertfile'    => $database_tlscertfile,
+        'database_tlscipher'      => $database_tlscipher,
+        'database_tlscipher13'    => $database_tlscipher13,
+        'database_tlsconnect'     => $database_tlsconnect,
+        'database_tlskeyfile'     => $database_tlskeyfile,
+        'database_user'           => $database_user,
+        'datasenderfrequency'     => $datasenderfrequency,
+        'debuglevel'              => $debuglevel,
+        'enableremotecommands'    => $enableremotecommands,
+        'externalscripts'         => $externalscripts,
+        'fping6location'          => $fping6location,
+        'fpinglocation'           => $fpinglocation,
+        'heartbeatfrequency'      => $heartbeatfrequency,
+        'historycachesize'        => $historycachesize,
+        'historyindexcachesize'   => $historyindexcachesize,
+        'hostname'                => $hostname,
+        'housekeepingfrequency'   => $housekeepingfrequency,
+        'include_dir'             => $include_dir,
+        'javagateway'             => $javagateway,
+        'javagatewayport'         => $javagatewayport,
+        'listenip'                => $listenip,
+        'listenport'              => $listenport,
+        'loadmodule'              => $loadmodule,
+        'loadmodulepath'          => $loadmodulepath,
+        'localbuffer'             => $localbuffer,
+        'logfile'                 => $logfile,
+        'logfilesize'             => $logfilesize,
+        'logremotecommands'       => $logremotecommands,
+        'logslowqueries'          => $logslowqueries,
+        'logtype'                 => $logtype,
+        'mode'                    => $mode,
+        'offlinebuffer'           => $offlinebuffer,
+        'pidfile'                 => $pidfile,
+        'snmptrapper'             => $snmptrapper,
+        'snmptrapperfile'         => $snmptrapperfile,
+        'socketdir'               => $socketdir,
+        'sourceip'                => $sourceip,
+        'sshkeylocation'          => $sshkeylocation,
+        'sslcalocation_dir'       => $sslcalocation_dir,
+        'sslcertlocation_dir'     => $sslcertlocation_dir,
+        'sslkeylocation_dir'      => $sslkeylocation_dir,
+        'startdbsyncers'          => $startdbsyncers,
+        'startdiscoverers'        => $startdiscoverers,
+        'starthttppollers'        => $starthttppollers,
+        'startipmipollers'        => $startipmipollers,
+        'startjavapollers'        => $startjavapollers,
+        'startpingers'            => $startpingers,
+        'startpollers'            => $startpollers,
+        'startpollersunreachable' => $startpollersunreachable,
+        'startpreprocessors'      => $startpreprocessors,
+        'starttrappers'           => $starttrappers,
+        'startvmwarecollectors'   => $startvmwarecollectors,
+        'timeout'                 => $timeout,
+        'tlsaccept'               => $tlsaccept,
+        'tlscafile'               => $tlscafile,
+        'tlscertfile'             => $tlscertfile,
+        'tlscipherall'            => $tlscipherall,
+        'tlscipherall13'          => $tlscipherall13,
+        'tlsciphercert'           => $tlsciphercert,
+        'tlsciphercert13'         => $tlsciphercert13,
+        'tlscipherpsk'            => $tlscipherpsk,
+        'tlscipherpsk13'          => $tlscipherpsk13,
+        'tlsconnect'              => $tlsconnect,
+        'tlscrlfile'              => $tlscrlfile,
+        'tlskeyfile'              => $tlskeyfile,
+        'tlspskfile'              => $tlspskfile,
+        'tlspskidentity'          => $tlspskidentity,
+        'tlsservercertissuer'     => $tlsservercertissuer,
+        'tlsservercertsubject'    => $tlsservercertsubject,
+        'tmpdir'                  => $tmpdir,
+        'trappertimeout'          => $trappertimeout,
+        'unavaliabledelay'        => $unavaliabledelay,
+        'unreachabedelay'         => $unreachabedelay,
+        'unreachableperiod'       => $unreachableperiod,
+        'vaultdbpath'             => $vaultdbpath,
+        'vaulttoken'              => $vaulttoken,
+        'vaulturl'                => $vaulturl,
+        'vmwarecachesize'         => $vmwarecachesize,
+        'vmwarefrequency'         => $vmwarefrequency,
+        'vmwareperffrequency'     => $vmwareperffrequency,
+        'vmwaretimeout'           => $vmwaretimeout,
+        'zabbix_server_host'      => $zabbix_server_host,
+        'zabbix_server_port'      => $zabbix_server_port,
+        'zabbix_user'             => $zabbix::params::server_zabbix_user,
+        'zabbix_version'          => $zabbix_version,
     }),
   }
 
diff --git a/manifests/server.pp b/manifests/server.pp
index 1395b6888..02bf60a0c 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -453,98 +453,98 @@
     require => Package["zabbix-server-${db}"],
     replace => true,
     content => epp('zabbix/zabbix_server.conf.epp', {
-          'alertscriptspath'        => $alertscriptspath,
-          'allowroot'               => $allowroot,
-          'cachesize'               => $cachesize,
-          'cacheupdatefrequency'    => $cacheupdatefrequency,
-          'database_host'           => $database_host,
-          'database_name'           => $database_name,
-          'database_password'       => $database_password,
-          'database_port'           => $database_port,
-          'database_schema'         => $database_schema,
-          'database_socket'         => $database_socket,
-          'database_tlscafile'      => $database_tlscafile,
-          'database_tlscertfile'    => $database_tlscertfile,
-          'database_tlscipher'      => $database_tlscipher,
-          'database_tlscipher13'    => $database_tlscipher13,
-          'database_tlsconnect'     => $database_tlsconnect,
-          'database_tlskeyfile'     => $database_tlskeyfile,
-          'database_user'           => $database_user,
-          'debuglevel'              => $debuglevel,
-          'externalscripts'         => $externalscripts,
-          'fping6location'          => $fping6location,
-          'fpinglocation'           => $fpinglocation,
-          'historycachesize'        => $historycachesize,
-          'historyindexcachesize'   => $historyindexcachesize,
-          'housekeepingfrequency'   => $housekeepingfrequency,
-          'include_dir'             => $include_dir,
-          'javagateway'             => $javagateway,
-          'javagatewayport'         => $javagatewayport,
-          'listenip'                => $listenip,
-          'listenport'              => $listenport,
-          'loadmodule'              => $loadmodule,
-          'loadmodulepath'          => $loadmodulepath,
-          'logfile'                 => $logfile,
-          'logfilesize'             => $logfilesize,
-          'logslowqueries'          => $logslowqueries,
-          'logtype'                 => $logtype,
-          'maxhousekeeperdelete'    => $maxhousekeeperdelete,
-          'pidfile'                 => $pidfile,
-          'proxyconfigfrequency'    => $proxyconfigfrequency,
-          'proxydatafrequency'      => $proxydatafrequency,
-          'snmptrapperfile'         => $snmptrapperfile,
-          'socketdir'               => $socketdir,
-          'sourceip'                => $sourceip,
-          'sshkeylocation'          => $sshkeylocation,
-          'sslcalocation_dir'       => $sslcalocation_dir,
-          'sslcertlocation_dir'     => $sslcertlocation_dir,
-          'sslkeylocation_dir'      => $sslkeylocation_dir,
-          'startalerters'           => $startalerters,
-          'startdbsyncers'          => $startdbsyncers,
-          'startdiscoverers'        => $startdiscoverers,
-          'startescalators'         => $startescalators,
-          'starthttppollers'        => $starthttppollers,
-          'startipmipollers'        => $startipmipollers,
-          'startjavapollers'        => $startjavapollers,
-          'startlldprocessors'      => $startlldprocessors,
-          'startpingers'            => $startpingers,
-          'startpollers'            => $startpollers,
-          'startpollersunreachable' => $startpollersunreachable,
-          'startpreprocessors'      => $startpreprocessors,
-          'startproxypollers'       => $startproxypollers,
-          'startreportwriters'      => $startreportwriters,
-          'startsnmptrapper'        => $startsnmptrapper,
-          'starttimers'             => $starttimers,
-          'starttrappers'           => $starttrappers,
-          'startvmwarecollectors'   => $startvmwarecollectors,
-          'timeout'                 => $timeout,
-          'tlscafile'               => $tlscafile,
-          'tlscertfile'             => $tlscertfile,
-          'tlscipherall'            => $tlscipherall,
-          'tlscipherall13'          => $tlscipherall13,
-          'tlsciphercert'           => $tlsciphercert,
-          'tlsciphercert13'         => $tlsciphercert13,
-          'tlscipherpsk'            => $tlscipherpsk,
-          'tlscipherpsk13'          => $tlscipherpsk13,
-          'tlscrlfile'              => $tlscrlfile,
-          'tlskeyfile'              => $tlskeyfile,
-          'tmpdir'                  => $tmpdir,
-          'trappertimeout'          => $trappertimeout,
-          'trendcachesize'          => $trendcachesize,
-          'unavailabledelay'        => $unavailabledelay,
-          'unreachabledelay'        => $unreachabledelay,
-          'unreachableperiod'       => $unreachableperiod,
-          'valuecachesize'          => $valuecachesize,
-          'vaultdbpath'             => $vaultdbpath,
-          'vaulttoken'              => $vaulttoken,
-          'vaulturl'                => $vaulturl,
-          'vmwarecachesize'         => $vmwarecachesize,
-          'vmwarefrequency'         => $vmwarefrequency,
-          'vmwareperffrequency'     => $vmwareperffrequency,
-          'vmwaretimeout'           => $vmwaretimeout,
-          'webserviceurl'           => $webserviceurl,
-          'zabbix_user'             => $zabbix::params::server_zabbix_user,
-          'zabbix_version'          => $zabbix_version,
+        'alertscriptspath'        => $alertscriptspath,
+        'allowroot'               => $allowroot,
+        'cachesize'               => $cachesize,
+        'cacheupdatefrequency'    => $cacheupdatefrequency,
+        'database_host'           => $database_host,
+        'database_name'           => $database_name,
+        'database_password'       => $database_password,
+        'database_port'           => $database_port,
+        'database_schema'         => $database_schema,
+        'database_socket'         => $database_socket,
+        'database_tlscafile'      => $database_tlscafile,
+        'database_tlscertfile'    => $database_tlscertfile,
+        'database_tlscipher'      => $database_tlscipher,
+        'database_tlscipher13'    => $database_tlscipher13,
+        'database_tlsconnect'     => $database_tlsconnect,
+        'database_tlskeyfile'     => $database_tlskeyfile,
+        'database_user'           => $database_user,
+        'debuglevel'              => $debuglevel,
+        'externalscripts'         => $externalscripts,
+        'fping6location'          => $fping6location,
+        'fpinglocation'           => $fpinglocation,
+        'historycachesize'        => $historycachesize,
+        'historyindexcachesize'   => $historyindexcachesize,
+        'housekeepingfrequency'   => $housekeepingfrequency,
+        'include_dir'             => $include_dir,
+        'javagateway'             => $javagateway,
+        'javagatewayport'         => $javagatewayport,
+        'listenip'                => $listenip,
+        'listenport'              => $listenport,
+        'loadmodule'              => $loadmodule,
+        'loadmodulepath'          => $loadmodulepath,
+        'logfile'                 => $logfile,
+        'logfilesize'             => $logfilesize,
+        'logslowqueries'          => $logslowqueries,
+        'logtype'                 => $logtype,
+        'maxhousekeeperdelete'    => $maxhousekeeperdelete,
+        'pidfile'                 => $pidfile,
+        'proxyconfigfrequency'    => $proxyconfigfrequency,
+        'proxydatafrequency'      => $proxydatafrequency,
+        'snmptrapperfile'         => $snmptrapperfile,
+        'socketdir'               => $socketdir,
+        'sourceip'                => $sourceip,
+        'sshkeylocation'          => $sshkeylocation,
+        'sslcalocation_dir'       => $sslcalocation_dir,
+        'sslcertlocation_dir'     => $sslcertlocation_dir,
+        'sslkeylocation_dir'      => $sslkeylocation_dir,
+        'startalerters'           => $startalerters,
+        'startdbsyncers'          => $startdbsyncers,
+        'startdiscoverers'        => $startdiscoverers,
+        'startescalators'         => $startescalators,
+        'starthttppollers'        => $starthttppollers,
+        'startipmipollers'        => $startipmipollers,
+        'startjavapollers'        => $startjavapollers,
+        'startlldprocessors'      => $startlldprocessors,
+        'startpingers'            => $startpingers,
+        'startpollers'            => $startpollers,
+        'startpollersunreachable' => $startpollersunreachable,
+        'startpreprocessors'      => $startpreprocessors,
+        'startproxypollers'       => $startproxypollers,
+        'startreportwriters'      => $startreportwriters,
+        'startsnmptrapper'        => $startsnmptrapper,
+        'starttimers'             => $starttimers,
+        'starttrappers'           => $starttrappers,
+        'startvmwarecollectors'   => $startvmwarecollectors,
+        'timeout'                 => $timeout,
+        'tlscafile'               => $tlscafile,
+        'tlscertfile'             => $tlscertfile,
+        'tlscipherall'            => $tlscipherall,
+        'tlscipherall13'          => $tlscipherall13,
+        'tlsciphercert'           => $tlsciphercert,
+        'tlsciphercert13'         => $tlsciphercert13,
+        'tlscipherpsk'            => $tlscipherpsk,
+        'tlscipherpsk13'          => $tlscipherpsk13,
+        'tlscrlfile'              => $tlscrlfile,
+        'tlskeyfile'              => $tlskeyfile,
+        'tmpdir'                  => $tmpdir,
+        'trappertimeout'          => $trappertimeout,
+        'trendcachesize'          => $trendcachesize,
+        'unavailabledelay'        => $unavailabledelay,
+        'unreachabledelay'        => $unreachabledelay,
+        'unreachableperiod'       => $unreachableperiod,
+        'valuecachesize'          => $valuecachesize,
+        'vaultdbpath'             => $vaultdbpath,
+        'vaulttoken'              => $vaulttoken,
+        'vaulturl'                => $vaulturl,
+        'vmwarecachesize'         => $vmwarecachesize,
+        'vmwarefrequency'         => $vmwarefrequency,
+        'vmwareperffrequency'     => $vmwareperffrequency,
+        'vmwaretimeout'           => $vmwaretimeout,
+        'webserviceurl'           => $webserviceurl,
+        'zabbix_user'             => $zabbix::params::server_zabbix_user,
+        'zabbix_version'          => $zabbix_version,
     }),
   }
 
diff --git a/manifests/web.pp b/manifests/web.pp
index 107610f64..74863ab40 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -290,26 +290,26 @@
     mode    => '0640',
     replace => true,
     content => epp('zabbix/web/zabbix.conf.php.epp', {
-          'database_type'           => $database_type,
-          'database_host'           => $database_host,
-          'database_port'           => $database_port,
-          'db_port'                 => $db_port,
-          'database_name'           => $database_name,
-          'database_user'           => $database_user,
-          'database_password'       => $database_password,
-          'database_schema'         => $database_schema,
-          'database_double_ieee754' => $database_double_ieee754,
-          'zabbix_server'           => $zabbix_server,
-          'zabbix_listenport'       => $zabbix_listenport,
-          'zabbix_server_name'      => $zabbix_server_name,
-          'ldap_cacert'             => $ldap_cacert,
-          'ldap_clientcert'         => $ldap_clientcert,
-          'ldap_clientkey'          => $ldap_clientkey,
-          'ldap_reqcert'            => $ldap_reqcert,
-          'saml_sp_key'             => $saml_sp_key,
-          'saml_sp_cert'            => $saml_sp_cert,
-          'saml_idp_cert'           => $saml_idp_cert,
-          'saml_settings'           => $saml_settings,
+        'database_type'           => $database_type,
+        'database_host'           => $database_host,
+        'database_port'           => $database_port,
+        'db_port'                 => $db_port,
+        'database_name'           => $database_name,
+        'database_user'           => $database_user,
+        'database_password'       => $database_password,
+        'database_schema'         => $database_schema,
+        'database_double_ieee754' => $database_double_ieee754,
+        'zabbix_server'           => $zabbix_server,
+        'zabbix_listenport'       => $zabbix_listenport,
+        'zabbix_server_name'      => $zabbix_server_name,
+        'ldap_cacert'             => $ldap_cacert,
+        'ldap_clientcert'         => $ldap_clientcert,
+        'ldap_clientkey'          => $ldap_clientkey,
+        'ldap_reqcert'            => $ldap_reqcert,
+        'saml_sp_key'             => $saml_sp_key,
+        'saml_sp_cert'            => $saml_sp_cert,
+        'saml_idp_cert'           => $saml_idp_cert,
+        'saml_settings'           => $saml_settings,
     }),
   }