--- madsonic.sh	2015-08-06 12:49:44.168119164 -0400
+++ madsonic-new.sh	2015-08-06 13:18:28.224548446 -0400
@@ -4,20 +4,35 @@
 # Shell script for starting Madsonic.  See http://madsonic.org.
 ###################################################################################
 
-MADSONIC_HOME=/var/madsonic
-MADSONIC_HOST=0.0.0.0
-MADSONIC_PORT=4040
+JAVA_HOME=/opt/java/jre:/usr/lib/jvm/java-7-openjdk
+export LANG=en_US.UTF-8
+export LC_CTYPE=en_US.UTF-8
+
+# Check for config and source it
+[[ -f /etc/madsonic.conf && -r /etc/madsonic.conf ]] && . /etc/madsonic.conf
+
+# Disable IPv6 if not enabled in config
+USEIPV6=${LISTENIPV6:-true}
+[[ $USEIPV6 == false ]] && export _JAVA_OPTIONS="-Djava.net.preferIPv4Stack=true"
+
+# Values can be set in config
+MADSONIC_HOME=${MADSONIC_BASEDIR:-/var/madsonic}
+MADSONIC_HOST=${LISTEN_ADDR:-0.0.0.0}
+MADSONIC_PORT=${LISTEN_PORT:-4040}
+MADSONIC_INIT_MEMORY=${INIT_MEMORY:-192}
+MADSONIC_MAX_MEMORY=${MAX_MEMORY:-384}
+
 MADSONIC_HTTPS_PORT=0
 MADSONIC_CONTEXT_PATH=/
-MADSONIC_INIT_MEMORY=192
-MADSONIC_MAX_MEMORY=384
 MADSONIC_PIDFILE=
-MADSONIC_DEFAULT_MUSIC_FOLDER=/var/media/artists
-MADSONIC_DEFAULT_UPLOAD_FOLDER=/var/media/incoming
-MADSONIC_DEFAULT_PODCAST_FOLDER=/var/media/podcast
-MADSONIC_DEFAULT_PLAYLIST_IMPORT_FOLDER=/var/media/playlists/import
-MADSONIC_DEFAULT_PLAYLIST_EXPORT_FOLDER=/var/media/playlists/export
-MADSONIC_DEFAULT_PLAYLIST_BACKUP_FOLDER=/var/media/playlists/backup
+
+MADSONIC_DEFAULT_MUSIC_FOLDER=${MS_MUSIC_DIR:-/var/media/artists}
+MADSONIC_DEFAULT_UPLOAD_FOLDER=${MS_UPLOAD_DIR:-/var/media/incoming}
+MADSONIC_DEFAULT_PODCAST_FOLDER=${MS_PODCAST_DIR:-/var/media/podcast}
+MADSONIC_DEFAULT_PLAYLIST_IMPORT_FOLDER=${MS_PLAYLIST_IMPORT_DIR:-/var/media/playlists/import}
+MADSONIC_DEFAULT_PLAYLIST_EXPORT_FOLDER=${MS_PLAYLIST_EXPORT_DIR:-/var/media/playlists/export}
+MADSONIC_DEFAULT_PLAYLIST_BACKUP_FOLDER=${MS_PLAYLIST_BACKUP_DIR:-/var/media/playlists/backup}
+
 MADSONIC_DEFAULT_TIMEZONE=
 quiet=0