[Pkg-citadel-commit] r372 - citadel/trunk/debian
Michael Meskes
meskes at alioth.debian.org
Wed Aug 12 11:24:34 UTC 2009
Author: meskes
Date: 2009-08-12 11:24:34 +0000 (Wed, 12 Aug 2009)
New Revision: 372
Modified:
citadel/trunk/debian/changelog
citadel/trunk/debian/citadel-server.config
citadel/trunk/debian/citadel-server.postinst
citadel/trunk/debian/citadel-server.templates
Log:
Added LDAP stuff to debconf
Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog 2009-08-12 11:05:16 UTC (rev 371)
+++ citadel/trunk/debian/changelog 2009-08-12 11:24:34 UTC (rev 372)
@@ -3,6 +3,7 @@
* New upstream version.
* Debug package only suggests citadel-mta to not force people to change their
mta when debugging citadel.
+ * Added Wilfried's patch to ask for LDAP information using debconf.
-- Michael Meskes <meskes at debian.org> Wed, 12 Aug 2009 13:04:48 +0200
Modified: citadel/trunk/debian/citadel-server.config
===================================================================
--- citadel/trunk/debian/citadel-server.config 2009-08-12 11:05:16 UTC (rev 371)
+++ citadel/trunk/debian/citadel-server.config 2009-08-12 11:24:34 UTC (rev 372)
@@ -19,7 +19,7 @@
# are we in first install?
if test "$1" = "configure"; then
DO_CONFIGURE=yes
- LASTSTATE=5
+ LASTSTATE=10
fi
fi
@@ -44,6 +44,21 @@
5)
db_input high citadel/Password_again || true
;;
+ 6)
+ db_input high citadel/LDAPServer || true
+ ;;
+ 7)
+ db_input high citadel/LDAPServerPort || true
+ ;;
+ 8)
+ db_input high citadel/LDAPBaseDN || true
+ ;;
+ 9)
+ db_input high citadel/LDAPBindDN || true
+ ;;
+ 10)
+ db_input high citadel/LDAPBindDNPassword || true
+ ;;
esac
if db_go; then
@@ -53,13 +68,22 @@
2)
db_get citadel/LoginType
LoginType=$RET
- if [ "$LoginType" = "true" ]; then
- # external authentication, user has to exist
- LASTSTATE=3
- fi
+ case "$LoginType" in
+ Host)
+ # external authentication, user has to exist
+ # and of course LDAP information is not needed
+ LASTSTATE=3
+ ;;
+ Internal)
+ # Don't ask LDAP stuff
+ LASTSTATE=5
+ ;;
+ *)
+ STATE=5
+ ;;
;;
3)
- if [ "$LoginType" = "true" ]; then
+ if [ "$LoginType" = "Host" ]; then
db_get citadel/Administrator
if ! getent passwd $RET >/dev/null; then
# user doesn't exist
Modified: citadel/trunk/debian/citadel-server.postinst
===================================================================
--- citadel/trunk/debian/citadel-server.postinst 2009-08-12 11:05:16 UTC (rev 371)
+++ citadel/trunk/debian/citadel-server.postinst 2009-08-12 11:24:34 UTC (rev 372)
@@ -29,9 +29,14 @@
move_file /etc/citadel/citadel.control /var/lib/citadel/data/citadel.control
move_file /etc/citadel/citadel.config /var/lib/citadel/data/citadel.config
- db_get citadel/Administrator && admin="$RET"
- db_get citadel/ServerIPAddress && ip_addr="$RET"
- db_get citadel/LoginType && deb_enable_unix_auth="$RET"
+ db_get citadel/Administrator && admin="$RET"
+ db_get citadel/ServerIPAddress && ip_addr="$RET"
+ db_get citadel/LoginType && deb_enable_unix_auth="$RET"
+ db_get citadel/LDAPServer && LDAP_HOST="$RET"; export LDAP_HOST
+ db_get citadel/LDAPServerPort && LDAP_PORT="$RET"; export LDAP_PORT
+ db_get citadel/LDAPBaseDN && LDAP_BASE_DN="$RET"; export LDAP_BASE_DN
+ db_get citadel/LDAPBindDN && LDAP_BIND_DN="$RET"; export LDAP_BIND_DN
+ db_get citadel/LDAPBindDNPassword && LDAP_BIND_PW="$RET"; export LDAP_BIND_PW
if test "$deb_enable_unix_auth" = "true"; then
export ENABLE_UNIX_AUTH=yes
Modified: citadel/trunk/debian/citadel-server.templates
===================================================================
--- citadel/trunk/debian/citadel-server.templates 2009-08-12 11:05:16 UTC (rev 371)
+++ citadel/trunk/debian/citadel-server.templates 2009-08-12 11:24:34 UTC (rev 372)
@@ -9,17 +9,55 @@
of Citadel are running on the same computer.
Template: citadel/LoginType
-Type: boolean
-Default: false
+Type: select
+_Choices: Internal, Host, LDAP, Active Directory
+Default: Internal
_Description: Enable external authentication mode?
- Please choose the user authentication mode. By default Citadel will
- use its own internal user accounts database. If you accept this
- option, Citadel users will have accounts on the host system,
- authenticated via /etc/passwd (or LDAP).
+ Please choose the user authentication mode. By default Citadel will use its
+ own internal user accounts database. If you choose Host, Citadel users will
+ have accounts on the host system, authenticated via /etc/passwd or a PAM
+ source. LDAP chooses an RFC 2307 compliant directory server, the last option
+ chooses the nonstandard MS Active Directory LDAP scheme.
.
- Do not accept this option unless you are sure it is required, since
+ Do not change this option unless you are sure it is required, since
changing back requires a full reinstall of Citadel.
+Template: citadel/LDAPServer
+Type: string
+Default: 0.0.0.0
+_Description: LDAP host
+ Please enter host name or IP address of your LDAP server.
+
+Template: citadel/LDAPServerPort
+Type: integer
+Default: 389
+_Description: LDAP port number
+ Please enter the port number of your LDAP service (usually 389).
+
+Template: citadel/LDAPBaseDN
+Type: string
+Default: dc=example,dc=com
+_Description: LDAP base DN
+ Please enter the Base DN to search for authentication
+ (for example: dc=example,dc=com),
+
+Template: citadel/LDAPBindDN
+Type: string
+Default:
+_Description: LDAP bind DN
+ Please enter the DN of an account to use for binding to the LDAP server
+ for performing queries. The account does not require any other
+ privileges. If your LDAP server allows anonymous queries, you can.
+ leave this blank.
+
+Template: citadel/LDAPBindDNPassword
+Type: string
+Default: OpenSesame
+_Description: LDAP bind password
+ If you entered a Bind DN in the previous question, you must now enter
+ the password associated with that account. Otherwise, you can leave this
+ blank.
+
Template: citadel/Administrator
Type: string
Default: admin
More information about the Pkg-citadel-commit
mailing list