Andrew Bogott has submitted this change and it was merged.
Change subject: A few more tuneups of mediawiki_singlenode:
......................................................................
A few more tuneups of mediawiki_singlenode:
- $Remove definition of $wgScriptPath
(we don't need this because it's set by the MW setup script.)
- Set $wgServer to '"//" . $_SERVER["SERVER_NAME"]'
(Allows https as well as http for static content)
- Allow overriding of apache site so that other classes can
derive from mediawiki_singlenode and add https.
Change-Id: I77b6a640a2da1eaf4b4b7baa28b571fb6a387c63
---
M modules/mediawiki_singlenode/manifests/init.pp
M modules/mediawiki_singlenode/templates/labs-localsettings
M modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
3 files changed, 11 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 f608c7d..227a9ff 100644
--- a/modules/mediawiki_singlenode/manifests/init.pp
+++ b/modules/mediawiki_singlenode/manifests/init.pp
@@ -19,7 +19,8 @@
$install_path = '/srv/mediawiki',
$role_config_lines = [],
$mysql_pass = '',
- $memcached_size = 128
+ $memcached_size = 128,
+ $apache_site_template = 'mediawiki_singlenode/mediawiki_singlenode.erb'
) {
if !defined(Class['webserver::php5']) {
class {'webserver::php5':
@@ -57,14 +58,15 @@
owner => root,
group => root,
mode => '0644',
- content =>
template('mediawiki_singlenode/mediawiki_singlenode.erb'),
+ content => template($apache_site_template),
}
if $::labs_mediawiki_hostname {
- $mwserver = "http://${::labs_mediawiki_hostname}";
+ $servername = "${::labs_mediawiki_hostname}"
} else {
- $mwserver = "http://${::hostname}.pmtpa.wmflabs";
+ $servername = "${::hostname}.pmtpa.wmflabs"
}
+ $mwserver = "http://${servername}";
file { "${install_path}/orig":
ensure => directory,
@@ -128,7 +130,7 @@
}
apache_module { 'rewrite':
- name => 'rewrite',
+ name => 'rewrite',
}
exec { 'apache_restart':
diff --git a/modules/mediawiki_singlenode/templates/labs-localsettings
b/modules/mediawiki_singlenode/templates/labs-localsettings
index e15ac52..7de451d 100644
--- a/modules/mediawiki_singlenode/templates/labs-localsettings
+++ b/modules/mediawiki_singlenode/templates/labs-localsettings
@@ -10,7 +10,6 @@
#####################################################################
$wgArticlePath = "/wiki/$1";
-$wgScriptPath = "/w";
require_once( "$IP/extensions/Nuke/Nuke.php" );
require_once( "$IP/extensions/SpamBlacklist/SpamBlacklist.php" );
@@ -28,6 +27,8 @@
# Include the complete settings file generated by mw install
require_once( 'orig/LocalSettings.php' );
+$wgServer = "//" . $_SERVER["SERVER_NAME"];
+
if ( ! $wgLogo or $wgLogo == '/wiki/skins/common/images/wiki.png' ) {
# Logo is either unset or defaulting to the standard wiki logo;
# use a labs one instead.
diff --git a/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
b/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
index 2f1cd07..ad25ae1 100644
--- a/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
+++ b/modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
@@ -1,14 +1,14 @@
<VirtualHost *:80>
ServerAdmin
"https://wikitech.wikimedia.org/wiki/Help:Single_Node_MediaWiki";
- DocumentRoot /var/www
+ DocumentRoot <%=@install_path%>/..
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
- <Directory /var/www/>
+ <Directory <%=@install_path%>/..>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Order allow,deny
--
To view, visit https://gerrit.wikimedia.org/r/62416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77b6a640a2da1eaf4b4b7baa28b571fb6a387c63
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
