(dhcp) renamed classes inside files, and updated includes

3 files changed, 10 insertions, 10 deletions

diff --git a/manifests/classes/dhcp-server-base.pp b/manifests/classes/dhcp-server-base.pp
index 4e1497e..2410896 100644
--- a/manifests/classes/dhcp-server-base.pp
+++ b/manifests/classes/dhcp-server-base.pp
@@ -1,13 +1,13 @@
 /*
 
-= Class dhcp::base
+= Class dhcp::server::base
 Do NOT include this class - it won't work at all.
 Set variables for package name and so on.
-This class should be inherited in dhcp::$operatingsystem.
+This class should be inherited in dhcp::server::$operatingsystem.
 
 */
-class dhcp::base {
-  include dhcp::variables
+class dhcp::server::base {
+  include dhcp::params
   package {"dhcp-server":
     ensure => present,
     name   => $dhcp::variables::srv_dhcpd,
diff --git a/manifests/classes/dhcp-server-debian.pp b/manifests/classes/dhcp-server-debian.pp
index eacd8b6..b1056be 100644
--- a/manifests/classes/dhcp-server-debian.pp
+++ b/manifests/classes/dhcp-server-debian.pp
@@ -1,12 +1,12 @@
 /*
 
-= Class: dhcp::debian
+= Class: dhcp::server::debian
 Installs a dhcp server on debian system.
 
-This class should not be included as is, please include "dhcp" instead.
+This class should not be included as is, please include "dhcp::server" instead.
 
 */
-class dhcp::debian inherits dhcp::base {
+class dhcp::server::debian inherits dhcp::server::base {
 
   Common::Concatfilepart["00-base"] {
     content => template('dhcp/dhcpd.conf.debian.erb'),
diff --git a/manifests/classes/dhcp-server.pp b/manifests/classes/dhcp-server.pp
index 9ae7b9f..f0efea0 100644
--- a/manifests/classes/dhcp-server.pp
+++ b/manifests/classes/dhcp-server.pp
@@ -1,6 +1,6 @@
 /*
 
-= Class: dhcp
+= Class: dhcp::server
 Simple OS wrapper. Include this to install a dhcp server on your host.
 
 Requires:
@@ -18,7 +18,7 @@ Example:
 node "dhcp.toto.ltd" {
   $dhcpd_domain_name = 'toto.ltd'
   $dhcpd_dns_servers = '192.168.21.1'
-  include dhcp
+  include dhcp::server
   
   dhcp::subnet {"192.168.20.0":
     ensure => present,
@@ -38,6 +38,6 @@ node "dhcp.toto.ltd" {
 */
 class dhcp {
   case $operatingsystem {
-    Debian: { include dhcp::debian }
+    Debian: { include dhcp::server::debian }
   }
 }