diff options
| author | Benjamin Copeland <ben.copeland@linaro.org> | 2018-03-06 11:21:24 +0000 |
|---|---|---|
| committer | Benjamin Copeland <ben.copeland@linaro.org> | 2018-03-06 17:19:59 +0000 |
| commit | 2e3234d00041542995510104bad0995013e397d1 (patch) | |
| tree | e6e4012203b7d22ad7c0997fb8673628c75eef47 | |
| parent | 3d59d938537b3dba14b28728c5f2974f44c40bc8 (diff) | |
LLP: Move to letsencrypt
Move builds.96boards.org to letsencrypt and update our apache config to
use SSLCertificateChainFile instead of SSLCACertificateFile.
We are still using the wrong "var" but for a sake of keeping the
changeset down.
Change-Id: I44c5563e824701b22a8e7fc097ef087d95c28a9f
Reviewed-on: https://review.linaro.org/24218
Reviewed-by: Fathi Boudra <fathi.boudra@linaro.org>
Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
| -rw-r--r-- | files/publishing/llp-apache-96boards.conf | 2 | ||||
| -rw-r--r-- | files/publishing/llp-apache.conf | 2 | ||||
| -rw-r--r-- | publishing.yml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/files/publishing/llp-apache-96boards.conf b/files/publishing/llp-apache-96boards.conf index 144c63eb..175bd68c 100644 --- a/files/publishing/llp-apache-96boards.conf +++ b/files/publishing/llp-apache-96boards.conf @@ -23,7 +23,7 @@ CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA" SSLCertificateFile {{ssl_cert}} SSLCertificateKeyFile {{ssl_key}} - SSLCACertificateFile {{ssl_ca_cert}} + SSLCertificateChainFile {{ssl_ca_cert}} RewriteEngine on RedirectMatch "^/$" "http://releases.linaro.org/96boards" diff --git a/files/publishing/llp-apache.conf b/files/publishing/llp-apache.conf index eede6086..b7f0886d 100644 --- a/files/publishing/llp-apache.conf +++ b/files/publishing/llp-apache.conf @@ -76,7 +76,7 @@ CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA" SSLCertificateFile {{ssl_cert}} SSLCertificateKeyFile {{ssl_key}} - SSLCACertificateFile {{ssl_ca_cert}} + SSLCertificateChainFile {{ssl_ca_cert}} <Directory {{django_app_root}}/static> <IfVersion < 2.3 > diff --git a/publishing.yml b/publishing.yml index 30ebeaa9..d6a87b85 100644 --- a/publishing.yml +++ b/publishing.yml @@ -14,5 +14,5 @@ become: yes roles: - {role: apache-site, src: publishing/llp-apache-96boards.conf, config: "builds.96boards.org", tags: [96boards], - ssl_cert: /etc/ssl/certs/wildcard.96boards.org.crt, ssl_key: /etc/ssl/private/wildcard.96boards.org.key, - ssl_ca_cert: /etc/ssl/certs/gd_bundle-g2-g1.pem } + ssl_cert: /etc/letsencrypt/live/builds.96boards.org/cert.pem, ssl_key: /etc/letsencrypt/live/builds.96boards.org/privkey.pem, + ssl_ca_cert: /etc/letsencrypt/live/builds.96boards.org/chain.pem} |