commit:     b0681327d08961e310f204ad2d0f671327480ac1
Author:     Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Tue Apr 12 11:00:59 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May  9 08:05:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0681327

net-misc/i2pd: use static user and group

 net-misc/i2pd/files/i2pd-2.6.0-r3.confd | 9 +++++++++
 net-misc/i2pd/i2pd-2.6.0-r3.ebuild      | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.confd 
b/net-misc/i2pd/files/i2pd-2.6.0-r3.confd
new file mode 100644
index 0000000..9a22d23
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r3.confd
@@ -0,0 +1,9 @@
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
+I2PD_LOG=/var/log/i2pd.log
+I2PD_PID=/run/i2pd/i2pd.pid
+
+# Options to i2pd
+I2PD_OPTIONS="--daemon --service --pidfile=${I2PD_PID} \
+--log=file --logfile=${I2PD_LOG} \
+--conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf"

diff --git a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild 
b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
index de78320..6500008 100644
--- a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
+++ b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
@@ -28,8 +28,8 @@ DEPEND="${RDEPEND}
        i2p-hardening? ( >=sys-devel/gcc-4.7 )
        || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
 
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
 
 CMAKE_USE_DIR="${S}/build"
 
@@ -85,7 +85,7 @@ src_install() {
        doenvd "${FILESDIR}/99i2pd"
 
        # openrc and systemd daemon routines
-       newconfd "${FILESDIR}/i2pd-2.6.0-r2.confd" i2pd
+       newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
        newinitd "${FILESDIR}/i2pd-2.6.0-r2.initd" i2pd
        systemd_newunit "${FILESDIR}/i2pd-2.6.0-r2.service" i2pd.service
        

Reply via email to