diff options
| author | Kelley Spoon <kelley.spoon@linaro.org> | 2019-02-06 01:45:49 -0600 |
|---|---|---|
| committer | Kelley Spoon <kelley.spoon@linaro.org> | 2019-02-08 22:51:32 +0000 |
| commit | f5820405f3d7862c708e2fc1fe1d85ba9f5d4306 (patch) | |
| tree | 94c686882c47308cec6d80f9d165fdd804da2d78 | |
| parent | 42871de1999ecf93839b6434123620fb9ef0a5e9 (diff) | |
apache: update apache config for jenkins to use includes
This review updates the configuration for
jenkins to use the new include method
for apache configuration.
Change-Id: Ifee559b91665c6678d1188dc2021df0fc2057716
Reviewed-on: https://review.linaro.org/30152
Reviewed-by: Kelley Spoon <kelley.spoon@linaro.org>
| -rw-r--r-- | files/jenkins/ci.linaro.org.conf | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/files/jenkins/ci.linaro.org.conf b/files/jenkins/ci.linaro.org.conf index 9dd9c7d5..4827705b 100644 --- a/files/jenkins/ci.linaro.org.conf +++ b/files/jenkins/ci.linaro.org.conf @@ -8,15 +8,17 @@ ProxyPass /.well-known/acme-challenge/ ! ProxyPass / http://localhost:{{jenkins_master_port}}/ + Header set Cache-Control private + <FilesMatch ".(jpg|jpeg|png|gif|ico)$"> + Header set Cache-Control "max-age=86400, public" + </FilesMatch> + RewriteEngine on ReWriteCond %{SERVER_PORT} !^443$ RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/.*$ RewriteRule ^/(.*) https://%{HTTP_HOST}/$1 [NC,R,L] - Alias "/.well-known/acme-challenge/" "/srv/certbot/.well-known/acme-challenge/" - <Directory "/srv/certbot/.well-known/acme-challenge/"> - Require all granted - </Directory> + Include /etc/apache2/linaro/letsencrypt.conf </VirtualHost> <VirtualHost *:443> @@ -37,7 +39,12 @@ ProxyPass / http://localhost:{{jenkins_master_port}}/ nocanon ProxyPassReverse / http://localhost:{{jenkins_master_port}}/ - SSLEngine on + Header set Cache-Control private + <FilesMatch ".(jpg|jpeg|png|gif|ico)$"> + Header set Cache-Control "max-age=86400, public" + </FilesMatch> + + Include /etc/apache2/linaro/settings-ssl.conf SSLCertificateFile {{ssl_cert}} SSLCertificateKeyFile {{ssl_key}} </VirtualHost> |