|
@@ -17,11 +17,6 @@ services:
|
|
|
- ./conf.d/real_ip.conf:/etc/nginx/conf.d/real_ip.conf:ro
|
|
|
|
|
|
- ./htpasswd:/etc/nginx/htpasswd
|
|
|
-
|
|
|
- - ${TOP_DOMAIN_CERT}:/etc/nginx/certs/jibby.org.crt
|
|
|
- - ${TOP_DOMAIN_KEY}:/etc/nginx/certs/jibby.org.key
|
|
|
- - ${WC_DOMAIN_CERT}:/etc/nginx/certs/shared.crt
|
|
|
- - ${WC_DOMAIN_KEY}:/etc/nginx/certs/shared.key
|
|
|
environment:
|
|
|
- DEFAULT_HOST=jibby.org
|
|
|
restart: always
|
|
@@ -138,27 +133,6 @@ services:
|
|
|
- CERT_NAME=shared
|
|
|
restart: always
|
|
|
|
|
|
- netdata:
|
|
|
- image: titpetric/netdata
|
|
|
- privileged: true
|
|
|
- hostname: cumulus-monitor
|
|
|
- expose:
|
|
|
- - "19999"
|
|
|
- volumes:
|
|
|
- - /proc:/host/proc:ro
|
|
|
- - /sys:/host/sys:ro
|
|
|
- - ${CONTAINERS_DIR}/netdata/health_alarm_notify.conf:/etc/netdata/health_alarm_notify.conf
|
|
|
- - ${CONTAINERS_DIR}/netdata/conf.d/:/usr/lib/netdata/conf.d/
|
|
|
- environment:
|
|
|
- - VIRTUAL_HOST=netdata.jibby.org
|
|
|
- - VIRTUAL_PORT=19999
|
|
|
- - CERT_NAME=shared
|
|
|
- - SMTP_TO=${LETSENCRYPT_EMAIL}
|
|
|
- - SMTP_FROM=${SMTP_USER}
|
|
|
- - SMTP_USER=${SMTP_USER}
|
|
|
- - SMTP_PASS=${SMTP_PASS}
|
|
|
- restart: always
|
|
|
-
|
|
|
selfoss:
|
|
|
image: hardware/selfoss
|
|
|
expose:
|
|
@@ -185,162 +159,3 @@ services:
|
|
|
- VIRTUAL_PORT=8096
|
|
|
- CERT_NAME=shared
|
|
|
restart: always
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|