7:22 a.m.
commit 153d102510c2f0ba617dbe8b9bd3858d9fb4ab0d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 4 08:22:51 2016 +0100
Switch from fas to admin
roles/ipsilon/files/openid_server.py | 3 +--
roles/ipsilon/files/templates/login/form.html | 4 ++--
roles/ipsilon/templates/configuration.conf | 6 +-----
roles/packager_alias/files/owner-email.py | 2 +-
roles/pkgdb2/templates/pkgdb2_admin.cfg | 2 +-
5 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/roles/ipsilon/files/openid_server.py b/roles/ipsilon/files/openid_server.py
index e804edc..1280011 100644
--- a/roles/ipsilon/files/openid_server.py
+++ b/roles/ipsilon/files/openid_server.py
@@ -1043,8 +1043,7 @@ class OpenIDResponse(object):
@change: 2.1.0 added the ENCODE_HTML_FORM response.
"""
if self.request.mode in BROWSER_REQUEST_MODES:
- do_post_trusts = ['http://admin.rpmfusion.org/',
- 'http://fas.rpmfusion.org/']
+ do_post_trusts = ['http://admin.rpmfusion.org/']
if self.request.trust_root in do_post_trusts:
# Workaround, since too many clients don't follow the spec
return ENCODE_HTML_FORM
diff --git a/roles/ipsilon/files/templates/login/form.html
b/roles/ipsilon/files/templates/login/form.html
index 62b9939..5a8a725 100644
--- a/roles/ipsilon/files/templates/login/form.html
+++ b/roles/ipsilon/files/templates/login/form.html
@@ -24,7 +24,7 @@
<input class="form-control"
id="password" name="login_password" type="password"
placeholder="Password" />
</div>
<div class="col-xs-12 text-xs-right">
- <small class="text-muted"><a
target="_blank"
href="https://fas.rpmfusion.org/accounts/user/resetpass">Forgot
password?</a></small>
+ <small class="text-muted"><a
target="_blank"
href="https://admin.rpmfusion.org/accounts/user/resetpass">F...
password?</a></small>
</div>
</div>
<div class="form-group row m-b-0">
@@ -37,6 +37,6 @@
{% block after_card %}
-<div class="text-xs-center"><small
class="text-muted">Don't have a FAS account? <a
target="_blank"
href="https://fas.rpmfusion.org/accounts/user/new">Sign up
now</a>.</small></div>
+<div class="text-xs-center"><small
class="text-muted">Don't have a FAS account? <a
target="_blank"
href="https://admin.rpmfusion.org/accounts/user/new">Sign up
now</a>.</small></div>
{% endblock %}
diff --git a/roles/ipsilon/templates/configuration.conf
b/roles/ipsilon/templates/configuration.conf
index fc81907..52d0ab0 100644
--- a/roles/ipsilon/templates/configuration.conf
+++ b/roles/ipsilon/templates/configuration.conf
@@ -1,10 +1,6 @@
[login_config]
global enabled=fas
-{% if env == 'staging' %}
-fas FAS url=https://fas.stg.rpmfusion.org/accounts/
-{% else %}
-fas FAS url=https://fas.rpmfusion.org/accounts/
-{% endif %}
+fas FAS url=https://admin.rpmfusion.org/accounts/
fas FAS Proxy client user Agent=RPM Fusion Ipsilon
fas FAS Insecure Auth=True
diff --git a/roles/packager_alias/files/owner-email.py
b/roles/packager_alias/files/owner-email.py
index 5e86a83..d659a38 100755
--- a/roles/packager_alias/files/owner-email.py
+++ b/roles/packager_alias/files/owner-email.py
@@ -18,7 +18,7 @@ config.read('/etc/fas.conf')
pkgdb_url = 'https://admin.rpmfusion.org/pkgdb'
-fas = BaseClient('https://fas.rpmfusion.org/accounts';,
+fas = BaseClient('https://admin.rpmfusion.org/accounts';,
username=config.get('global', 'login').strip('"'),
password=config.get('global', 'password').strip('"'))
diff --git a/roles/pkgdb2/templates/pkgdb2_admin.cfg
b/roles/pkgdb2/templates/pkgdb2_admin.cfg
index 2044bee..b673c7d 100644
--- a/roles/pkgdb2/templates/pkgdb2_admin.cfg
+++ b/roles/pkgdb2/templates/pkgdb2_admin.cfg
@@ -45,7 +45,7 @@ PKGDB2_BUGZILLA_PASSWORD = None
### FAS information
## URL to the FAS instance to query
-PKGDB2_FAS_URL = 'https://fas.rpmfusion.org/accounts'
+PKGDB2_FAS_URL = 'https://admin.rpmfusion.org/accounts'
## name of the user the pkgdb application can log in to FAS with
PKGDB2_FAS_USER = '{{ fedorathirdpartyUser }}'
## password of the user the pkgdb application can log in to FAS with