aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-06-15 11:29:11 +0100
committerColin Guthrie <colin@mageia.org>2014-06-15 11:29:11 +0100
commit043e8f0e6e79e5bceb598bd9c2f0933fd24c3805 (patch)
tree44a891ec65a3dcfa2074d504c97725eda2af5a48 /modules
parentaf32fd7f9112b398947d7f488eb21676085e6e89 (diff)
downloadpuppet-043e8f0e6e79e5bceb598bd9c2f0933fd24c3805.tar
puppet-043e8f0e6e79e5bceb598bd9c2f0933fd24c3805.tar.gz
puppet-043e8f0e6e79e5bceb598bd9c2f0933fd24c3805.tar.bz2
puppet-043e8f0e6e79e5bceb598bd9c2f0933fd24c3805.tar.xz
puppet-043e8f0e6e79e5bceb598bd9c2f0933fd24c3805.zip
bugzilla: Switch bugzilla template hosting to git.
This template is implemented as an extension and the older 'custom' folder is no longer needed (according to neoclust), so has been removed.
Diffstat (limited to 'modules')
-rw-r--r--modules/bugzilla/manifests/init.pp22
1 files changed, 4 insertions, 18 deletions
diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index 33a67ce0..30585fdd 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -2,7 +2,7 @@ class bugzilla {
$bugzilla_location = '/usr/share/bugzilla/template/en/custom'
- $extension_location = '/usr/share/bugzilla/extensions'
+ $extension_location = '/usr/share/bugzilla/extensions/Mageia'
package {['bugzilla',
'bugzilla-extension-sitemap',
@@ -50,32 +50,18 @@ class bugzilla {
vhost => $bugs_vhost,
}
- subversion::snapshot { $bugzilla_location:
- source => 'svn://svn.mageia.org/svn/web/templates/bugzilla/trunk',
+ git::snapshot { $extension_location:
+ source => "git://git.$::domain/web/templates/bugzilla",
require => Package['bugzilla'],
}
- file { 'custom':
- ensure => directory,
- path => '/usr/share/bugzilla/template/en/custom',
- group => 'apache',
- mode => '0640',
- recurse => true,
- require => Subversion::Snapshot[$bugzilla_location],
- }
-
- subversion::snapshot { $extension_location:
- source => 'svn://svn.mageia.org/svn/web/templates/bugzilla/extensions',
- require => Package['bugzilla'],
- }
-
file { 'Mageia':
ensure => directory,
path => '/usr/share/bugzilla/extensions',
group => 'apache',
mode => '0640',
recurse => true,
- require => Subversion::Snapshot[$extension_location],
+ require => Git::Snapshot[$extension_location],
}
file { '/usr/share/bugzilla/www/robots.txt':