From 83c6fd43e5fb40c818e10a235ab7aaa2c7e12190 Mon Sep 17 00:00:00 2001
From: hypercubus <hypercubus>
Date: Wed, 1 Sep 2004 16:46:27 +0000
Subject: [PATCH] * corrected: unix service install scripts erroneously pointed
to 'i2psvc' instead of 'i2prouter' * pid file naming fixed once and for all,
using 'i2p.pid' ;-) ('i2prouter.pid' did not work)
---
installer/resources/install_i2p_service_unix | 24 +++++++++----------
.../resources/uninstall_i2p_service_unix | 24 +++++++++----------
installer/resources/wrapper.conf | 11 +++++++--
3 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/installer/resources/install_i2p_service_unix b/installer/resources/install_i2p_service_unix
index c9bd87a5cc..9f5c2e19b9 100644
--- a/installer/resources/install_i2p_service_unix
+++ b/installer/resources/install_i2p_service_unix
@@ -34,34 +34,34 @@ fi
install_bsd()
{
- ln -sf `pwd`/i2psvc /usr/local/etc/rc.d/i2psvc.sh
+ ln -sf `pwd`/i2prouter /usr/local/etc/rc.d/i2prouter.sh
}
install_debian()
{
- ln -sf `pwd`/i2psvc /etc/init.d/i2psvc
- update-rc.d i2psvc start 20 2 3 4 5 . stop 20 0 1 6 .
+ ln -sf `pwd`/i2prouter /etc/init.d/i2prouter
+ update-rc.d i2prouter start 20 2 3 4 5 . stop 20 0 1 6 .
}
install_gentoo()
{
- ln -sf `pwd`/i2psvc /etc/init.d/i2psvc
- rc-update add i2psvc default
+ ln -sf `pwd`/i2prouter /etc/init.d/i2prouter
+ rc-update add i2prouter default
}
install_redhat()
{
- ln -sf `pwd`/i2psvc /etc/rc.d/init.d/i2psvc
- chkconfig --level 345 i2psvc on
+ ln -sf `pwd`/i2prouter /etc/rc.d/init.d/i2prouter
+ chkconfig --level 345 i2prouter on
}
install_sysv()
{
- ln -sf `pwd`/i2psvc /etc/init.d/i2psvc
- ln -sf /etc/init.d/i2psvc /etc/rc0.d/K20i2psvc
- ln -sf /etc/init.d/i2psvc /etc/rc1.d/K20i2psvc
- ln -sf /etc/init.d/i2psvc /etc/rc2.d/S20i2psvc
- ln -sf /etc/init.d/i2psvc /etc/rc3.d/S20i2psvc
+ ln -sf `pwd`/i2prouter /etc/init.d/i2prouter
+ ln -sf /etc/init.d/i2prouter /etc/rc0.d/K20i2prouter
+ ln -sf /etc/init.d/i2prouter /etc/rc1.d/K20i2prouter
+ ln -sf /etc/init.d/i2prouter /etc/rc2.d/S20i2prouter
+ ln -sf /etc/init.d/i2prouter /etc/rc3.d/S20i2prouter
}
case $HOST_OS in
diff --git a/installer/resources/uninstall_i2p_service_unix b/installer/resources/uninstall_i2p_service_unix
index 701c18fff8..091777c03b 100644
--- a/installer/resources/uninstall_i2p_service_unix
+++ b/installer/resources/uninstall_i2p_service_unix
@@ -34,34 +34,34 @@ fi
uninstall_bsd()
{
- rm /usr/local/etc/rc.d/i2psvc.sh
+ rm /usr/local/etc/rc.d/i2prouter.sh
}
uninstall_debian()
{
- rm /etc/init.d/i2psvc
- update-rc.d -f i2psvc remove
+ rm /etc/init.d/i2prouter
+ update-rc.d -f i2prouter remove
}
uninstall_gentoo()
{
- rm /etc/init.d/i2psvc
- rc-update del i2psvc default
+ rm /etc/init.d/i2prouter
+ rc-update del i2prouter default
}
uninstall_redhat()
{
- rm /etc/rc.d/init.d/i2psvc
- chkconfig --level 345 i2psvc off
+ rm /etc/rc.d/init.d/i2prouter
+ chkconfig --level 345 i2prouter off
}
uninstall_sysv()
{
- rm /etc/init.d/i2psvc
- rm /etc/rc0.d/K20i2psvc
- rm /etc/rc1.d/K20i2psvc
- rm /etc/rc2.d/S20i2psvc
- rm /etc/rc3.d/S20i2psvc
+ rm /etc/init.d/i2prouter
+ rm /etc/rc0.d/K20i2prouter
+ rm /etc/rc1.d/K20i2prouter
+ rm /etc/rc2.d/S20i2prouter
+ rm /etc/rc3.d/S20i2prouter
}
case $HOST_OS in
diff --git a/installer/resources/wrapper.conf b/installer/resources/wrapper.conf
index ce3baca15d..bdf15a014a 100644
--- a/installer/resources/wrapper.conf
+++ b/installer/resources/wrapper.conf
@@ -108,8 +108,15 @@ wrapper.use_system_time=false
# pid file for the JVM
wrapper.java.pidfile=routerjvm.pid
# pid file for the service monitoring the JVM
-# (needs to be named i2prouter since the i2prouter script looks for that)
-wrapper.pidfile=i2prouter.pid
+#
+# From i2prouter:
+#
+# PIDDIR="."
+# APP_NAME="i2p"
+# PIDFILE="$PIDDIR/$APP_NAME.pid"
+#
+# This means i2prouter looks for './i2p.pid'.
+wrapper.pidfile=i2p.pid
#********************************************************************
# Wrapper NT Service Properties
--
GitLab