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

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2016-03-18 20:12:34 +00:00
commit 857353ee27
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/basset/frontend/files/basset.conf
View file

@ -1,4 +1,4 @@
WSGIDaemonProcess basset user=basset group=basset threads=5 WSGIDaemonProcess basset user=basset-frontend group=basset-frontend threads=5
WSGIScriptAlias /basset /usr/share/basset/basset-frontend WSGIScriptAlias /basset /usr/share/basset/basset-frontend
<Location /basset> <Location /basset>

8
roles/fas_server/templates/fas.cfg.j2
View file

@ -115,14 +115,20 @@ cla_deprecated_groups = ['cla_fedora']
# Format: 'group1:a,b,c|group2:d,e,f' # Format: 'group1:a,b,c|group2:d,e,f'
auto_approve_groups = 'packager:fedorabugs|qa:fedorabugs|security-team:fedorabugs|qa-beaker-user:qa-automation-shell|docs:fedorabugs|cla_fpca:cla_done|cla_redhat:cla_done|cla_dell:cla_done|cla_ibm:cla_done|cla_intel:cla_done' auto_approve_groups = 'packager:fedorabugs|qa:fedorabugs|security-team:fedorabugs|qa-beaker-user:qa-automation-shell|docs:fedorabugs|cla_fpca:cla_done|cla_redhat:cla_done|cla_dell:cla_done|cla_ibm:cla_done|cla_intel:cla_done'
{% if env == "staging" %}
# Anti-spam approval check script, which injects in both registration and CLA steps # Anti-spam approval check script, which injects in both registration and CLA steps
# In Fedora, this is provided by the Basset service # In Fedora, this is provided by the Basset service
{% if env == "staging" %}
antispam.api.url = 'http://basset01.stg.phx2.fedoraproject.org/basset' antispam.api.url = 'http://basset01.stg.phx2.fedoraproject.org/basset'
antispam.api.username = '{{ basset_stg_frontend_user }}' antispam.api.username = '{{ basset_stg_frontend_user }}'
antispam.api.password = '{{ basset_stg_frontend_pass }}' antispam.api.password = '{{ basset_stg_frontend_pass }}'
antispam.registration.autoaccept = False antispam.registration.autoaccept = False
antispam.cla.autoaccept = False antispam.cla.autoaccept = False
{% else %}
antispam.api.url = 'http://basset01.phx2.fedoraproject.org/basset'
antispam.api.username = '{{ basset_prod_frontend_user }}'
antispam.api.password = '{{ basset_prod_frontend_pass }}'
antispam.registration.autoaccept = False
antispam.cla.autoaccept = False
{% endif %} {% endif %}
# Some server parameters that you may want to tweak # Some server parameters that you may want to tweak