Masato Taruishi
taru****@users*****
2004年 10月 11日 (月) 01:08:16 JST
===================================================================
RCS file: ultrapossum/module/startTLS/11startTLS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/startTLS/11startTLS 2004/10/10 12:05:45 1.3
+++ ultrapossum/module/startTLS/11startTLS 2004/10/10 16:08:16 1.4
@@ -47,8 +47,6 @@
# OpenLDAP TLS options
TLSCIPHERSUITE=$(ultrapossum_getconf TLSCIPHERSUITE HIGH:MEDIUM)
-TLSCERTIFICATEFILE=$(ultrapossum_getconf TLSCERTIFICATEFILE $TLSSYSCONFDIR/slapd-cert.pem)
-TLSCERTIFICATEKEYFILE=$(ultrapossum_getconf TLSCERTIFICATEKEYFILE $TLSSYSCONFDIR/slapd-key.pem)
# startTLS replication
REPLICASTARTTLS=$(ultrapossum_getconf REPLICASTARTTLS "critical")
@@ -66,6 +64,9 @@
fi
CERTUNIT=$(ultrapossum_getconf CERTUNIT '')
CERTEMAIL=$(ultrapossum_getconf CERTEMAIL '')
+
+TLSCERTIFICATEFILE=$(ultrapossum_getconf TLSCERTIFICATEFILE $TLSSYSCONFDIR/slapd-$CERTHOST-cert.pem)
+TLSCERTIFICATEKEYFILE=$(ultrapossum_getconf TLSCERTIFICATEKEYFILE $TLSSYSCONFDIR/slapd-$CERTHOST-key.pem)
# URIs to accept
LDAPSLISTENPORT=$(ultrapossum_getconf LDAPSLISTENPORT "$ldapslistenport")
===================================================================
RCS file: ultrapossum/module/startTLS/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/startTLS/Makefile.am 2004/06/24 08:43:02 1.4
+++ ultrapossum/module/startTLS/Makefile.am 2004/10/10 16:08:16 1.5
@@ -4,10 +4,12 @@
include ../ultrapossum.am.in
module_DATA = 11startTLS
+modulelocal_SCRIPTS = keyman
update_SCRIPTS = update-startTLS
modulesysconf_DATA = startTLS.cf
EXTRA_DIST = startTLS.cf \
update-startTLS \
- 11startTLS
+ 11startTLS \
+ keyan
===================================================================
RCS file: ultrapossum/module/startTLS/update-startTLS,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/module/startTLS/update-startTLS 2004/09/27 09:07:56 1.12
+++ ultrapossum/module/startTLS/update-startTLS 2004/10/10 16:08:16 1.13
@@ -44,21 +44,8 @@
configure() {
install -d $TLSSYSCONFDIR
if ! test -f "$TLSCERTIFICATEKEYFILE" && ! test -f "$TLSCERTIFICATEFILE"; then
- progress "Creating SSL certificate fie... "
- touch $TLSCERTIFICATEKEYFILE $TLSCERTIFICATEFILE
- chmod 640 $TLSCERTIFICATEKEYFILE
- ( echo "$CERTCOUNTRY";
- echo "$CERTSTATE";
- echo "$CERTLOCALITY";
- echo "$CERTORGANIZATION";
- echo "$CERTUNIT";
- echo "$CERTHOST";
- echo "$CERTEMAIL"; ) | \
- /usr/bin/openssl req -new -x509 -nodes \
- -days 365 -out $TLSCERTIFICATEFILE -keyout $TLSCERTIFICATEKEYFILE 2> $tmp || cat $tmp 1>&2
- progress "Creating SSL certificate fie... done"
+ $MODULEDIR/startTLS/keyman genkey
fi
-
# haresources configuration
if test "x$ULTRAPOSSUMMARK" = "xULTRAPOSSUM"; then