From 5388cb70a8e90280d52e9bb33d6a0902ea274d6d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 15 Jun 2014 18:41:57 +0000 Subject: [PATCH] Conditionalize wiki auth for staging --- roles/mediawiki/tasks/main.yml | 2 +- .../{files/Auth_FAS.php => templates/Auth_FAS.php.j2} | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) rename roles/mediawiki/{files/Auth_FAS.php => templates/Auth_FAS.php.j2} (95%) diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index c7f2d57639..0f513ec5a3 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -29,7 +29,7 @@ - packages - name: adding FAS auth - copy: src=Auth_FAS.php dest=/usr/share/mediawiki119/extensions/Auth_FAS.php owner=root group=root mode=775 + template: src=Auth_FAS.php.j2 dest=/usr/share/mediawiki119/extensions/Auth_FAS.php owner=root group=root mode=775 tags: - config diff --git a/roles/mediawiki/files/Auth_FAS.php b/roles/mediawiki/templates/Auth_FAS.php.j2 similarity index 95% rename from roles/mediawiki/files/Auth_FAS.php rename to roles/mediawiki/templates/Auth_FAS.php.j2 index e429f5cf5e..437f141c45 100644 --- a/roles/mediawiki/files/Auth_FAS.php +++ b/roles/mediawiki/templates/Auth_FAS.php.j2 @@ -9,7 +9,11 @@ class Auth_FAS extends AuthPlugin { $username = strtolower( $username); $ch = curl_init(); +{% if env == 'staging' %} + curl_setopt($ch, CURLOPT_URL, 'https://admin.stg.fedoraproject.org/accounts/json/person_by_username?tg_format=json'); +{% else %} curl_setopt($ch, CURLOPT_URL, 'https://admin.fedoraproject.org/accounts/json/person_by_username?tg_format=json'); +{% endif %} curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_USERAGENT, "Auth_FAS 0.9"); curl_setopt($ch, CURLOPT_POSTFIELDS, "username=".urlencode($username)."&user_name=".urlencode($username)."&password=".urlencode($password)."&login=Login");