From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 3 Jun 2012 19:44:36 +0000 (+0200)
Subject: Try different file names, to see if that pleases puppet
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=8fc104f1c82d84fb71ed3f3b5e8ac7708dea6d86

Try different file names, to see if that pleases puppet
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 1db00d81..61231224 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,7 +41,7 @@ node default {
 	}
 
 	if $::hostname == 'dinis' {
-		include bacula-director
+		include bacula::director
 	}
 
 	if $::kernel == Linux {
diff --git a/modules/bacula/manifests/bacula-director.pp b/modules/bacula/manifests/bacula-director.pp
deleted file mode 100644
index 62665945..00000000
--- 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
index 00000000..3bb01976
--- /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;
+  }
+}