Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/61811
Change subject: Grab-bag of mediawiki_singlenode tuneups.
......................................................................
Grab-bag of mediawiki_singlenode tuneups.
- Add $mysql_pass argyment
- Avoid duplicate definitions of webserver::php5
- Avoid duplicate definitions of memcached
- Remove unused symlink to /var/www
- Rename 'controller' to 'wikicontroller' to prevent naming conflicts
- Increase use of $install_path
Change-Id: I6c4caa12223746af5860532cad0281b064df2f14
---
M modules/mediawiki_singlenode/manifests/init.pp
M modules/mediawiki_singlenode/templates/simplewiki.wmflabs.org
2 files changed, 23 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/61811/1
diff --git a/modules/mediawiki_singlenode/manifests/init.pp
b/modules/mediawiki_singlenode/manifests/init.pp
index 4743538..d4bf362 100644
--- a/modules/mediawiki_singlenode/manifests/init.pp
+++ b/modules/mediawiki_singlenode/manifests/init.pp
@@ -18,19 +18,25 @@
$role_requires = [],
$install_path = '/srv/mediawiki',
$role_config_lines = [],
+ $mysql_pass = '',
$memcached_size = 128
) {
- require role::labs-mysql-server
- require webserver::php5-mysql
- require webserver::php5
+ if !defined(Class['webserver::php5']) {
+ class {'webserver::php5':
+ ssl => true;
+ }
+ }
+ require role::labs-mysql-server, webserver::php5-mysql
package { [ 'imagemagick', 'php-apc' ] :
ensure => latest,
}
- class { 'memcached':
- memcached_ip => '127.0.0.1',
- memcached_size => $memcached_size,
+ if !defined(Class['memcached']) {
+ class { 'memcached':
+ memcached_ip => '127.0.0.1',
+ memcached_size => $memcached_size,
+ }
}
git::clone { 'mediawiki':
@@ -54,16 +60,6 @@
content =>
template('mediawiki_singlenode/simplewiki.wmflabs.org'),
}
- file { '/var/www/srv':
- ensure => directory,
- }
-
- file { "/var/www/${install_path}":
- ensure => link,
- target => $install_path,
- require => [ File['/var/www/srv'], Git::Clone['mediawiki'] ],
- }
-
if $::labs_mediawiki_hostname {
$mwserver = "http://${::labs_mediawiki_hostname}";
} else {
@@ -84,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} --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 \"${install_path}\" --confpath \"${install_path}/orig/\"",
logoutput => on_failure,
}
@@ -127,25 +123,25 @@
}
}
- apache_site { 'controller':
+ apache_site { 'wikicontroller':
name => 'wiki',
}
exec { 'apache_restart':
- require => [ Apache_site['controller'] ],
+ require => [ Apache_site['wikicontroller'] ],
command => '/usr/sbin/service apache2 restart',
}
file { "${install_path}/cache":
- require => Exec["mediawiki_setup"],
- mode => '0775',
- owner => 'www-data';
+ require => Exec['mediawiki_setup'],
+ mode => '0775',
+ owner => 'www-data',
}
file { "${install_path}/images":
- require => Exec["mediawiki_setup"],
- mode => '0775',
- owner => 'www-data';
+ require => Exec['mediawiki_setup'],
+ mode => '0775',
+ owner => 'www-data',
}
file { "${install_path}/LocalSettings.php":
diff --git a/modules/mediawiki_singlenode/templates/simplewiki.wmflabs.org
b/modules/mediawiki_singlenode/templates/simplewiki.wmflabs.org
index ba85a5a..0c9dae1 100644
--- a/modules/mediawiki_singlenode/templates/simplewiki.wmflabs.org
+++ b/modules/mediawiki_singlenode/templates/simplewiki.wmflabs.org
@@ -17,8 +17,8 @@
Deny from all
</Directory>
- Alias /w /srv/mediawiki
- Alias /wiki /srv/mediawiki/index.php
+ Alias /w <%=install_path%>
+ Alias /wiki <%=install_path%>/index.php
ErrorLog /var/log/apache2/error.log
--
To view, visit https://gerrit.wikimedia.org/r/61811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c4caa12223746af5860532cad0281b064df2f14
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
