Debug xinetd setup.

svn path=/branches/tk377/; revision=5061

5 files changed, 34 insertions, 3 deletions

diff --git a/rtr-origin/Makefile.in b/rtr-origin/Makefile.in
index ef15ac4c..9eb2ac55 100644
--- a/rtr-origin/Makefile.in
+++ b/rtr-origin/Makefile.in
@@ -34,12 +34,10 @@ clean:
 
 install: all ${RTR_ORIGIN_INSTALL_TARGETS}
 
-install-always:
+install-binary:
 	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -m 555 -d ${DESTDIR}${bindir}; fi
 	${INSTALL} -m 555 ${BIN} ${DESTDIR}${bindir}/${BIN}
 
-install-postconf: install-listener
-
 deinstall uninstall:
 	rm -f ${DESTDIR}${bindir}/${BIN}
 
diff --git a/rtr-origin/rules.darwin.mk b/rtr-origin/rules.darwin.mk
index 570b704a..1230db92 100644
--- a/rtr-origin/rules.darwin.mk
+++ b/rtr-origin/rules.darwin.mk
@@ -1,5 +1,9 @@
 # $Id$
 
+install-always: install-binary
+
+install-postconf: install-listener
+
 install-listener:
 	@echo "No rule for $@ on this platform (yet), you'll have to do that yourself if it matters."
 
diff --git a/rtr-origin/rules.freebsd.mk b/rtr-origin/rules.freebsd.mk
index 5db4cb72..4cb21f3b 100644
--- a/rtr-origin/rules.freebsd.mk
+++ b/rtr-origin/rules.freebsd.mk
@@ -1,5 +1,9 @@
 # $Id$
 
+install-always: install-binary
+
+install-postconf: install-listener
+
 install-listener: .FORCE
 	@if /usr/bin/egrep -q '^rpki-rtr' /etc/services ; \
 	then \
diff --git a/rtr-origin/rules.linux.mk b/rtr-origin/rules.linux.mk
index e6840f47..72b5c3c9 100644
--- a/rtr-origin/rules.linux.mk
+++ b/rtr-origin/rules.linux.mk
@@ -1,5 +1,10 @@
 # $Id$
 
+install-always: install-binary install-listener
+
+install-postconf:
+	@true
+
 # Only need to make listener if not already present
 
 install-listener: ${DESTDIR}/etc/xinetd.d/rpki-rtr
@@ -8,6 +13,21 @@ ${DESTDIR}/etc/xinetd.d/rpki-rtr:
 	@${AWK} 'BEGIN { \
 	    print "service rpki-rtr"; \
 	    print "{"; \
+	    print "    type           = UNLISTED"; \
+	    print "    flags          = IPv4"; \
+	    print "    socket_type    = stream"; \
+	    print "    protocol       = tcp"; \
+	    print "    port           = ${RPKI_RTR_PORT}"; \
+	    print "    wait           = no"; \
+	    print "    user           = nobody"; \
+	    print "    server         = /usr/bin/rtr-origin"; \
+	    print "    server_args    = --server /var/rpki-rtr"; \
+	    print "}"; \
+	    print ""; \
+	    print "service rpki-rtr"; \
+	    print "{"; \
+	    print "    type           = UNLISTED"; \
+	    print "    flags          = IPv6"; \
 	    print "    socket_type    = stream"; \
 	    print "    protocol       = tcp"; \
 	    print "    port           = ${RPKI_RTR_PORT}"; \
@@ -17,5 +37,6 @@ ${DESTDIR}/etc/xinetd.d/rpki-rtr:
 	    print "    server_args    = --server /var/rpki-rtr"; \
 	    print "}"; \
 	}' >xinetd.rpki-rtr
+	${INSTALL} -d ${DESTDIR}/etc/xinetd.d
 	${INSTALL} -m 644 xinetd.rpki-rtr $@
 	rm  xinetd.rpki-rtr
diff --git a/rtr-origin/rules.unknown.mk b/rtr-origin/rules.unknown.mk
index 58c412a3..fb16e93a 100644
--- a/rtr-origin/rules.unknown.mk
+++ b/rtr-origin/rules.unknown.mk
@@ -1,4 +1,8 @@
 # $Id$
 
+install-always: install-binary
+
+install-postconf: install-listener
+
 install-listener:
 	@echo "Don't know how to make $@ on this platform"; exit 1