Skip to content

Commit

Permalink
Lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
DEFERME Bert committed Dec 12, 2022
1 parent d975ad9 commit 31ac5d7
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 132 deletions.
34 changes: 17 additions & 17 deletions manifests/database/mysql.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,37 +66,37 @@
}

# Loading the sql files.
$_mysql_env = [ "database_password=${database_password_unsensitive}" ]
$_mysql_env = ["database_password=${database_password_unsensitive}"]
case $zabbix_type {
'proxy' : {
exec { 'zabbix_proxy_create.sql':
command => $zabbix_proxy_create_sql,
path => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
unless => 'test -f /etc/zabbix/.schema.done',
provider => 'shell',
command => $zabbix_proxy_create_sql,
path => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
unless => 'test -f /etc/zabbix/.schema.done',
provider => 'shell',
environment => $_mysql_env,
}
}
'server' : {
exec { 'zabbix_server_create.sql':
command => $zabbix_server_create_sql,
path => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
unless => 'test -f /etc/zabbix/.schema.done',
provider => 'shell',
command => $zabbix_server_create_sql,
path => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
unless => 'test -f /etc/zabbix/.schema.done',
provider => 'shell',
environment => $_mysql_env,
}
-> exec { 'zabbix_server_images.sql':
command => $zabbix_server_images_sql,
path => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
unless => 'test -f /etc/zabbix/.images.done',
provider => 'shell',
command => $zabbix_server_images_sql,
path => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
unless => 'test -f /etc/zabbix/.images.done',
provider => 'shell',
environment => $_mysql_env,
}
-> exec { 'zabbix_server_data.sql':
command => $zabbix_server_data_sql,
path => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
unless => 'test -f /etc/zabbix/.data.done',
provider => 'shell',
command => $zabbix_server_data_sql,
path => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
unless => 'test -f /etc/zabbix/.data.done',
provider => 'shell',
environment => $_mysql_env,
}
}
Expand Down
190 changes: 95 additions & 95 deletions manifests/proxy.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,101 +508,101 @@
require => Package["zabbix-proxy-${db}"],
replace => true,
content => Sensitive(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,
})),
}

Expand Down
40 changes: 20 additions & 20 deletions manifests/web.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,26 +290,26 @@
mode => '0640',
replace => true,
content => Sensitive(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,
})),
}

Expand Down

0 comments on commit 31ac5d7

Please sign in to comment.