1.1 --- a/tools/config.sh Wed Oct 28 00:12:48 2015 +0100
1.2 +++ b/tools/config.sh Wed Oct 28 00:37:57 2015 +0100
1.3 @@ -4,3 +4,4 @@
1.4 IMIP_AGENT_GROUP=lmtp
1.5 INSTALL_DIR=/var/lib/imip-agent
1.6 WEB_INSTALL_DIR=/var/www/imip-agent
1.7 +CONFIG_DIR=/etc/imip-agent
2.1 --- a/tools/install.sh Wed Oct 28 00:12:48 2015 +0100
2.2 +++ b/tools/install.sh Wed Oct 28 00:37:57 2015 +0100
2.3 @@ -1,11 +1,17 @@
2.4 #!/bin/sh
2.5
2.6 +DIRNAME=`dirname $0`
2.7 +
2.8 +if [ -e "$DIRNAME/config.sh" ]; then
2.9 + . "$DIRNAME/config.sh"
2.10 +else
2.11 + . /etc/imip-agent/config.sh
2.12 +fi
2.13 +
2.14 # Agents and modules.
2.15
2.16 AGENTS="imip_person.py imip_person_outgoing.py imip_resource.py"
2.17 MODULES="markup.py imip_store.py vCalendar.py vContent.py vRecurrence.py"
2.18 -INSTALL_DIR=/var/lib/imip-agent
2.19 -CONFIG_DIR=/etc/imip-agent
2.20
2.21 if [ ! -e "$INSTALL_DIR" ]; then
2.22 mkdir -p "$INSTALL_DIR"
2.23 @@ -73,8 +79,6 @@
2.24
2.25 # Web manager interface.
2.26
2.27 -WEB_INSTALL_DIR=/var/www/imip-agent
2.28 -
2.29 if [ ! -e "$WEB_INSTALL_DIR" ]; then
2.30 mkdir -p "$WEB_INSTALL_DIR"
2.31 fi