opendev
/
puppet-mediawiki
Code Issues Proposed changes

Allow user to pass a hash of captcha questions 

Change-Id: I102ff6991831901c578dab4107b0c23245da9d4b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-02-24 16:26:54 -05:00
parent bd415b1503
commit ffe475ba99
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -14,7 +14,9 @@ class mediawiki(
$wg_dbpassword = undef,
$wg_secretkey = undef,
$wg_upgradekey = undef,
# TODO(pabelanger): Remove this once 284418 lands.
$wg_captchaquestions_answer = undef,
$wg_captchaquestions = {},
$wg_googleanalyticsaccount = undef,
) {

13
templates/Settings.php.erb
View File

@ -183,11 +183,18 @@ $wgExtraNamespaces[111] = 'Obsolete_talk';
$wgNamespacesWithSubpages[110] = true;
## Extensions
#
require_once( "$IP/extensions/ConfirmEdit/ConfirmEdit.php" );
require_once( "$IP/extensions/ConfirmEdit/QuestyCaptcha.php" );
$wgCaptchaClass = 'QuestyCaptcha';
$wgCaptchaQuestions[] = array( 'question' => 'What\'s the secret word?', 'answer' => "<%= scope.lookupvar('::mediawiki::wg_captchaquestions_answer') %>" );
$arr = array (
<% @wg_captchaquestions.each do|key, val| -%>
"<%= key %>" => "<%= val %>",
<% end -%>
);
foreach ( $arr as $key => $value ) {
$wgCaptchaQuestions[] = array( 'question' => $key, 'answer' => $value );
}
$wgGroupPermissions['user' ]['skipcaptcha'] = true;
require_once( "$IP/extensions/OpenID/OpenID.php" );