Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/95471
Change subject: Prepare for name-based virtualhosting ...................................................................... Prepare for name-based virtualhosting Give the mediawiki server a qualified hostname, and tweak apache configs to facilitate multiple guest servers. Reenable the default site, it's useful for diagnosing hostname errors. Without it, the first host alphabetically becomes de facto default. Also, the forwarded port seemed to be broken... donno if we want to fix that. Change-Id: I2a612e445b975606e07679ddde9f242c991dd7ad --- M README M puppet/manifests/roles.pp M puppet/modules/apache/manifests/site.pp M puppet/modules/apache/templates/ports.conf.erb M puppet/modules/apache/templates/site.conf.erb M puppet/modules/mediawiki/manifests/apache.pp M puppet/modules/mediawiki/templates/mediawiki-apache-site.erb 7 files changed, 12 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/71/95471/1 diff --git a/README b/README index dcef127..2a98bae 100644 --- a/README +++ b/README @@ -38,7 +38,11 @@ Canonical, retrieve some additional packages, and install and configure each of them in turn. -If it all worked, you should be able to browse to http://127.0.0.1:8080/ and +Now, edit your host system's /etc/hosts file, and add this line: + + 10.11.12.13 wiki.dev + +If it all worked, you should be able to browse to http://wiki.dev/ and see the main page of your MediaWiki instance. diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp index d253dcc..8ebfbd2 100644 --- a/puppet/manifests/roles.pp +++ b/puppet/manifests/roles.pp @@ -31,13 +31,13 @@ class role::mediawiki { include role::generic - $wiki_name = 'devwiki' + $wiki_name = 'wiki.dev' # 'forwarded_port' defaults to 8080, but may be overridden by # changing the value of 'FORWARDED_PORT' in Vagrantfile. $server_url = $::forwarded_port ? { undef => undef, - default => "http://127.0.0.1:${::forwarded_port}";, + default => "http://${wiki_name}";, } $dir = '/vagrant/mediawiki' diff --git a/puppet/modules/apache/manifests/site.pp b/puppet/modules/apache/manifests/site.pp index 9747a64..b7d34e4 100644 --- a/puppet/modules/apache/manifests/site.pp +++ b/puppet/modules/apache/manifests/site.pp @@ -32,7 +32,7 @@ # } # define apache::site( - $listen = '*', + $listen = '*:80', $ensure = 'present', $site = $title, $content = undef, @@ -56,7 +56,7 @@ before => File["/etc/apache2/sites-available/${site_file}"], } - apache::conf { "000-${site}": + apache::conf { $site_file: ensure => $ensure, site => $site, content => $content, diff --git a/puppet/modules/apache/templates/ports.conf.erb b/puppet/modules/apache/templates/ports.conf.erb index 431b6b5..efffb41 100644 --- a/puppet/modules/apache/templates/ports.conf.erb +++ b/puppet/modules/apache/templates/ports.conf.erb @@ -1,6 +1,3 @@ # This file is managed by Puppet. Listen 80 -<% if @forwarded_port and @forwarded_port.to_s != "80" -%> -Listen <%= @forwarded_port %> -<%- end -%> diff --git a/puppet/modules/apache/templates/site.conf.erb b/puppet/modules/apache/templates/site.conf.erb index 86d9335..610a82f 100644 --- a/puppet/modules/apache/templates/site.conf.erb +++ b/puppet/modules/apache/templates/site.conf.erb @@ -3,6 +3,8 @@ # Apache site configuration for <%= @site %> # This file is managed by Puppet. # +NameVirtualHost <%= @listen %> + <VirtualHost <%= @listen %>> Include site.d/<%= @site %> </VirtualHost> diff --git a/puppet/modules/mediawiki/manifests/apache.pp b/puppet/modules/mediawiki/manifests/apache.pp index 3499af5..0ccd335 100644 --- a/puppet/modules/mediawiki/manifests/apache.pp +++ b/puppet/modules/mediawiki/manifests/apache.pp @@ -6,10 +6,6 @@ include ::mediawiki include ::apache - @apache::site { 'default': - ensure => absent, - } - @apache::site { $mediawiki::wiki_name: ensure => present, content => template('mediawiki/mediawiki-apache-site.erb'), diff --git a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb index 158ca80..dbab42b 100644 --- a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb +++ b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb @@ -3,7 +3,7 @@ # Apache site configuration for MediaWiki # This file is managed by Puppet. # -ServerName vagrant +ServerName <%= scope.lookupvar('mediawiki::wiki_name') %> ServerAdmin http://www.mediawiki.org/wiki/Vagrant DocumentRoot "/var/www" -- To view, visit https://gerrit.wikimedia.org/r/95471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a612e445b975606e07679ddde9f242c991dd7ad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Adamw <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
