Skip to content
This repository was archived by the owner on Apr 16, 2018. It is now read-only.

Commit 21b4129

Browse files
TheFlyingCorpseTheFlyingCorpse
committed
Add a new class to handle path resolving for PR 196
1 parent f49387f commit 21b4129

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+214
-113
lines changed

‎manifests/conf.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
$template = undef,
2424
$options_hash = undef,
2525
$ensure = present,
26-
$target_dir = "${::icinga2::config_dir}/conf.d",
26+
$target_dir = "${::icinga2::paths::config_dir}/conf.d",
2727
$target_file_name = "${name}.conf",
2828
$target_file_owner = $::icinga2::config_owner,
2929
$target_file_group = $::icinga2::config_group,

‎manifests/config.pp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
# maintained directories
1515
file {
1616
[
17-
$::icinga2::config_dir,
18-
"${::icinga2::config_dir}/pki",
19-
"${::icinga2::config_dir}/scripts",
20-
"${::icinga2::config_dir}/features-available",
17+
$::icinga2::paths::config_dir,
18+
"${::icinga2::paths::config_dir}/pki",
19+
"${::icinga2::paths::config_dir}/scripts",
20+
"${::icinga2::paths::config_dir}/features-available",
2121
]:
2222
ensure => directory,
2323
}
2424

