Merge branch 'master' into newmc

Conflicts:
	app.psgi
	log.conf

diff --combined app.psgi
index eee1ad7b69211a6afa50e1d444c6a6c1ded1957f,1181e13d4bf718702fc5b6e31758058e29ddc613..b5fd756387632198ebf89e3cae6e8bacd0aada7f
--- 1/app.psgi
--- 2/app.psgi
+++ b/app.psgi
@@@ -9,7 -9,6 +9,6 @@@ 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;
@@@ -17,10 -16,10 +16,10 @@@ default-src 'none
  connect-src 'self'
  form-action 'self'
  frame-ancestors 'none'
 -img-src 'self'
 +img-src 'self' https://static.mindcoding.ro
  referrer origin-when-cross-origin
 -script-src 'self'
 -style-src 'self'
 +script-src https://static.mindcoding.ro/static/js.js
 +style-src https://static.mindcoding.ro/static/css/
  CSP
        chomp $csp;
        $csp =~ s/\n/; /gr;
@@@ -44,7 -43,7 +43,7 @@@ sub add_headers 
                my $resp = $app->($_[0]);
                my $hdrs = Plack::Util::headers($resp->[1]);
                $hdrs->set('Content-Security-Policy', CONTENT_SECURITY_POLICY);
 -              $hdrs->set('Link', '</static/cyborg.css>; rel=stylesheet') if $hdrs->get('Content-Type') =~ m,^text/html,;
 +              $hdrs->set('Link', '<https://static.mindcoding.ro/static/slate.css>; rel=stylesheet') if $hdrs->get('Content-Type') =~ m,^text/html,;
                $hdrs->set('Cache-Control', 'public, max-age=604800') if $_[0]->{PATH_INFO} =~ qr,^/static/,;
                $resp->[1] = $hdrs->headers;
                $resp;
@@@ -52,12 -51,10 +51,10 @@@
  }
  
  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/,;

diff --combined log.conf
index a0f2bdab500841236d09de84174d51898b901345,1f3132357ac49ca7b591e2ecf6c11c5ad667f270..dbde8c99849fd272e94c9eb7ee599934edcd195f
--- 1/log.conf
--- 2/log.conf
+++ b/log.conf
@@@ -1,11 -1,5 +1,5 @@@
 -log4perl.category. = TRACE,
 +log4perl.category. = TRACE, stderr
- log4perl.category.access = INFO, accesslog
  
  log4perl.appender.stderr                          = Log::Log4perl::Appender::Screen
  log4perl.appender.stderr.layout                   = Log::Log4perl::Layout::PatternLayout
  log4perl.appender.stderr.layout.ConversionPattern = [%d] [%F{1}:%M{1}:%L] [%p] %m%n
- 
- log4perl.appender.accesslog                          = Log::Log4perl::Appender::File
- log4perl.appender.accesslog.filename                 = /var/log/accesslog
- log4perl.appender.accesslog.layout                   = Log::Log4perl::Layout::PatternLayout
- log4perl.appender.accesslog.layout.ConversionPattern = %m%n