move tids.init to redhat

Patch from Stefan Paetow

diff --git a/Makefile.am b/Makefile.am
index a997abf..371e57f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,4 +69,5 @@ systemdsystemunit_DATA = tids.service
 endif
 
 EXTRA_DIST = trust_router.spec common/tests.json schema.sql tids.service \
-       tr/manual.cfg tr/portal.cfg
+       tr/manual.cfg tr/portal.cfg \
+       redhat/tids.init

diff --git a/tids.initd b/redhat/tids.initd
similarity index 97%
rename from tids.initd
rename to redhat/tids.initd
index 3af387a..2bff707 100644 (file)
--- a/tids.initd
+++ b/redhat/tids.initd
@@ -59,7 +59,7 @@ case "$1" in
         timestamp=$(date)
         echo "${timestamp} Starting TIDS..." >> ${LOGFILE}
         echo -n "Starting TIDS..."
-        daemon --user="${TIDS_USER}" --pidfile="{PIDFILE}" "${prog}" "${OPTIONS}"
+        daemon --user="${TIDS_USER}" --pidfile="${PIDFILE}" "${prog}" "${OPTIONS}"
         echo
 
         exit $?

diff --git a/trust_router.spec b/trust_router.spec
index 1d449ed..9a40478 100644 (file)
--- a/trust_router.spec
+++ b/trust_router.spec
@@ -61,7 +61,7 @@ install -D -m 640 redhat/default-main.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_r
 install -D -m 640 redhat/tr-test-main.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/tr-test/main.cfg
 install -D -m 640 redhat/sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/trust_router
 install -D -m 640 redhat/sysconfig.tids $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/tids
-install -D -m 755 tids.initd $RPM_BUILD_ROOT/%{_initrddir}/tids
+install -D -m 755 redhat/tids.initd $RPM_BUILD_ROOT/%{_initrddir}/tids
 
 # Link shared config
 ln -s ../../trusts.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/default/trusts.cfg