.
continuous-integration/drone/push Build was killed Details

This commit is contained in:
Giles Bradshaw 2020-05-05 20:27:43 +01:00
parent 5644f79360
commit ce0a9bac57
1 changed files with 23 additions and 8 deletions

View File

@ -35,7 +35,7 @@ server {
#access_log /var/log/nginx/access.log compression; #access_log /var/log/nginx/access.log compression;
server_name ${SERVER_NAME}; server_name ${SERVER_NAME};
location / { location ~ /(.*) {
sub_filter '</head>' '<!-- Matomo --> sub_filter '</head>' '<!-- Matomo -->
<script type="text/javascript"> <script type="text/javascript">
var _paq = window._paq || []; var _paq = window._paq || [];
@ -52,8 +52,13 @@ server {
</script> </script>
<!-- End Matomo Code --> <!-- End Matomo Code -->
</head>'; </head>';
proxy_set_header Host ${DOLLAR}http_host;
proxy_pass ${COMMENTO_PROXY_PASS}; proxy_set_header X-Real-IP ${DOLLAR}remote_addr;
proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme;
proxy_buffering off;
set ${DOLLAR}upstream ${COMMENTO_PROXY_PASS}${DOLLAR}1${DOLLAR}is_args${DOLLAR}args;
proxy_pass ${DOLLAR}upstream;
} }
} }
@ -73,7 +78,7 @@ server {
#access_log /var/log/nginx/access.log compression; #access_log /var/log/nginx/access.log compression;
server_name ${SERVER_NAME}; server_name ${SERVER_NAME};
location / { location ~ /(.*) {
sub_filter '</head>' '<!-- Matomo --> sub_filter '</head>' '<!-- Matomo -->
<script type="text/javascript"> <script type="text/javascript">
var _paq = window._paq || []; var _paq = window._paq || [];
@ -90,8 +95,14 @@ server {
</script> </script>
<!-- End Matomo Code --> <!-- End Matomo Code -->
</head>'; </head>';
proxy_set_header Host ${DOLLAR}http_host;
proxy_pass ${DRONE_PROXY_PASS}; proxy_set_header X-Real-IP ${DOLLAR}remote_addr;
proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme;
proxy_buffering off;
set ${DOLLAR}upstream ${DRONE_PROXY_PASS}${DOLLAR}1${DOLLAR}is_args${DOLLAR}args;
proxy_pass ${DOLLAR}upstream;
} }
} }
server { server {
@ -115,7 +126,7 @@ server {
# required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486) # required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486)
chunked_transfer_encoding on; chunked_transfer_encoding on;
server_name ${SERVER_NAME}; server_name ${SERVER_NAME};
location /v2/(.*) { locatio ~ /v2/(.*) {
# Do not allow connections from docker 1.5 and earlier # Do not allow connections from docker 1.5 and earlier
# docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents # docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents
if (${DOLLAR}http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) { if (${DOLLAR}http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) {
@ -175,7 +186,11 @@ server {
</script> </script>
<!-- End Matomo Code --> <!-- End Matomo Code -->
</head>'; </head>';
proxy_set_header Host ${DOLLAR}http_host;
proxy_set_header X-Real-IP ${DOLLAR}remote_addr;
proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme;
proxy_buffering off;
set ${DOLLAR}upstream ${GIT_PROXY_PASS}${DOLLAR}1${DOLLAR}is_args${DOLLAR}args; set ${DOLLAR}upstream ${GIT_PROXY_PASS}${DOLLAR}1${DOLLAR}is_args${DOLLAR}args;
proxy_pass ${DOLLAR}upstream; proxy_pass ${DOLLAR}upstream;
} }