Remove restart.sh dependencies from packaging

pull/9164/head
Dennis M. Pöpperl 2 years ago
parent 2a70cf115c
commit 2abd4c0c9c

@ -1,33 +0,0 @@
#Allow jellyfin group to start, stop and restart itself
Cmnd_Alias RESTARTSERVER_SYSV = /sbin/service jellyfin restart, /usr/sbin/service jellyfin restart
Cmnd_Alias STARTSERVER_SYSV = /sbin/service jellyfin start, /usr/sbin/service jellyfin start
Cmnd_Alias STOPSERVER_SYSV = /sbin/service jellyfin stop, /usr/sbin/service jellyfin stop
Cmnd_Alias RESTARTSERVER_SYSTEMD = /usr/bin/systemd-run systemctl restart jellyfin
Cmnd_Alias STARTSERVER_SYSTEMD = /usr/bin/systemd-run systemctl start jellyfin
Cmnd_Alias STOPSERVER_SYSTEMD = /usr/bin/systemd-run systemctl stop jellyfin
Cmnd_Alias RESTARTSERVER_INITD = /etc/init.d/jellyfin restart
Cmnd_Alias STARTSERVER_INITD = /etc/init.d/jellyfin start
Cmnd_Alias STOPSERVER_INITD = /etc/init.d/jellyfin stop
jellyfin ALL=(ALL) NOPASSWD: RESTARTSERVER_SYSV
jellyfin ALL=(ALL) NOPASSWD: STARTSERVER_SYSV
jellyfin ALL=(ALL) NOPASSWD: STOPSERVER_SYSV
jellyfin ALL=(ALL) NOPASSWD: RESTARTSERVER_SYSTEMD
jellyfin ALL=(ALL) NOPASSWD: STARTSERVER_SYSTEMD
jellyfin ALL=(ALL) NOPASSWD: STOPSERVER_SYSTEMD
jellyfin ALL=(ALL) NOPASSWD: RESTARTSERVER_INITD
jellyfin ALL=(ALL) NOPASSWD: STARTSERVER_INITD
jellyfin ALL=(ALL) NOPASSWD: STOPSERVER_INITD
Defaults!RESTARTSERVER_SYSV !requiretty
Defaults!STARTSERVER_SYSV !requiretty
Defaults!STOPSERVER_SYSV !requiretty
Defaults!RESTARTSERVER_SYSTEMD !requiretty
Defaults!STARTSERVER_SYSTEMD !requiretty
Defaults!STOPSERVER_SYSTEMD !requiretty
Defaults!RESTARTSERVER_INITD !requiretty
Defaults!STARTSERVER_INITD !requiretty
Defaults!STOPSERVER_INITD !requiretty
Defaults:jellyfin !requiretty

5
debian/control vendored

@ -18,11 +18,10 @@ Package: jellyfin-server
Replaces: jellyfin (<<10.6.0) Replaces: jellyfin (<<10.6.0)
Breaks: jellyfin (<<10.6.0) Breaks: jellyfin (<<10.6.0)
Architecture: any Architecture: any
Depends: at, Depends: libsqlite3-0,
libsqlite3-0,
libfontconfig1, libfontconfig1,
libfreetype6, libfreetype6,
libssl1.1 | libssl3 libssl1.1 | libssl3
Recommends: jellyfin-web, sudo Recommends: jellyfin-web
Description: Jellyfin is the Free Software Media System. Description: Jellyfin is the Free Software Media System.
This package provides the Jellyfin server backend and API. This package provides the Jellyfin server backend and API.

1
debian/install vendored

@ -2,4 +2,3 @@ usr/lib/jellyfin usr/lib/
debian/conf/jellyfin etc/default/ debian/conf/jellyfin etc/default/
debian/conf/logging.json etc/jellyfin/ debian/conf/logging.json etc/jellyfin/
debian/conf/jellyfin.service.conf etc/systemd/system/jellyfin.service.d/ debian/conf/jellyfin.service.conf etc/systemd/system/jellyfin.service.d/
debian/conf/jellyfin-sudoers etc/sudoers.d/

