# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1461001145 -7200
# Node ID f8478a58346101d0e5cad70718725e18362d77c6
# Parent  cfbb32370151770464c3a220c87e0f294006ee84# Parent  89c26af3226f0533641beb04958f9b3bf74b525c
Merged changes from the default branch.

diff -r cfbb32370151 -r f8478a583461 README.txt
--- a/README.txt	Sun Apr 17 23:47:19 2016 +0200
+++ b/README.txt	Mon Apr 18 19:39:05 2016 +0200
@@ -21,7 +21,7 @@
 
 See the following Web pages for more information about this work:
 
-http://hgweb.boddie.org.uk/imip-agent
+http://groupware.boddie.org.uk/imip-agent
 
 The author can be contacted at the following e-mail address:
 
diff -r cfbb32370151 -r f8478a583461 conf/apache/imip-agent.conf
--- a/conf/apache/imip-agent.conf	Sun Apr 17 23:47:19 2016 +0200
+++ b/conf/apache/imip-agent.conf	Mon Apr 18 19:39:05 2016 +0200
@@ -9,11 +9,11 @@
      # Choose one of the sections below.
 
      # LDAP authentication...
-     ##AuthBasicProvider ldap
-     ##AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
+     #${APACHE_LDAP_ENABLE}AuthBasicProvider ldap
+     #${APACHE_LDAP_ENABLE}AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
  
      # Simple file-based authentication...
-     ##AuthUserFile /var/www/imip-agent/users
+     #${APACHE_SIMPLE_ENABLE}AuthUserFile /var/www/imip-agent/users
 
      # Access policy. Where users and groups are involved, specific users or
      # groups can be required here.
diff -r cfbb32370151 -r f8478a583461 conf/apache/imip-manager.conf
--- a/conf/apache/imip-manager.conf	Sun Apr 17 23:47:19 2016 +0200
+++ b/conf/apache/imip-manager.conf	Mon Apr 18 19:39:05 2016 +0200
@@ -8,11 +8,11 @@
     # Choose one of the sections below.
 
     # LDAP authentication...
-    #AuthBasicProvider ldap
-    #AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
+    ${APACHE_LDAP_ENABLE}AuthBasicProvider ldap
+    ${APACHE_LDAP_ENABLE}AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
 
     # Simple file-based authentication...
-    AuthUserFile /var/www/imip-agent/users
+    ${APACHE_SIMPLE_ENABLE}AuthUserFile /var/www/imip-agent/users
 
     # Access policy. Where users and groups are involved, specific users or
     # groups can be required here.
diff -r cfbb32370151 -r f8478a583461 conf/configure.example
--- a/conf/configure.example	Sun Apr 17 23:47:19 2016 +0200
+++ b/conf/configure.example	Mon Apr 18 19:39:05 2016 +0200
@@ -78,11 +78,20 @@
     fi
 fi
 
+if [ "$USER_DATABASE" = 'Simple' ]; then
+    APACHE_LDAP_ENABLE=#
+    APACHE_SIMPLE_ENABLE=
+else
+    APACHE_LDAP_ENABLE=
+    APACHE_SIMPLE_ENABLE=#
+fi
+
 
 
 # Substituted variables.
 
 SUBSTITUTED='$MAIL_DOMAIN $MAIL_DOMAIN_QUOTED \
  $MAILBOX_DELIVERY_OPTIONS $MAILBOX_DELIVERY_GROUP \
+ $APACHE_LDAP_ENABLE $APACHE_SIMPLE_ENABLE \
  $POSTFIX_LOCAL_SYSTEM_ENABLE \
  $LDAP_SCHEME $LDAP_HOST $LDAP_PORT $LDAP_BASE_DN $LDAP_SERVICE_BIND_DN $LDAP_SERVICE_PASSWORD'
diff -r cfbb32370151 -r f8478a583461 markup.py
--- a/markup.py	Sun Apr 17 23:47:19 2016 +0200
+++ b/markup.py	Mon Apr 18 19:39:05 2016 +0200
@@ -2,12 +2,13 @@
 # with absolutely no warranty and you can do
 # absolutely whatever you want with it.
 
-__date__ = '1 October 2012'
-__version__ = '1.9'
+__date__ = '16 March 2015'
+__version__ = '1.10'
 __doc__= """
 This is markup.py - a Python module that attempts to
 make it easier to generate HTML/XML from a Python program
 in an intuitive, lightweight, customizable and pythonic way.
+It works with both python 2 and 3.
 
 The code is in the public domain.
 
@@ -28,6 +29,7 @@
     # python 3
     basestring = str
     string = str
+    long = int
 
 # tags which are reserved python keywords will be referred 
 # to by a leading underscore otherwise we end up with a syntax error