opuppet/module-icingaweb2
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix PuppetLint warnings due to config rewrite

Browse source
This commit is contained in:
Markus Frosch 2015-04-07 13:59:48 +02:00
parent 51012fc049
commit b5111c856e
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
manifests/config.pp
View file

@ -43,16 +43,16 @@ class icingaweb2::config {
mode => $::icingaweb2::config_dir_mode; mode => $::icingaweb2::config_dir_mode;
"${::icingaweb2::config_dir}/authentication.ini": "${::icingaweb2::config_dir}/authentication.ini":
ensure => present; ensure => file;
"${::icingaweb2::config_dir}/config.ini": "${::icingaweb2::config_dir}/config.ini":
ensure => present; ensure => file;
"${::icingaweb2::config_dir}/resources.ini": "${::icingaweb2::config_dir}/resources.ini":
ensure => present; ensure => file;
"${::icingaweb2::config_dir}/roles.ini": "${::icingaweb2::config_dir}/roles.ini":
ensure => present; ensure => file;
$::icingaweb2::web_root: $::icingaweb2::web_root:
ensure => directory, ensure => directory,
@ -113,32 +113,32 @@ class icingaweb2::config {
# Configure resources.ini # Configure resources.ini
icingaweb2::config::resource_database { 'icingaweb_db': icingaweb2::config::resource_database { 'icingaweb_db':
resource_db => "${::icingaweb2::web_db}", resource_db => $::icingaweb2::web_db,
resource_host => "${::icingaweb2::web_db_host}", resource_host => $::icingaweb2::web_db_host,
resource_port => "${::icingaweb2::web_db_port}", resource_port => $::icingaweb2::web_db_port,
resource_dbname => "${::icingaweb2::web_db_name}", resource_dbname => $::icingaweb2::web_db_name,
resource_username => "${::icingaweb2::web_db_user}", resource_username => $::icingaweb2::web_db_user,
resource_password => "${::icingaweb2::web_db_pass}", resource_password => $::icingaweb2::web_db_pass,
} }
icingaweb2::config::resource_database { 'icinga_ido': icingaweb2::config::resource_database { 'icinga_ido':
resource_db => "${::icingaweb2::ido_db}", resource_db => $::icingaweb2::ido_db,
resource_host => "${::icingaweb2::ido_db_host}", resource_host => $::icingaweb2::ido_db_host,
resource_port => "${::icingaweb2::ido_db_port}", resource_port => $::icingaweb2::ido_db_port,
resource_dbname => "${::icingaweb2::ido_db_name}", resource_dbname => $::icingaweb2::ido_db_name,
resource_username => "${::icingaweb2::ido_db_user}", resource_username => $::icingaweb2::ido_db_user,
resource_password => "${::icingaweb2::ido_db_pass}", resource_password => $::icingaweb2::ido_db_pass,
} }
# Configure roles.ini # Configure roles.ini
icingaweb2::config::roles { 'Admins': icingaweb2::config::roles { 'Admins':
role_users => "${::icingaweb2::admin_users}", role_users => $::icingaweb2::admin_users,
role_permissions => "${::icingaweb2::admin_permissions}", role_permissions => $::icingaweb2::admin_permissions,
} }
if $::icingaweb2::manage_apache_vhost { if $::icingaweb2::manage_apache_vhost {
::apache::custom_config { 'icingaweb2': ::apache::custom_config { 'icingaweb2':
content => template("${::icingaweb2::template_apache}"), content => template($::icingaweb2::template_apache),
} }
} }
} }

8
manifests/config/authentication_database.pp
View file

@ -12,14 +12,14 @@ define icingaweb2::config::authentication_database (
} }
ini_setting { "icingaweb2 authentication ${title} resource": ini_setting { "icingaweb2 authentication ${title} resource":
section => "$auth_section", section => $auth_section,
setting => 'resource', setting => 'resource',
value => "\"$auth_resource\"", value => "\"${auth_resource}\"",
} }
ini_setting { "icingaweb2 authentication ${title} backend": ini_setting { "icingaweb2 authentication ${title} backend":
section => "$auth_section", section => $auth_section,
setting => 'backend', setting => 'backend',
value => '"db"', value => '"db"',
} }
} }

8
manifests/config/authentication_external.pp
View file

@ -12,14 +12,14 @@ define icingaweb2::config::authentication_external (
} }
ini_setting { "icingaweb2 authentication ${title} filter": ini_setting { "icingaweb2 authentication ${title} filter":
section => "$auth_section", section => $auth_section,
setting => 'strip_username_regexp', setting => 'strip_username_regexp',
value => "\"$auth_filter\"", value => "\"${auth_filter}\"",
} }
ini_setting { "icingaweb2 authentication ${title} backend": ini_setting { "icingaweb2 authentication ${title} backend":
section => "$auth_section", section => $auth_section,
setting => 'backend', setting => 'backend',
value => '"external"', value => '"external"',
} }
} }