aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Jeanneret <cedric.jeanneret@camptocamp.com>2010-11-05 11:58:27 +0100
committerCédric Jeanneret <cedric.jeanneret@camptocamp.com>2010-11-05 11:58:27 +0100
commit08359bd89e27e21a8434046861b2045de9e1d389 (patch)
tree921a6eda5c77758a78ec57a2ceed0acf8440600f
parenta580b3818a0d0ff9aea5dcce9e1abc02d584a183 (diff)
downloadpuppet-dhcp-08359bd89e27e21a8434046861b2045de9e1d389.tar.gz
puppet-dhcp-08359bd89e27e21a8434046861b2045de9e1d389.tar.bz2
(dhcp) renamed files so that we see they comes from dhcp module
This will prevent duplicated definitions.
-rw-r--r--manifests/classes/dhcp-server-base.pp4
-rw-r--r--manifests/classes/dhcp-server-debian.pp2
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/classes/dhcp-server-base.pp b/manifests/classes/dhcp-server-base.pp
index 2410896..d997ad1 100644
--- a/manifests/classes/dhcp-server-base.pp
+++ b/manifests/classes/dhcp-server-base.pp
@@ -20,14 +20,14 @@ class dhcp::server::base {
require => Package["dhcp-server"],
}
- common::concatfilepart {"00-base":
+ common::concatfilepart {"00.dhcp.server.base":
file => "${dhcp::variables::config_dir}/dhcpd.conf",
ensure => present,
require => Package["dhcp-server"],
notify => Service["dhcpd"],
}
- file {"subnet-config-dir":
+ file {"dhcp-subnet-config-dir":
path => "${dhcp::variables::config_dir}/subnets",
ensure => directory,
require => Package["dhcp-server"],
diff --git a/manifests/classes/dhcp-server-debian.pp b/manifests/classes/dhcp-server-debian.pp
index b1056be..9762384 100644
--- a/manifests/classes/dhcp-server-debian.pp
+++ b/manifests/classes/dhcp-server-debian.pp
@@ -8,7 +8,7 @@ This class should not be included as is, please include "dhcp::server" instead.
*/
class dhcp::server::debian inherits dhcp::server::base {
- Common::Concatfilepart["00-base"] {
+ Common::Concatfilepart["00.dhcp.server.base"] {
content => template('dhcp/dhcpd.conf.debian.erb'),
}