Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Jan 2021 15:42:01 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r561921 - in head/security/i2pd: . files
Message-ID:  <202101181542.10IFg1eL000760@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Jan 18 15:42:01 2021
New Revision: 561921
URL: https://svnweb.freebsd.org/changeset/ports/561921

Log:
  Revert 561829, this is not a correct solution
  
  PR:		252159

Modified:
  head/security/i2pd/Makefile
  head/security/i2pd/files/i2pd.in

Modified: head/security/i2pd/Makefile
==============================================================================
--- head/security/i2pd/Makefile	Mon Jan 18 14:32:22 2021	(r561920)
+++ head/security/i2pd/Makefile	Mon Jan 18 15:42:01 2021	(r561921)
@@ -3,7 +3,7 @@
 
 PORTNAME=	i2pd
 PORTVERSION=	2.33.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	amdmi3@FreeBSD.org

Modified: head/security/i2pd/files/i2pd.in
==============================================================================
--- head/security/i2pd/files/i2pd.in	Mon Jan 18 14:32:22 2021	(r561920)
+++ head/security/i2pd/files/i2pd.in	Mon Jan 18 15:42:01 2021	(r561921)
@@ -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}"}
+: ${i2pd_logfile="/var/log/${name}/${name}.log"}
 
-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
-
 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"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101181542.10IFg1eL000760>