diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index b3f0ed449b..975080149f 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -605,35 +605,23 @@ $wgPluggableAuth_EnableAutoLogin = false; $wgPluggableAuth_EnableLocalLogin = false; $wgPluggableAuth_EnableLocalProperties = false; -{% if env == "production" %} -$wgPluggableAuth_Class = 'OpenIDConnect'; -{% endif %} - $wgGroupPermissions['*']['autocreateaccount'] = true; -{% if env == "production" %} -$wgOpenIDConnect_Config['https://id{{ env_suffix }}.fedoraproject.org/openidc/'] = [ - 'clientID' => 'fpwiki', - 'clientsecret' => '{{ fpwiki_prod_client_secret }}', - - 'name' => "Fedora Authentication", - 'scope' => [ 'openid', 'profile', 'email', - 'https://id.fedoraproject.org/scope/groups', - 'https://id.fedoraproject.org/scope/agreements' ] -]; -{% else %} $wgPluggableAuth_Config[] = [ 'plugin' => 'OpenIDConnect', 'data' => [ 'providerURL' => 'https://id{{ env_suffix }}.fedoraproject.org/openidc/', 'clientID' => 'fpwiki', + {% if env == "staging" %} 'clientsecret' => '{{ fpwiki_stg_client_secret }}', + {% else %} + 'clientsecret' => '{{ fpwiki_prod_client_secret }}', + {% endif %} 'scope' => [ 'openid', 'profile', 'email', 'https://id.fedoraproject.org/scope/groups', 'https://id.fedoraproject.org/scope/agreements' ] ] ]; -{% endif %} $wgOpenIDConnect_UseRealNameAsUserName = false; $wgOpenIDConnect_UseEmailNameAsUserName = false;