aboutsummaryrefslogtreecommitdiffstats
path: root/modules/bugzilla-dev
diff options
context:
space:
mode:
authorNicolas Lécureuil <neoclust@mageia.org>2017-04-07 08:51:22 +0200
committerNicolas Lécureuil <neoclust@mageia.org>2017-04-07 08:51:22 +0200
commit4c979ec470611fb7778517e6e8f10d89b170fb1f (patch)
treecb379d0330ab5108bf21db8ab7f3059742501912 /modules/bugzilla-dev
parentb5bb120d39dd5399c23385f07c38dacbab7a8243 (diff)
downloadpuppet-4c979ec470611fb7778517e6e8f10d89b170fb1f.tar
puppet-4c979ec470611fb7778517e6e8f10d89b170fb1f.tar.gz
puppet-4c979ec470611fb7778517e6e8f10d89b170fb1f.tar.bz2
puppet-4c979ec470611fb7778517e6e8f10d89b170fb1f.tar.xz
puppet-4c979ec470611fb7778517e6e8f10d89b170fb1f.zip
Fix bugzilla dev module
Diffstat (limited to 'modules/bugzilla-dev')
-rwxr-xr-xmodules/bugzilla-dev/manifests/init.pp18
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/bugzilla-dev/manifests/init.pp b/modules/bugzilla-dev/manifests/init.pp
index c258e3e4..ab3aee3d 100755
--- a/modules/bugzilla-dev/manifests/init.pp
+++ b/modules/bugzilla-dev/manifests/init.pp
@@ -1,6 +1,6 @@
class bugzilla-dev {
- $bugzilla_location = '/usr/share/bugzilla/'
+ $bugzilla_dev_location = '/usr/share/bugzilla/'
package {['graphviz',
'perl-Template-GD', # needed for graphical_report support
@@ -18,18 +18,18 @@ class bugzilla-dev {
file { '/etc/bugzilla/localconfig':
group => 'apache',
mode => '0640',
- content => template('bugzilla/localconfig')
+ content => template('bugzilla-dev/localconfig')
}
file { '/var/lib/bugzilla/params':
group => 'apache',
mode => '0640',
- content => template('bugzilla/params')
+ content => template('bugzilla-dev/params')
}
- apache::webapp_other { 'bugzilla':
- webapp_file => 'bugzilla/webapp_bugzilla.conf',
+ apache::webapp_other { 'bugzilla-dev':
+ webapp_file => 'bugzilla-dev/webapp_bugzilla.conf',
}
$bugs_vhost = "bugs-dev.${::domain}"
@@ -38,14 +38,14 @@ class bugzilla-dev {
apache::vhost::redirect_ssl { $bugs_vhost: }
apache::vhost::base { $bugs_vhost:
- content => template('bugzilla/vhost.conf'),
+ content => template('bugzilla-dev/vhost.conf'),
aliases => { '/bugzilla/' => $vhost_root },
use_ssl => true,
location => $vhost_root,
vhost => $bugs_vhost,
}
- git::snapshot { $bugzilla_location:
+ git::snapshot { $bugzilla_dev_location:
source => "git://git.${::domain}/web/bugs"
}
@@ -55,13 +55,13 @@ class bugzilla-dev {
group => 'apache',
mode => '0640',
recurse => true,
- require => Git::Snapshot[$bugzilla_location],
+ require => Git::Snapshot[$bugzilla_dev_location],
}
file { '/usr/share/bugzilla/robots.txt':
group => 'apache',
mode => '0640',
- content => template('bugzilla/robots.txt')
+ content => template('bugzilla-dev/robots.txt')
}
cron { 'collectstats':