From 9af2c3a2f1aa4ff8639f8628ad3e4b2205498e92 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Tue, 5 May 2020 15:29:30 +0100 Subject: [PATCH] nagios-nginx --- docker-compose.yml | 2 ++ drone-starlark/repos/deploy.star | 4 ++-- letsencrypt-nginx/conf/git.conf | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2d8e035..58fd5bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,8 @@ services: - PORTAINER_LOCATION=/portainer/ - MATOMO_PROXY_PASS=http://matomo-web/ - MATOMO_LOCATION=/analytics/ + - NAGIOS_PROXY_PASS=http://nagios/ + - NAGIOS_LOCATION=/nagios/ - GIT_LOCATION=/git/ - BLOG_LOCATION=/ - CHAT_LOCATION=/chat/ diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star index 0f9dda1..5f54307 100644 --- a/drone-starlark/repos/deploy.star +++ b/drone-starlark/repos/deploy.star @@ -30,8 +30,8 @@ def deploy( "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit), "docker network prune -f", "cd {folder}".format(folder=folder), - "docker stack rm {name}".format(name = name), - "sleep 30", + # "docker stack rm {name}".format(name = name), + # "sleep 30", "docker stack deploy -c {filename} {name}".format(name= name, filename = filename), ] + commands } diff --git a/letsencrypt-nginx/conf/git.conf b/letsencrypt-nginx/conf/git.conf index b16ea01..72364d4 100644 --- a/letsencrypt-nginx/conf/git.conf +++ b/letsencrypt-nginx/conf/git.conf @@ -205,6 +205,33 @@ server { proxy_buffering off; proxy_pass ${DOLLAR}upstream; } + location ~ ${NAGIOS_LOCATION}(.*) { + resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns + sub_filter '' ' + + + '; + + set ${DOLLAR}upstream ${NAGIOS_PROXY_PASS}${DOLLAR}1${DOLLAR}is_args${DOLLAR}args; + 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; + proxy_pass ${DOLLAR}upstream; + } location ~ ${CHAT_LOCATION}sockjs(.*) { resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns