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, 43 insertions, 0 deletions

diff --git a/manifests/server/config.pp b/manifests/server/config.pp
new file mode 100644
index 0000000..c37d044
--- /dev/null
+++ b/manifests/server/config.pp
@@ -0,0 +1,43 @@
+class dhcp::server::config {
+  include ::dhcp::params
+  include ::concat::setup
+
+  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",
+    content => template($dhcp::params::base_template),
+  }
+
+  file {"${dhcp::params::config_dir}/dhcpd.conf.d":
+    ensure  => directory,
+    mode    => '0700',
+    recurse => true,
+    purge   => true,
+    force   => true,
+    source  => "puppet:///modules/${module_name}/empty"
+  }
+
+  file {"${dhcp::params::config_dir}/subnets":
+    ensure  => directory,
+    recurse => true,
+    purge   => true,
+    force   => true,
+    source  => "puppet:///modules/${module_name}/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/${module_name}/empty",
+  }
+}