Refactor module

  * Use a top dhcp class with a $server boolean param
  * Refactor the dhcp::class to use packages/config/service classes
  * Don't use inheritance, put everything in dhcp::params

1 files changed, 0 insertions, 65 deletions

diff --git a/manifests/server/base.pp b/manifests/server/base.pp
deleted file mode 100644
index 4e7d645..0000000
--- a/manifests/server/base.pp
+++ /dev/null
@@ -1,65 +0,0 @@
-# = 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::server::$operatingsystem.
-#
-class dhcp::server::base {
-
-  include dhcp::params
-  include concat::setup
-
-  package {'dhcp-server':
-    ensure => present,
-    name   => $dhcp::params::srv_dhcpd,
-  }
-
-  service {'dhcpd':
-    ensure  => running,
-    name    => $dhcp::params::srv_dhcpd,
-    enable  => true,
-    require => Package['dhcp-server'],
-  }
-
-  concat {"${dhcp::params::config_dir}/dhcpd.conf":
-    owner => root,
-    group => root,
-    mode  => '0644',
-  }
-
-  concat::fragment {'00.dhcp.server.base':
-    ensure  => present,
-    target  => "${dhcp::params::config_dir}/dhcpd.conf",
-    require => Package['dhcp-server'],
-    notify  => Service['dhcpd'],
-  }
-
-  file {"${dhcp::params::config_dir}/dhcpd.conf.d":
-    ensure  => directory,
-    mode    => '0700',
-    recurse => true,
-    purge   => true,
-    force   => true,
-    source  => 'puppet:///modules/dhcp/empty'
-  }
-
-  file {"${dhcp::params::config_dir}/subnets":
-    ensure  => directory,
-    recurse => true,
-    purge   => true,
-    force   => true,
-    source  => 'puppet:///modules/dhcp/empty',
-    require => Package['dhcp-server'],
-    notify  => Service['dhcpd'],
-  }
-
-  file {"${dhcp::params::config_dir}/hosts.d":
-    ensure  => directory,
-    recurse => true,
-    purge   => true,
-    force   => true,
-    source  => 'puppet:///modules/dhcp/empty',
-    require => Package['dhcp-server'],
-  }
-
-}