aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-03-23 16:20:53 +0000
committerColin Guthrie <colin@mageia.org>2014-03-23 16:20:53 +0000
commit9643919d77c272def67c43f7b5b2808b284f8dda (patch)
tree5dbe4b1d29e30c1ded6eebcaefb08776e695959a /modules
parent29b4c8338ac752d88297a8383405d911ad0343c1 (diff)
downloadpuppet-9643919d77c272def67c43f7b5b2808b284f8dda.tar
puppet-9643919d77c272def67c43f7b5b2808b284f8dda.tar.gz
puppet-9643919d77c272def67c43f7b5b2808b284f8dda.tar.bz2
puppet-9643919d77c272def67c43f7b5b2808b284f8dda.tar.xz
puppet-9643919d77c272def67c43f7b5b2808b284f8dda.zip
Switch identity.mageia.org (aka CatDap) to git
Diffstat (limited to 'modules')
-rw-r--r--modules/catdap/manifests/init.pp7
-rw-r--r--modules/catdap/manifests/snapshot.pp7
2 files changed, 8 insertions, 6 deletions
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: