Merge pull request #11252 from neheb/i22p

i2pd: fix various issues in 18.06
This commit is contained in:
Rosen Penev 2020-02-06 19:08:00 -08:00 committed by GitHub
commit b2a29b7a49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions

View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=i2pd
PKG_VERSION:=2.18.0
PKG_RELEASE:=2
PKG_RELEASE:=3
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; \

View File

@ -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
fi
[ -d $DATADIR ] || {
mkdir -p $DATADIR
chown $USER:$GROUP $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
}
## We need permissions
chown -R $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