diff --git a/inventory/host_vars/wiki01.stg.phx2.fedoraproject.org b/inventory/host_vars/wiki01.stg.phx2.fedoraproject.org index b8ce930bf2..825c7fcfad 100644 --- a/inventory/host_vars/wiki01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/wiki01.stg.phx2.fedoraproject.org @@ -2,8 +2,10 @@ nm: 255.255.255.0 gw: 10.5.128.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27 +# 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 eth0_ip: 10.5.128.188 eth1_ip: 10.5.127.42 diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index 8e0eed5fc1..d347c372e5 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -54,7 +54,6 @@ - name: install needed packages (fedora only) package: name={{ item }} state=present with_items: - - "{{ wikiver }}-openid" - "{{ wikiver }}-skin-fedora" - php-mysqlnd tags: diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 54088fea1b..306a9e6029 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -330,28 +330,28 @@ require_once "$IP/extensions/Cite/Cite.php"; require_once "$IP/extensions/Auth_FAS.php"; $wgAuth = new Auth_FAS(); {% else %} -require_once "$IP/extensions/OpenID/OpenID.php"; -$wgOpenIDLoginOnly = true; -$wgOpenIDMode = 'consumer'; -$wgOpenIDTrustRoot = 'https://stg.fedoraproject.org/w/'; -$wgOpenIDConsumerDenyByDefault = true; -$wgOpenIDServerForceAllowTrust = 'https://id.stg.fedoraproject.org/openid/'; -$wgOpenIDConsumerAllow = array ("#^https://id.stg.fedoraproject.org/openid/$#", "#^http://([a-z0-9]+).id.stg.fedoraproject.org/$#"); -$wgOpenIDProposeUsernameFromSREG = true; -$wgOpenIDAllowNewAccountname = false; -$wgOpenIDAllowExistingAccountSelection = false; -$wgOpenIDTrustEmailAddress = true; -$wgOpenIDAllowAutomaticUsername = true; -$wgOpenIDUseEmailAsNickname = true; -$wgOpenIDUseNicknameAsUsername = true; -// $wgOpenIDConsumerStorePath; -$wgOpenIDForcedProvider = 'fedora'; -$wgOpenIDProviders = array( - 'fedora' => array( - 'large-provider' => false, - 'openid-url' => 'https://id.stg.fedoraproject.org/openid/' - ), -); +#require_once "$IP/extensions/OpenID/OpenID.php"; +#$wgOpenIDLoginOnly = true; +#$wgOpenIDMode = 'consumer'; +#$wgOpenIDTrustRoot = 'https://stg.fedoraproject.org/w/'; +#$wgOpenIDConsumerDenyByDefault = true; +#$wgOpenIDServerForceAllowTrust = 'https://id.stg.fedoraproject.org/openid/'; +#$wgOpenIDConsumerAllow = array ("#^https://id.stg.fedoraproject.org/openid/$#", "#^http://([a-z0-9]+).id.stg.fedoraproject.org/$#"); +#$wgOpenIDProposeUsernameFromSREG = true; +#$wgOpenIDAllowNewAccountname = false; +#$wgOpenIDAllowExistingAccountSelection = false; +#$wgOpenIDTrustEmailAddress = true; +#$wgOpenIDAllowAutomaticUsername = true; +#$wgOpenIDUseEmailAsNickname = true; +#$wgOpenIDUseNicknameAsUsername = true; +#// $wgOpenIDConsumerStorePath; +#$wgOpenIDForcedProvider = 'fedora'; +#$wgOpenIDProviders = array( +# 'fedora' => array( +# 'large-provider' => false, +# 'openid-url' => 'https://id.stg.fedoraproject.org/openid/' +# ), +#); {% endif %} require_once "$IP/extensions/fedmsg-emit.php"; require_once "$IP/extensions/HTTP302Found/HTTP302Found.php";