X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=20c8cb56f57a73f3c17f44ce03535e6aff9267bb;hb=refs%2Fheads%2Fnewmc-nodbic;hp=7bc7437ea97aea04b0c4d2826aedbf1db1eb745f;hpb=b8caa1675f0dc5c501fccb3716395709032519fb;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index 7bc7437..20c8cb5 100644
--- a/app.psgi
+++ b/app.psgi
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 use v5.14;
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+use warnings;
 
 use Gruntmaster::Data;
 use Plack::App::Gruntmaster;
@@ -8,33 +8,26 @@ use Plack::Builder;
 use Plack::Util;
 use Log::Log4perl;
 
-use constant AUTH_TIMEOUT => 5 * 60;
-use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
-
 sub CONTENT_SECURITY_POLICY () {
 	my $csp = <<CSP;
 default-src 'none'
 connect-src 'self'
 form-action 'self'
 frame-ancestors 'none'
-img-src 'self' https://static.mindcoding.ro www.google-analytics.com
+img-src 'self' https://static.mindcoding.ro
 referrer origin-when-cross-origin
-script-src https://static.mindcoding.ro/static/js.js https://www.google-analytics.com/analytics.js
-style-src https://static.mindcoding.ro/static/css/
+script-src 'self'
+style-src 'self'
 CSP
 	chomp $csp;
 	$csp =~ s/\n/; /gr;
 }
 
-my $db;
-
 sub add_database {
 	my $app = $_[0];
 	sub {
-		my ($env) = @_;
-		$db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
-		$env->{'gruntmaster.dbic'} = $db;
-		$app->($env)
+		dbinit $ENV{GRUNTMASTER_DSN} // 'dbi:Pg:' unless db;
+		$app->(@_)
 	}
 }
 
@@ -51,12 +44,10 @@ sub add_headers {
 }
 
 Log::Log4perl->init_once('log.conf');
-my $access_logger = Log::Log4perl->get_logger('access');
 $ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
 
 builder {
 	enable_if { $_[0]->{PATH_INFO} eq '/ok' } sub { sub{ [200, [], []] }};
-	enable 'AccessLog', format => ACCESSLOG_FORMAT, logger => sub { $access_logger->info(@_) };
 	enable 'ContentLength';
 	enable \&add_headers;
 	enable 'Static', path => qr,^/static/,;