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

Stop copr-fe from installing a file, then modifying it every time.

Browse source
This commit is contained in:
Kevin Fenzi 2015-02-23 17:08:06 +00:00
parent c72f37a112
commit dfb4783661
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/copr/frontend/files/httpd/coprs_ssl.conf
View file

@ -6,10 +6,12 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
Header always add Strict-Transport-Security "max-age=15768000; preload" Header always add Strict-Transport-Security "max-age=15768000; preload"
SSLCertificateFile /etc/pki/tls/ca.crt
SSLCertificateKeyFile /etc/pki/tls/private/ca.key
ServerName copr-fe.cloud.fedoraproject.org:443 ServerName copr-fe.cloud.fedoraproject.org:443
SSLCertificateFile /etc/pki/tls/certs/copr-fe.fedoraproject.org.crt"
SSLCertificateKeyFile /etc/pki/tls/private/copr-fe.fedoraproject.org.key"
SSLCertificateChainFile /etc/pki/tls/certs/DigiCertCA.crt"
WSGIPassAuthorization On WSGIPassAuthorization On
#WSGIDaemonProcess 127.0.0.1 user=copr-fe group=copr-fe threads=5 #WSGIDaemonProcess 127.0.0.1 user=copr-fe group=copr-fe threads=5
WSGIScriptAlias / /usr/share/copr/coprs_frontend/application WSGIScriptAlias / /usr/share/copr/coprs_frontend/application

13
roles/copr/frontend/tasks/install_certs.yml
View file

@ -12,16 +12,3 @@
copy: src=DigiCertCA.crt dest="/etc/pki/tls/certs/" owner=root group=root mode=0600 copy: src=DigiCertCA.crt dest="/etc/pki/tls/certs/" owner=root group=root mode=0600
tags: tags:
- config - config
- lineinfile: dest=/etc/httpd/conf.d/copr_ssl.conf regexp="SSLCertificateFile " insertafter="^#SSLCertificateFile " line="SSLCertificateFile /etc/pki/tls/certs/copr-fe.fedoraproject.org.crt"
notify:
- restart httpd
- lineinfile: dest=/etc/httpd/conf.d/copr_ssl.conf regexp="SSLCertificateKeyFile " insertafter="^#SSLCertificateKeyFile " line="SSLCertificateKeyFile /etc/pki/tls/private/copr-fe.fedoraproject.org.key"
notify:
- restart httpd
- lineinfile: dest=/etc/httpd/conf.d/copr_ssl.conf regexp="SSLCertificateChainFile " insertafter="SSLCertificateKeyFile " line="SSLCertificateChainFile /etc/pki/tls/certs/DigiCertCA.crt"
notify:
- restart httpd