Masato Taruishi
taru****@users*****
2004年 9月 17日 (金) 00:43:39 JST
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ultrapossum/debian/ultrapossum-server.config 2004/09/16 13:46:44 1.21
+++ ultrapossum/debian/ultrapossum-server.config 2004/09/16 15:43:39 1.22
@@ -12,42 +12,37 @@
trap "/bin/rm -f $tmp" 0
chmod 600 $tmp
-if test -f "/usr/share/ultrapossum/module.d/10server"; then
+if test -x "/usr/bin/ultrapossum-config"; then
eval `/usr/bin/ultrapossum-config init`
trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
-
-set() {
- db_set "$1" "$2"
-}
-
else
# initial configuration should come here
- if test -x "/usr/bin/ultrapossum-config"; then
- eval `/usr/bin/ultrapossum-config init`
- trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
- else
- MASTER=${MASTER:-`hostname`}
- DBDIRECTORY=${DBDIRECTORY:-"/var/lib/ultrapossum/db"}
- ROOTPW=""
- CREDENTIALS=""
- if test -f "/etc/ultrapossum/ultrapossum.cf"; then
- . /etc/ultrapossum/ultrapossum.cf
- fi
- if test -f "/etc/ultrapossum/module.d/server.cf"; then
- . /etc/ultrapossum/module.d/server.cf
- fi
- if test -f "/etc/ultrapossum/secret.cf"; then
- . /etc/ultrapossum/secret.cf
- fi
+ MASTER=${MASTER:-`hostname`}
+ DBDIRECTORY=${DBDIRECTORY:-"/var/lib/ultrapossum/db"}
+ ROOTPW=""
+ CREDENTIALS=""
+ if test -f "/etc/ultrapossum/ultrapossum.cf"; then
+ . /etc/ultrapossum/ultrapossum.cf
fi
-
-set() {
- db_fget "$1" seen
- if test "x$RET" = "xfalse"; then
- db_set "$1" "$2"
+ if test -f "/etc/ultrapossum/module.d/server.cf"; then
+ . /etc/ultrapossum/module.d/server.cf
+ fi
+ if test -f "/etc/ultrapossum/secret.cf"; then
+ . /etc/ultrapossum/secret.cf
fi
-}
+fi
+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
set ultrapossum-common/organization "$ORGANIZATION"