From 5f4a22d6775fc091124c95bbb0b891bf95e6043c Mon Sep 17 00:00:00 2001
From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 15 Nov 2011 13:17:30 +0100
Subject: file renaming to be compliant with recommended module structure.

---
 manifests/classes/dhcp-params.pp        | 22 -------------
 manifests/classes/dhcp-server-base.pp   | 58 ---------------------------------
 manifests/classes/dhcp-server-debian.pp | 21 ------------
 manifests/classes/dhcp-server.pp        | 37 ---------------------
 4 files changed, 138 deletions(-)
 delete mode 100644 manifests/classes/dhcp-params.pp
 delete mode 100644 manifests/classes/dhcp-server-base.pp
 delete mode 100644 manifests/classes/dhcp-server-debian.pp
 delete mode 100644 manifests/classes/dhcp-server.pp

(limited to 'manifests/classes')

diff --git a/manifests/classes/dhcp-params.pp b/manifests/classes/dhcp-params.pp
deleted file mode 100644
index 4a8eaa1..0000000
--- a/manifests/classes/dhcp-params.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-
-= Class: dhcp::params
-Do NOT include this class - it won't do anything.
-Set variables for names and paths
-
-*/
-class dhcp::params {
-  case $operatingsystem {
-    Debian: {
-      $config_dir = $lsbdistcodename? {
-        lenny   => "/etc/dhcp3",
-        squeeze => "/etc/dhcp",
-      }
-
-      $srv_dhcpd = $lsbdistcodename? {
-        lenny   => "dhcp3-server",
-        squeeze => "isc-dhcp-server",
-      }
-    }
-  }
-}
diff --git a/manifests/classes/dhcp-server-base.pp b/manifests/classes/dhcp-server-base.pp
deleted file mode 100644
index 1725b36..0000000
--- a/manifests/classes/dhcp-server-base.pp
+++ /dev/null
@@ -1,58 +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
-  package {"dhcp-server":
-    ensure => present,
-    name   => $dhcp::params::srv_dhcpd,
-  }
-
-  service {"dhcpd":
-    name    => $dhcp::params::srv_dhcpd,
-    ensure  => running,
-    enable  => true,
-    require => Package["dhcp-server"],
-  }
-
-  common::concatfilepart {"00.dhcp.server.base":
-    file    => "${dhcp::params::config_dir}/dhcpd.conf",
-    ensure  => present,
-    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,
-    require => Package["dhcp-server"],
-    notify  => Service["dhcpd"],
-    recurse => true,
-    purge   => true,
-    force   => true,
-    source  => "puppet:///modules/dhcp/empty"
-  }
-
-  file {"${dhcp::params::config_dir}/hosts.d":
-    ensure => directory,
-    require => Package["dhcp-server"],
-    recurse => true,
-    purge   => true,
-    force   => true,
-    source  => "puppet:///modules/dhcp/empty"
-  }
-
-}
diff --git a/manifests/classes/dhcp-server-debian.pp b/manifests/classes/dhcp-server-debian.pp
deleted file mode 100644
index 9762384..0000000
--- a/manifests/classes/dhcp-server-debian.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-
-= Class: dhcp::server::debian
-Installs a dhcp server on debian system.
-
-This class should not be included as is, please include "dhcp::server" instead.
-
-*/
-class dhcp::server::debian inherits dhcp::server::base {
-
-  Common::Concatfilepart["00.dhcp.server.base"] {
-    content => template('dhcp/dhcpd.conf.debian.erb'),
-  }
-
-  Service["dhcpd"] {
-    pattern => $lsbdistcodename ? {
-      squeeze => "/usr/sbin/dhcpd",
-      lenny   => "/usr/sbin/dhcpd3",
-    }
-  }
-}
diff --git a/manifests/classes/dhcp-server.pp b/manifests/classes/dhcp-server.pp
deleted file mode 100644
index 7d56854..0000000
--- a/manifests/classes/dhcp-server.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-
-= Class: dhcp::server
-Simple OS wrapper. Include this to install a dhcp server on your host.
-
-Requires:
-  module "common": git://github.com/camptocamp/puppet-common.git
-
-facultative argument:
-  *$dhcpd_ddns_update*        : ddns-update-style option (default to none)
-  *$dhcpd_authoritative* : set it if you want that your DHCP server is authoritative (default to no)
-  *$dhcpd_opts*               : any other DHCPD valid options
-
-Example:
-node "dhcp.toto.ltd" {
-  $dhcpd_opts = ['domain-name "toto.ltd"', "domain-name-servers 192.168.21.1"]
-  include dhcp::server
-  
-  dhcp::subnet {"10.27.20.0":
-    ensure     => present,
-    broadcast  => "10.27.20.255",
-    other_opts => ['filename "pxelinux.0";', 'next-server 10.27.10.1;'],
-  }
-
-  dhcp::host {"titi-eth0":
-    ensure => present,
-    mac    => "0e:18:fa:fe:d9:00",
-    subnet => "10.27.20.0",
-    fixed_address => "10.27.10.52",
-  }
-}
-*/
-class dhcp::server {
-  case $operatingsystem {
-    Debian: { include dhcp::server::debian }
-  }
-}
-- 
cgit v1.2.3