Merge pull request #565 from bilalrao12/master

fix for using 'homer_user' as ldap groupname

Author: adubovikov

docker/docker-entrypoint.d/1

@@ -17,7 +17,7 @@ TSHARK_GID=${TSHARK_GID:-0}
 if [ -f /usr/local/homer/etc/webapp_config.json ]; then
 
    if [ -n "$DB_HOST" ]; then sed -i "s/homer_db_host/${DB_HOST}/g" /usr/local/homer/etc/webapp_config.json; fi
-   if [ -n "$DB_USER" ]; then sed -i "s/homer_user/${DB_USER}/g" /usr/local/homer/etc/webapp_config.json; fi
+   if [ -n "$DB_USER" ]; then sed -i "s/homer_db_user/${DB_USER}/g" /usr/local/homer/etc/webapp_config.json; fi
    if [ -n "$DB_PASS" ]; then sed -i "s/homer_password/${DB_PASS}/g" /usr/local/homer/etc/webapp_config.json; fi
    if [ -n "$DB_KEEPALIVE" ]; then sed -i "s/homer_db_keepalive/${DB_KEEPALIVE}/g" /usr/local/homer/etc/webapp_config.json; fi
    if [ -n "$DB_HOMER_CONFIG" ]; then sed -i "s/homer_config/${DB_HOMER_CONFIG}/g" /usr/local/homer/etc/webapp_config.json; fi

docker/webapp_config.json

@@ -2,14 +2,14 @@
   "database_data": {
     "local": {
       "node": "LocalNode",
-      "user": "homer_user",
+      "user": "homer_db_user",
       "pass": "homer_password",
       "name": "homer_data",
       "host": "homer_db_host"
     }
   },
   "database_config": {
-    "user": "homer_user",
+    "user": "homer_db_user",
     "pass": "homer_password",
     "name": "homer_config",
     "host": "homer_db_host",