Try different file names, to see if that pleases puppet

diff --git a/manifests/site.pp b/manifests/site.pp
index 1db00d81f6af53f8fed98284425522906b99c07e..6123122491d6661c7e8a7f66b40a7a283110f8fe 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,7 +41,7 @@ node default {
        }
 
        if $::hostname == 'dinis' {
        }
 
        if $::hostname == 'dinis' {

-               include bacula-director
+               include bacula::director

        }
 
        if $::kernel == Linux {
        }
 
        if $::kernel == Linux {

diff --git a/modules/bacula/manifests/bacula-director.pp b/modules/bacula/manifests/bacula-director.pp
deleted file mode 100644 (file)
index 6266594..0000000
--- a/modules/bacula/manifests/bacula-director.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-class bacula-director inherits bacula {
-
-  package {
-    "bacula-director-pgsql": ensure => installed;
-    "bacula-common": ensure => installed;
-    "bacula-common-pgsql": ensure => installed;
-  }
-
-  service {
-    "bacula-director":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      require => Package["bacula-director-pgsql"];
-  }
-  file {
-    "/etc/bacula/conf.d":
-      ensure  => directory,
-      mode => 755,
-      group => bacula,
-      notify  => Exec["bacula-director restart"]
-      ;
-    "/etc/bacula/bacula-dir.conf":
-      content => template("bacula/etc/bacula/bacula-dir.conf.erb"),
-      mode => 440,
-      group => bacula,
-      require => Package["bacula-director-pgsql"],
-      notify  => Exec["bacula-director restart"]
-      ;
-  }
-
-  exec {
-    "bacula-director restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
-  }
-}

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
new file mode 100644 (file)
index 0000000..3bb0197
--- /dev/null
+++ b/modules/bacula/manifests/director.pp
@@ -0,0 +1,37 @@
+class bacula::director inherits bacula {
+
+  package {
+    "bacula-director-pgsql": ensure => installed;
+    "bacula-common": ensure => installed;
+    "bacula-common-pgsql": ensure => installed;
+  }
+
+  service {
+    "bacula-director":
+      ensure => running,
+      enable => true,
+      hasstatus => true,
+      require => Package["bacula-director-pgsql"];
+  }
+  file {
+    "/etc/bacula/conf.d":
+      ensure  => directory,
+      mode => 755,
+      group => bacula,
+      notify  => Exec["bacula-director restart"]
+      ;
+    "/etc/bacula/bacula-dir.conf":
+      content => template("bacula/etc/bacula/bacula-dir.conf.erb"),
+      mode => 440,
+      group => bacula,
+      require => Package["bacula-director-pgsql"],
+      notify  => Exec["bacula-director restart"]
+      ;
+  }
+
+  exec {
+    "bacula-director restart":
+      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+      refreshonly => true;
+  }
+}