diff options
Diffstat (limited to 'files/apache/review.trustedfirmware.org.conf')
| -rw-r--r-- | files/apache/review.trustedfirmware.org.conf | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/files/apache/review.trustedfirmware.org.conf b/files/apache/review.trustedfirmware.org.conf index 5f63d700..b4b5f546 100644 --- a/files/apache/review.trustedfirmware.org.conf +++ b/files/apache/review.trustedfirmware.org.conf @@ -2,38 +2,48 @@ ServerName {{inventory_hostname}} ServerAlias {{inventory_hostname}} - RedirectMatch permanent "^/(?!\.well-known/acme-challenge)(.*)" "https://{{hostname}}/$1" - - Alias "/.well-known/acme-challenge/" "/srv/certbot/.well-known/acme-challenge/" - <Directory "/srv/certbot/.well-known/acme-challenge/"> - Require all granted - </Directory> + Header set Cache-Control private + <FilesMatch ".(jpg|jpeg|png|gif|ico)$"> + Header set Cache-Control "max-age=86400, public" + </FilesMatch> + RedirectMatch permanent "^/(?!\.well-known/acme-challenge)(.*)" "https://{{hostname}}/$1" + Include /etc/apache2/linaro/letsencrypt.conf + RewriteEngine On + Include /etc/apache2/linaro/block-refs.conf </VirtualHost> <VirtualHost *:443> ServerName {{inventory_hostname}} ServerAlias {{inventory_hostname}} - SSLEngine On - SSLCertificateFile {{ssl_cert}} - SSLCertificateKeyFile {{ssl_key}} - SSLCACertificateFile {{ssl_ca}} + Include /etc/apache2/linaro/settings-ssl.conf + SSLCertificateFile {{ssl_cert}} + SSLCertificateKeyFile {{ssl_key}} + SSLCACertificateFile {{ssl_ca}} DocumentRoot /srv/gerrit - CustomLog /var/log/apache2/{{inventory_hostname}}.linaro.org-access.log combined - ErrorLog /var/log/apache2/{{inventory_hostname}}.linaro.org-error.log + CustomLog /var/log/apache2/{{inventory_hostname}}.linaro.org-access.log combined + ErrorLog /var/log/apache2/{{inventory_hostname}}.linaro.org-error.log - ProxyRequests Off - ProxyVia Off - ProxyPreserveHost On - <Proxy *> - Order deny,allow - Allow from all - </Proxy> + Header set Cache-Control private + <FilesMatch ".(jpg|jpeg|png|gif|ico)$"> + Header set Cache-Control "max-age=86400, public" + </FilesMatch> + + RewriteEngine on + Include /etc/apache2/linaro/block-refs.conf + RewriteRule "^/c/trusted-firmware-m(.*)" "/c/TF-M/trusted-firmware-m$1" [redirect=301] + + ProxyRequests Off + ProxyVia Off + ProxyPreserveHost On + <Proxy *> + Order deny,allow + Allow from all + </Proxy> AllowEncodedSlashes On - ProxyPass / http://127.0.0.1:8080/ nocanon + ProxyPass / http://127.0.0.1:8080/ nocanon </VirtualHost> - |