2525
# TODO: temporary until we provide some default templates
2626
file {
2727
[
28-
"${::icinga2::config_dir}/conf.d",
28+
"${::icinga2::paths::config_dir}/conf.d",
2929
]:
3030
ensure => directory,
3131
purge => $::icinga2::purge_confd,
@@ -35,54 +35,54 @@
3535

3636
file {
3737
[
38-
"${::icinga2::config_dir}/features-enabled",
39-
"${::icinga2::config_dir}/objects",
40-
"${::icinga2::config_dir}/zones.d",
38+
"${::icinga2::paths::config_dir}/features-enabled",
39+
"${::icinga2::paths::config_dir}/objects",
40+
"${::icinga2::paths::config_dir}/zones.d",
4141
]:
4242
ensure => directory,
4343
purge => $::icinga2::purge_configs,
4444
recurse => $::icinga2::purge_configs,
4545
force => $::icinga2::purge_configs,
4646
}
4747

48-
file { "${::icinga2::config_dir}/icinga2.conf":
48+
file { "${::icinga2::paths::config_dir}/icinga2.conf":
4949
ensure => file,
5050
content => template($::icinga2::config_template),
5151
}
5252

5353
# maintained object directories
5454
file {
5555
[
56-
"${::icinga2::config_dir}/objects/hosts",
57-
"${::icinga2::config_dir}/objects/hostgroups",
58-
"${::icinga2::config_dir}/objects/services",
59-
"${::icinga2::config_dir}/objects/servicegroups",
60-
"${::icinga2::config_dir}/objects/users",
61-
"${::icinga2::config_dir}/objects/usergroups",
62-
"${::icinga2::config_dir}/objects/checkcommands",
63-
"${::icinga2::config_dir}/objects/notificationcommands",
64-
"${::icinga2::config_dir}/objects/eventcommands",
65-
"${::icinga2::config_dir}/objects/notifications",
66-
"${::icinga2::config_dir}/objects/timeperiods",
67-
"${::icinga2::config_dir}/objects/scheduleddowntimes",
68-
"${::icinga2::config_dir}/objects/dependencies",
69-
"${::icinga2::config_dir}/objects/perfdatawriters",
70-
"${::icinga2::config_dir}/objects/graphitewriters",
71-
"${::icinga2::config_dir}/objects/idomysqlconnections",
72-
"${::icinga2::config_dir}/objects/idopgsqlconnections",
73-
"${::icinga2::config_dir}/objects/livestatuslisteners",
74-
"${::icinga2::config_dir}/objects/statusdatawriters",
75-
"${::icinga2::config_dir}/objects/applys",
76-
"${::icinga2::config_dir}/objects/templates",
77-
"${::icinga2::config_dir}/objects/constants",
56+
"${::icinga2::paths::config_dir}/objects/hosts",
57+
"${::icinga2::paths::config_dir}/objects/hostgroups",
58+
"${::icinga2::paths::config_dir}/objects/services",
59+
"${::icinga2::paths::config_dir}/objects/servicegroups",
60+
"${::icinga2::paths::config_dir}/objects/users",
61+
"${::icinga2::paths::config_dir}/objects/usergroups",
62+
"${::icinga2::paths::config_dir}/objects/checkcommands",
63+
"${::icinga2::paths::config_dir}/objects/notificationcommands",
64+
"${::icinga2::paths::config_dir}/objects/eventcommands",
65+
"${::icinga2::paths::config_dir}/objects/notifications",
66+
"${::icinga2::paths::config_dir}/objects/timeperiods",
67+
"${::icinga2::paths::config_dir}/objects/scheduleddowntimes",
68+
"${::icinga2::paths::config_dir}/objects/dependencies",
69+
"${::icinga2::paths::config_dir}/objects/perfdatawriters",
70+
"${::icinga2::paths::config_dir}/objects/graphitewriters",
71+
"${::icinga2::paths::config_dir}/objects/idomysqlconnections",
72+
"${::icinga2::paths::config_dir}/objects/idopgsqlconnections",
73+
"${::icinga2::paths::config_dir}/objects/livestatuslisteners",
74+
"${::icinga2::paths::config_dir}/objects/statusdatawriters",
75+
"${::icinga2::paths::config_dir}/objects/applys",
76+
"${::icinga2::paths::config_dir}/objects/templates",
77+
"${::icinga2::paths::config_dir}/objects/constants",
7878
]:
7979
ensure => directory,
8080
purge => $::icinga2::purge_configs,
8181
recurse => $::icinga2::purge_configs,
8282
force => $::icinga2::purge_configs,
8383
}
8484

85-
file { "${::icinga2::config_dir}/zones.conf":
85+
file { "${::icinga2::paths::config_dir}/zones.conf":
8686
ensure => file,
8787
content => template('icinga2/zones.conf.erb'),
8888
}

‎manifests/config/objectdir.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
Class['icinga2::config'] ->
1818
file { "icinga2 objectdir ${name}":
1919
ensure => directory,
20-
path => "${::icinga2::config_dir}/objects/${name}",
20+
path => "${::icinga2::paths::config_dir}/objects/${name}",
2121
owner => $::icinga2::config_owner,
2222
group => $::icinga2::config_group,
2323
mode => $::icinga2::config_mode,

‎manifests/database.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
exec { 'mysql_schema_load':
2727
user => 'root',
2828
path => $::path,
29-
command => "mysql -h '${::icinga2::db_host}' -u '${::icinga2::db_user}' -p'${::icinga2::db_pass}' '${::icinga2::db_name}' < '${db_schema}' && touch ${::icinga2::config_dir}/mysql_schema_loaded.txt",
30-
creates => "${::icinga2::config_dir}/mysql_schema_loaded.txt",
29+
command => "mysql -h '${::icinga2::db_host}' -u '${::icinga2::db_user}' -p'${::icinga2::db_pass}' '${::icinga2::db_name}' < '${db_schema}' && touch ${::icinga2::paths::config_dir}/mysql_schema_loaded.txt",
30+
creates => "${::icinga2::paths::config_dir}/mysql_schema_loaded.txt",
3131
}
3232
}
3333
elsif $::icinga2::db_type == 'pgsql' {
@@ -47,8 +47,8 @@
4747
environment => [
4848
"PGPASSWORD=${::icinga2::db_pass}",
4949
],
50-
command => "psql -U '${::icinga2::db_user}' -h '${::icinga2::db_host}' ${port} -d '${::icinga2::db_name}' < '${db_schema}' && touch ${::icinga2::config_dir}/postgres_schema_loaded.txt",
51-
creates => "${::icinga2::config_dir}/postgres_schema_loaded.txt",
50+
command => "psql -U '${::icinga2::db_user}' -h '${::icinga2::db_host}' ${port} -d '${::icinga2::db_name}' < '${db_schema}' && touch ${::icinga2::paths::config_dir}/postgres_schema_loaded.txt",
51+
creates => "${::icinga2::paths::config_dir}/postgres_schema_loaded.txt",
5252
}
5353
}
5454

‎manifests/feature.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
Class['icinga2::config'] ->
3434
file { "icinga2 feature ${name}":
3535
ensure => file,
36-
path => "${::icinga2::config_dir}/features-available/${name}.conf",
36+
path => "${::icinga2::paths::config_dir}/features-available/${name}.conf",
3737
content => $content_rel,
3838
} ->
3939
File["icinga2 feature ${name} enabled"]
@@ -42,8 +42,8 @@
4242

4343
file { "icinga2 feature ${name} enabled":
4444
ensure => link,
45-
path => "${::icinga2::config_dir}/features-enabled/${name}.conf",
46-
target => "${::icinga2::config_dir}/features-available/${name}.conf",
45+
path => "${::icinga2::paths::config_dir}/features-enabled/${name}.conf",
46+
target => "${::icinga2::paths::config_dir}/features-available/${name}.conf",
4747
}
4848

4949
if $::icinga2::manage_service {

‎manifests/feature/api.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
class icinga2::feature::api (
99
$accept_commands = false,
1010
$accept_config = false,
11-
$ca_path = "${::icinga2::config_dir}/pki/ca.crt",
12-
$cert_path = "${::icinga2::config_dir}/pki/${::fqdn}.crt",
13-
$key_path = "${::icinga2::config_dir}/pki/${::fqdn}.key",
11+
$ca_path = "${::icinga2::paths::config_dir}/pki/ca.crt",
12+
$cert_path = "${::icinga2::paths::config_dir}/pki/${::fqdn}.crt",
13+
$key_path = "${::icinga2::paths::config_dir}/pki/${::fqdn}.key",
1414
$crl_path = undef,
1515
$bind_host = undef,
1616
$bind_port = undef,

‎manifests/feature/debuglog.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
class icinga2::feature::debuglog (
66
$severity = 'debug',
7-
$path = "${::icinga2::var_dir}/log/icinga2/debug.log"
7+
$path = "${::icinga2::paths::var_dir}/log/icinga2/debug.log"
88
) {
99

1010
validate_string($severity)

‎manifests/feature/graphite.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
enable_send_thresholds => $enable_send_thresholds,
2222
enable_send_metadata => $enable_send_metadata,
2323
enable_legacy_mode => $enable_legacy_mode,
24-
target_dir => "${::icinga2::config_dir}/features-available",
24+
target_dir => "${::icinga2::paths::config_dir}/features-available",
2525
}
2626

2727
::icinga2::feature { 'graphite':

‎manifests/feature/ido_mysql.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
cleanup => $cleanup,
5252
categories => $categories,
5353
target_file_name => 'ido-mysql.conf',
54-
target_dir => "${::icinga2::config_dir}/features-available",
54+
target_dir => "${::icinga2::paths::config_dir}/features-available",
5555
} ->
5656

5757
::icinga2::feature { 'ido-mysql':

‎manifests/feature/ido_pgsql.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
cleanup => $cleanup,
5252
categories => $categories,
5353
target_file_name => 'ido-pgsql.conf',
54-
target_dir => "${::icinga2::config_dir}/features-available",
54+
target_dir => "${::icinga2::paths::config_dir}/features-available",
5555
} ->
5656

5757
::icinga2::feature { 'ido-pgsql':

0 commit comments

Comments
 (0)