i2pd: Move DATADIR to /var/lib/i2pd, fix #5693

Original author: dartraiden <wowemuh@gmail.com>

Signed-off-by: David Yang <mmyangfl@gmail.com>

diff --git a/net/i2pd/Makefile b/net/i2pd/Makefile
index c15994ed82c8eb6b938aa410f922a1be5ab2fe98..a35e629b15d1078d65dda9f82bc6e26c6b64e4e2 100644 (file)
--- a/net/i2pd/Makefile
+++ b/net/i2pd/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=i2pd
 PKG_VERSION:=2.18.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_BUILD_PARALLEL:=1
 
 PKG_SOURCE_PROTO:=git
@@ -55,8 +55,6 @@ define Package/i2pd/install
        $(INSTALL_DIR) $(1)/usr/share/i2pd
        $(CP) $(PKG_BUILD_DIR)/contrib/certificates  $(1)/usr/share/i2pd
        $(INSTALL_DIR) $(1)/etc/i2pd
-       $(LN) /usr/share/i2pd/certificates $(1)/etc/i2pd/certificates
-       $(LN) /var/lib/i2pd/peerProfiles $(1)/etc/i2pd/peerProfiles
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/i2pd.conf $(1)/etc/i2pd
        $(SED) ' \
                s/127.0.0.1/192.168.1.1/g; \

diff --git a/net/i2pd/files/i2pd.init b/net/i2pd/files/i2pd.init
index f1c394a0e85e848c8d31267b74e5e478c0606a3b..81e97cdce53eadce7b137152649f8c2efd3a7470 100755 (executable)
--- a/net/i2pd/files/i2pd.init
+++ b/net/i2pd/files/i2pd.init
@@ -10,24 +10,26 @@ PROG=/usr/sbin/i2pd
 USER="i2pd"
 GROUP="i2pd"
 PIDFILE=/var/run/i2pd.pid
-DATADIR=/etc/i2pd
-PEERDIR=/var/lib/i2pd/peerProfiles
+DATADIR=/var/lib/i2pd
 
 
 start_service() {
        ## RAM
-       if [ ! -d $PEERDIR ]; then
-               mkdir -p $PEERDIR
-               chown $USER:$GROUP $PEERDIR
+       if [ ! -d $DATADIR ]; then
+               mkdir -p $DATADIR
+               ln -s /usr/share/i2pd/certificates  $DATADIR/certificates
+               ln -s /etc/i2pd/tunnels.conf $DATADIR/tunnels.conf
+               # for peoples who not possible to use http reseeding
+               ln -s /etc/i2pd/addressbook $DATADIR/addressbook
        fi
 
        ## We need permissions
-       chown -R $USER:$GROUP $DATADIR
+       chown $USER:$GROUP $DATADIR
        touch $PIDFILE
        chown $USER:adm $PIDFILE
 
        procd_open_instance
-       procd_set_param command $PROG --service --conf=/etc/i2pd/i2pd.conf
+       procd_set_param command $PROG --service --conf=/etc/i2pd/i2pd.conf --pidfile $PIDFILE
        ## Don't know about i2pd user's HOME
        procd_set_param env HOME=$DATADIR
        procd_set_param limits nofile=4096