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

Style fixes

Browse source
This commit is contained in:
Tom De Vylder 2015-04-23 11:40:42 +02:00
parent 0ded568a44
commit d4eff6a815
10 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
manifests/config.pp
View file

@ -32,24 +32,24 @@ class icingaweb2::config (
recurse => $::icingaweb2::config_dir_recurse;
"${::icingaweb2::config_dir}/enabledModules":
ensure => directory,
mode => $::icingaweb2::config_dir_mode;
ensure => directory,
mode => $::icingaweb2::config_dir_mode;
"${::icingaweb2::config_dir}/modules":
ensure => directory,
mode => $::icingaweb2::config_dir_mode;
ensure => directory,
mode => $::icingaweb2::config_dir_mode;
"${::icingaweb2::config_dir}/authentication.ini":
ensure => file;
"${::icingaweb2::config_dir}/config.ini":
ensure => file;
ensure => file;
"${::icingaweb2::config_dir}/resources.ini":
ensure => file;
ensure => file;
"${::icingaweb2::config_dir}/roles.ini":
ensure => file;
ensure => file;
$::icingaweb2::web_root:
ensure => directory,
@ -89,11 +89,13 @@ class icingaweb2::config (
setting => 'log',
value => "\"${::icingaweb2::log_method}\"",
}
ini_setting { 'icingaweb2 config logging level':
section => 'logging',
setting => 'level',
value => "\"${::icingaweb2::log_level}\"",
}
ini_setting { 'icingaweb2 config logging application':
section => 'logging',
setting => 'application',
@ -106,6 +108,7 @@ class icingaweb2::config (
setting => 'store',
value => "\"${::icingaweb2::log_store}\"",
}
ini_setting { 'icingaweb2 config preferences resource':
section => 'preferences',
setting => 'resource',

6
manifests/config/authentication_database.pp
View file

@ -1,10 +1,9 @@
# Define for setting IcingaWeb2 Authentication
#
define icingaweb2::config::authentication_database (
$auth_section = undef,
$auth_resource = undef,
$auth_section = undef,
) {
Ini_Setting {
ensure => present,
require => File["${::icingaweb2::config_dir}/authentication.ini"],
@ -23,3 +22,4 @@ define icingaweb2::config::authentication_database (
value => '"db"',
}
}

6
manifests/config/authentication_external.pp
View file

@ -1,10 +1,9 @@
# Define for setting IcingaWeb2 Authentication
#
define icingaweb2::config::authentication_external (
$auth_section = undef,
$auth_filter = undef,
$auth_section = undef,
) {
Ini_Setting {
ensure => present,
require => File["${::icingaweb2::config_dir}/authentication.ini"],
@ -23,3 +22,4 @@ define icingaweb2::config::authentication_external (
value => '"external"',
}
}

14
manifests/config/resource_database.pp
View file

@ -1,15 +1,14 @@
# Define for setting IcingaWeb2 Database Resource
# Define for setting IcingaWeb2 Database Resource
#
define icingaweb2::config::resource_database (
$resource_name = $title,
$resource_db = undef,
$resource_host = undef,
$resource_port = undef,
$resource_dbname = undef,
$resource_username = undef,
$resource_host = undef,
$resource_name = $title,
$resource_password = undef,
$resource_port = undef,
$resource_username = undef,
) {
Ini_Setting {
ensure => present,
require => File["${::icingaweb2::config_dir}/resources.ini"],
@ -58,3 +57,4 @@ define icingaweb2::config::resource_database (
value => "\"${resource_password}\"",
}
}

8
manifests/config/resource_file.pp
View file

@ -1,11 +1,10 @@
# Define for setting IcingaWeb2 File Resource
# Define for setting IcingaWeb2 File Resource
#
define icingaweb2::config::resource_file (
$resource_name = $title,
$resource_filepath = undef,
$resource_name = $title,
$resource_pattern = undef,
) {
Ini_Setting {
ensure => present,
require => File["${::icingaweb2::config_dir}/resources.ini"],
@ -30,3 +29,4 @@ define icingaweb2::config::resource_file (
value => "\"${resource_pattern}\"",
}
}

14
manifests/config/resource_ldap.pp
View file

@ -1,14 +1,13 @@
# Define for setting IcingaWeb2 LDAP Resource
# Define for setting IcingaWeb2 LDAP Resource
#
define icingaweb2::config::resource_ldap (
$resource_name = $title,
$resource_host = undef,
$resource_port = undef,
$resource_root_dn = undef,
$resource_bind_dn = undef,
$resource_bind_pw = undef,
$resource_host = undef,
$resource_name = $title,
$resource_port = undef,
$resource_root_dn = undef,
) {
Ini_Setting {
ensure => present,
require => File["${::icingaweb2::config_dir}/resources.ini"],
@ -51,3 +50,4 @@ define icingaweb2::config::resource_ldap (
value => "\"${resource_bind_pw}\"",
}
}

7
manifests/config/resource_livestatus.pp
View file

@ -1,10 +1,9 @@
# Define for setting IcingaWeb2 LiveStatus
# Define for setting IcingaWeb2 LiveStatus
#
define icingaweb2::config::resource_livestatus (
$resource_name = $title,
$resource_socket = undef,
) {
Ini_Setting {
ensure => present,
require => File["${::icingaweb2::config_dir}/resources.ini"],
@ -22,5 +21,5 @@ define icingaweb2::config::resource_livestatus (
setting => 'socket',
value => "\"${resource_socket}\"",
}
}

12
manifests/config/roles.pp
View file

@ -1,14 +1,13 @@
# Define for setting IcingaWeb2 Roles
# Define for setting IcingaWeb2 Roles
#
define icingaweb2::config::roles (
$role_name = $title,
$role_users = undef,
$role_groups = undef,
$role_permissions = undef,
$role_host_filter = undef,
$role_name = $title,
$role_permissions = undef,
$role_service_filter = undef,
$role_users = undef,
) {
Ini_Setting {
ensure => present,
require => File["${::icingaweb2::config_dir}/roles.ini"],
@ -45,3 +44,4 @@ define icingaweb2::config::roles (
value => "\"${role_service_filter}\"",
}
}

2
manifests/init.pp
View file

@ -252,11 +252,11 @@ class icingaweb2 (
validate_string($template_config)
validate_string($template_resources)
validate_string($template_roles)
if $::icingaweb2::manage_apache_vhost {
validate_string($template_apache)
}
if $pkg_repo_release_metadata_expire {
validate_string($pkg_repo_release_metadata_expire)
}

6
manifests/preinstall/redhat.pp
View file

@ -32,10 +32,10 @@ define icingaweb2::preinstall::redhat(
}
}
# TODO 'Debian': {}
# TODO 'Ubuntu': {}
# TODO 'Fedora': {}
# TODO 'Amazon': {}
# TODO 'Debian': {}
# TODO 'Fedora': {}
# TODO 'Ubuntu': {}
default: {
# Already caught by icingaweb2::preinstall