From 568be2adf123420070be66dbcba4c9e8b8ef40c8 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sat, 17 Mar 2012 16:53:36 +0000
Subject: split snapshot.pp from init.pp to follow puppet convention of 1
 module per file

---
 modules/catdap/manifests/init.pp     | 25 ++-----------------------
 modules/catdap/manifests/snapshot.pp | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 23 deletions(-)
 create mode 100644 modules/catdap/manifests/snapshot.pp

(limited to 'modules')

diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp
index 713b8b86..9cb4d22f 100644
--- a/modules/catdap/manifests/init.pp
+++ b/modules/catdap/manifests/init.pp
@@ -36,33 +36,12 @@ class catdap {
 
     $ldap_password = extlookup('catdap_ldap','x')
 
-    define catdap_snapshot($location, $svn_location) {
-        file { "$location/catdap_local.yml":
-            group   => apache,
-            mode    => '0640',
-            content => template('catdap/catdap_local.yml'),
-            require => Subversion::Snapshot[$location],
-        }
-
-        subversion::snapshot { $location:
-            source => $svn_location
-        }
-
-        apache::vhost_catalyst_app { $name:
-            script   => "$location/script/catdap_fastcgi.pl",
-            location => $location,
-            use_ssl  => true,
-        }
-
-        apache::vhost_redirect_ssl { $name: }
-    }
-
-    catdap_snapshot { "identity.$::domain":
+    catdap::snapshot { "identity.$::domain":
         location     => '/var/www/identity',
         svn_location => "$upstream_svn/branches/live"
     }
 
-    catdap_snapshot { "identity-trunk.$::domain":
+    catdap::snapshot { "identity-trunk.$::domain":
         location     => '/var/www/identity-trunk',
         svn_location => "$upstream_svn/trunk"
     }
diff --git a/modules/catdap/manifests/snapshot.pp b/modules/catdap/manifests/snapshot.pp
new file mode 100644
index 00000000..4dc7796f
--- /dev/null
+++ b/modules/catdap/manifests/snapshot.pp
@@ -0,0 +1,20 @@
+define catdap::snapshot($location, $svn_location) {
+    file { "$location/catdap_local.yml":
+        group   => apache,
+        mode    => '0640',
+        content => template('catdap/catdap_local.yml'),
+        require => Subversion::Snapshot[$location],
+    }
+
+    subversion::snapshot { $location:
+        source => $svn_location
+    }
+
+    apache::vhost_catalyst_app { $name:
+        script   => "$location/script/catdap_fastcgi.pl",
+        location => $location,
+        use_ssl  => true,
+    }
+
+    apache::vhost_redirect_ssl { $name: }
+}
-- 
cgit v1.2.1