From: Marius Gavrilescu Date: Wed, 25 Feb 2015 20:28:54 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=f2ea44d7760ab1a725cac836fff9e7cd5c893700;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: app.psgi --- f2ea44d7760ab1a725cac836fff9e7cd5c893700 diff --cc app.psgi index 42be500,c61b8bb..ab5ca00 --- a/app.psgi +++ b/app.psgi @@@ -12,8 -12,22 +12,22 @@@ 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"'; - use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' static.mindcoding.ro www.google-analytics.com; style-src 'self' static.mindcoding.ro; img-src 'self' static.mindcoding.ro www.google-analytics.com; connect-src 'self',; + + sub CONTENT_SECURITY_POLICY () { + my $csp = <connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');