jenkins-bot has submitted this change and it was merged.
Change subject: Apache: listen on both 80 & 8080.
......................................................................
Apache: listen on both 80 & 8080.
Having the server listen on port 80 is nice because it allows the user to omit
the port when (for example) cURLing a URL from the guest. But serving on port
8080 means there is a canonical way of addressing resources that is consistent
on both guest and host.
Change-Id: I6adfbb97fe6e322cbae25ae4936e5018b25fb22c
---
A puppet/modules/apache/files/ports.conf
M puppet/modules/apache/manifests/init.pp
M puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
3 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/apache/files/ports.conf
b/puppet/modules/apache/files/ports.conf
new file mode 100644
index 0000000..c179423
--- /dev/null
+++ b/puppet/modules/apache/files/ports.conf
@@ -0,0 +1,4 @@
+# This file is managed by Puppet.
+
+Listen 80
+Listen 8080
diff --git a/puppet/modules/apache/manifests/init.pp
b/puppet/modules/apache/manifests/init.pp
index 10b78cd..2de4362 100644
--- a/puppet/modules/apache/manifests/init.pp
+++ b/puppet/modules/apache/manifests/init.pp
@@ -3,8 +3,13 @@
ensure => present,
}
+ file { '/etc/apache2/ports.conf':
+ source => 'puppet:///modules/apache/ports.conf',
+ require => Package['apache2'],
+ notify => Service['apache2'],
+ }
+
file { '/etc/apache2/conf.d/disable-sendfile':
- ensure => file,
source => 'puppet:///modules/apache/disable-sendfile',
require => Package['apache2'],
notify => Service['apache2'],
diff --git a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
index 251b83a..c6c78bc 100644
--- a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
+++ b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
@@ -1,4 +1,5 @@
# vim: filetype=apache sts=4 sw=4 autoindent
+
<VirtualHost *>
ServerName vagrant
ServerAdmin http://www.mediawiki.org/wiki/Vagrant
--
To view, visit https://gerrit.wikimedia.org/r/61752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6adfbb97fe6e322cbae25ae4936e5018b25fb22c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
