diff options
| author | Jeanneret Cedric <contact@internux.ch> | 2015-11-06 08:57:26 +0100 |
|---|---|---|
| committer | Jeanneret Cedric <contact@internux.ch> | 2015-11-06 08:57:26 +0100 |
| commit | b2fcb15c7f3e54720d23a1ad2002dadd872668df (patch) | |
| tree | 1f324dd54a27b7d89d4f45679e2aa4a7716a2193 /manifests | |
| parent | b5ee63a48adbea3e50300e2c0c26c575ec1b5abb (diff) | |
| parent | 42f495f3525bc740ea3b2451cfedac912167f843 (diff) | |
| download | puppet-dhcp-b2fcb15c7f3e54720d23a1ad2002dadd872668df.tar.gz puppet-dhcp-b2fcb15c7f3e54720d23a1ad2002dadd872668df.tar.bz2 | |
Merge pull request #17 from camptocamp/failover-corrected
Failover corrected
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/failover.pp | 4 | ||||
| -rw-r--r-- | manifests/server/config.pp | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/manifests/failover.pp b/manifests/failover.pp index 6b465f2..cfcccb0 100644 --- a/manifests/failover.pp +++ b/manifests/failover.pp @@ -23,7 +23,7 @@ define dhcp::failover( default => $ensure, } - file {"${dhcp::params::config_dir}/failover/${name}.conf": + file {"${dhcp::params::config_dir}/failover.d/${name}.conf": ensure => $_ensure, content => template("${module_name}/failover.conf.erb"), group => 'root', @@ -34,7 +34,7 @@ define dhcp::failover( concat::fragment {"dhcp.failover.${name}": ensure => $ensure, - content => "include \"${dhcp::params::config_dir}/failover/${name}.conf\";\n", + content => "include \"${dhcp::params::config_dir}/failover.d/${name}.conf\";\n", target => "${dhcp::params::config_dir}/dhcpd.conf", } diff --git a/manifests/server/config.pp b/manifests/server/config.pp index eb2efa1..68e2104 100644 --- a/manifests/server/config.pp +++ b/manifests/server/config.pp @@ -52,4 +52,11 @@ class dhcp::server::config { purge => true, force => true, } + + file {"${dhcp::params::config_dir}/failover.d": + ensure => directory, + recurse => true, + purge => true, + force => true, + } } |