@ -16,10 +16,9 @@ URL: https://jellyfin.org
Source0: jellyfin-server-%{version}.tar.gz Source0: jellyfin-server-%{version}.tar.gz
Source11: jellyfin.service Source11: jellyfin.service
Source12: jellyfin.env Source12: jellyfin.env
Source13: jellyfin.sudoers Source13: jellyfin.override.conf
Source14: jellyfin.override.conf Source14: jellyfin-firewalld.xml
Source15: jellyfin-firewalld.xml Source15: jellyfin-server-lowports.conf
Source16: jellyfin-server-lowports.conf
%{?systemd_requires} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
@ -43,7 +42,7 @@ Jellyfin is a free software media system that puts you in control of managing an
Summary: The Free Software Media System Server backend Summary: The Free Software Media System Server backend
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: ffmpeg Requires: ffmpeg
Requires: libcurl, fontconfig, freetype, openssl, glibc, libicu, at, sudo Requires: libcurl, fontconfig, freetype, openssl, glibc, libicu
%description server %description server
The Jellyfin media server backend. The Jellyfin media server backend.
@ -81,9 +80,8 @@ ln -srf %{_libdir}/jellyfin/jellyfin %{buildroot}%{_bindir}/jellyfin
%{__install} -D %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/jellyfin %{__install} -D %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/jellyfin
# system config # system config
%{__install} -D %{SOURCE15} %{buildroot}%{_prefix}/lib/firewalld/services/jellyfin.xml %{__install} -D %{SOURCE14} %{buildroot}%{_prefix}/lib/firewalld/services/jellyfin.xml
%{__install} -D %{SOURCE13} %{buildroot}%{_sysconfdir}/sudoers.d/jellyfin-sudoers %{__install} -D %{SOURCE13} %{buildroot}%{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf
%{__install} -D %{SOURCE14} %{buildroot}%{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf
%{__install} -D %{SOURCE11} %{buildroot}%{_unitdir}/jellyfin.service %{__install} -D %{SOURCE11} %{buildroot}%{_unitdir}/jellyfin.service
# empty directories # empty directories
@ -93,7 +91,7 @@ ln -srf %{_libdir}/jellyfin/jellyfin %{buildroot}%{_bindir}/jellyfin
%{__mkdir} -p %{buildroot}%{_var}/log/jellyfin %{__mkdir} -p %{buildroot}%{_var}/log/jellyfin
# jellyfin-server-lowports subpackage # jellyfin-server-lowports subpackage
%{__install} -D -m 0644 %{SOURCE16} %{buildroot}%{_unitdir}/jellyfin.service.d/jellyfin-server-lowports.conf %{__install} -D -m 0644 %{SOURCE15} %{buildroot}%{_unitdir}/jellyfin.service.d/jellyfin-server-lowports.conf
%files %files
@ -116,7 +114,6 @@ ln -srf %{_libdir}/jellyfin/jellyfin %{buildroot}%{_bindir}/jellyfin
# system config # system config
%{_prefix}/lib/firewalld/services/jellyfin.xml %{_prefix}/lib/firewalld/services/jellyfin.xml
%{_unitdir}/jellyfin.service %{_unitdir}/jellyfin.service
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/sudoers.d/jellyfin-sudoers
%config(noreplace) %{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf %config(noreplace) %{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf
# empty directories # empty directories

@ -1,14 +0,0 @@
# Allow jellyfin group to start, stop and restart itself
Cmnd_Alias RESTARTSERVER_SYSTEMD = /usr/bin/systemd-run systemctl restart jellyfin
Cmnd_Alias STARTSERVER_SYSTEMD = /usr/bin/systemd-run systemctl start jellyfin
Cmnd_Alias STOPSERVER_SYSTEMD = /usr/bin/systemd-run systemctl stop jellyfin
jellyfin ALL=(ALL) NOPASSWD: RESTARTSERVER_SYSTEMD
jellyfin ALL=(ALL) NOPASSWD: STARTSERVER_SYSTEMD
jellyfin ALL=(ALL) NOPASSWD: STOPSERVER_SYSTEMD
Defaults!RESTARTSERVER_SYSTEMD !requiretty
Defaults!STARTSERVER_SYSTEMD !requiretty
Defaults!STOPSERVER_SYSTEMD !requiretty
Defaults:jellyfin !requiretty
Loading…
Cancel
Save