diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-01-18 15:42:01 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-01-18 15:42:01 +0000 |
| commit | 07228913c66b21d6ae7cf9d9f7d72674e890aac9 (patch) | |
| tree | 82cc3b5c1531a2978f34173c8aa1cd25333ea68f /security/i2pd | |
| parent | 90eeb7952d4a34614670638ee3b2333c21f4df93 (diff) | |
| download | ports-07228913c66b21d6ae7cf9d9f7d72674e890aac9.tar.gz ports-07228913c66b21d6ae7cf9d9f7d72674e890aac9.zip | |
Revert 561829, this is not a correct solution
PR: 252159
Notes
Notes:
svn path=/head/; revision=561921
Diffstat (limited to 'security/i2pd')
| -rw-r--r-- | security/i2pd/Makefile | 2 | ||||
| -rw-r--r-- | security/i2pd/files/i2pd.in | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/security/i2pd/Makefile b/security/i2pd/Makefile index 682cb0e523f5..3869cf3d3a0d 100644 --- a/security/i2pd/Makefile +++ b/security/i2pd/Makefile @@ -3,7 +3,7 @@ PORTNAME= i2pd PORTVERSION= 2.33.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net-p2p MAINTAINER= amdmi3@FreeBSD.org diff --git a/security/i2pd/files/i2pd.in b/security/i2pd/files/i2pd.in index 74341e9f5fde..0ba1601e73f8 100644 --- a/security/i2pd/files/i2pd.in +++ b/security/i2pd/files/i2pd.in @@ -9,12 +9,6 @@ # # i2pd_enable="YES" # -# By default, it writes logs to /var/log/i2pd/i2pd.log not using syslogd. -# You may change log file name with i2pd_logfile variable in /etc/rc.conf, or -# if you prefer it send logs to syslogd then add the following to /etc/rc.conf: -# -# i2pd_logfile="syslog:warn" # for flags: --log syslog --loglevel warn -# . /etc/rc.subr @@ -28,18 +22,12 @@ load_rc_config ${name} : ${i2pd_group="%%GROUP%%"} : ${i2pd_pidfile="/var/run/${name}/${name}.pid"} : ${i2pd_datadir="/var/db/${name}"} - -case "$i2pd_logfile" in - syslog) log="--log syslog" ;; - syslog:*) log="--log syslog --loglevel ${i2pd_logfile#syslog:}" ;; - *) : ${i2pd_logfile="/var/log/${name}/${name}.log"} - log="--log file --logfile ${i2pd_logfile}" ;; -esac +: ${i2pd_logfile="/var/log/${name}/${name}.log"} required_dirs=${i2pd_datadir} pidfile=${i2pd_pidfile} command="%%PREFIX%%/bin/${name}" -command_args="--pidfile ${i2pd_pidfile} --service --datadir ${i2pd_datadir} --daemon $log" +command_args="--pidfile ${i2pd_pidfile} --service --datadir ${i2pd_datadir} --log file --logfile ${i2pd_logfile} --daemon" extra_commands="reload" reload_cmd="pkill -1 -F ${i2pd_pidfile} -x i2pd" |