From 9643919d77c272def67c43f7b5b2808b284f8dda Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sun, 23 Mar 2014 16:20:53 +0000
Subject: Switch identity.mageia.org (aka CatDap) to git

---
 modules/catdap/manifests/init.pp     | 7 ++++---
 modules/catdap/manifests/snapshot.pp | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'modules/catdap')

diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp
index 9cb4d22f..41ba5d13 100644
--- a/modules/catdap/manifests/init.pp
+++ b/modules/catdap/manifests/init.pp
@@ -1,6 +1,6 @@
 class catdap {
 
-    $upstream_svn = 'svn://svn.mageia.org/svn/soft/identity/CatDap/'
+    $upstream_git = 'git://git.mageia.org/web/identity'
 
     # TODO switch to a proper rpm packaging
     $rpm_requirement = ['perl-Catalyst-Runtime',
@@ -38,11 +38,12 @@ class catdap {
 
     catdap::snapshot { "identity.$::domain":
         location     => '/var/www/identity',
-        svn_location => "$upstream_svn/branches/live"
+        git_location => $upstream_git,
+        git_branch   => 'topic/production',
     }
 
     catdap::snapshot { "identity-trunk.$::domain":
         location     => '/var/www/identity-trunk',
-        svn_location => "$upstream_svn/trunk"
+        git_location => $upstream_git,
     }
 }
diff --git a/modules/catdap/manifests/snapshot.pp b/modules/catdap/manifests/snapshot.pp
index 95adefe2..d087596f 100644
--- a/modules/catdap/manifests/snapshot.pp
+++ b/modules/catdap/manifests/snapshot.pp
@@ -1,4 +1,4 @@
-define catdap::snapshot($location, $svn_location) {
+define catdap::snapshot($location, $git_location, $git_branch) {
     file { "$location/catdap_local.yml":
         group   => apache,
         mode    => '0640',
@@ -6,8 +6,9 @@ define catdap::snapshot($location, $svn_location) {
         require => Subversion::Snapshot[$location],
     }
 
-    subversion::snapshot { $location:
-        source => $svn_location
+    git::snapshot { $location:
+        source => $git_location,
+        branch => $git_branch,
     }
 
     apache::vhost::catalyst_app { $name:
-- 
cgit v1.2.1