#722 Change FAS link from admin.fp.o to accounts.fp.o
Merged 2 months ago by mobrien. Opened 3 months ago by lenkaseg.
fedora-infra/ lenkaseg/ansible accounts  into  main

@@ -33,7 +33,7 @@ 

      # 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}}",

@@ -112,7 +112,7 @@ 

      # 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.

  

@@ -101,14 +101,14 @@ 

  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 @@ 

  

  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.

  

@@ -244,11 +244,11 @@ 

  

  {% 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/'

@@ -3,7 +3,7 @@ 

          username="fedoradummy",

          password="{{ fedoraDummyUserPassword }}",

      {% if env == 'staging' %}

-         base_url="https://admin.stg.fedoraproject.org/accounts/",

+         base_url="https://accounts.stg.fedoraproject.org/",

      {% endif %}

      ),

  )

@@ -3,7 +3,7 @@ 

          username="fedoradummy",

          password="{{ fedoraDummyUserPassword }}",

      {% if env == 'staging' %}

-         base_url="https://admin.stg.fedoraproject.org/accounts/",

+         base_url="https://accounts.stg.fedoraproject.org/",

      {% endif %}

      ),

  )

@@ -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>

  

@@ -41,9 +41,9 @@ 

      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)

@@ -96,9 +96,9 @@ 

  #    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)

@@ -8,7 +8,7 @@ 

  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/

  """

  

@@ -22,7 +22,7 @@ 

  

  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']

@@ -94,7 +94,7 @@ 

      "fas_credentials": {

          "username": "{{fedoraDummyUser}}",

          "password": "{{fedoraDummyUserPassword}}",

-         "base_url": "https://admin.stg.fedoraproject.org/accounts",

+         "base_url": "https://accounts.stg.fedoraproject.org",

      },

      {% else -%}

      "fasjson": {

@@ -16,7 +16,7 @@ 

      "fas_credentials": {

          "username": "{{fedoraDummyUser}}",

          "password": "{{fedoraDummyUserPassword}}",

-         "base_url": "https://admin.stg.fedoraproject.org/accounts",

+         "base_url": "https://accounts.stg.fedoraproject.org",

      },

      {% else %}

      "fas_credentials": {

@@ -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>

admin.fedoraproject.org/accounts and admin.stg.fedoraproject.org/accounts is deprecated.
Urls now pointing to accounts.fedoraproject.org and accounts.stg.fedoraproject.org

Should fix https://pagure.io/fedora-infrastructure/issue/10127

Please check specially this file, I hope nothing gets broken.

This is related to the old fas server and does not need to be changed

This is related to the old fas server and does not need to be changed

All of this file can be left unchanged

rebased onto 7da43b0ebb9b2af572ff0d508cf0d6e3f965b454

3 months ago

rebased onto 3f3a167e8d2d9e0e0ce215d8da79fa84fcb54180

3 months ago

rebased onto 2a4b71920d1c8f51a0fbf4c94a5f9d057ea8c7d5

3 months ago

We may want to leave this out for now. It points to the old fas instance which is in read only mode and may be relied on for some scripts. We should change it eventually but will need to do some comms first

rebased onto 65ae1209cfb6079329e93cb1542ca07883bcc5b8

2 months ago

rebased onto d654d59

2 months ago

rebased onto d654d59

2 months ago

Pull-Request has been merged by mobrien

2 months ago