modified: apps/gramps/docker-compose.yml

modified:   apps/nextcloud/docker-compose.yml
	modified:   apps/passbolt/docker-compose.yml
	modified:   core/authelia/configuration.yml
	modified:   core/docker-compose.yml
	modified:   default-environment.env
	modified:   monitoring/gotify/docker-compose.yml
	modified:   monitoring/prometheus/docker-compose.yml
	modified:   monitoring/prometheus/prometheus.yml
	modified:   services-up.sh

monitoring/gotify/docker-compose.yml

@@ -4,8 +4,8 @@ services:
     image: gotify/server:latest
     container_name: gotify
     restart: always
-    env_file:
-      - ${PROJECT_ROOT}/secrets/stack-secrets.env
+#    env_file:
+#      - ${PROJECT_ROOT}/secrets/stack-secrets.env
     volumes:
       - ${PROJECT_ROOT}/monitoring/gotify/data:/app/data
     environment:

monitoring/prometheus/docker-compose.yml

@@ -4,8 +4,8 @@ services:
   prometheus:
     profiles: ["monitoring","all","prometheus"]
     image: prom/prometheus:latest
-    env_file:
-      - ${PROJECT_ROOT}/secrets/stack-secrets.env
+#    env_file:
+#      - ${PROJECT_ROOT}/secrets/stack-secrets.env
     container_name: prometheus
     depends_on:
 #      - alertmanager
@@ -104,12 +104,12 @@ services:
     image: influxdb:2.7
     container_name: influxdb
     restart: unless-stopped
-    env_file:
-      - ${PROJECT_ROOT}/secrets/stack-secrets.env
+#    env_file:
+#      - ${PROJECT_ROOT}/secrets/stack-secrets.env
     volumes:
       - ${PROJECT_ROOT}/monitoring/influxdb:/var/lib/influxdb2
     environment:
-      DOCKER_INFLUXDB_INIT_MODE: setup
+      DOCKER_INFLUXDB_INIT_MODE: ${INFLUXDB_INIT_MODE}
       DOCKER_INFLUXDB_INIT_USERNAME: ${INFLUXDB_INIT_USERNAME}
       DOCKER_INFLUXDB_INIT_PASSWORD_FILE: /run/secrets/influxdb_init_password
       DOCKER_INFLUXDB_INIT_ORG: ${INFLUXDB_INIT_ORG}
@@ -212,14 +212,14 @@ services:
     profiles: ["monitoring","all","prometheus-exporters"]
     image: ekofr/pihole-exporter:latest
     container_name: pihole-exporter
-    env_file:
-      - ${PROJECT_ROOT}/secrets/stack-secrets.env
+#    env_file:
+#      - ${PROJECT_ROOT}/secrets/stack-secrets.env
     environment:
       PIHOLE_HOSTNAME: ${PIHOLE_HOSTNAME}
       PIHOLE_PASSWORD: ${PIHOLE_PASSWORD}
-      PORT: 9617
+      PORT: ${PIHOLE_EXPORTER_PORT}
     ports:
-      - "9617:9617"
+      - "${PIHOLE_EXPORTER_PORT}:${PIHOLE_EXPORTER_PORT}"
     restart: unless-stopped
     networks:
 #      - edge

monitoring/prometheus/prometheus.yml

@@ -96,9 +96,9 @@ scrape_configs:
     scrape_interval: 30s
 
     basic_auth:
-      username: ${PROMETHEUS_KUMA_BASIC_AUTH_USERNAME}
+      username: wayne.bennett@live.com
       password_file: /run/secrets/prometheus_kuma_basic_auth_password
-
+#      password: '4vjCco?[%{=+,t`):C'
     static_configs:
       - targets:
           - monitor-kuma:3001