file renaming to be compliant with recommended module structure.

diff --git a/manifests/definitions/bind-a.pp b/manifests/a.pp
similarity index 100%
rename from manifests/definitions/bind-a.pp
rename to manifests/a.pp

diff --git a/manifests/definitions/bind-aaaa.pp b/manifests/aaaa.pp
similarity index 100%
rename from manifests/definitions/bind-aaaa.pp
rename to manifests/aaaa.pp

diff --git a/manifests/classes/bind-base.pp b/manifests/base.pp
similarity index 100%
rename from manifests/classes/bind-base.pp
rename to manifests/base.pp

diff --git a/manifests/classes/bind.pp b/manifests/classes/bind.pp
deleted file mode 100644 (file)
index d9af708..0000000
--- a/manifests/classes/bind.pp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-
-= Class: bind
-Include this class to install bind9 server on your node.
-
-Requires:
-- module common (git://github.com/camptocamp/puppet-common.git)
-
-Bind documentation:
-http://www.bind9.net/manuals
-
-Limitations:
-This modules is valid for Bind 9.7.1 (squeeze version).
-For 9.7.2, it will be really limited (no view nor ACL support).
-
-
-Example:
-
-node "ns1.domain.ltd" {
-  include bind
-  bind::zone {"domain.ltd":
-    ensure => present,
-    zone_contact => "contact.domain.ltd",
-    zone_ns      => $fqdn,
-    zone_serial  => "2010110804",
-    zone_ttl     => "604800",
-  }
-
-  bind::a {"ns $fqdn":
-    zone  => "domain.ltd",
-    owner => "${fqdn}.",
-    host  => $ipaddress,
-  }
-
-  bind::a {"mail.domain.ltd":
-    zone  => "domain.ltd",
-    owner => "mail",
-    host  => "6.6.6.6",
-  }
-
-  bind::mx {"mx1":
-    zone     => "domain.ltd",
-    owner    => "@",
-    priority => 1,
-    host     => "mail.domain.ltd",
-  }
-}
-*/
-class bind {
-  case $operatingsystem {
-    "Debian","Ubuntu": { include bind::debian }
-    default: { fail "Unknown $operatingsystem" }
-  }
-}

diff --git a/manifests/definitions/bind-cname.pp b/manifests/cname.pp
similarity index 100%
rename from manifests/definitions/bind-cname.pp
rename to manifests/cname.pp

diff --git a/manifests/classes/bind-debian.pp b/manifests/debian.pp
similarity index 100%
rename from manifests/classes/bind-debian.pp
rename to manifests/debian.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index 6cc196984538866527976cfecefe39bf4de9c63c..d9af70871d8c5acbe017adddabe8ee910d8b2051 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,2 +1,54 @@
-import "classes/*.pp"
-import "definitions/*.pp"
+/*
+
+= Class: bind
+Include this class to install bind9 server on your node.
+
+Requires:
+- module common (git://github.com/camptocamp/puppet-common.git)
+
+Bind documentation:
+http://www.bind9.net/manuals
+
+Limitations:
+This modules is valid for Bind 9.7.1 (squeeze version).
+For 9.7.2, it will be really limited (no view nor ACL support).
+
+
+Example:
+
+node "ns1.domain.ltd" {
+  include bind
+  bind::zone {"domain.ltd":
+    ensure => present,
+    zone_contact => "contact.domain.ltd",
+    zone_ns      => $fqdn,
+    zone_serial  => "2010110804",
+    zone_ttl     => "604800",
+  }
+
+  bind::a {"ns $fqdn":
+    zone  => "domain.ltd",
+    owner => "${fqdn}.",
+    host  => $ipaddress,
+  }
+
+  bind::a {"mail.domain.ltd":
+    zone  => "domain.ltd",
+    owner => "mail",
+    host  => "6.6.6.6",
+  }
+
+  bind::mx {"mx1":
+    zone     => "domain.ltd",
+    owner    => "@",
+    priority => 1,
+    host     => "mail.domain.ltd",
+  }
+}
+*/
+class bind {
+  case $operatingsystem {
+    "Debian","Ubuntu": { include bind::debian }
+    default: { fail "Unknown $operatingsystem" }
+  }
+}

diff --git a/manifests/definitions/bind-mx.pp b/manifests/mx.pp
similarity index 100%
rename from manifests/definitions/bind-mx.pp
rename to manifests/mx.pp

diff --git a/manifests/definitions/bind-ns.pp b/manifests/ns.pp
similarity index 100%
rename from manifests/definitions/bind-ns.pp
rename to manifests/ns.pp

diff --git a/manifests/definitions/bind-record.pp b/manifests/record.pp
similarity index 100%
rename from manifests/definitions/bind-record.pp
rename to manifests/record.pp

diff --git a/manifests/definitions/bind-zone.pp b/manifests/zone.pp
similarity index 100%
rename from manifests/definitions/bind-zone.pp
rename to manifests/zone.pp