From aa65271559bc5a0da9d6a181fddb8afa0a218f6b Mon Sep 17 00:00:00 2001
From: Filip Kobierski <fkobi@pm.me>
Date: Tue, 6 May 2025 20:59:07 +0200
Subject: [PATCH] contrib: unify openrc & systemd service files a bit

- place pidfile in /run/ instead of /var/run/
- sort command_args
---
 contrib/i2pd.service       | 2 +-
 contrib/openrc/i2pd.openrc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/i2pd.service b/contrib/i2pd.service
index 381ae483..a1a54d97 100644
--- a/contrib/i2pd.service
+++ b/contrib/i2pd.service
@@ -11,7 +11,7 @@ RuntimeDirectoryMode=0700
 LogsDirectory=i2pd
 LogsDirectoryMode=0700
 Type=forking
-ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
+ExecStart=/usr/bin/i2pd --daemon --service --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log
 ExecReload=/bin/sh -c "kill -HUP $MAINPID"
 PIDFile=/run/i2pd/i2pd.pid
 ### Uncomment, if auto restart needed
diff --git a/contrib/openrc/i2pd.openrc b/contrib/openrc/i2pd.openrc
index 41782533..d43199ee 100644
--- a/contrib/openrc/i2pd.openrc
+++ b/contrib/openrc/i2pd.openrc
@@ -3,14 +3,14 @@
 name="Invisible Internet Protocol daemon"
 description="i2p router written in C++"
 
-pidfile="/var/run/i2pd/i2pd.pid"
+pidfile="/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"
 
 command="/usr/bin/i2pd"
-command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile"
+command_args="--daemon --service --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile --log=file --logfile=$logfile "
 command_user="i2pd"
 required_dirs="/var/lib/i2pd"
 required_files="/etc/i2pd/i2pd.conf"