opendev/puppet-ethercalc
Code Issues Proposed changes

Revert "Downgrade puppetlabs-apache to version 0.0.4."

Browse Source 
This reverts commit 7b9ea298cf4ae941af74381925b17a4b29337eb9.

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 ebb6eab5d9
commit 447d8e5f14
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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,