summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelley Spoon <kelley.spoon@linaro.org>2018-04-24 09:48:07 -0500
committerBenjamin Copeland <ben.copeland@linaro.org>2018-04-24 18:19:34 +0000
commit22fb10da3e1d4de79728fa81ff64b31b2e8fc0b5 (patch)
treebe16492bc12896d62118ac02d5c21a5056129d2e
parentb6441f7db38055996ca697d2eea1d6f58bd12fcf (diff)
downloadansible-playbooks-master.tar.gz
Certbot: changes required to move patchwork to certbotHEADmaster
Change-Id: I11534c47c97f5420f5a1198e55581e5732a26c6b Reviewed-on: https://review.linaro.org/24944 Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
-rw-r--r--files/patchwork/apache.conf7
-rw-r--r--patchwork.yml2
2 files changed, 7 insertions, 2 deletions
diff --git a/files/patchwork/apache.conf b/files/patchwork/apache.conf
index e797a57..3d49d9e 100644
--- a/files/patchwork/apache.conf
+++ b/files/patchwork/apache.conf
@@ -12,12 +12,17 @@
Alias /static/ "{{install_base}}/{{hostname}}/static/"
- <Directory "{{install_base}}/{{hostname}}/static/">
+ <Directory "{{install_base}}/{{hostname}}/static/">
Order allow,deny
Allow from all
Require all granted
</Directory>
+ Alias "/.well-known/acme-challenge/" "/srv/certbot/.well-known/acme-challenge/"
+ <Directory "/srv/certbot/.well-known/acme-challenge/">
+ Require all granted
+ </Directory>
+
WSGIScriptAlias / "{{install_base}}/{{hostname}}/wsgi.py"
<Directory "{{install_base}}/{{hostname}}">
Require all granted
diff --git a/patchwork.yml b/patchwork.yml
index bca3a3e..d648a25 100644
--- a/patchwork.yml
+++ b/patchwork.yml
@@ -5,9 +5,9 @@
vars_files:
- "{{secrets_dir}}/host_vars/{{inventory_hostname}}"
roles:
+ - {role: certbot, tags: [ssl]}
- postgres
- patchwork-deps
- - letsencrypt
- {role: django, tags: [django]}
- {role: apache-site, src: patchwork/apache.conf, config: "{{inventory_hostname}}", tags: [apache] }