1.1 --- a/README.txt Sun Apr 17 23:47:19 2016 +0200
1.2 +++ b/README.txt Mon Apr 18 19:39:05 2016 +0200
1.3 @@ -21,7 +21,7 @@
1.4
1.5 See the following Web pages for more information about this work:
1.6
1.7 -http://hgweb.boddie.org.uk/imip-agent
1.8 +http://groupware.boddie.org.uk/imip-agent
1.9
1.10 The author can be contacted at the following e-mail address:
1.11
2.1 --- a/conf/apache/imip-agent.conf Sun Apr 17 23:47:19 2016 +0200
2.2 +++ b/conf/apache/imip-agent.conf Mon Apr 18 19:39:05 2016 +0200
2.3 @@ -9,11 +9,11 @@
2.4 # Choose one of the sections below.
2.5
2.6 # LDAP authentication...
2.7 - ##AuthBasicProvider ldap
2.8 - ##AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
2.9 + #${APACHE_LDAP_ENABLE}AuthBasicProvider ldap
2.10 + #${APACHE_LDAP_ENABLE}AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
2.11
2.12 # Simple file-based authentication...
2.13 - ##AuthUserFile /var/www/imip-agent/users
2.14 + #${APACHE_SIMPLE_ENABLE}AuthUserFile /var/www/imip-agent/users
2.15
2.16 # Access policy. Where users and groups are involved, specific users or
2.17 # groups can be required here.
3.1 --- a/conf/apache/imip-manager.conf Sun Apr 17 23:47:19 2016 +0200
3.2 +++ b/conf/apache/imip-manager.conf Mon Apr 18 19:39:05 2016 +0200
3.3 @@ -8,11 +8,11 @@
3.4 # Choose one of the sections below.
3.5
3.6 # LDAP authentication...
3.7 - #AuthBasicProvider ldap
3.8 - #AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
3.9 + ${APACHE_LDAP_ENABLE}AuthBasicProvider ldap
3.10 + ${APACHE_LDAP_ENABLE}AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
3.11
3.12 # Simple file-based authentication...
3.13 - AuthUserFile /var/www/imip-agent/users
3.14 + ${APACHE_SIMPLE_ENABLE}AuthUserFile /var/www/imip-agent/users
3.15
3.16 # Access policy. Where users and groups are involved, specific users or
3.17 # groups can be required here.
4.1 --- a/conf/configure.example Sun Apr 17 23:47:19 2016 +0200
4.2 +++ b/conf/configure.example Mon Apr 18 19:39:05 2016 +0200
4.3 @@ -78,11 +78,20 @@
4.4 fi
4.5 fi
4.6
4.7 +if [ "$USER_DATABASE" = 'Simple' ]; then
4.8 + APACHE_LDAP_ENABLE=#
4.9 + APACHE_SIMPLE_ENABLE=
4.10 +else
4.11 + APACHE_LDAP_ENABLE=
4.12 + APACHE_SIMPLE_ENABLE=#
4.13 +fi
4.14 +
4.15
4.16
4.17 # Substituted variables.
4.18
4.19 SUBSTITUTED='$MAIL_DOMAIN $MAIL_DOMAIN_QUOTED \
4.20 $MAILBOX_DELIVERY_OPTIONS $MAILBOX_DELIVERY_GROUP \
4.21 + $APACHE_LDAP_ENABLE $APACHE_SIMPLE_ENABLE \
4.22 $POSTFIX_LOCAL_SYSTEM_ENABLE \
4.23 $LDAP_SCHEME $LDAP_HOST $LDAP_PORT $LDAP_BASE_DN $LDAP_SERVICE_BIND_DN $LDAP_SERVICE_PASSWORD'
5.1 --- a/markup.py Sun Apr 17 23:47:19 2016 +0200
5.2 +++ b/markup.py Mon Apr 18 19:39:05 2016 +0200
5.3 @@ -2,12 +2,13 @@
5.4 # with absolutely no warranty and you can do
5.5 # absolutely whatever you want with it.
5.6
5.7 -__date__ = '1 October 2012'
5.8 -__version__ = '1.9'
5.9 +__date__ = '16 March 2015'
5.10 +__version__ = '1.10'
5.11 __doc__= """
5.12 This is markup.py - a Python module that attempts to
5.13 make it easier to generate HTML/XML from a Python program
5.14 in an intuitive, lightweight, customizable and pythonic way.
5.15 +It works with both python 2 and 3.
5.16
5.17 The code is in the public domain.
5.18
5.19 @@ -28,6 +29,7 @@
5.20 # python 3
5.21 basestring = str
5.22 string = str
5.23 + long = int
5.24
5.25 # tags which are reserved python keywords will be referred
5.26 # to by a leading underscore otherwise we end up with a syntax error