Commit Graph

46 Commits

Author SHA1 Message Date
Bill Thornton 226a43619f Fix fedora build version 2021-12-30 16:54:59 -05:00
Brian J. Murrell 543b0127b3 Fix build on EL7
Add /usr/local/bin to $PATH.

Update fedora/Makefile with enhancements from jellyfin-web.
2021-12-14 17:50:58 -05:00
Cody Robibero 0e8c97ed60
Merge pull request #5894 from brianjmurrell/bmurrell/setcap-low-port 2021-12-11 22:12:19 -07:00
Brian J. Murrell 296a61cbc4 Run bump_version in make srpm
Also add an "rpms" target that builds the RPMs using mock in a target
environment.

Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>
2021-12-11 22:49:19 -05:00
Brian J. Murrell 148fcb1bb8 Put low port privilege into an optional subpackage
Move "AmbientCapabilities=CAP_NET_BIND_SERVICE" to the "[Service]"
section of the optional "lowport" unit drop-in file and package that
drop-in in a separate, optionally installable jellyfin-server-lowports
subpackage.

This isolates the CAP_NET_BIND_SERVICE capability to only installations
that desire it.

Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>
2021-11-30 01:18:27 -05:00
Brian J. Murrell 757970bfc1 Merge remote-tracking branch 'origin/master' into HEAD 2021-11-29 17:53:26 -05:00
Cody Robibero 4fc3de9b75
Fix builds for dotnet6 (#6595)
* Target net6.0

* Use new Enum.TryParse(ReadOnlySpan<char>) overload

* Replace RNGCryptoServiceProvider with RandomNumberGenerator

* ci - target net6.0 (#6594)

* Update deployment for dotnet6

* Use generic 6.0.x preview for CI

* Update direct dotnet download links

Co-authored-by: Bond_009 <bond.009@outlook.com>
2021-09-25 06:21:48 -06:00
Claus Vium 06242121c5
Merge pull request #4615 from strugee/fix-restart.sh 2021-09-06 13:53:23 +02:00
Joshua M. Boniface e5cbafdb6b
Merge pull request #5606 from lmnotran/feature/delay-service-start
Delay starting service until after network is online
2021-08-18 02:25:54 -04:00
Brian J. Murrell a3a4689af2 Allow to bind to priveleged ports (i.e. 80/443)
Add "AmbientCapabilities=CAP_NET_BIND_SERVICE" to the "[Service]"
section of the unit file to allow the server to bind to ports 80 and 443.

Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>
2021-04-22 10:07:51 -04:00
cvium 01491796a2 Enable Workstation GC mode 2021-04-11 12:57:28 +02:00
Mason Tran 415b03d719
Delay starting services until after network is online 2021-03-24 02:35:44 -04:00
dkanada 995b370017
Merge pull request #4663 from joshuaboniface/bump-version-10.8.0
Bump version to 10.8.0 for next release
2021-02-09 11:38:31 +09:00
Joe Ceresini 530c4dc11b Use variables for version, and fix conflict 2021-01-05 00:32:46 -05:00
Joshua M. Boniface 5f2cd11199 Bump version to 10.8.0 for next release 2020-12-04 21:56:24 -05:00
AJ Jordan bab389114b
Use a service unit, not a scope unit, to restart
Reportedly `systemd-run --scope` still got killed by the service
manager; see #4615. The suspected cause is that `scope` units are run by
the `systemd-run` process itself and inherit the caller's execution
environment (see systemd-run(1)). To fix this, we use a systemd
`service` unit instead, which is run and managed by PID 1 - hopefully
this will isolate us sufficiently so that we don't get terminated along
with `jellyfin.service`.
2020-12-04 16:33:24 -08:00
AJ Jordan d251c701b9
Use systemd-run(1) in restart.sh
systemd-run(1) runs `systemctl restart` in an isolated systemd unit
that is not subject to process termination as jellyfin.service is shut
down. We adjust the sudoers configuration for this new usage, removing
the old config, since restart.sh is the only user of the sudoers
policy.

Additionally we change `systemctl start` to `systemctl restart` since
there was a race condition where jellyfin.service was not fully
stopped by the time this ran, so `systemctl start` became a noop.
`systemctl restart` on the other hand works whether jellyfin.service is
stopped or not.

The at(1) hack (and the usage of `start` instead of `restart`) is left
in for other init systems since I cannot test on those systems, and
because I don't know of any systemd-run(1) equivalent (although it may
be a non-issue since alternate init systems do not keep track of daemon
children nearly as aggressively as systemd does).
2020-12-04 16:18:26 -08:00
AJ Jordan b528816b2a
Add sudo to package dependencies
It's used in the restart.sh script.

For Debian, this is a Recommends because virtually everyone will need
this (default APT policy is to install recommended packages so this
works ok), but technically you can configure the server to run as root
and then you wouldn't need it.

For Fedora... frankly I got confused by their Weak Dependencies etc. so
I just made it a hard dependency.
2020-11-29 04:15:11 -05:00
AJ Jordan 2911dfc37d
Don't restart with sudo(8) if it's not available
Some environments, like system containers, have no reason to have
sudo(8) installed. In these environments restart.sh will silently fail
because /usr/bin/sudo does not exist to execute, so test that sudo
exists and don't try to use it otherwise.

Note also that hardcoding sudo's path is wrong: it can be installed in
other places. On FreeBSD, for example, it is /usr/local/bin/sudo when
installed from ports.
2020-11-29 04:04:38 -05:00
AJ Jordan ce82932c9a
Remove useless which(1) calls in restart.sh
at(1) runs commandlines with /bin/sh anyway, which resolves paths. No
need to do it ourselves.
2020-11-29 04:04:22 -05:00
AJ Jordan a4e1732e35
Fix restart.sh to look at what's actually booted
The old code was wrong because e.g. systemd can be *installed* on the
system, but not actually used as PID1. In that case we would pick
`systemctl`, but it wouldn't actually work because PID1 was some other
init system.
2020-11-29 03:43:03 -05:00
Joshua M. Boniface 922b02733b
Revert "Enable jellyfin.service unit on Fedora fresh install" 2020-11-24 17:25:50 -05:00
Bill Thornton 4f96e2f256
Merge pull request #4554 from joshuaboniface/fix-restart
Run explicit service start if restart failed
2020-11-23 14:15:18 -05:00
Joshua M. Boniface 91dd95faa3 Add at to the dependencies on Fedora (as in Deb) 2020-11-22 18:32:34 -05:00
Joshua M. Boniface 6de79e03a2 Go back to at with lower sleep and start 2020-11-22 18:32:16 -05:00
Joshua M. Boniface 97665c9478 Remove the `at now` hack 2020-11-22 17:19:39 -05:00
Joshua M. Boniface 1079ddb46c Run explicit service start if restart failed
Should solve the occasional bugs with the restart in the WebUI.
Sometimes the service stops and then doesn't start again; this will run
an explicit start action afterwards. If this doesn't fix it I'm certain
there would be more tweaking that can be done.
2020-11-22 17:12:29 -05:00
Joshua M. Boniface 5f135a4b46 Use --now to the enable to start too 2020-11-22 17:01:13 -05:00
Joshua M. Boniface be4e485bd3 Make use of the $1 flag to set installed only 2020-11-22 16:58:07 -05:00
Joshua M. Boniface d88504c1d6 Set systemctl enabled on Jellyfin service
This was not set for Fedora; I do not recall if this was just an oversight or was
explicitly removed in the past; open to feedback there.

Reported in the LUP Bug-A-Thon
2020-11-22 16:49:12 -05:00
crobibero 1d96167e8d Fix builders 2020-11-16 17:05:31 -07:00
crobibero 185fac0677 Upgrade all netcore3.1 to net5.0 2020-11-15 13:31:47 -07:00
Joshua M. Boniface 88bc2fa3ec Just make everything under libdir/jf a wildcard
I don't know if this will actually work but maybe it will.
2020-10-04 19:50:54 -04:00
crobibero 03d4e90728 add new files to rpm build 2020-09-09 18:52:12 -06:00
crobibero 583f47ea28 Remove GenerateDocumentationFile 2020-09-04 07:04:06 -06:00
crobibero 44fb76bbcf include xml docs when publishing 2020-08-29 10:42:12 -06:00
Joshua M. Boniface 0424d09b8d Merge pull request #4001 from brianjmurrell/patch-1
Add an empty %files section to main package

(cherry picked from commit c3ef1f56f6)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
2020-08-28 10:46:21 -04:00
Joshua M. Boniface a511e0ac0b Bump master version to 10.7.0 for next release 2020-07-27 19:10:40 -04:00
Joshua M. Boniface 8c9604afba Add Web integration option in default service conf 2020-04-29 16:06:42 -04:00
Joshua M. Boniface a327e4ccac
Update fedora/jellyfin.spec
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2020-04-25 22:13:21 -04:00
Joshua M. Boniface b0e80b486b Use jellyfin.org everywhere 2020-04-09 11:40:04 -04:00
Joshua M. Boniface 9eab678487 Improve Fedora spec and add metapackage 2020-04-09 11:25:42 -04:00
Joshua M. Boniface 05aa28a377 Clean up redundant Makefile steps 2020-03-24 00:01:48 -04:00
Joshua M. Boniface 891aa7c255 Update info in Fedora spec 2020-03-23 23:00:35 -04:00
Joshua M. Boniface fc5e932492 Fix makefile formatting 2020-03-23 22:55:37 -04:00
Joshua M. Boniface 6028bc0f79 Port Fedora and CentOS builds and remove web build
Simplifies a number of aspects of the RPM build, including moving
.copr/Makefile into the "fedora/" folder (and leaving a symlink),
removing the jellyfin-web build components, and renaming it
jellyfin-server like Debian did.
2020-03-23 17:32:07 -04:00