Masato Taruishi
taru****@users*****
2004年 9月 28日 (火) 23:22:54 JST
===================================================================
RCS file: ultrapossum/module/server/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/module/server/Makefile.am 2004/09/27 16:27:45 1.12
+++ ultrapossum/module/server/Makefile.am 2004/09/28 14:22:54 1.13
@@ -4,6 +4,7 @@
include ../ultrapossum.am.in
module_DATA = 10server
+modulesysconf_DATA = server.cf
update_SCRIPTS = update-server
modulelocal_SCRIPTS = startup 2.0 2.1 \
@@ -28,18 +29,13 @@
$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/lib/$(PACKAGE)/conf.d
$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/apps.d
$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/backups/$(PACKAGE)
- test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/secret.cf || \
- ( $(INSTALL_DATA) $(srcdir)/secret.cf \
+ $(INSTALL_DATA) $(srcdir)/secret.cf \
$(DESTDIR)/$(sysconfdir)/$(PACKAGE); \
- chmod 660 $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/secret.cf )
+ chmod 660 $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/secret.cf
$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/module.d/
- test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/module.d/server.cf || \
- $(INSTALL_DATA) $(srcdir)/server.cf \
- $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/module.d/
for p in $(TEMPLATES); do \
- test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/$$p || \
- $(INSTALL_DATA) $(srcdir)/$$p \
- $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/; \
+ $(INSTALL_DATA) $(srcdir)/$$p \
+ $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/; \
done
EXTRA_DIST = update-server \
===================================================================
RCS file: ultrapossum/module/server/pid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/server/pid 2004/06/22 15:28:32 1.3
+++ ultrapossum/module/server/pid 2004/09/28 14:22:54 1.4
@@ -2,6 +2,8 @@
set -e
+tick="1 2 3 4 5 6 7 8 9 10"
+
# status <pidfile>
status_pid() {
if test -f $1; then
@@ -27,7 +29,7 @@
return 0
fi
- (for i in 1 2 3 4 5 6 7 8 9 10
+ ( for i in $tick
do
sleep $i
if test "`status_pid $1`" = "running"; then
@@ -50,7 +52,7 @@
if test -f $1; then /bin/rm -f $1; fi
return 0
fi
- (for i in 1 2 3 4 5 6 7 8 9 10
+ (for i in $tick
do
echo -n "." 1>&2
if ! test -d /proc/$PID; then