diff --git a/install_modules.sh b/install_modules.sh index 8bd527de0b..1e09f22c16 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -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" diff --git a/modules/cgit/manifests/init.pp b/modules/cgit/manifests/init.pp index 6cd0ec9599..ccd002e38a 100644 --- a/modules/cgit/manifests/init.pp +++ b/modules/cgit/manifests/init.pp @@ -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, diff --git a/modules/etherpad_lite/manifests/apache.pp b/modules/etherpad_lite/manifests/apache.pp index 93287b0adf..26eaa20365 100644 --- a/modules/etherpad_lite/manifests/apache.pp +++ b/modules/etherpad_lite/manifests/apache.pp @@ -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, diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp index 900c4525d3..c9d6b51c68 100644 --- a/modules/gerrit/manifests/init.pp +++ b/modules/gerrit/manifests/init.pp @@ -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, diff --git a/modules/jenkins/manifests/master.pp b/modules/jenkins/manifests/master.pp index 13e0ad5817..b0ed0585dc 100644 --- a/modules/jenkins/manifests/master.pp +++ b/modules/jenkins/manifests/master.pp @@ -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, diff --git a/modules/logstash/manifests/web.pp b/modules/logstash/manifests/web.pp index 9919301f9a..c1cb3781fb 100644 --- a/modules/logstash/manifests/web.pp +++ b/modules/logstash/manifests/web.pp @@ -69,7 +69,7 @@ class logstash::web ( apache::vhost { $vhost_name: port => 80, - docroot => 'MEANINGLESS ARGUMENT', + docroot => '/tmp/meaningless_docroot', priority => '50', template => $vhost, } diff --git a/modules/mediawiki/manifests/init.pp b/modules/mediawiki/manifests/init.pp index 76ef75785b..130e2d4c56 100644 --- a/modules/mediawiki/manifests/init.pp +++ b/modules/mediawiki/manifests/init.pp @@ -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, diff --git a/modules/storyboard/manifests/init.pp b/modules/storyboard/manifests/init.pp index c492a00389..1c93a8ed75 100644 --- a/modules/storyboard/manifests/init.pp +++ b/modules/storyboard/manifests/init.pp @@ -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'], diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp index b61e799e18..b4e2ff1254 100644 --- a/modules/zuul/manifests/init.pp +++ b/modules/zuul/manifests/init.pp @@ -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', }