diff --git a/VERSION b/VERSION index 005119baaa0653ca59d923010341d8341daa8c43..437459cd94c9fa59d82c61c0bc8aa36e293b735e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.1 +2.5.0 diff --git a/lib/PZ.pm b/lib/PZ.pm index 3fa671a53c8777a41cda279d55884a19d50742ee..e972d368eeb841913d007d5a03a8177223155db1 100644 --- a/lib/PZ.pm +++ b/lib/PZ.pm @@ -5,8 +5,12 @@ use Mojo::Pg; use Mojo::Redis; use Mojolicious::Plugin::Authentication; use Net::OAuth2::Profile::WebServer; +use File::Find; +use Path::Tiny qw( path ); use PZ::Schema; +use constant SECRETS => '/run/secrets'; + sub startup { my $self = shift; @@ -14,6 +18,9 @@ sub startup { my $cfg = $self->plugin('Config'); $self->helper( cfg => sub { return $cfg; } ); + # konfigurace z docker secrets (maji prednost!) + find(sub { $cfg->{$_} = path(SECRETS . "/$_")->slurp_utf8 }, SECRETS); + # Podpis pro cookies $self->secrets($cfg->{session}{secrets});