From 9ef067c1aa836d5edaffb83d5c343a3bb0669ff0 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Thu, 20 Dec 2018 20:59:12 +0100 Subject: [PATCH] Fix #8 --- examples/compose/.env | 3 --- examples/compose/docker-compose.yml | 18 +++++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/examples/compose/.env b/examples/compose/.env index c961723..a847768 100644 --- a/examples/compose/.env +++ b/examples/compose/.env @@ -1,6 +1,3 @@ -DOMAINNAME=example.com -HOSTNAME=librenms - MYSQL_DATABASE=librenms MYSQL_USER=librenms MYSQL_PASSWORD=asupersecretpassword diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml index baf50ba..093fbde 100644 --- a/examples/compose/docker-compose.yml +++ b/examples/compose/docker-compose.yml @@ -10,7 +10,7 @@ services: - "--entryPoints=Name:https Address::443 TLS" - "--docker" - "--docker.exposedbydefault=false" - - "--docker.domain=${DOMAINNAME}" + - "--docker.domain=example.com" - "--acme=true" - "--acme.acmelogging=true" - "--acme.email=webmaster@example.com" @@ -77,7 +77,7 @@ services: volumes: - "/etc/localtime:/etc/localtime:ro" environment: - - "SERVER_HOSTNAME=${HOSTNAME}.${DOMAINNAME}" + - "SERVER_HOSTNAME=librenms.example.com" - "SMTP_SERVER=${SMTP_SERVER}" - "SMTP_USERNAME=${SMTP_USERNAME}" - "SMTP_PASSWORD=${SMTP_PASSWORD}" @@ -85,8 +85,8 @@ services: app: image: librenms/librenms:latest - domainname: ${DOMAINNAME} - hostname: ${HOSTNAME} + domainname: example.com + hostname: librenms depends_on: - db - memcached @@ -98,7 +98,7 @@ services: - "traefik.enable=true" - "traefik.backend=librenms" - "traefik.port=80" - - "traefik.frontend.rule=Host:${HOSTNAME}.${DOMAINNAME}" + - "traefik.frontend.rule=Host:librenms.example.com" environment: - "TZ=${TZ}" - "PUID=${PUID}" @@ -114,8 +114,8 @@ services: cron: image: librenms/librenms:latest - domainname: ${DOMAINNAME} - hostname: ${HOSTNAME} + domainname: example.com + hostname: librenms command: - "/usr/local/bin/cron" depends_on: @@ -137,8 +137,8 @@ services: syslog-ng: image: librenms/librenms:latest - domainname: ${DOMAINNAME} - hostname: ${HOSTNAME} + domainname: example.com + hostname: librenms command: - "/usr/sbin/syslog-ng" - "-F"