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

Back to archive index

Masato Taruishi taru****@users*****
2004年 9月 24日 (金) 12:46:08 JST


===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/debian/ultrapossum-common.postinst	2004/09/21 04:58:38	1.11
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/24 03:46:07	1.12
@@ -64,9 +64,6 @@
     ;;
     *)
       ultrapossum_setconf_shell /etc/ultrapossum/config.cf ULTRAPOSSUM_CONFIG_BACKEND ""
-      install -d /etc/ultrapossum/
-      ucf /usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf \
-        /etc/ultrapossum/ultrapossum.cf
     ;;
   esac
   eval `ultrapossum-config term`
@@ -77,7 +74,7 @@
 case "$1" in
     configure)
 
-	for f in config.cf debian.cf secret.cf
+	for f in ultrapossum.cf config.cf debian.cf secret.cf
 	do
 	        install -d `dirname /etc/ultrapossum/$f`
 		ucf /usr/share/ultrapossum/ucf/ultrapossum/$f \
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.templates,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-common.templates	2004/09/20 03:01:36	1.7
+++ ultrapossum/debian/ultrapossum-common.templates	2004/09/24 03:46:07	1.8
@@ -5,10 +5,11 @@
 _Description: Which backend do you want to use to store configurations
  UltraPossum stores your configuration in a configuration backend. You
  can select the backend to use. In most of cases, the backend 'file'
- is the best choice. This backend holds configurations as file. If
- you want to share configurations with ultrapossum servers, then you
- may want to select ldap backend. This backend holds them in LDAP
- directory.
+ is the best choice. This backend holds configurations as file in shell
+ fragment. If you want to share configurations between ultrapossum servers,
+ then you may want to select ldap backend. This backend retrieves default
+ configurations from LDAP directory. You can overwrite every configuartion
+ by the same way as the file backend.
 
 Template: ultrapossum-common/rootpw
 Type: password
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postinst,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/debian/ultrapossum-failover.postinst	2004/09/17 03:05:00	1.10
+++ ultrapossum/debian/ultrapossum-failover.postinst	2004/09/24 03:46:07	1.11
@@ -42,17 +42,7 @@
         eval `ultrapossum-config init`
         trap "eval `ultrapossum-config term`" 0
 
-	case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-	  ldap)
-	    :
-	  ;;
-	  *)
-	    install -d /etc/ultrapossum/module.d
-	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/failover.cf \
-	  	/etc/ultrapossum/module.d/failover.cf
-	  ;;
-	esac        
-	for f in in.d/authkeys.in \
+	for f in module.d/failover.cf in.d/authkeys.in \
 		in.d/ha.cf.in in.d/haresources.in in.d/recovery.conf.in \
 		in.d/ultrapossum.mon.cf.in
 	do
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.postinst,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ultrapossum/debian/ultrapossum-server.postinst	2004/09/20 03:01:36	1.28
+++ ultrapossum/debian/ultrapossum-server.postinst	2004/09/24 03:46:07	1.29
@@ -61,17 +61,7 @@
         eval `ultrapossum-config init`
 	trap "eval `ultrapossum-config term`" 0
 
-	case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-	  ldap)
-	    :
-	  ;;
-	  *)
-	    install -d /etc/ultrapossum/module.d
-	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/server.cf \
-	  	/etc/ultrapossum/module.d/server.cf
-	  ;;
-	esac
-	for f in default.cf in.d/slapd-bdb.conf.in \
+	for f in module.d/server.cf default.cf in.d/slapd-bdb.conf.in \
 		in.d/slapd-ldbm.conf.in in.d/init.ldif.in
 	do
 	  install -d `dirname /etc/ultrapossum/$f`
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-tls.postinst	2004/09/16 18:30:13	1.7
+++ ultrapossum/debian/ultrapossum-tls.postinst	2004/09/24 03:46:07	1.8
@@ -41,16 +41,9 @@
 	eval `ultrapossum-config init`
 	trap "eval `ultrapossum-config term`" 0
 
-        case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-          ldap)
-            :
-          ;;
-          *)
-            install -d /etc/ultrapossum/module.d/
-      	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/startTLS.cf \
-		/etc/ultrapossum/module.d/startTLS.cf
-          ;;
-        esac
+        install -d /etc/ultrapossum/module.d/
+      	ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/startTLS.cf \
+	  /etc/ultrapossum/module.d/startTLS.cf
 
 	settlsconfig certcountry CERTCOUNTRY
 	settlsconfig certstate CERTSTATE



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