From: Marius Gavrilescu Date: Mon, 2 Mar 2015 15:08:18 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=d2a977e374a40ff05a877e183f2d015ae0f1b877;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: js/90-themes.js tmpl/skel.en --- d2a977e374a40ff05a877e183f2d015ae0f1b877 diff --cc app.psgi index 728e144,5372109..be72e9b --- a/app.psgi +++ b/app.psgi @@@ -5,14 -5,11 +5,11 @@@ no if $] >= 5.017011, warnings => 'expe use Gruntmaster::Data; use Plack::App::Gruntmaster; use Plack::Builder; - use Plack::Request; use Plack::Util; - use Digest::SHA qw/sha256/; use Log::Log4perl; - use Tie::Hash::Expire; use constant AUTH_TIMEOUT => 5 * 60; -use constant ACCESSLOG_FORMAT => 'combined'; +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 = < - - - - ++ ++