From e7e16b75517aa72a81eeea2d1c1d12e80b59fbdd Mon Sep 17 00:00:00 2001
From: aguestuser <aguestuser@riseup.net>
Date: Tue, 4 Aug 2020 00:32:49 -0400
Subject: [PATCH] [hotfix] fixup mr !324: mount vhost.d correctly on
signalboost prod
* symptoms:
* prometheus returning no data from signald scrape job
* ngix logs show: `4132 no live upstreams while connecting to
upstream, client: REDACTED, server: signald.signalboost.info`
* suspected cause: metrics docker compose vhost.d ip whitelisting
works because we mount a volume from the filesystem instead of
using a namded volume, but in signalboost prod configs we still
use a (vestigal) named volume from example configs
* attemped fix: mount the `vhost.d` directory from the repo instead of using the
named volume
---
docker-compose-metrics.yml | 1 -
docker-compose.yml | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/docker-compose-metrics.yml b/docker-compose-metrics.yml
index c613e87bf..0db000ea5 100644
--- a/docker-compose-metrics.yml
+++ b/docker-compose-metrics.yml
@@ -6,7 +6,6 @@ volumes:
loki_data:
certs:
html:
- vhost.d:
services:
prometheus:
diff --git a/docker-compose.yml b/docker-compose.yml
index 69136bd8d..31adf7e96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,6 @@ volumes:
postgres_data:
signal_sock:
signal_data:
- vhost.d:
x-logging: &loki-logging
options:
@@ -96,7 +95,7 @@ services:
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
volumes:
- certs:/etc/nginx/certs:ro
- - vhost.d:/etc/nginx/vhost.d
+ - ./nginx/vhost.d:/etc/nginx/vhost.d:ro
- html:/usr/share/nginx/html
- /var/run/docker.sock:/tmp/docker.sock:ro
networks:
--
GitLab