opendev/system-config
Code Issues Proposed changes

Revert "Downgrade puppetlabs-apache to version 0.0.4."

Browse Source 
This reverts commit 7b9ea298cf.

Upgrading puppetlabs-apache to version 0.4.0 will give us important
variables in apache::params (specifically $conf_dir and $vdir) which
will allow us to modify the cgit module to run on both Debuntu and RHEL
systems -- which is useful because test.sh should be testing all modules
on both systems.

Of the two issues that 7b9ea298 addresses, I believe that our Oneiric
hosts have all gone the way of the dinosaur and we can work around the
docroot check by replacing 'MEANINGLESS ARGUMENT' with
'/tmp/meaningless_docroot'.

Conflicts:
	install_modules.sh

Change-Id: I7c08f85db6810ab28fa044f1923833359271e8ec
This commit is contained in:
K Jonathan Harker 2014-06-27 15:19:01 -07:00
parent f45f0f57ab
commit 3afc75132a
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install_modules.sh
View File

@ -41,7 +41,7 @@ MODULES["puppetlabs-ntp"]="0.2.0"
# licensed
MODULES["openstackci-vcsrepo"]="0.0.8"
MODULES["puppetlabs-apache"]="0.0.4"
MODULES["puppetlabs-apache"]="0.4.0"
MODULES["puppetlabs-apt"]="1.1.0"
MODULES["puppetlabs-haproxy"]="0.4.1"
MODULES["puppetlabs-mysql"]="0.6.1"

2
modules/cgit/manifests/init.pp
View File

@ -86,7 +86,7 @@ class cgit(
apache::vhost { $vhost_name:
port => $https_port,
serveraliases => $serveraliases,
docroot => 'MEANINGLESS ARGUMENT',
docroot => '/tmp/meaningless_docroot',
priority => '50',
template => 'cgit/git.vhost.erb',
ssl => true,

2
modules/etherpad_lite/manifests/apache.pp
View File

@ -17,7 +17,7 @@ class etherpad_lite::apache (
include apache
apache::vhost { $vhost_name:
port => 443,
docroot => 'MEANINGLESS ARGUMENT',
docroot => '/tmp/meaningless_docroot',
priority => '50',
template => 'etherpad_lite/etherpadlite.vhost.erb',
ssl => true,

2
modules/gerrit/manifests/init.pp
View File

@ -351,7 +351,7 @@ class gerrit(
# - $robots_txt_source
apache::vhost { $vhost_name:
port => 443,
docroot => 'MEANINGLESS ARGUMENT',
docroot => '/tmp/meaningless_docroot',
priority => '50',
template => 'gerrit/gerrit.vhost.erb',
ssl => true,

2
modules/jenkins/manifests/master.pp
View File

@ -45,7 +45,7 @@ class jenkins::master(
apache::vhost { $vhost_name:
port => 443,
docroot => 'MEANINGLESS ARGUMENT',
docroot => '/tmp/meaningless_docroot',
priority => '50',
template => 'jenkins/jenkins.vhost.erb',
ssl => true,

2
modules/logstash/manifests/web.pp
View File

@ -69,7 +69,7 @@ class logstash::web (
apache::vhost { $vhost_name:
port => 80,
docroot => 'MEANINGLESS ARGUMENT',
docroot => '/tmp/meaningless_docroot',
priority => '50',
template => $vhost,
}

2
modules/mediawiki/manifests/init.pp
View File

@ -56,7 +56,7 @@ class mediawiki(
apache::vhost { $site_hostname:
port => 443,
docroot => 'MEANINGLESS ARGUMENT',
docroot => '/tmp/meaningless_docroot',
priority => '50',
template => 'mediawiki/apache/mediawiki.erb',
ssl => true,

2
modules/storyboard/manifests/init.pp
View File

@ -195,7 +195,7 @@ class storyboard (
apache::vhost { $vhost_name:
port => 80,
docroot => 'MEANINGLESS ARGUMENT',
docroot => '/tmp/meaningless_docroot',
priority => '50',
template => 'storyboard/storyboard.vhost.erb',
require => Package['libapache2-mod-wsgi'],

2
modules/zuul/manifests/init.pp
View File

@ -300,7 +300,7 @@ class zuul (
apache::vhost { $vhost_name:
port => 443,
docroot => 'MEANINGLESS ARGUMENT',
docroot => '/tmp/meaningless_docroot',
priority => '50',
template => 'zuul/zuul.vhost.erb',
}