diff --git a/Dockerfile b/Dockerfile index 4cc0a633e7b7957e2640cbb7ff382b342ad18762..5af10bb637e8225e14f53a523fb5ea3e2d0a0dd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN apt-get update && apt-get install -y \ libmodule-build-perl \ libnet-oauth2-perl \ libnet-ssleay-perl \ + libredis-perl \ libyaml-dev RUN cpanm \ @@ -38,5 +39,5 @@ RUN npm update && npm install && npm run build && rm -rf mode_modules USER nobody EXPOSE 3000 -CMD hypnotoad -f /opt/PiTube/script/pitube -#CMD /opt/PiTube/script/pitube daemon +#CMD hypnotoad -f /opt/PiTube/script/pitube +CMD /opt/PiTube/script/pitube daemon diff --git a/lib/PiTube.pm b/lib/PiTube.pm index 863972edf962739b4ecab1377a41bf6f90d0129f..112392da36d4d7001d04aa7bd9d691b42fc3c204 100644 --- a/lib/PiTube.pm +++ b/lib/PiTube.pm @@ -2,9 +2,10 @@ package PiTube; use Mojo::Base 'Mojolicious'; use Mojo::Pg; -use Net::OAuth2::Profile::WebServer; use Mojolicious::Plugin::Authentication; use Mojolicious::Plugin::Authorization; +use Net::OAuth2::Profile::WebServer; +use Redis; use PiTube::Schema; sub startup { @@ -22,6 +23,10 @@ sub startup { $self->plugin('PiTube::Helpers::OAuth2'); + # Pripojeni na redis + my $redis = Redis->new( %{ $cfg->{redis} } ); + $self->helper( redis => sub { return $redis; } ); + # migrace schematu my $pg = Mojo::Pg->new ->dsn($cfg->{database}{dsn}) @@ -85,7 +90,7 @@ sub startup { # $r->put('/streams/:id')->over( is => 'administrator' )->to('Stream#update'); # $r->delete('/streams/:id')->over( is => 'administrator' )->to('Stream#delete'); - $r->websocket('/ws/streams')->to('Stream#ws'); + $r->websocket('/ws')->to('Websockets#main'); $r->get('/oauth2')->to('OAuth2#callback'); $r->get('/logout')->to('OAuth2#do_logout');