From fc4174930d5a1af747826b795baba9a33fe249ca Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Sat, 7 Jul 2018 23:37:55 +0200
Subject: [PATCH] Add user config Fix directories config for cron

---
 entrypoint.sh                       | 21 ++++++++++++++-------
 examples/compose/docker-compose.yml | 14 +++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 70fd7df..a7ea2b2 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -85,6 +85,14 @@ rm -f ${LIBRENMS_PATH}/config.d/*
 
 echo "Setting LibreNMS configuration..."
 
+# Config : Directories
+  cat > ${LIBRENMS_PATH}/config.d/directories.php <<EOL
+<?php
+\$config['install_dir'] = '${LIBRENMS_PATH}';
+\$config['log_dir'] = '${DATA_PATH}/logs';
+\$config['rrd_dir'] = '${DATA_PATH}/rrd';
+EOL
+
 # Config : Database
 if [ -z "$DB_HOST" ]; then
   >&2 echo "ERROR: DB_HOST must be defined"
@@ -101,6 +109,12 @@ EOL
 dbcmd="mysql -h ${DB_HOST} -P ${DB_PORT} -u "${DB_USER}" "-p${DB_PASSWORD}""
 unset DB_PASSWORD
 
+# Config : User
+cat > ${LIBRENMS_PATH}/config.d/user.php <<EOL
+<?php
+\$config['user'] = "librenms";
+EOL
+
 # Config : Fping
 cat > ${LIBRENMS_PATH}/config.d/fping.php <<EOL
 <?php
@@ -159,13 +173,6 @@ if [ "$1" == "/usr/local/bin/cron" ]; then
   echo "Fixing permissions..."
   chmod -R 0644 ${CRONTAB_PATH}
 else
-  # Config : Directories
-  cat > ${LIBRENMS_PATH}/config.d/directories.php <<EOL
-<?php
-\$config['install_dir'] = '${LIBRENMS_PATH}';
-\$config['log_dir'] = '${DATA_PATH}/logs';
-\$config['rrd_dir'] = '${DATA_PATH}/rrd';
-EOL
   # Fix perms
   echo "Fixing permissions..."
   chown -R librenms. ${DATA_PATH} \
diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml
index 0f303a6..6c20d1c 100644
--- a/examples/compose/docker-compose.yml
+++ b/examples/compose/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       - --innodb-file-per-table=1
       - --lower-case-table-names=0
     volumes:
-      - db:/var/lib/mysql
+      - ./db:/var/lib/mysql
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_DATABASE=librenms
@@ -55,8 +55,12 @@ services:
 
   rrdcached:
     image: crazymax/rrdcached
+    volumes:
+      - ./librenms/rrd:/data
     environment:
       - TZ=Europe/Paris
+      - PUID=1000
+      - GID=1000
       - LOG_LEVEL=LOG_INFO
       - WRITE_TIMEOUT=1800
       - WRITE_JITTER=1800
@@ -71,7 +75,7 @@ services:
       - memcached
       - rrdcached
     volumes:
-      - librenms:/data
+      - ./librenms:/data
     labels:
       - traefik.enable=true
       - traefik.backend=librenms
@@ -86,12 +90,8 @@ services:
     depends_on:
       - app
     volumes:
-      - librenms:/data
+      - ./librenms:/data
     command: /usr/local/bin/cron
     env_file:
       - ./librenms.env
     restart: always
-
-volumes:
-  db:
-  librenms: