diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a1b091a89a13057f65d2bdf13baea9fbee216c9..64d9db08662989cdce019aa13801783018cd2297 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: docker:20.10.9 variables: DOCKER_TLS_CERTDIR: "/certs" - IMAGE_VER: 2.0.1 + IMAGE_VER: 2.0.2 services: - docker:20.10.9-dind diff --git a/lib/PiTube/Controller/Nginx.pm b/lib/PiTube/Controller/Nginx.pm index fe24a15bf17f0c1abe9664a8a3b42bc24ac00483..5cc008c00375466123c6437c01cdb553ec835e3c 100644 --- a/lib/PiTube/Controller/Nginx.pm +++ b/lib/PiTube/Controller/Nginx.pm @@ -1,11 +1,11 @@ package PiTube::Controller::Nginx; -use feature 'signatures'; -no warnings qw{ experimental::signatures }; - use Mojo::Base 'Mojolicious::Controller'; use Mojo::Pg::PubSub; +use feature 'signatures'; +no warnings qw{ experimental::signatures }; + use constant HLS => qr/hls\/([a-z0-9\-]+)(_\w+)?(\/\w+)?\.(m3u8|ts)$/i; sub callback_rtmp($c) { diff --git a/lib/PiTube/Controller/Websockets.pm b/lib/PiTube/Controller/Websockets.pm index 5e24010d11a2cbcc2cd666a1cf972a7a43bf1c9b..702ed8594ed0a4dc96f1b060ba0a134f17074d0a 100644 --- a/lib/PiTube/Controller/Websockets.pm +++ b/lib/PiTube/Controller/Websockets.pm @@ -1,11 +1,11 @@ package PiTube::Controller::Websockets; -use feature 'signatures'; -no warnings qw{ experimental::signatures }; - use Mojo::Base 'Mojolicious::Controller'; use Mojo::Pg::PubSub; +use feature 'signatures'; +no warnings qw{ experimental::signatures }; + use constant SOCKET_INACTIVITY_TIMEOUT => 300; sub main {