135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into og-sshcollector-core

Browse Source
This commit is contained in:
Oliver Gorwits
2019-03-12 13:18:13 +00:00
parent ed675b249c b9218d91c8
commit d826e8c224
5 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/App/Netdisco/Web.pm
View File

@@ -66,9 +66,13 @@ if (setting('template_paths') and ref [] eq ref setting('template_paths')) {
# load cookie key from database
setting('session_cookie_key' => undef);
my $sessions = schema('netdisco')->resultset('Session');
my $skey = $sessions->find({id => 'dancer_session_cookie_key'});
setting('session_cookie_key' => $skey->get_column('a_session')) if $skey;
setting('session_cookie_key' => 'this_is_for_testing_only')
if $ENV{HARNESS_ACTIVE};
eval {
my $sessions = schema('netdisco')->resultset('Session');
my $skey = $sessions->find({id => 'dancer_session_cookie_key'});
setting('session_cookie_key' => $skey->get_column('a_session')) if $skey;
};
Dancer::Session::Cookie::init(session);
# workaround for https://github.com/PerlDancer/Dancer/issues/935

3
lib/App/Netdisco/Worker/Plugin/DumpConfig.pm
View File

@@ -11,7 +11,8 @@ register_worker({ phase => 'main' }, sub {
my $extra = $job->extra;
my $config = config();
p ($extra ? $config->{$extra} : $config);
my $dump = ($extra ? $config->{$extra} : $config);
p $dump;
return Status->done('Dumped config');
});