Commit e244a8da authored by Markus Frosch's avatar Markus Frosch 📣
Browse files

Satisfy puppet-lint

parent 8c759b26
......@@ -2,7 +2,7 @@ class icinga2_testing::helpers::icinga2::ido_mysql(
$ido_dbname = $::icinga2::feature::ido_mysql::database,
$ido_username = $::icinga2::feature::ido_mysql::user,
$ido_password = $::icinga2::feature::ido_mysql::password,
) inherits ::icinga2::feature::ido_mysql
) inherits ::icinga2::feature::ido_mysql # lint:ignore:inherits_across_namespaces
{
# Install schema
if $::osfamily == 'Debian' {
......
......@@ -2,7 +2,7 @@ class icinga2_testing::helpers::icinga2::ido_pgsql(
$ido_dbname = $::icinga2::feature::ido_pgsql::database,
$ido_username = $::icinga2::feature::ido_pgsql::user,
$ido_password = $::icinga2::feature::ido_pgsql::password,
) inherits ::icinga2::feature::ido_pgsql
) inherits ::icinga2::feature::ido_pgsql # lint:ignore:inherits_across_namespaces
{
# Install schema
if $::osfamily == 'Debian' {
......@@ -15,7 +15,7 @@ class icinga2_testing::helpers::icinga2::ido_pgsql(
fail("Schema creating not supported on ${::operatingsystem} (${::osfamily})")
}
$_psql = "psql -U '${ido_username}' -h '${host}' -d '${ido_dbname}'"
$_psql = "psql -U '${ido_username}' -h '${icinga2::feature::ido_pgsql::host}' -d '${ido_dbname}'"
Package['icinga2-ido-pgsql'] ->
exec { 'import icinga2 pgsql schema':
......
......@@ -16,7 +16,7 @@ class icinga2_testing::profiles::apache
$default_ssl_chain = "${conf_dir}/ssl/chain.pem"
$_default_ssl_key = "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem"
$_default_ssl_cert = "/var/lib/puppet/ssl/certs/${::fqdn}.pem"
$_default_ssl_chain = "/var/lib/puppet/ssl/certs/ca.pem"
$_default_ssl_chain = '/var/lib/puppet/ssl/certs/ca.pem'
}
class { '::apache':
......
define icinga2_testing::profiles::icingaweb2::backend_group (
define icinga2_testing::profiles::icingaweb2::backend_group(
$resource,
$backend = 'db',
$user_backend = 'icingaweb2',
$group_class = 'group',
$group_name_attribute = 'cn',
$backend = 'db',
$user_backend = 'icingaweb2',
$group_class = 'group',
$group_name_attribute = 'cn',
$group_member_attribute = 'member',
$group_filter = undef,
$base_dn = undef,
){
$group_filter = undef,
$base_dn = undef,
) {
include ::icingaweb2
ensure_resource('file', "${::icingaweb2::config_dir}/groups.ini", {
ensure => file,
ensure => file,
owner => $::icingaweb2::config_owner,
group => $::icingaweb2::config_group,
}
......@@ -24,38 +24,66 @@ define icinga2_testing::profiles::icingaweb2::backend_group (
path => "${::icingaweb2::config_dir}/groups.ini",
}
# lint:ignore:selector_inside_resource
ini_setting {
"icingaweb2 group ${name} backend":
ensure => $backend ? { undef => absent, default => present },
ensure => $backend ? {
undef => absent,
default => present
},
setting => 'backend',
value => $backend;
"icingaweb2 group ${name} resource":
ensure => $resource ? { undef => absent, default => present },
ensure => $resource ? {
undef => absent,
default => present
},
setting => 'resource',
value => $resource;
"icingaweb2 group ${name} user_backend":
ensure => $user_backend ? { undef => absent, default => present },
ensure => $user_backend ? {
undef => absent,
default => present
},
setting => 'user_backend',
value => $user_backend;
"icingaweb2 group ${name} group_class":
ensure => $group_class ? { undef => absent, default => present },
ensure => $group_class ? {
undef => absent,
default => present
},
setting => 'group_class',
value => $group_class;
"icingaweb2 group ${name} group_name_attribute":
ensure => $group_name_attribute ? { undef => absent, default => present },
ensure => $group_name_attribute ? {
undef => absent,
default => present
},
setting => 'group_name_attribute',
value => $group_name_attribute;
"icingaweb2 group ${name} group_member_attribute":
ensure => $group_member_attribute ? { undef => absent, default => present },
ensure => $group_member_attribute ? {
undef => absent,
default => present
},
setting => 'group_member_attribute',
value => $group_member_attribute;
"icingaweb2 group ${name} group_filter":
ensure => $group_filter ? { undef => absent, default => present },
ensure => $group_filter ? {
undef => absent,
default => present
},
setting => 'group_filter',
value => $group_filter;
"icingaweb2 group ${name} base_dn":
ensure => $base_dn ? { undef => absent, default => present },
ensure => $base_dn ? {
undef => absent,
default => present
},
setting => 'base_dn',
value => $base_dn;
}
# lint:endignore
}
class icinga2_testing::massconfig {
class icinga2_testing::profiles::massconfig {
include ::icinga2_testing
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment