Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62416
Change subject: Allow overriding of apache site.
......................................................................
Allow overriding of apache site.
This allows other classes to derive from mediawiki_singlenode
and add https.
Change-Id: I77b6a640a2da1eaf4b4b7baa28b571fb6a387c63
---
M modules/mediawiki_singlenode/manifests/init.pp
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/62416/1
diff --git a/modules/mediawiki_singlenode/manifests/init.pp
b/modules/mediawiki_singlenode/manifests/init.pp
index f608c7d..ca59305 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_content = '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_content),
}
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':
--
To view, visit https://gerrit.wikimedia.org/r/62416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77b6a640a2da1eaf4b4b7baa28b571fb6a387c63
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
