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

Change FAS link from admin.fp.o to accounts.fp.o

Browse source
This commit is contained in:
Lenka Segura 2021-07-29 09:14:27 +02:00 • committed by mobrien
parent b78179ed3c
commit d654d59f3a
14 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/badges/backend/templates/badges-awarder.py
View file

@ -33,7 +33,7 @@ config = {
# to fas usernames so it can act appropriately on certain message types.
"fas_credentials": {
{% if env == 'staging' %}
"base_url": "https://admin.stg.fedoraproject.org/accounts/",
"base_url": "https://accounts.stg.fedoraproject.org/",
{% endif %}
"username": "{{fedoraDummyUser}}",
"password": "{{fedoraDummyUserPassword}}",

2
roles/distgit/pagure/files/fas2.py
View file

@ -112,7 +112,7 @@ class AccountSystem(BaseClient):
# URLs for remote avatar providers.
_valid_avatar_services = ['libravatar', 'gravatar']
def __init__(self, base_url='https://admin.fedoraproject.org/accounts/',
def __init__(self, base_url='https://accounts.fedoraproject.org/',
*args, **kwargs):
'''Create the AccountSystem client object.

8
roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2
View file

@ -101,14 +101,14 @@ VERBOSE = False
DRYRUN = False
{% if env == 'staging' %}
FASURL = 'https://admin.stg.fedoraproject.org/accounts'
FASURL = 'https://accounts.stg.fedoraproject.org'
FASINSECURE = True
PAGUREURL = 'https://stg.pagure.io'
PAGURE_DIST_GIT_URL = 'https://src.stg.fedoraproject.org'
PDCURL = 'https://pdc.stg.fedoraproject.org/rest_api/v1/'
MDAPIURL = 'https://apps.stg.fedoraproject.org/mdapi/'
{% else %}
FASURL = 'https://admin.fedoraproject.org/accounts'
FASURL = 'https://accounts.fedoraproject.org'
FASINSECURE = False
PAGUREURL = 'https://pagure.io'
PAGURE_DIST_GIT_URL = 'https://src.fedoraproject.org'
@ -190,8 +190,8 @@ address.
c) Change your Fedora Account System email to match your existing
bugzilla.redhat.com account.
https://admin.fedoraproject.org/accounts login, click on 'my account',
then 'edit' and change your email address.
https://accounts.fedoraproject.org login, click on 'Edit profile',
then 'Emails' and change your email address.
If you have questions or concerns, please let us know.

4
roles/distgit/pagure/templates/pagure.cfg
View file

@ -244,11 +244,11 @@ REQUIRED_GROUPS = {
{% if env == 'staging' %}
RESULTSDB_URL = 'https://taskotron.stg.fedoraproject.org/resultsdb_api/'
FAS_URL = 'https://admin.stg.fedoraproject.org/accounts'
FAS_URL = 'https://accounts.stg.fedoraproject.org'
FAS_OPENID_ENDPOINT = 'https://id.stg.fedoraproject.org/openid/'
{% else %}
RESULTSDB_URL = 'https://taskotron.fedoraproject.org/resultsdb_api/'
FAS_URL = 'https://admin.fedoraproject.org/accounts'
FAS_URL = 'https://accounts.fedoraproject.org'
{% endif %}
THEME_TEMPLATE_FOLDER = '/usr/share/pagure_dist_git/template/'

2
roles/fedmsg/datanommer/templates/fas-credentials.py
View file

@ -3,7 +3,7 @@ config = dict(
username="fedoradummy",
password="{{ fedoraDummyUserPassword }}",
{% if env == 'staging' %}
base_url="https://admin.stg.fedoraproject.org/accounts/",
base_url="https://accounts.stg.fedoraproject.org/",
{% endif %}
),
)

2
roles/fedmsg/irc/templates/fas-credentials.py
View file

@ -3,7 +3,7 @@ config = dict(
username="fedoradummy",
password="{{ fedoraDummyUserPassword }}",
{% if env == 'staging' %}
base_url="https://admin.stg.fedoraproject.org/accounts/",
base_url="https://accounts.stg.fedoraproject.org/",
{% endif %}
),
)

2
roles/mailman/files/signup_closed.html
View file

@ -10,7 +10,7 @@
<p>
{% blocktrans %}
Account creation for the Fedora mailing-lists is done by
<a href="https://admin.fedoraproject.org/accounts/user/new">creating an account in FAS</a>.
<a href="https://accounts.fedoraproject.org/">creating an account in FAS</a>.
{% endblocktrans %}
</p>

4
roles/membership-map/build/templates/membership-map.py
View file

@ -41,9 +41,9 @@ def calc_list():
password = '{{ fedoraDummyUserPassword }}'
{% if env == "staging" %}
base_url = 'https://admin.stg.fedoraproject.org/accounts/'
base_url = 'https://accounts.stg.fedoraproject.org/'
{% else %}
base_url = 'https://admin.fedoraproject.org/accounts/'
base_url = 'https://accounts.fedoraproject.org/'
{% endif %}
fas = AccountSystem(base_url=base_url, username=username, password=password)

4
roles/membership-map/build/templates/membership-mwclient.py
View file

@ -96,9 +96,9 @@ def calc_list():
# username = raw_input('Username: ').strip()
# password = getpass.getpass('Password: ')
{% if env == "staging" %}
base_url = 'https://admin.stg.fedoraproject.org/accounts/'
base_url = 'https://accounts.stg.fedoraproject.org/'
{% else %}
base_url = 'https://admin.fedoraproject.org/accounts/'
base_url = 'https://accounts.fedoraproject.org/'
{% endif %}
fas = AccountSystem(base_url=base_url, username=username, password=password, timeout=600)

2
roles/notifs/backend/files/fasjson-port/consumer.py
View file

@ -8,7 +8,7 @@ what user notification preferences are, both of which require expensive API
queries to `FAS`_, `pkgdb`_, or the database.
.. _fedmsg consumer: http://www.fedmsg.com/en/latest/consuming/#the-hub-consumer-approach
.. _FAS: https://admin.fedoraproject.org/accounts/
.. _FAS: https://accounts.fedoraproject.org/
.. _pkgdb: https://admin.fedoraproject.org/pkgdb/
"""

2
roles/notifs/backend/files/fasjson-port/fmn_fasshim.py
View file

@ -22,7 +22,7 @@ _cache = make_region(
log = logging.getLogger("moksha.hub")
default_url = 'https://admin.fedoraproject.org/accounts/'
default_url = 'https://accounts.fedoraproject.org/'
creds = config.app_conf['fas_credentials']
fasjson = config.app_conf['fasjson']

2
roles/notifs/backend/templates/fmn.consumer.py
View file

@ -94,7 +94,7 @@ config = {
"fas_credentials": {
"username": "{{fedoraDummyUser}}",
"password": "{{fedoraDummyUserPassword}}",
"base_url": "https://admin.stg.fedoraproject.org/accounts",
"base_url": "https://accounts.stg.fedoraproject.org",
},
{% else -%}
"fasjson": {

2
roles/notifs/frontend/templates/fmn.web.py
View file

@ -16,7 +16,7 @@ config = {
"fas_credentials": {
"username": "{{fedoraDummyUser}}",
"password": "{{fedoraDummyUserPassword}}",
"base_url": "https://admin.stg.fedoraproject.org/accounts",
"base_url": "https://accounts.stg.fedoraproject.org",
},
{% else %}
"fas_credentials": {

2
roles/planet/files/sub-planets/people/templates/index.html.tmpl
View file

@ -44,7 +44,7 @@
</a>
</h2>
<small>Posted by <a href="<TMPL_VAR channel_link ESCAPE="HTML">"><TMPL_VAR channel_name></a>
<span class="fas-account">(<img src="https://fedoraproject.org/w/uploads/a/ac/Infra-icon_fas.png" alt="Fedora Account System Username" name="Fedora Account System Username"><a href="https://admin.fedoraproject.org/accounts/user/view/<TMPL_VAR channel_fasname ESCAPE="HTML">"><TMPL_VAR channel_fasname ESCAPE="HTML"></a>)</span>
<span class="fas-account">(<img src="https://fedoraproject.org/w/uploads/a/ac/Infra-icon_fas.png" alt="Fedora Account System Username" name="Fedora Account System Username"><a href="https://accounts.fedoraproject.org/user/<TMPL_VAR channel_fasname ESCAPE="HTML">"><TMPL_VAR channel_fasname ESCAPE="HTML"></a>)</span>
on <a href="<TMPL_VAR link>"><TMPL_VAR date></a>
</small>
</div>