From 08359bd89e27e21a8434046861b2045de9e1d389 Mon Sep 17 00:00:00 2001
From: Cédric Jeanneret <cedric.jeanneret@camptocamp.com>
Date: Fri, 5 Nov 2010 11:58:27 +0100
Subject: (dhcp) renamed files so that we see they comes from dhcp module

This will prevent duplicated definitions.
---
 manifests/classes/dhcp-server-base.pp   | 4 ++--
 manifests/classes/dhcp-server-debian.pp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests')

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'),
   }
 
-- 
cgit v1.2.3