net-misc/i2pd: use static user and group

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 (file)
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 de78320d7981fde33135c3899abf278551abbdc5..650000805fcdcdcf427e59c7bba8ee4c4d5de4ec 100644 (file)
--- 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