giles
/
stack
Archived
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nagios-nginx
continuous-integration/drone/push Build was killed Details

This commit is contained in:
Giles Bradshaw 2020-05-05 15:29:30 +01:00
parent d663d82381
commit 9af2c3a2f1
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -24,6 +24,8 @@ services:
- PORTAINER_LOCATION=/portainer/ - PORTAINER_LOCATION=/portainer/
- MATOMO_PROXY_PASS=http://matomo-web/ - MATOMO_PROXY_PASS=http://matomo-web/
- MATOMO_LOCATION=/analytics/ - MATOMO_LOCATION=/analytics/
- NAGIOS_PROXY_PASS=http://nagios/
- NAGIOS_LOCATION=/nagios/
- GIT_LOCATION=/git/ - GIT_LOCATION=/git/
- BLOG_LOCATION=/ - BLOG_LOCATION=/
- CHAT_LOCATION=/chat/ - CHAT_LOCATION=/chat/

4
drone-starlark/repos/deploy.star
View File

@ -30,8 +30,8 @@ def deploy(
"export DRONE_COMMIT={commit}".format(commit=ctx.build.commit), "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit),
"docker network prune -f", "docker network prune -f",
"cd {folder}".format(folder=folder), "cd {folder}".format(folder=folder),
"docker stack rm {name}".format(name = name), # "docker stack rm {name}".format(name = name),
"sleep 30", # "sleep 30",
"docker stack deploy -c {filename} {name}".format(name= name, filename = filename), "docker stack deploy -c {filename} {name}".format(name= name, filename = filename),
] + commands ] + commands
} }

27
letsencrypt-nginx/conf/git.conf
View File

@ -205,6 +205,33 @@ server {
proxy_buffering off; proxy_buffering off;
proxy_pass ${DOLLAR}upstream; proxy_pass ${DOLLAR}upstream;
} }
location ~ ${NAGIOS_LOCATION}(.*) {
resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns
sub_filter '</head>' '<!-- Matomo -->
<script type="text/javascript">
var _paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["trackPageView"]);
_paq.push(["enableLinkTracking"]);
(function() {
var u="//${SERVER_NAME}${MATOMO_LOCATION}";
_paq.push(["setTrackerUrl", u+"matomo.php"]);
_paq.push(["setSiteId", "1"]);
var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];
g.type="text/javascript"; g.async=true; g.defer=true; g.src=u+"matomo.js"; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->
</head>';
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(.*) { location ~ ${CHAT_LOCATION}sockjs(.*) {
resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns