Merge branch 'master' of /git/ansible

This commit is contained in:
Kevin Fenzi 2014-05-22 21:32:05 +00:00
commit 0a4b6b3eeb

View file

@ -48,10 +48,12 @@ PKGDB2_BUGZILLA_PASSWORD = None
{% if env == 'staging' %}
PKGDB2_FAS_URL = 'https://admin.stg.fedoraproject.org/accounts'
PKGDB2_FAS_INSECURE = True
SITE_URL = 'https://admin.stg.fedoraproject.org'
SITE_ROOT = 'https://admin.stg.fedoraproject.org'
SITE_URL = '%s/pkgdb' % SITE_ROOT
{% else %}
PKGDB2_FAS_URL = 'https://admin.fedoraproject.org/accounts'
SITE_URL = 'https://admin.fedoraproject.org'
SITE_ROOT = 'https://admin.fedoraproject.org'
SITE_URL = '%s/pkgdb' % SITE_ROOT
{% endif %}
## name of the user the pkgdb application can log in to FAS with
PKGDB2_FAS_USER = '{{ fedorathirdpartyUser }}'