From 7b8012f7a60737a2be5040021e7f0e9462b9c781 Mon Sep 17 00:00:00 2001
From: Filip Kobierski <fkobi@pm.me>
Date: Tue, 6 May 2025 20:46:27 +0200
Subject: [PATCH 1/5] contrib/openrc: improve service name

---
 contrib/openrc/i2pd.openrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/openrc/i2pd.openrc b/contrib/openrc/i2pd.openrc
index 0233eed8..86e1500e 100644
--- a/contrib/openrc/i2pd.openrc
+++ b/contrib/openrc/i2pd.openrc
@@ -6,7 +6,7 @@ mainconf="/etc/i2pd/i2pd.conf"
 tunconf="/etc/i2pd/tunnels.conf"
 tundir="/etc/i2pd/tunnels.conf.d"
 
-name="i2pd"
+name="Invisible Internet Protocol daemon"
 command="/usr/bin/i2pd"
 command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile"
 description="i2p router written in C++"

From eb516cd5a0dd12a0b10cf39d1ac6d2666fbef98e Mon Sep 17 00:00:00 2001
From: Filip Kobierski <fkobi@pm.me>
Date: Tue, 6 May 2025 20:47:04 +0200
Subject: [PATCH 2/5] contrib/openrc: move name & description up

improves readability
---
 contrib/openrc/i2pd.openrc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/openrc/i2pd.openrc b/contrib/openrc/i2pd.openrc
index 86e1500e..ec67ceb2 100644
--- a/contrib/openrc/i2pd.openrc
+++ b/contrib/openrc/i2pd.openrc
@@ -1,15 +1,16 @@
 #!/sbin/openrc-run
 
+name="Invisible Internet Protocol daemon"
+description="i2p router written in C++"
+
 pidfile="/var/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"
 
-name="Invisible Internet Protocol daemon"
 command="/usr/bin/i2pd"
 command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile"
-description="i2p router written in C++"
 required_dirs="/var/lib/i2pd"
 required_files="$mainconf"
 start_stop_daemon_args="--chuid i2pd"

From d317e374e494fda19e9be4f6fe30e0cc4d7272bf Mon Sep 17 00:00:00 2001
From: Filip Kobierski <fkobi@pm.me>
Date: Tue, 6 May 2025 20:52:23 +0200
Subject: [PATCH 3/5] contrib/openrc: use command_user instead of --chuid

---
 contrib/openrc/i2pd.openrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/openrc/i2pd.openrc b/contrib/openrc/i2pd.openrc
index ec67ceb2..fa154703 100644
--- a/contrib/openrc/i2pd.openrc
+++ b/contrib/openrc/i2pd.openrc
@@ -11,9 +11,9 @@ 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_user="i2pd"
 required_dirs="/var/lib/i2pd"
-required_files="$mainconf"
-start_stop_daemon_args="--chuid i2pd"
+required_files="/etc/i2pd/i2pd.conf"
 
 depend() {
   need mountall

From f6442611ca7554de3fba32aed434de67a2562163 Mon Sep 17 00:00:00 2001
From: Filip Kobierski <fkobi@pm.me>
Date: Tue, 6 May 2025 20:52:41 +0200
Subject: [PATCH 4/5] contrib/openrc: use $command_user when checking for
 ownership

loses adm group
---
 contrib/openrc/i2pd.openrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/openrc/i2pd.openrc b/contrib/openrc/i2pd.openrc
index fa154703..41782533 100644
--- a/contrib/openrc/i2pd.openrc
+++ b/contrib/openrc/i2pd.openrc
@@ -31,8 +31,8 @@ start_pre() {
     exit 1
   fi
 
-  checkpath -f -o i2pd:adm $logfile
-  checkpath -f -o i2pd:adm $pidfile
+  checkpath -f -o $command_user $logfile
+  checkpath -f -o $command_user $pidfile
 
   if [ -n "$DAEMON_OPTS" ]; then
     command_args="$command_args $DAEMON_OPTS"

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 5/5] 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"