Revert "see if we can use a letsencrypt ssl cert for wcidff"
This reverts commit 5e1236a70b
.
This commit is contained in:
parent
5e1236a70b
commit
c720becafe
3 changed files with 0 additions and 30 deletions
|
@ -1,2 +0,0 @@
|
||||||
RewriteEngine on
|
|
||||||
RewriteRule ^/\.well-known/(.*) /srv/web/acme-challenge/.well-known/$1 [L]
|
|
|
@ -47,24 +47,6 @@
|
||||||
state=link
|
state=link
|
||||||
when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
|
when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
|
||||||
|
|
||||||
- name: install special wcidff.conf with letsencrypt info
|
|
||||||
copy: src={{ files }}/httpd/wcidff.org.conf dest=/etc/httpd/conf.d/whatcanidoforfedora.org/wcidff.conf
|
|
||||||
when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
|
|
||||||
|
|
||||||
- name: setup link to letsencrypt certs on proxy01
|
|
||||||
file: >
|
|
||||||
path=/etc/pki/tls/certs/whatcanidoforfedora.intermediate.cert
|
|
||||||
src=/etc/letsencrypt/live/whatcanidoforfedora.org/fullchain.pem
|
|
||||||
state=link
|
|
||||||
when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
|
|
||||||
|
|
||||||
- name: setup link to letsencrypt certs on proxy01
|
|
||||||
file: >
|
|
||||||
path=/etc/pki/tls/certs/whatcanidoforfedora.org.cert
|
|
||||||
src=/etc/letsencrypt/live/whatcanidoforfedora.org/cert.pem
|
|
||||||
state=link
|
|
||||||
when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
|
|
||||||
|
|
||||||
- include: "{{ tasks_path }}/yumrepos.yml"
|
- include: "{{ tasks_path }}/yumrepos.yml"
|
||||||
- include: "{{ tasks_path }}/2fa_client.yml"
|
- include: "{{ tasks_path }}/2fa_client.yml"
|
||||||
- include: "{{ tasks_path }}/motd.yml"
|
- include: "{{ tasks_path }}/motd.yml"
|
||||||
|
|
|
@ -398,22 +398,12 @@
|
||||||
ssl: false
|
ssl: false
|
||||||
cert_name: "{{wildcard_cert_name}}"
|
cert_name: "{{wildcard_cert_name}}"
|
||||||
|
|
||||||
- role: httpd/website
|
|
||||||
name: whatcanidoforfedora.org
|
|
||||||
server_aliases:
|
|
||||||
- www.whatcanidoforfedora.org
|
|
||||||
ssl: true
|
|
||||||
cert_name: whatcanidoforfedora.org
|
|
||||||
SSLCertificateChainFile: whatcanidoforfedora.org.intermediate.cert
|
|
||||||
when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
|
|
||||||
|
|
||||||
- role: httpd/website
|
- role: httpd/website
|
||||||
name: whatcanidoforfedora.org
|
name: whatcanidoforfedora.org
|
||||||
server_aliases:
|
server_aliases:
|
||||||
- www.whatcanidoforfedora.org
|
- www.whatcanidoforfedora.org
|
||||||
ssl: false
|
ssl: false
|
||||||
cert_name: "{{wildcard_cert_name}}"
|
cert_name: "{{wildcard_cert_name}}"
|
||||||
when: inventory_hostname != 'proxy01.phx2.fedoraproject.org'
|
|
||||||
|
|
||||||
- role: httpd/website
|
- role: httpd/website
|
||||||
name: fedoramagazine.org
|
name: fedoramagazine.org
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue