From e09395b7d31acabf035cb34cb692ca205eaf4fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Mon, 25 Oct 2021 19:25:30 +0200
Subject: [PATCH] Bugfix
---
.gitlab-ci.yml | 2 +-
lib/PiTube/Controller/Nginx.pm | 6 +++---
lib/PiTube/Controller/Websockets.pm | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a1b091..64d9db0 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 fe24a15..5cc008c 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 5e24010..702ed85 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 {
--
GitLab