From 6d24e0620ba94f83a5a2918ee66325237ab93f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 23 Aug 2021 11:56:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=B4=D0=BE=D0=BC=D0=B0=D1=88=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B8=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=B9=20jackett=20=D0=B8=20torrserver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acct-user/jackett/jackett-0.ebuild | 2 +- acct-user/torrserver/torrserver-0.ebuild | 2 +- net-p2p/torrserver-bin/files/torrserver.initd | 2 +- .../net-p2p/torrserver-bin/.calculate_directory | 2 +- .../net-p2p/torrserver-bin/torrserver/.calculate_directory | 2 +- .../net-p2p/torrserver-bin/torrserver/config.db.chmod | 4 ++++ www-apps/jackett-bin/files/jackett.initd | 2 +- www-apps/jackett-bin/files/jackett.service | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/torrserver/config.db.chmod diff --git a/acct-user/jackett/jackett-0.ebuild b/acct-user/jackett/jackett-0.ebuild index fa8d878b7..80c12121b 100644 --- a/acct-user/jackett/jackett-0.ebuild +++ b/acct-user/jackett/jackett-0.ebuild @@ -9,6 +9,6 @@ DESCRIPTION="User for www-apps/jackett-bin" KEYWORDS="amd64" ACCT_USER_ID=-1 ACCT_USER_GROUPS=( jackett ) -ACCT_USER_HOME="/var/jackett/" +ACCT_USER_HOME="/var/lib/jackett/" acct-user_add_deps diff --git a/acct-user/torrserver/torrserver-0.ebuild b/acct-user/torrserver/torrserver-0.ebuild index a1c4bc5ab..491065393 100644 --- a/acct-user/torrserver/torrserver-0.ebuild +++ b/acct-user/torrserver/torrserver-0.ebuild @@ -9,6 +9,6 @@ DESCRIPTION="User for net-p2p/torrserver-bin" KEYWORDS="amd64" ACCT_USER_ID=-1 ACCT_USER_GROUPS=( torrserver ) -ACCT_USER_HOME="/var/calculate/torrserver/" +ACCT_USER_HOME="/var/lib/torrserver/" acct-user_add_deps diff --git a/net-p2p/torrserver-bin/files/torrserver.initd b/net-p2p/torrserver-bin/files/torrserver.initd index 1b15a662c..ecb98fa4a 100644 --- a/net-p2p/torrserver-bin/files/torrserver.initd +++ b/net-p2p/torrserver-bin/files/torrserver.initd @@ -12,7 +12,7 @@ depend() { start() { ebegin "Starting $name" start-stop-daemon --start --exec /opt/torrserver/TorrServer-linux-amd64 \ - --env HOME=/var/calculate/torrserver --chdir /var/calculate/torrserver \ + --env HOME=/var/lib/torrserver --chdir /var/lib/torrserver \ --make-pidfile --pidfile /var/run/torrserver.pid \ --background --user torrserver:torrserver eend $? "Failed to start $name" diff --git a/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/.calculate_directory index d7e703ccf..8a1607e88 100644 --- a/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/.calculate_directory +++ b/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/.calculate_directory @@ -1 +1 @@ -# Calculate mergepkg()!= path=/var/calculate/torrserver name=cache +# Calculate mergepkg()!= chown=torrserver:torrserver chmod=0700 path=/var/calculate/torrserver name=cache diff --git a/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/torrserver/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/torrserver/.calculate_directory index bff40fe70..6a26e67a0 100644 --- a/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/torrserver/.calculate_directory +++ b/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/torrserver/.calculate_directory @@ -1 +1 @@ -# Calculate path=/var/lib name=torrserver exists(/var/lib/torrserver/config.db)== +# Calculate chown=torrserver:torrserver chmod=0700 path=/var/lib name=torrserver exists(/var/lib/torrserver/config.db)== diff --git a/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/torrserver/config.db.chmod b/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/torrserver/config.db.chmod new file mode 100644 index 000000000..1303f667a --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/net-p2p/torrserver-bin/torrserver/config.db.chmod @@ -0,0 +1,4 @@ +# Calculate run=/bin/bash + +chown torrserver. /var/lib/torrserver/config.db +exit 0 diff --git a/www-apps/jackett-bin/files/jackett.initd b/www-apps/jackett-bin/files/jackett.initd index 2241cdd14..d717029df 100644 --- a/www-apps/jackett-bin/files/jackett.initd +++ b/www-apps/jackett-bin/files/jackett.initd @@ -12,7 +12,7 @@ depend() { start() { ebegin "Starting $name" start-stop-daemon --start --exec /opt/jackett/jackett \ - --env HOME=/var/jackett --chdir /var/jackett \ + --env HOME=/var/lib/jackett --chdir /var/lib/jackett \ --make-pidfile --pidfile /var/run/jackett.pid \ --background --user jackett:jackett eend $? "Failed to start $name" diff --git a/www-apps/jackett-bin/files/jackett.service b/www-apps/jackett-bin/files/jackett.service index b2f2ee870..013137f2a 100644 --- a/www-apps/jackett-bin/files/jackett.service +++ b/www-apps/jackett-bin/files/jackett.service @@ -9,7 +9,7 @@ RestartSec=5 Type=simple User=jackett Group=jackett -WorkingDirectory=/var/jackett +WorkingDirectory=/var/lib/jackett ExecStart=/bin/sh "/opt/jackett/jackett_launcher.sh" TimeoutStopSec=30