I2P -> .NET

This commit is contained in:
Михаил Подивилов 2019-05-11 18:25:50 +03:00
parent f176f1909b
commit fdb0ce6703
272 changed files with 5702 additions and 8931 deletions

14
debian/.gitignore vendored
View file

@ -1,9 +1,9 @@
debhelper-build-stamp
files
i2pd-dbg.substvars
i2pd.postinst.debhelper
i2pd.postrm.debhelper
i2pd.prerm.debhelper
i2pd.substvars
i2pd/
i2pd-dbg/
dotnet-dbg.substvars
dotnet.postinst.debhelper
dotnet.postrm.debhelper
dotnet.prerm.debhelper
dotnet.substvars
dotnet/
dotnet-dbg/

98
debian/changelog vendored
View file

@ -1,50 +1,50 @@
i2pd (2.25.0-1) unstable; urgency=medium
dotnet (2.25.0-1) unstable; urgency=medium
* updated to version 2.25.0/0.9.40
-- orignal <orignal@i2pmail.org> Thu, 9 May 2019 16:00:00 +0000
-- orignal <orignal@dotnetmail.org> Thu, 9 May 2019 16:00:00 +0000
i2pd (2.24.0-1) unstable; urgency=medium
dotnet (2.24.0-1) unstable; urgency=medium
* updated to version 2.24.0/0.9.39
-- orignal <orignal@i2pmail.org> Thu, 21 Mar 2019 16:00:00 +0000
-- orignal <orignal@dotnetmail.org> Thu, 21 Mar 2019 16:00:00 +0000
i2pd (2.23.0-1) unstable; urgency=medium
dotnet (2.23.0-1) unstable; urgency=medium
* updated to version 2.23.0/0.9.38
* update docs, dirs, install, links files
-- orignal <orignal@i2pmail.org> Mon, 21 Jan 2019 16:00:00 +0000
-- orignal <orignal@dotnetmail.org> Mon, 21 Jan 2019 16:00:00 +0000
i2pd (2.22.0-1) unstable; urgency=medium
dotnet (2.22.0-1) unstable; urgency=medium
* updated to version 2.22.0/0.9.37
* update manpage (1)
* update links, install files to support tunnelsdir option
* renamed and updated patch (#1210)
-- r4sas <r4sas@i2pmail.org> Fri, 09 Nov 2018 02:00:00 +0000
-- r4sas <r4sas@dotnetmail.org> Fri, 09 Nov 2018 02:00:00 +0000
i2pd (2.21.1-1) unstable; urgency=medium
dotnet (2.21.1-1) unstable; urgency=medium
* updated to version 2.21.1
-- orignal <orignal@i2pmail.org> Thu, 22 Oct 2018 16:00:00 +0000
-- orignal <orignal@dotnetmail.org> Thu, 22 Oct 2018 16:00:00 +0000
i2pd (2.21.0-1) unstable; urgency=medium
dotnet (2.21.0-1) unstable; urgency=medium
* updated to version 2.21.0/0.9.37
-- orignal <orignal@i2pmail.org> Thu, 4 Oct 2018 16:00:00 +0000
-- orignal <orignal@dotnetmail.org> Thu, 4 Oct 2018 16:00:00 +0000
i2pd (2.20.0-1) unstable; urgency=medium
dotnet (2.20.0-1) unstable; urgency=medium
* updated to version 2.20.0/0.9.36
-- orignal <orignal@i2pmail.org> Thu, 23 Aug 2018 16:00:00 +0000
-- orignal <orignal@dotnetmail.org> Thu, 23 Aug 2018 16:00:00 +0000
i2pd (2.19.0-1) unstable; urgency=medium
dotnet (2.19.0-1) unstable; urgency=medium
* updated to version 2.19.0/0.9.35
* update manpage (1)
@ -53,107 +53,107 @@ i2pd (2.19.0-1) unstable; urgency=medium
* fixes in systemd unit (#1089, #1142, #1154, #1155)
* package now building with systemd support
-- R4SAS <r4sas@i2pmail.org> Tue, 26 Jun 2018 16:27:45 +0000
-- R4SAS <r4sas@dotnetmail.org> Tue, 26 Jun 2018 16:27:45 +0000
i2pd (2.18.0-1) unstable; urgency=low
dotnet (2.18.0-1) unstable; urgency=low
* updated to version 2.18.0/0.9.33
-- orignal <orignal@i2pmail.org> Tue, 30 Jan 2018 16:00:00 +0000
-- orignal <orignal@dotnetmail.org> Tue, 30 Jan 2018 16:00:00 +0000
i2pd (2.17.0-1) unstable; urgency=low
dotnet (2.17.0-1) unstable; urgency=low
* updated to version 2.17.0/0.9.32
-- orignal <orignal@i2pmail.org> Mon, 4 Dec 2017 18:00:00 +0000
-- orignal <orignal@dotnetmail.org> Mon, 4 Dec 2017 18:00:00 +0000
i2pd (2.16.0-1) unstable; urgency=low
dotnet (2.16.0-1) unstable; urgency=low
* updated to version 2.16.0/0.9.32
-- orignal <orignal@i2pmail.org> Mon, 13 Nov 2017 18:00:00 +0000
-- orignal <orignal@dotnetmail.org> Mon, 13 Nov 2017 18:00:00 +0000
i2pd (2.15.0-1) unstable; urgency=low
dotnet (2.15.0-1) unstable; urgency=low
* updated to version 2.15.0/0.9.31
-- orignal <orignal@i2pmail.org> Thu, 17 Aug 2017 18:00:00 +0000
-- orignal <orignal@dotnetmail.org> Thu, 17 Aug 2017 18:00:00 +0000
i2pd (2.14.0-1) unstable; urgency=low
dotnet (2.14.0-1) unstable; urgency=low
* updated to version 2.14.0/0.9.30
* updated debian/control
* renamed logrotate to i2pd.logrotate
* renamed logrotate to dotnet.logrotate
* fixed init.d script
-- orignal <orignal@i2pmail.org> Thu, 1 Jun 2017 14:00:00 +0000
-- orignal <orignal@dotnetmail.org> Thu, 1 Jun 2017 14:00:00 +0000
i2pd (2.13.0-1) unstable; urgency=low
dotnet (2.13.0-1) unstable; urgency=low
* updated to version 2.13.0/0.9.29
* updated debian/control
* renamed logrotate to i2pd.logrotate
* renamed logrotate to dotnet.logrotate
* fixed init.d script
-- orignal <orignal@i2pmail.org> Thu, 6 Apr 2017 14:00:00 +0000
-- orignal <orignal@dotnetmail.org> Thu, 6 Apr 2017 14:00:00 +0000
i2pd (2.12.0-1) unstable; urgency=low
dotnet (2.12.0-1) unstable; urgency=low
* updated to version 2.12.0/0.9.28
-- orignal <orignal@i2pmail.org> Tue, 14 Feb 2017 17:59:30 +0000
-- orignal <orignal@dotnetmail.org> Tue, 14 Feb 2017 17:59:30 +0000
i2pd (2.11.0-1) unstable; urgency=low
dotnet (2.11.0-1) unstable; urgency=low
* updated to version 2.11.0/0.9.28
-- orignal <orignal@i2pmail.org> Sun, 18 Dec 2016 21:01:30 +0000
-- orignal <orignal@dotnetmail.org> Sun, 18 Dec 2016 21:01:30 +0000
i2pd (2.10.2-1) unstable; urgency=low
dotnet (2.10.2-1) unstable; urgency=low
* updated to version 2.10.2
-- orignal <orignal@i2pmail.org> Sun, 4 Dec 2016 19:38:30 +0000
-- orignal <orignal@dotnetmail.org> Sun, 4 Dec 2016 19:38:30 +0000
i2pd (2.10.1-1) unstable; urgency=low
dotnet (2.10.1-1) unstable; urgency=low
* updated to version 2.10.1
-- orignal <orignal@i2pmail.org> Mon, 7 Nov 2016 14:18:30 +0000
-- orignal <orignal@dotnetmail.org> Mon, 7 Nov 2016 14:18:30 +0000
i2pd (2.10.0-1) unstable; urgency=low
dotnet (2.10.0-1) unstable; urgency=low
* updated to version 2.10.0/0.9.27
* reseed.verify set to true by default
-- orignal <orignal@i2pmail.org> Sun, 16 Oct 2016 13:55:40 +0000
-- orignal <orignal@dotnetmail.org> Sun, 16 Oct 2016 13:55:40 +0000
i2pd (2.9.0-1) unstable; urgency=low
dotnet (2.9.0-1) unstable; urgency=low
* updated to version 2.9.0
* updated tune-patch
* removed I2PD_PORT in i2pd.default
* removed DOTNET_PORT in dotnet.default
* removed all port assigments in services files
* fixed logrotate
* subscriptions.txt and tunnels.conf taken from docs folder
-- orignal <orignal@i2pmail.org> Fri, 12 Aug 2016 14:25:40 +0000
-- orignal <orignal@dotnetmail.org> Fri, 12 Aug 2016 14:25:40 +0000
i2pd (2.7.0-1) unstable; urgency=low
dotnet (2.7.0-1) unstable; urgency=low
* updated to version 2.7.0/0.9.25
-- hagen <hagen@i2pmail.org> Wed, 18 May 2016 01:11:04 +0000
-- hagen <hagen@dotnetmail.org> Wed, 18 May 2016 01:11:04 +0000
i2pd (2.2.0-2) unstable; urgency=low
dotnet (2.2.0-2) unstable; urgency=low
* updated to version 2.2.0
-- hagen <hagen@i2pmail.org> Wed, 23 Dec 2015 01:29:40 +0000
-- hagen <hagen@dotnetmail.org> Wed, 23 Dec 2015 01:29:40 +0000
i2pd (2.1.0-1) unstable; urgency=low
dotnet (2.1.0-1) unstable; urgency=low
* updated to version 2.1.0/0.9.23
* updated deps
-- hagen <hagen@i2pmail.org> Fri, 19 Sep 2014 05:16:12 +0000
-- hagen <hagen@dotnetmail.org> Fri, 19 Sep 2014 05:16:12 +0000

30
debian/control vendored
View file

@ -1,32 +1,32 @@
Source: i2pd
Source: dotnet
Section: net
Priority: optional
Maintainer: r4sas <r4sas@i2pmail.org>
Maintainer: r4sas <r4sas@dotnetmail.org>
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.17.2~), gcc (>= 4.7) | clang (>= 3.3), libboost-system-dev (>= 1.46), libboost-date-time-dev (>= 1.46), libboost-filesystem-dev (>= 1.46), libboost-program-options-dev (>= 1.46), libminiupnpc-dev, libssl-dev, zlib1g-dev
Standards-Version: 3.9.6
Homepage: http://i2pd.website/
Vcs-Git: git://github.com/PurpleI2P/i2pd.git
Vcs-Browser: https://github.com/PurpleI2P/i2pd
Homepage: http://dotnet.website/
Vcs-Git: git://github.com/PurpleI2P/dotnet.git
Vcs-Browser: https://github.com/PurpleI2P/dotnet
Package: i2pd
Package: dotnet
Architecture: any
Pre-Depends: adduser
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base,
Description: Full-featured C++ implementation of I2P client.
I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
communications over I2P are anonymous and end-to-end encrypted, participants
Description: Full-featured C++ implementation of DOTNET client.
DOTNET (Invisible Internet Protocol) is a universal anonymous network layer. All
communications over DOTNET are anonymous and end-to-end encrypted, participants
don't reveal their real IP addresses.
.
This package contains the full-featured C++ implementation of I2P router.
This package contains the full-featured C++ implementation of DOTNET router.
Package: i2pd-dbg
Package: dotnet-dbg
Architecture: any
Priority: extra
Section: debug
Depends: i2pd (= ${binary:Version}), ${misc:Depends}
Description: i2pd debugging symbols
I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
communications over I2P are anonymous and end-to-end encrypted, participants
Depends: dotnet (= ${binary:Version}), ${misc:Depends}
Description: dotnet debugging symbols
DOTNET (Invisible Internet Protocol) is a universal anonymous network layer. All
communications over DOTNET are anonymous and end-to-end encrypted, participants
don't reveal their real IP addresses.
.
This package contains symbols required for debugging.

16
debian/copyright vendored
View file

@ -1,22 +1,22 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: i2pd
Upstream-Name: dotnet
Source: https://github.com/PurpleI2P
Files: *
Copyright: 2013-2017 PurpleI2P
License: BSD-3-clause
Files: qt/i2pd_qt/android/src/org/kde/necessitas/ministro/IMinistro.aidl
qt/i2pd_qt/android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl
qt/i2pd_qt/android/src/org/qtproject/qt5/android/bindings/QtActivity.java
qt/i2pd_qt/android/src/org/qtproject/qt5/android/bindings/QtApplication.java
Files: qt/dotnet_qt/android/src/org/kde/necessitas/ministro/IMinistro.aidl
qt/dotnet_qt/android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl
qt/dotnet_qt/android/src/org/qtproject/qt5/android/bindings/QtActivity.java
qt/dotnet_qt/android/src/org/qtproject/qt5/android/bindings/QtApplication.java
Copyright: 2011-2013 BogDan Vatra <bogdan@kde.org>
License: BSD-2-Clause
Files: debian/*
Copyright: 2013-2015 Kill Your TV <killyourtv@i2pmail.org>
2014-2016 hagen <hagen@i2pmail.org>
2016-2017 R4SAS <r4sas@i2pmail.org>
Copyright: 2013-2015 Kill Your TV <killyourtv@dotnetmail.org>
2014-2016 hagen <hagen@dotnetmail.org>
2016-2017 R4SAS <r4sas@dotnetmail.org>
2017-2018 Yangfl <mmyangfl@gmail.com>
License: GPL-2+

2
debian/docs vendored
View file

@ -1,5 +1,5 @@
README.md
contrib/i2pd.conf
contrib/dotnet.conf
contrib/subscriptions.txt
contrib/tunnels.conf
contrib/tunnels.d

44
debian/i2pd.1 vendored
View file

@ -1,31 +1,31 @@
.TH "I2PD" "1" "June 20, 2018"
.TH "DOTNET" "1" "June 20, 2018"
.SH "NAME"
i2pd \- Full-featured C++ implementation of I2P client.
dotnet \- Full-featured C++ implementation of DOTNET client.
.SH "SYNOPSIS"
.B i2pd
.B dotnet
[\fIOPTION1\fR] [\fIOPTION2\fR]...
.SH "DESCRIPTION"
i2pd
is a C++ implementation of the router for the I2P anonymizing network, offering
dotnet
is a C++ implementation of the router for the DOTNET anonymizing network, offering
a simple layer that identity-sensitive applications can use to securely
communicate. All data is wrapped with several layers of encryption, and the
network is both distributed and dynamic, with no trusted parties.
.PP
Any of the configuration options below can be used in the \fBDAEMON_ARGS\fR variable in \fI/etc/default/i2pd\fR.
Any of the configuration options below can be used in the \fBDAEMON_ARGS\fR variable in \fI/etc/default/dotnet\fR.
.SH "OPTIONS"
.TP
\fB\-\-help\fR
Show available options.
.TP
\fB\-\-conf=\fR
Config file (default: \fI~/.i2pd/i2pd.conf\fR or \fI/var/lib/i2pd/i2pd.conf\fR)
Config file (default: \fI~/.dotnet/dotnet.conf\fR or \fI/var/lib/dotnet/dotnet.conf\fR)
.BR
This parameter will be silently ignored if the specified config file does not exist.
Options specified on the command line take precedence over those in the config file.
.TP
\fB\-\-tunconf=\fR
Tunnels config file (default: \fI~/.i2pd/tunnels.conf\fR or \fI/var/lib/i2pd/tunnels.conf\fR)
Tunnels config file (default: \fI~/.dotnet/tunnels.conf\fR or \fI/var/lib/dotnet/tunnels.conf\fR)
.TP
\fB\-\-pidfile=\fR
Where to write pidfile (don\'t write by default)
@ -43,10 +43,10 @@ Log messages above this level (\fIdebug\fR, \fBinfo\fR, \fIwarn\fR, \fIerror\fR,
Log messages with full CLF-formatted date and time (\fIdisabled\fR by default)
.TP
\fB\-\-datadir=\fR
Path to storage of i2pd data (RI, keys, peer profiles, ...)
Path to storage of dotnet data (RI, keys, peer profiles, ...)
.TP
\fB\-\-tunnelsdir=\fR
Path to tunnels configuration files (default: \fI~/.i2pd/tunnels.d\fR or \fI/var/lib/i2pd/tunnels.d\fR)
Path to tunnels configuration files (default: \fI~/.dotnet/tunnels.d\fR or \fI/var/lib/dotnet/tunnels.d\fR)
.TP
\fB\-\-host=\fR
The external IP address
@ -94,36 +94,36 @@ Limit of transit traffic from max bandwidth in percents. (default: 100)
Router will go to background after start (\fIdisabled\fR by default)
.TP
\fB\-\-service\fR
Router will use system folders like \fI/var/lib/i2pd\fR (\fIdisabled\fR by default)
Router will use system folders like \fI/var/lib/dotnet\fR (\fIdisabled\fR by default)
.TP
\fB\-\-family=\fR
Name of a family, router belongs to.
.PP
Switches, which enabled by default (like \fB\-\-ssu\fR, \fB\-\-ntcp\fR, etc.), can be disabled in config file.
.RE
See service-specific parameters in example config file \fI/usr/share/doc/i2pd/i2pd.conf.gz\fR
See service-specific parameters in example config file \fI/usr/share/doc/dotnet/dotnet.conf.gz\fR
.SH "FILES"
/etc/i2pd/i2pd.conf, /etc/i2pd/tunnels.conf, /etc/default/i2pd
/etc/dotnet/dotnet.conf, /etc/dotnet/tunnels.conf, /etc/default/dotnet
.RS 4
i2pd configuration files (when running as a system service)
dotnet configuration files (when running as a system service)
.RE
.PP
/var/lib/i2pd/
/var/lib/dotnet/
.RS 4
i2pd profile directory (when running as a system service, see \fB\-\-service\fR above)
dotnet profile directory (when running as a system service, see \fB\-\-service\fR above)
.RE
.PP
$HOME/.i2pd/
$HOME/.dotnet/
.RS 4
i2pd profile directory (when running as a normal user)
dotnet profile directory (when running as a normal user)
.SH "SEE ALSO"
Documentation at Read the Docs: \m[blue]\fBhttps://i2pd\&.readthedocs\&.io/en/latest/\fR\m[]
Documentation at Read the Docs: \m[blue]\fBhttps://dotnet\&.readthedocs\&.io/en/latest/\fR\m[]
.SH "AUTHOR"
This manual page was written by kytv <\m[blue]\fBkillyourtv@i2pmail\&.org\fR\m[]> for the Debian system (but may be used by others).
This manual page was written by kytv <\m[blue]\fBkillyourtv@dotnetmail\&.org\fR\m[]> for the Debian system (but may be used by others).
.RE
Updated by hagen <\m[blue]\fBhagen@i2pmail\&.org\fR\m[]> in 2016.
Updated by hagen <\m[blue]\fBhagen@dotnetmail\&.org\fR\m[]> in 2016.
.RE
Updated by R4SAS <\m[blue]\fBr4sas@i2pmail\&.org\fR\m[]> in 2018.
Updated by R4SAS <\m[blue]\fBr4sas@dotnetmail\&.org\fR\m[]> in 2018.
.PP
Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
.RE

12
debian/i2pd.default vendored
View file

@ -1,11 +1,11 @@
# Defaults for i2pd initscript
# sourced by /etc/init.d/i2pd
# installed at /etc/default/i2pd by the maintainer scripts
I2PD_ENABLED="yes"
# Defaults for dotnet initscript
# sourced by /etc/init.d/dotnet
# installed at /etc/default/dotnet by the maintainer scripts
DOTNET_ENABLED="yes"
# Additional options that are passed to the Daemon.
# see possible switches in /usr/share/doc/i2pd/configuration.md.gz
# see possible switches in /usr/share/doc/dotnet/configuration.md.gz
DAEMON_OPTS=""
# If you have problems with hunging i2pd, you can try enable this
# If you have problems with hunging dotnet, you can try enable this
ulimit -n 4096

4
debian/i2pd.dirs vendored
View file

@ -1,2 +1,2 @@
etc/i2pd
var/lib/i2pd
etc/dotnet
var/lib/dotnet

22
debian/i2pd.init vendored
View file

@ -1,26 +1,26 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: i2pd
# Provides: dotnet
# Required-Start: $network $local_fs $remote_fs
# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: i2p router written in C++
# Short-Description: dotnet router written in C++
### END INIT INFO
# Author: hagen <hagen@i2pmail.org>
# Author: hagen <hagen@dotnetmail.org>
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC=i2pd # Introduce a short description here
NAME=i2pd # Introduce the short server's name here
DESC=dotnet # Introduce a short description here
NAME=dotnet # Introduce the short server's name here
DAEMON=/usr/sbin/$NAME # Introduce the server's location here
DAEMON_OPTS="" # Arguments to run the daemon with
PIDFILE=/var/run/$NAME/$NAME.pid
I2PCONF=/etc/$NAME/i2pd.conf
DOTNETCONF=/etc/$NAME/dotnet.conf
TUNCONF=/etc/$NAME/tunnels.conf
TUNDIR=/etc/$NAME/tunnels.conf.d
LOGFILE=/var/log/$NAME/$NAME.log
USER="i2pd"
USER="dotnet"
# Exit if the package is not installed
[ -x $DAEMON ] || exit 0
@ -37,23 +37,23 @@ do_start()
# 1 if daemon was already running
# 2 if daemon could not be started
if [ "x$I2PD_ENABLED" != "xyes" ]; then
if [ "x$DOTNET_ENABLED" != "xyes" ]; then
log_warning_msg "$NAME disabled in config"
return 2
fi
test -e /var/run/i2pd || install -m 755 -o i2pd -g i2pd -d /var/run/i2pd
test -e /var/run/dotnet || install -m 755 -o dotnet -g dotnet -d /var/run/dotnet
touch "$PIDFILE"
chown -f $USER:adm "$PIDFILE"
test -e /var/log/i2pd || install -m 755 -o i2pd -g i2pd -d /var/log/i2pd
test -e /var/log/dotnet || install -m 755 -o dotnet -g dotnet -d /var/log/dotnet
touch "$LOGFILE"
chown -f $USER:adm "$LOGFILE"
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid "$USER" --test > /dev/null \
|| return 1
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid "$USER" -- \
--service --daemon --log=file --logfile=$LOGFILE --conf=$I2PCONF --tunconf=$TUNCONF \
--service --daemon --log=file --logfile=$LOGFILE --conf=$DOTNETCONF --tunconf=$TUNCONF \
--tunnelsdir=$TUNDIR --pidfile=$PIDFILE $DAEMON_OPTS > /dev/null 2>&1 \
|| return 2
return $?

14
debian/i2pd.install vendored
View file

@ -1,7 +1,7 @@
i2pd usr/sbin/
contrib/i2pd.conf etc/i2pd/
contrib/tunnels.conf etc/i2pd/
contrib/subscriptions.txt etc/i2pd/
contrib/certificates/ usr/share/i2pd/
contrib/tunnels.d/README etc/i2pd/tunnels.conf.d/
contrib/apparmor/usr.sbin.i2pd etc/apparmor.d
dotnet usr/sbin/
contrib/dotnet.conf etc/dotnet/
contrib/tunnels.conf etc/dotnet/
contrib/subscriptions.txt etc/dotnet/
contrib/certificates/ usr/share/dotnet/
contrib/tunnels.d/README etc/dotnet/tunnels.conf.d/
contrib/apparmor/usr.sbin.dotnet etc/apparmor.d

10
debian/i2pd.links vendored
View file

@ -1,5 +1,5 @@
etc/i2pd/i2pd.conf var/lib/i2pd/i2pd.conf
etc/i2pd/tunnels.conf var/lib/i2pd/tunnels.conf
etc/i2pd/subscriptions.txt var/lib/i2pd/subscriptions.txt
etc/i2pd/tunnels.conf.d var/lib/i2pd/tunnels.d
usr/share/i2pd/certificates var/lib/i2pd/certificates
etc/dotnet/dotnet.conf var/lib/dotnet/dotnet.conf
etc/dotnet/tunnels.conf var/lib/dotnet/tunnels.conf
etc/dotnet/subscriptions.txt var/lib/dotnet/subscriptions.txt
etc/dotnet/tunnels.conf.d var/lib/dotnet/tunnels.d
usr/share/dotnet/certificates var/lib/dotnet/certificates

View file

@ -1,4 +1,4 @@
/var/log/i2pd/i2pd.log {
/var/log/dotnet/dotnet.log {
rotate 6
daily
missingok

View file

@ -1 +1 @@
debian/i2pd.1
debian/dotnet.1

32
debian/i2pd.openrc vendored
View file

@ -1,18 +1,18 @@
#!/sbin/openrc-run
pidfile="/var/run/i2pd/i2pd.pid"
logfile="/var/log/i2pd/i2pd.log"
mainconf="/etc/i2pd/i2pd.conf"
tunconf="/etc/i2pd/tunnels.conf"
tundir="/etc/i2pd/tunnels.conf.d"
pidfile="/var/run/dotnet/dotnet.pid"
logfile="/var/log/dotnet/dotnet.log"
mainconf="/etc/dotnet/dotnet.conf"
tunconf="/etc/dotnet/tunnels.conf"
tundir="/etc/dotnet/tunnels.conf.d"
name="i2pd"
command="/usr/sbin/i2pd"
name="dotnet"
command="/usr/sbin/dotnet"
command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile"
description="i2p router written in C++"
required_dirs="/var/lib/i2pd"
description="dotnet router written in C++"
required_dirs="/var/lib/dotnet"
required_files="$mainconf"
start_stop_daemon_args="--chuid i2pd"
start_stop_daemon_args="--chuid dotnet"
depend() {
need mountall
@ -21,17 +21,17 @@ depend() {
}
start_pre() {
if [ -r /etc/default/i2pd ]; then
. /etc/default/i2pd
if [ -r /etc/default/dotnet ]; then
. /etc/default/dotnet
fi
if [ "x$I2PD_ENABLED" != "xyes" ]; then
ewarn "i2pd disabled in /etc/default/i2pd"
if [ "x$DOTNET_ENABLED" != "xyes" ]; then
ewarn "dotnet disabled in /etc/default/dotnet"
exit 1
fi
checkpath -f -o i2pd:adm $logfile
checkpath -f -o i2pd:adm $pidfile
checkpath -f -o dotnet:adm $logfile
checkpath -f -o dotnet:adm $pidfile
if [ -n "$DAEMON_OPTS" ]; then
command_args="$command_args $DAEMON_OPTS"

8
debian/i2pd.upstart vendored
View file

@ -1,11 +1,11 @@
description "i2p client daemon"
description "dotnet client daemon"
start on runlevel [2345]
stop on runlevel [016] or unmounting-filesystem
# these can be overridden in /etc/init/i2pd.override
env LOGFILE="/var/log/i2pd/i2pd.log"
# these can be overridden in /etc/init/dotnet.override
env LOGFILE="/var/log/dotnet/dotnet.log"
expect fork
exec /usr/sbin/i2pd --daemon --service --log=file --logfile=$LOGFILE
exec /usr/sbin/dotnet --daemon --service --log=file --logfile=$LOGFILE

View file

@ -1,2 +1,2 @@
# GPL come from debian/
i2pd: possible-gpl-code-linked-with-openssl
dotnet: possible-gpl-code-linked-with-openssl

View file

@ -1,25 +1,25 @@
Description: fix #1210
Disables two options, which not presented in old systemd versions
Author: r4sas <r4sas@i2pmail.org>
Author: r4sas <r4sas@dotnetmail.org>
Bug: https://github.com/PurpleI2P/i2pd/issues/1210
Reviewed-By: r4sas <r4sas@i2pmail.org>
Bug: https://github.com/PurpleI2P/dotnet/issues/1210
Reviewed-By: r4sas <r4sas@dotnetmail.org>
Last-Update: 2018-08-25
--- a/contrib/i2pd.service
+++ b/contrib/i2pd.service
--- a/contrib/dotnet.service
+++ b/contrib/dotnet.service
@@ -6,10 +6,10 @@ After=network.target
[Service]
User=i2pd
Group=i2pd
-RuntimeDirectory=i2pd
User=dotnet
Group=dotnet
-RuntimeDirectory=dotnet
-RuntimeDirectoryMode=0700
-LogsDirectory=i2pd
-LogsDirectory=dotnet
-LogsDirectoryMode=0700
+#RuntimeDirectory=i2pd
+#RuntimeDirectory=dotnet
+#RuntimeDirectoryMode=0700
+#LogsDirectory=i2pd
+#LogsDirectory=dotnet
+#LogsDirectoryMode=0700
Type=forking
ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
ExecStart=/usr/sbin/dotnet --conf=/etc/dotnet/dotnet.conf --tunconf=/etc/dotnet/tunnels.conf --tunnelsdir=/etc/dotnet/tunnels.conf.d --pidfile=/var/run/dotnet/dotnet.pid --logfile=/var/log/dotnet/dotnet.log --daemon --service
ExecReload=/bin/kill -HUP $MAINPID

24
debian/postinst vendored
View file

@ -1,29 +1,29 @@
#!/bin/sh
set -e
LOGFILE='/var/log/i2pd/i2pd.log'
I2PDHOME='/var/lib/i2pd'
I2PDUSER='i2pd'
LOGFILE='/var/log/dotnet/dotnet.log'
DOTNETHOME='/var/lib/dotnet'
DOTNETUSER='dotnet'
case "$1" in
configure|reconfigure)
# Older versions of adduser created the home directory.
# The version of adduser in Debian unstable does not.
# Create user and group as a system user.
if getent passwd $I2PDUSER > /dev/null 2>&1; then
groupadd -f $I2PDUSER || true
usermod -s "/bin/false" -e 1 $I2PDUSER > /dev/null || true
if getent passwd $DOTNETUSER > /dev/null 2>&1; then
groupadd -f $DOTNETUSER || true
usermod -s "/bin/false" -e 1 $DOTNETUSER > /dev/null || true
else
adduser --system --quiet --group --home $I2PDHOME $I2PDUSER
adduser --system --quiet --group --home $DOTNETHOME $DOTNETUSER
fi
mkdir -p -m0750 /var/log/i2pd
chown -f ${I2PDUSER}:adm /var/log/i2pd
mkdir -p -m0750 /var/log/dotnet
chown -f ${DOTNETUSER}:adm /var/log/dotnet
touch $LOGFILE
chmod 640 $LOGFILE
chown -f ${I2PDUSER}:adm $LOGFILE
mkdir -p -m0750 $I2PDHOME
chown -f -R -P ${I2PDUSER}:${I2PDUSER} ${I2PDHOME}
chown -f ${DOTNETUSER}:adm $LOGFILE
mkdir -p -m0750 $DOTNETHOME
chown -f -R -P ${DOTNETUSER}:${DOTNETUSER} ${DOTNETHOME}
;;
abort-upgrade|abort-remove|abort-deconfigure)
echo "Aborting upgrade"

10
debian/postrm vendored
View file

@ -2,11 +2,11 @@
set -e
if [ "$1" = "purge" ]; then
rm -f /etc/default/i2pd
rm -rf /etc/i2pd
rm -rf /var/lib/i2pd
rm -rf /var/log/i2pd
rm -rf /var/run/i2pd
rm -f /etc/default/dotnet
rm -rf /etc/dotnet
rm -rf /var/lib/dotnet
rm -rf /var/log/dotnet
rm -rf /var/run/dotnet
fi
#DEBHELPER#

4
debian/rules vendored
View file

@ -12,10 +12,10 @@ DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
%:
dh $@ --parallel
# dh_apparmor --profile-name=usr.sbin.i2pd -pi2pd
# dh_apparmor --profile-name=usr.sbin.dotnet -pdotnet
override_dh_strip:
dh_strip --dbg-package=i2pd-dbg
dh_strip --dbg-package=dotnet-dbg
## uncomment this if you have "missing info" problem when building package
#override_dh_shlibdeps:

4
debian/watch vendored
View file

@ -1,3 +1,3 @@
version=3
opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/i2pd-$1\.tar\.gz/ \
https://github.com/PurpleI2P/i2pd/tags .*/v?(\d\S*)\.tar\.gz
opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/dotnet-$1\.tar\.gz/ \
https://github.com/PurpleI2P/dotnet/tags .*/v?(\d\S*)\.tar\.gz