merge non overlapping mod_ssl role bits into people role so config does not flip flop every time the playbook is run
This commit is contained in:
parent
1eeadd6cc2
commit
b431a61efa
2 changed files with 14 additions and 2 deletions
|
@ -74,8 +74,6 @@
|
||||||
|
|
||||||
- role: apache
|
- role: apache
|
||||||
|
|
||||||
- role: httpd/mod_ssl
|
|
||||||
|
|
||||||
- role: httpd/certificate
|
- role: httpd/certificate
|
||||||
name: wildcard-2014.fedorapeople.org
|
name: wildcard-2014.fedorapeople.org
|
||||||
SSLCertificateChainFile: wildcard-2014.fedorapeople.org.intermediate.cert
|
SSLCertificateChainFile: wildcard-2014.fedorapeople.org.intermediate.cert
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
- libxml2-python
|
- libxml2-python
|
||||||
- python-jinja2
|
- python-jinja2
|
||||||
- tree # requested in ticket 5148
|
- tree # requested in ticket 5148
|
||||||
|
- mod_ssl
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
- people
|
- people
|
||||||
|
@ -34,6 +35,19 @@
|
||||||
tags:
|
tags:
|
||||||
- people
|
- people
|
||||||
|
|
||||||
|
- name: Install haveged for entropy
|
||||||
|
yum: name=haveged state=installed
|
||||||
|
tags:
|
||||||
|
- httpd
|
||||||
|
- httpd/proxy
|
||||||
|
|
||||||
|
- name: Set haveged running/enabled
|
||||||
|
service: name=haveged enabled=yes state=started
|
||||||
|
tags:
|
||||||
|
- service
|
||||||
|
- httpd
|
||||||
|
- httpd/proxy
|
||||||
|
|
||||||
- name: Empty default welcome.conf
|
- name: Empty default welcome.conf
|
||||||
copy: dest=/etc/httpd/conf.d/welcome.conf content=""
|
copy: dest=/etc/httpd/conf.d/welcome.conf content=""
|
||||||
tags:
|
tags:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue