# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1445989077 -3600
# Node ID 06e9eb58ca55720f56fe642e80530cce9de5a175
# Parent  23c1f8a2f08ac667a9f1025438568b017c63ecb3
Make the install script use the config script for configuration.

diff -r 23c1f8a2f08a -r 06e9eb58ca55 tools/config.sh
--- a/tools/config.sh	Wed Oct 28 00:12:48 2015 +0100
+++ b/tools/config.sh	Wed Oct 28 00:37:57 2015 +0100
@@ -4,3 +4,4 @@
 IMIP_AGENT_GROUP=lmtp
 INSTALL_DIR=/var/lib/imip-agent
 WEB_INSTALL_DIR=/var/www/imip-agent
+CONFIG_DIR=/etc/imip-agent
diff -r 23c1f8a2f08a -r 06e9eb58ca55 tools/install.sh
--- a/tools/install.sh	Wed Oct 28 00:12:48 2015 +0100
+++ b/tools/install.sh	Wed Oct 28 00:37:57 2015 +0100
@@ -1,11 +1,17 @@
 #!/bin/sh
 
+DIRNAME=`dirname $0`
+
+if [ -e "$DIRNAME/config.sh" ]; then
+    . "$DIRNAME/config.sh"
+else
+    . /etc/imip-agent/config.sh
+fi
+
 # Agents and modules.
 
 AGENTS="imip_person.py imip_person_outgoing.py imip_resource.py"
 MODULES="markup.py imip_store.py vCalendar.py vContent.py vRecurrence.py"
-INSTALL_DIR=/var/lib/imip-agent
-CONFIG_DIR=/etc/imip-agent
 
 if [ ! -e "$INSTALL_DIR" ]; then
     mkdir -p "$INSTALL_DIR"
@@ -73,8 +79,6 @@
 
 # Web manager interface.
 
-WEB_INSTALL_DIR=/var/www/imip-agent
-
 if [ ! -e "$WEB_INSTALL_DIR" ]; then
     mkdir -p "$WEB_INSTALL_DIR"
 fi