Andrew Bogott has submitted this change and it was merged. Change subject: Improvements to mediawiki_singlenode ......................................................................
Improvements to mediawiki_singlenode * Change ServerAdmin to a URL, pointing at module docs. See <http://httpd.apache.org/docs/current/mod/core.html#serveradmin>. * In erb templates, use '@varname' to refer to Puppet vars; 'varname' can clash with Ruby names. * Rename 'simplewiki.wmflabs.org' to 'mediawiki_singlenode.erb'. * Redirect root URL to MediaWiki main page. Change-Id: Iddae7ed1f61094e27a89b87049597f2ebd92a4e8 --- M modules/mediawiki_singlenode/manifests/init.pp R modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb 2 files changed, 17 insertions(+), 8 deletions(-) Approvals: Andrew Bogott: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/mediawiki_singlenode/manifests/init.pp b/modules/mediawiki_singlenode/manifests/init.pp index d4bf362..f608c7d 100644 --- a/modules/mediawiki_singlenode/manifests/init.pp +++ b/modules/mediawiki_singlenode/manifests/init.pp @@ -57,7 +57,7 @@ owner => root, group => root, mode => '0644', - content => template('mediawiki_singlenode/simplewiki.wmflabs.org'), + content => template('mediawiki_singlenode/mediawiki_singlenode.erb'), } if $::labs_mediawiki_hostname { @@ -80,7 +80,7 @@ exec { 'mediawiki_setup': require => [ Git::Clone['mediawiki'], File["${install_path}/orig"], exec['password_gen'] ], creates => "${install_path}/orig/LocalSettings.php", - command => "/usr/bin/php ${install_path}/maintenance/install.php ${wiki_name} admin --dbname ${database_name} --dbuser root --passfile \"${install_path}/orig/adminpass\" --server ${mwserver} --installdbuser=\"root\" --installdbpass \"${mysql_pass}\" --scriptpath \"${install_path}\" --confpath \"${install_path}/orig/\"", + command => "/usr/bin/php ${install_path}/maintenance/install.php ${wiki_name} admin --dbname ${database_name} --dbuser root --passfile \"${install_path}/orig/adminpass\" --server ${mwserver} --installdbuser=\"root\" --installdbpass \"${mysql_pass}\" --scriptpath '/w' --confpath \"${install_path}/orig/\"", logoutput => on_failure, } @@ -124,12 +124,16 @@ } apache_site { 'wikicontroller': - name => 'wiki', + name => 'wiki', + } + + apache_module { 'rewrite': + name => 'rewrite', } exec { 'apache_restart': - require => [ Apache_site['wikicontroller'] ], command => '/usr/sbin/service apache2 restart', + require => [ Apache_module['rewrite'], Apache_site['wikicontroller'] ], } file { "${install_path}/cache": diff --git a/modules/mediawiki_singlenode/templates/simplewiki.wmflabs.org b/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb similarity index 69% rename from modules/mediawiki_singlenode/templates/simplewiki.wmflabs.org rename to modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb index 0c9dae1..2f1cd07 100644 --- a/modules/mediawiki_singlenode/templates/simplewiki.wmflabs.org +++ b/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb @@ -1,11 +1,13 @@ <VirtualHost *:80> - ServerAdmin [email protected] + ServerAdmin "https://wikitech.wikimedia.org/wiki/Help:Single_Node_MediaWiki"; DocumentRoot /var/www + <Directory /> Options FollowSymLinks AllowOverride None </Directory> + <Directory /var/www/> Options Indexes FollowSymLinks MultiViews AllowOverride None @@ -13,12 +15,15 @@ allow from all </Directory> - <Directory <%=install_path%>/orig> + <Directory <%= @install_path %>/orig> Deny from all </Directory> - Alias /w <%=install_path%> - Alias /wiki <%=install_path%>/index.php + RewriteEngine On + RewriteRule ^/$ /w/index.php [R=301] + + Alias /wiki "<%= @install_path %>/index.php" + Alias /w "<%= @install_path %>" ErrorLog /var/log/apache2/error.log -- To view, visit https://gerrit.wikimedia.org/r/61816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddae7ed1f61094e27a89b87049597f2ebd92a4e8 Gerrit-PatchSet: 7 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh <[email protected]> Gerrit-Reviewer: Andrew Bogott <[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
