jenkins-bot has submitted this change and it was merged.
Change subject: Place snippets imported by apache::site in <VirtualHost>.
......................................................................
Place snippets imported by apache::site in <VirtualHost>.
Import partial apache configuration directives meant to configure a single
vhost within a <VirtualHost> container. The default scope for apache
directives is the "main" server config which is almost never the place that
configuration for a particular site should be placed.
Bug: 52756
Change-Id: I476384076adbea7fecf0846c7076181cea0b0fea
---
M puppet/modules/apache/manifests/site.pp
M puppet/modules/apache/templates/site.conf.erb
M puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
3 files changed, 30 insertions(+), 25 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/apache/manifests/site.pp
b/puppet/modules/apache/manifests/site.pp
index 1a13673..9747a64 100644
--- a/puppet/modules/apache/manifests/site.pp
+++ b/puppet/modules/apache/manifests/site.pp
@@ -4,6 +4,10 @@
#
# === Parameters
#
+# [*listen*]
+# The address and optional port to direct to this virutal host. The default
+# is '*'.
+#
# [*ensure*]
# If 'present', site will be enabled; if 'absent', disabled. The
# default is 'present'.
@@ -28,6 +32,7 @@
# }
#
define apache::site(
+ $listen = '*',
$ensure = 'present',
$site = $title,
$content = undef,
@@ -51,7 +56,7 @@
before => File["/etc/apache2/sites-available/${site_file}"],
}
- apache::conf { $site:
+ apache::conf { "000-${site}":
ensure => $ensure,
site => $site,
content => $content,
diff --git a/puppet/modules/apache/templates/site.conf.erb
b/puppet/modules/apache/templates/site.conf.erb
index 0cfeca8..86d9335 100644
--- a/puppet/modules/apache/templates/site.conf.erb
+++ b/puppet/modules/apache/templates/site.conf.erb
@@ -3,4 +3,6 @@
# Apache site configuration for <%= @site %>
# This file is managed by Puppet.
#
-Include site.d/<%= @site %>
+<VirtualHost <%= @listen %>>
+ Include site.d/<%= @site %>
+</VirtualHost>
diff --git a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
index c50b539..d0d1680 100644
--- a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
+++ b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
@@ -3,34 +3,32 @@
# Apache site configuration for MediaWiki
# This file is managed by Puppet.
#
-<VirtualHost *>
- ServerName vagrant
- ServerAdmin http://www.mediawiki.org/wiki/Vagrant
- DocumentRoot "/var/www"
+ServerName vagrant
+ServerAdmin http://www.mediawiki.org/wiki/Vagrant
+DocumentRoot "/var/www"
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
+<Directory />
+ Options FollowSymLinks
+ AllowOverride None
+</Directory>
- <Directory /var/www/>
- </Directory>
+<Directory /var/www/>
+</Directory>
- <Directory <%= scope.lookupvar('mediawiki::dir') %>>
- </Directory>
+<Directory <%= scope.lookupvar('mediawiki::dir') %>>
+</Directory>
- <Directory <%= scope.lookupvar('mediawiki::upload_dir') %>>
- </Directory>
+<Directory <%= scope.lookupvar('mediawiki::upload_dir') %>>
+</Directory>
- AllowEncodedSlashes on
+AllowEncodedSlashes on
- RewriteEngine On
- RewriteRule ^/$ /w/index.php [R=301]
+RewriteEngine On
+RewriteRule ^/$ /w/index.php [R=301]
- Alias /wiki "<%= scope.lookupvar('mediawiki::dir') %>/index.php"
- Alias /w "<%= scope.lookupvar('mediawiki::dir') %>"
- Alias /images "<%= scope.lookupvar('mediawiki::upload_dir') %>"
+Alias /wiki "<%= scope.lookupvar('mediawiki::dir') %>/index.php"
+Alias /w "<%= scope.lookupvar('mediawiki::dir') %>"
+Alias /images "<%= scope.lookupvar('mediawiki::upload_dir') %>"
- ErrorLog "/vagrant/logs/apache-error.log"
- LogLevel error
-</VirtualHost>
+ErrorLog "/vagrant/logs/apache-error.log"
+LogLevel error
--
To view, visit https://gerrit.wikimedia.org/r/78830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I476384076adbea7fecf0846c7076181cea0b0fea
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: MZMcBride <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
