Masato Taruishi
taru****@users*****
2004年 10月 14日 (木) 21:50:59 JST
===================================================================
RCS file: ultrapossum/debian/debian.cf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/debian/debian.cf 2004/10/14 12:34:07 1.3
+++ ultrapossum/debian/debian.cf 2004/10/14 12:50:59 1.4
@@ -2,8 +2,3 @@
# Uncomment this if you want to do SI tests on configure time
#TEST_ON_UPGRADE=true
-
-# Uncomment this if you want to use debconf cache in package upgrade-time
-# rather than local configuration file.
-#USE_DEBCONF_CACHE=true
-
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/debian/ultrapossum-common.config 2004/10/14 12:34:07 1.12
+++ ultrapossum/debian/ultrapossum-common.config 2004/10/14 12:50:59 1.13
@@ -46,15 +46,8 @@
fi
fi
-# Fetch USE_DEBCONF_CACHE variable
-if test -f "/etc/ultrapossum/debain.cf"; then
- . /etc/ultrapossum/debian.cf
-fi
-
# In reconfiguration time, debconf must use system configuration value
-if test "x$1" = "xreconfigure" ||
- test "x$USE_DEBCONF_CACHE" != "xtrue"
-then
+if test "x$1" = "xreconfigure"; then
set() {
db_set "$1" "$2"
}
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.config,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/debian/ultrapossum-failover.config 2004/10/14 12:34:07 1.11
+++ ultrapossum/debian/ultrapossum-failover.config 2004/10/14 12:50:59 1.12
@@ -18,13 +18,7 @@
fi
fi
-if test -f "/etc/ultrapossum/debian.cf"; then
- . /etc/ultrapossum/debian.cf
-fi
-
-if test "x$1" = "xreconfigure" ||
- test "x$USE_DEBCONF_CACHE" != "xtrue"
-then
+if test "x$1" = "xreconfigure"; then
set() {
db_set "$1" "$2"
}
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ultrapossum/debian/ultrapossum-server.config 2004/10/14 12:34:07 1.25
+++ ultrapossum/debian/ultrapossum-server.config 2004/10/14 12:50:59 1.26
@@ -32,13 +32,7 @@
fi
fi
-if test -f "/etc/ultrapossum/debian.cf"; then
- . /etc/ultrapossum/debian.cf
-fi
-
-if test "x$1" = "xreconfigure" ||
- test "x$USE_DEBCONF_CACHE" != "xtrue"
-then
+if test "x$1" = "xreconfigure"; then
set() {
db_set "$1" "$2"
}
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.config,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/debian/ultrapossum-tls.config 2004/10/14 12:34:07 1.9
+++ ultrapossum/debian/ultrapossum-tls.config 2004/10/14 12:50:59 1.10
@@ -35,32 +35,25 @@
fi
fi
-if test -f /etc/ultrapossum/debian.cf"; then
- . /etc/ultrapossum/debian.cf
-fi
-
-if test "x$1" = "xreconfigure" ||
- test "x$USE_DEBCONF_CACHE" != "xtrue"
-then
+if test "x$1" = "xreconfigure"; then
set() {
db_set "$1" "$2"
}
else
- set() {
- db_fget "$1" seen
- if test "x$RET" = "xfalse"; then
- db_set "$1" "$2"
- fi
- }
-fi
-
-if test "x$1" != "xreconfigure"; then
if test -f "$TLSCERTIFICATEFILE"; then
+# echo "Certificate file already exist: $TLSCERTIFICATEFILE" 1>&2
exit 0
fi
if test -f "$TLSCERTIFICATEKEYFILE"; then
+# echo "Certificate key file already exist: $TLSCERTIFICATEKEYFILE" 1>&2
exit 0
fi
+ set() {
+ db_fget "$1" seen
+ if test "x$RET" = "xfalse"; then
+ db_set "$1" "$2"
+ fi
+ }
fi
set ultrapossum-tls/certcountry "$CERTCOUNTRY"