Apparently, classes can't have '_' in the name

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 0fc7339..8dd2f39 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,6 @@
 node default {
     include munin-node
     include samhain
-    include debian_org
+    include debian-org
 }
 

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
new file mode 100644 (file)
index 0000000..4bbca8a
--- /dev/null
+++ b/modules/debian-org/manifests/init.pp
@@ -0,0 +1,23 @@
+class debian-org {
+   package { "userdir-ldap": ensure => latest;
+             "zsh": ensure => latest;
+             "tcsh": ensure => latest;
+             "pdksh": ensure => latest;
+             "ksh": ensure => latest;
+             "csh": ensure => latest;
+             "ntp": ensure => latest;
+             "locales-all": ensure => latest;
+             "sudo": ensure => latest;
+             "libpam-pwdfile": ensure => latest;
+             "vim": ensure => latest;
+             "munin-node": ensure => latest;
+             "gnupg": ensure => latest;
+             "bzip2": ensure => latest;
+             "less": ensure => latest;
+             "ed": ensure => latest;
+             "puppet": ensure => latest;
+
+   }
+
+}
+

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
deleted file mode 100644 (file)
index 5e70e5a..0000000
--- a/modules/debian_org/manifests/init.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-class debian_org {
-   package { "userdir-ldap": ensure => latest;
-             "zsh": ensure => latest;
-             "tcsh": ensure => latest;
-             "pdksh": ensure => latest;
-             "ksh": ensure => latest;
-             "csh": ensure => latest;
-             "ntp": ensure => latest;
-             "locales-all": ensure => latest;
-             "sudo": ensure => latest;
-             "libpam-pwdfile": ensure => latest;
-             "vim": ensure => latest;
-             "munin-node": ensure => latest;
-             "gnupg": ensure => latest;
-             "bzip2": ensure => latest;
-             "less": ensure => latest;
-             "ed": ensure => latest;
-             "puppet": ensure => latest;
-
-   }
-
-}
-