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

drop openid plugin in stg wiki, move stg wiki to f27

Browse source
This commit is contained in:
Kevin Fenzi 2017-11-10 20:24:59 +00:00
parent f67bb34783
commit def9f2bdae
3 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inventory/host_vars/wiki01.stg.phx2.fedoraproject.org
View file

@ -2,8 +2,10 @@
nm: 255.255.255.0 nm: 255.255.255.0
gw: 10.5.128.254 gw: 10.5.128.254
dns: 10.5.126.21 dns: 10.5.126.21
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/ # this should be correct after release, switch to it.
#ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/
ks_repo: http://10.5.126.23/pub/fedora/linux/development/27/Server/x86_64/os/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.5.128.188 eth0_ip: 10.5.128.188
eth1_ip: 10.5.127.42 eth1_ip: 10.5.127.42

1
roles/mediawiki/tasks/main.yml
View file

@ -54,7 +54,6 @@
- name: install needed packages (fedora only) - name: install needed packages (fedora only)
package: name={{ item }} state=present package: name={{ item }} state=present
with_items: with_items:
- "{{ wikiver }}-openid"
- "{{ wikiver }}-skin-fedora" - "{{ wikiver }}-skin-fedora"
- php-mysqlnd - php-mysqlnd
tags: tags:

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

@ -330,28 +330,28 @@ require_once "$IP/extensions/Cite/Cite.php";
require_once "$IP/extensions/Auth_FAS.php"; require_once "$IP/extensions/Auth_FAS.php";
$wgAuth = new Auth_FAS(); $wgAuth = new Auth_FAS();
{% else %} {% else %}
require_once "$IP/extensions/OpenID/OpenID.php"; #require_once "$IP/extensions/OpenID/OpenID.php";
$wgOpenIDLoginOnly = true; #$wgOpenIDLoginOnly = true;
$wgOpenIDMode = 'consumer'; #$wgOpenIDMode = 'consumer';
$wgOpenIDTrustRoot = 'https://stg.fedoraproject.org/w/'; #$wgOpenIDTrustRoot = 'https://stg.fedoraproject.org/w/';
$wgOpenIDConsumerDenyByDefault = true; #$wgOpenIDConsumerDenyByDefault = true;
$wgOpenIDServerForceAllowTrust = 'https://id.stg.fedoraproject.org/openid/'; #$wgOpenIDServerForceAllowTrust = 'https://id.stg.fedoraproject.org/openid/';
$wgOpenIDConsumerAllow = array ("#^https://id.stg.fedoraproject.org/openid/$#", "#^http://([a-z0-9]+).id.stg.fedoraproject.org/$#"); #$wgOpenIDConsumerAllow = array ("#^https://id.stg.fedoraproject.org/openid/$#", "#^http://([a-z0-9]+).id.stg.fedoraproject.org/$#");
$wgOpenIDProposeUsernameFromSREG = true; #$wgOpenIDProposeUsernameFromSREG = true;
$wgOpenIDAllowNewAccountname = false; #$wgOpenIDAllowNewAccountname = false;
$wgOpenIDAllowExistingAccountSelection = false; #$wgOpenIDAllowExistingAccountSelection = false;
$wgOpenIDTrustEmailAddress = true; #$wgOpenIDTrustEmailAddress = true;
$wgOpenIDAllowAutomaticUsername = true; #$wgOpenIDAllowAutomaticUsername = true;
$wgOpenIDUseEmailAsNickname = true; #$wgOpenIDUseEmailAsNickname = true;
$wgOpenIDUseNicknameAsUsername = true; #$wgOpenIDUseNicknameAsUsername = true;
// $wgOpenIDConsumerStorePath; #// $wgOpenIDConsumerStorePath;
$wgOpenIDForcedProvider = 'fedora'; #$wgOpenIDForcedProvider = 'fedora';
$wgOpenIDProviders = array( #$wgOpenIDProviders = array(
'fedora' => array( # 'fedora' => array(
'large-provider' => false, # 'large-provider' => false,
'openid-url' => 'https://id.stg.fedoraproject.org/openid/' # 'openid-url' => 'https://id.stg.fedoraproject.org/openid/'
), # ),
); #);
{% endif %} {% endif %}
require_once "$IP/extensions/fedmsg-emit.php"; require_once "$IP/extensions/fedmsg-emit.php";
require_once "$IP/extensions/HTTP302Found/HTTP302Found.php"; require_once "$IP/extensions/HTTP302Found/HTTP302Found.php";