[Ultrapossum-cvs 872] ultrapossum/debian ...

Back to archive index

Masato Taruishi taru****@users*****
2004年 10月 14日 (木) 21:34:07 JST


===================================================================
RCS file: ultrapossum/debian/debian.cf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/debian/debian.cf	2004/10/07 11:15:42	1.2
+++ ultrapossum/debian/debian.cf	2004/10/14 12:34:07	1.3
@@ -2,3 +2,8 @@
 
 # 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/debian/ultrapossum-common.config	2004/09/24 04:34:54	1.11
+++ ultrapossum/debian/ultrapossum-common.config	2004/10/14 12:34:07	1.12
@@ -46,8 +46,15 @@
   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"; then
+if test "x$1" = "xreconfigure" ||
+	test "x$USE_DEBCONF_CACHE" != "xtrue"
+then
   set() {
     db_set "$1" "$2"
   }
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.config,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/debian/ultrapossum-failover.config	2004/10/11 12:34:14	1.10
+++ ultrapossum/debian/ultrapossum-failover.config	2004/10/14 12:34:07	1.11
@@ -18,7 +18,13 @@
   fi
 fi
 
-if test "x$1" = "xreconfigure"; then
+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
   set() {
     db_set "$1" "$2"
   }
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ultrapossum/debian/ultrapossum-server.config	2004/09/24 17:07:03	1.24
+++ ultrapossum/debian/ultrapossum-server.config	2004/10/14 12:34:07	1.25
@@ -32,7 +32,13 @@
   fi
 fi
 
-if test "x$1" = "xreconfigure"; then
+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
   set() {
     db_set "$1" "$2"
   }
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.config,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/debian/ultrapossum-tls.config	2004/10/11 09:55:21	1.8
+++ ultrapossum/debian/ultrapossum-tls.config	2004/10/14 12:34:07	1.9
@@ -35,25 +35,32 @@
   fi
 fi
 
-if test "x$1" = "xreconfigure"; then
+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
   set() {
     db_set "$1" "$2"
   }
 else
-  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
+
+if test "x$1" != "xreconfigure"; then
+  if test -f "$TLSCERTIFICATEFILE"; then
+    exit 0
+  fi
+  if test -f "$TLSCERTIFICATEKEYFILE"; then
+    exit 0
+  fi
 fi
 
 set ultrapossum-tls/certcountry "$CERTCOUNTRY"



Ultrapossum-cvs メーリングリストの案内
Back to archive index