Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

wiki: update staging OIDC scopes for agreements

Browse source 
Updates the wiki OIDC scopes settings to point to the new agreements
scope rather than the CLA one from the FAS days

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
This commit is contained in:
Ryan Lercho 2020-09-17 21:19:59 +10:00 • committed by pingou
parent ac50ffe3d2
commit c2187f319a
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
roles/mediawiki/templates/LocalSettings.php.fp.j2
View file

@ -18,9 +18,9 @@ $wgCaptchaClass = 'SimpleCaptcha';
#$wgCaptchaDirectoryLevels = 0; #$wgCaptchaDirectoryLevels = 0;
#$wgCaptchaSecret = "{{ mediawikiCaptchaKey }}"; #$wgCaptchaSecret = "{{ mediawikiCaptchaKey }}";
$wgCaptchaTriggers['edit'] = true; $wgCaptchaTriggers['edit'] = true;
$wgCaptchaTriggers['create'] = true; $wgCaptchaTriggers['create'] = true;
$wgCaptchaTriggers['addurl'] = true; $wgCaptchaTriggers['addurl'] = true;
$wgCaptchaTriggers['createaccount'] = true; $wgCaptchaTriggers['createaccount'] = true;
$wgCaptchaTriggers['badlogin'] = false; $wgCaptchaTriggers['badlogin'] = false;
@ -353,7 +353,7 @@ $wgSquidServersNoPurge = array(
"152.19.134.142", "152.19.134.142",
"2610:28:3090:3001:dead:beef:cafe:fed3", "2610:28:3090:3001:dead:beef:cafe:fed3",
"192.168.1.14", "192.168.1.14",
# proxy05 # proxy05
"5.175.150.50", "5.175.150.50",
"2a00:d1a0:1::131", "2a00:d1a0:1::131",
@ -439,8 +439,8 @@ $wgSquidServers = array(
); );
$wgSquidMaxage = 21600; $wgSquidMaxage = 21600;
# Don't add rel="nofollow" # Don't add rel="nofollow"
$wgNoFollowLinks = false; $wgNoFollowLinks = false;
# This can be an array in version 1.14 and above. # This can be an array in version 1.14 and above.
$wgAllowExternalImagesFrom = array("http://fedoraproject.org/", "http://docs.fedoraproject.org", "http://fedorahosted.org/", "http://fedorapeople.org", "http://fedoraplanet.org"); $wgAllowExternalImagesFrom = array("http://fedoraproject.org/", "http://docs.fedoraproject.org", "http://fedorahosted.org/", "http://fedorapeople.org", "http://fedoraplanet.org");
@ -528,9 +528,15 @@ $wgOpenIDConnect_Config['https://id{{ env_suffix }}.fedoraproject.org/openidc/']
'clientsecret' => '{{ fpwiki_prod_client_secret }}', 'clientsecret' => '{{ fpwiki_prod_client_secret }}',
{% endif %} {% endif %}
'name' => "Fedora Authentication", 'name' => "Fedora Authentication",
{% if env == "staging" %}
'scope' => [ 'openid', 'profile', 'email', 'scope' => [ 'openid', 'profile', 'email',
'https://id.fedoraproject.org/scope/groups', 'https://id.fedoraproject.org/scope/groups',
'https://id.fedoraproject.org/scope/cla' ] 'https://id.fedoraproject.org/scope/cla' ]
{% else %}
'scope' => [ 'openid', 'profile', 'email',
'https://id.fedoraproject.org/scope/groups',
'https://id.fedoraproject.org/scope/agreements' ]
{% endif %}
]; ];
$wgOpenIDConnect_UseRealNameAsUserName = false; $wgOpenIDConnect_UseRealNameAsUserName = false;
$wgOpenIDConnect_UseEmailNameAsUserName = false; $wgOpenIDConnect_UseEmailNameAsUserName = false;