1.1 --- a/conf/apache/imip-agent.conf Sun Apr 17 23:55:56 2016 +0200
1.2 +++ b/conf/apache/imip-agent.conf Mon Apr 18 00:31:34 2016 +0200
1.3 @@ -9,11 +9,11 @@
1.4 # Choose one of the sections below.
1.5
1.6 # LDAP authentication...
1.7 - ##AuthBasicProvider ldap
1.8 - ##AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
1.9 + #${APACHE_LDAP_ENABLE}AuthBasicProvider ldap
1.10 + #${APACHE_LDAP_ENABLE}AuthLDAPUrl "$LDAP_SCHEME://$LDAP_HOST:$LDAP_PORT/$LDAP_BASE_DN?mail?sub"
1.11
1.12 # Simple file-based authentication...
1.13 - ##AuthUserFile /var/www/imip-agent/users
1.14 + #${APACHE_SIMPLE_ENABLE}AuthUserFile /var/www/imip-agent/users
1.15
1.16 # Access policy. Where users and groups are involved, specific users or
1.17 # groups can be required here.
2.1 --- a/conf/apache/imip-manager.conf Sun Apr 17 23:55:56 2016 +0200
2.2 +++ b/conf/apache/imip-manager.conf Mon Apr 18 00:31:34 2016 +0200
2.3 @@ -8,11 +8,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/configure.example Sun Apr 17 23:55:56 2016 +0200
3.2 +++ b/conf/configure.example Mon Apr 18 00:31:34 2016 +0200
3.3 @@ -78,11 +78,20 @@
3.4 fi
3.5 fi
3.6
3.7 +if [ "$USER_DATABASE" = 'Simple' ]; then
3.8 + APACHE_LDAP_ENABLE=#
3.9 + APACHE_SIMPLE_ENABLE=
3.10 +else
3.11 + APACHE_LDAP_ENABLE=
3.12 + APACHE_SIMPLE_ENABLE=#
3.13 +fi
3.14 +
3.15
3.16
3.17 # Substituted variables.
3.18
3.19 SUBSTITUTED='$MAIL_DOMAIN $MAIL_DOMAIN_QUOTED \
3.20 $MAILBOX_DELIVERY_OPTIONS $MAILBOX_DELIVERY_GROUP \
3.21 + $APACHE_LDAP_ENABLE $APACHE_SIMPLE_ENABLE \
3.22 $POSTFIX_LOCAL_SYSTEM_ENABLE \
3.23 $LDAP_SCHEME $LDAP_HOST $LDAP_PORT $LDAP_BASE_DN $LDAP_SERVICE_BIND_DN $LDAP_SERVICE_PASSWORD'