Infrastructure/ansible
1
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:
Rick Elrod 2014-10-21 22:09:45 +00:00
commit 723c006918
6 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
playbooks/groups/copr-frontend.yml
View file

@ -1,7 +1,6 @@
- name: check/create instance
#hosts: copr-front-stg:copr-front
#hosts: copr-front-stg
hosts: copr-fe-dev.cloud.fedoraproject.org
hosts: copr-front-stg
user: root
gather_facts: False
@ -15,7 +14,7 @@
- name: cloud basic setup
hosts: copr-back-stg
hosts: copr-front-stg
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- "{{ private }}/vars.yml"
@ -25,8 +24,7 @@
- name: provision instance
#hosts: copr-front:copr-front-stg
#hosts: copr-front-stg
hosts: copr-fe-dev.cloud.fedoraproject.org
hosts: copr-front-stg
user: root
gather_facts: True

2
roles/anitya/backend/files/anitya.cron
View file

@ -1,3 +1,3 @@
# Checks bi-daily for new versions
#
10 */12 * * * root ANITYA_WEB_CONFIG=/etc/anitya/anitya.cfg /usr/bin/python2 /usr/share/anitya/anitya_cron.py
10 */12 * * * root ANITYA_WEB_CONFIG=/etc/anitya/anitya.cfg /usr/local/bin/lock-wrapper /usr/bin/python2 /usr/share/anitya/anitya_cron.py

1
roles/anitya/backend/tasks/main.yml
View file

@ -108,5 +108,6 @@
with_items:
- { file: 'anitya.cron', location: /etc/cron.d }
tags:
- cron
- config
- anitya_backend

2
roles/copr/backend/tasks/main.yml
View file

@ -106,7 +106,7 @@
- provision_config
- name: put provisioning files
copy: src="provision/files" dest="/home/copr/provision/files"
synchronize: src="provision/files" dest="/home/copr/provision/"
tags:
- provision_config

2
roles/copr/backend/templates/copr-be.conf-dev
View file

@ -28,6 +28,8 @@ spawn_playbook=/home/copr/provision/builderpb.yml
# default is /etc/copr/terminate_playbook.yml
terminate_playbook=/home/copr/provision/terminatepb.yml
terminate_vars=vm_name
# directory where jobs are stored
# no defaults
jobsdir=/var/lib/copr/jobs

8
roles/keyserver/files/sks.conf
View file

@ -48,12 +48,15 @@ NameVirtualHost *:443
<VirtualHost *:443>
ServerAdmin sysadmin-keys-members@fedoraproject.org
ServerName keys.fedoraproject.org
ServerAlias keys01.fedoraproject.org
ServerAlias keys02.fedoraproject.org
SSLEngine on
SSLCertificateFile /etc/pki/tls/wildcard-2014.fedoraproject.org.cert
SSLCertificateChainFile /etc/pki/tls/wildcard-2014.fedoraproject.org.intermediate.cert
SSLCertificateKeyFile /etc/pki/tls/wildcard-2014.fedoraproject.org.key
SSLProtocol -All +TLSv1 +TLSv1.1 +TLSv1.2
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK
ProxyPass / http://localhost:11371/
ProxyPassReverse / http://localhost:11371/
SetEnv proxy-nokeepalive 1
@ -68,6 +71,9 @@ NameVirtualHost *:443
SSLEngine on
SSLCertificateFile /etc/pki/tls/keys_fedoraproject_org.crt.pem
SSLCertificateKeyFile /etc/pki/tls/keys_fedoraproject_org.key
SSLProtocol -All +TLSv1 +TLSv1.1 +TLSv1.2
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK
ProxyPass / http://localhost:11371/
ProxyPassReverse / http://localhost:11371/
SetEnv proxy-nokeepalive 1