Allow non-ssl for anonymous browsing

diff --git a/apache-conf.conf b/apache-conf.conf
index d28cbcac730b15003b81cf42ca16fa4f0620423c..521331101c7abb25ef509b531fc5fc1c85173bba 100644 (file)
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -15,11 +15,44 @@
 
 <VirtualHost *:80>
        ServerName nd.ruin.nu
+       ServerName ndtest.ruin.nu
 
-       RewriteEngine On
-        RewriteCond %{HTTPS} !=on
-       RewriteRule ^/(.*) https://%{SERVER_NAME}%{REQUEST_URI} [R]
+       ErrorLog /var/log/apache2/ndawn_error_log
+       <IfModule mod_log_config.c>
+               #TransferLog logs/ndawn_access_log
+               CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\""
+       </IfModule>
+
+       Alias /static /var/www/ndawn/root/static
+       Alias /favicon.ico /var/www/ndawn/root/favicon.ico
+       Alias /robots.txt /var/www/ndawn/root/robots.txt
+
+       FastCgiExternalServer /tmp/ndwebpub.fcgi -socket /tmp/ndweb.socket
+       Alias / /tmp/ndwebpub.fcgi/
 
+       <Location />
+               Allow from all
+       </Location>
+
+       DeflateFilterNote ratio
+       <Location /static>
+               SetHandler default-handler
+
+               ExpiresActive On
+               ExpiresDefault "access plus 1 week"
+               #ExpiresByType text/css "access plus 1 week"
+               #ExpiresByType application/javascript "access plus 1 week"
+               #ExpiresByType image/png "access plus 1 week"
+
+               AddOutputFilterByType DEFLATE text/html
+               AddOutputFilterByType DEFLATE text/xml
+               AddOutputFilterByType DEFLATE text/css
+               AddOutputFilterByType DEFLATE application/javascript
+               AddOutputFilterByType DEFLATE application/x-javascript
+               AddOutputFilterByType DEFLATE application/xhtml+xml
+               AddOutputFilterByType DEFLATE application/xml
+               AddOutputFilterByType DEFLATE application/ms* application/vnd* application/postscript
+       </Location>
 </VirtualHost>
 
 Listen 1337
@@ -40,6 +73,7 @@ NameVirtualHost *:443
 
 <VirtualHost *:443>
        ServerName nd.ruin.nu
+       ServerName ndtest.ruin.nu
 
        ErrorLog /var/log/apache2/ndawn_error_log
        <IfModule mod_log_config.c>

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 3eaaf0d009b254d61892ddc9c8b84eb7de0839d5..a7a59de1bc07e08e6f107a9f6df78081f6493fd1 100644 (file)
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -123,6 +123,11 @@ sub auto : Private {
 
        $c->stash(dbh => $dbh);
 
+       $c->stash(sslurl => sub {
+                       $_[0]->scheme('https') unless $c->debug;
+                       return $_[0];
+               });
+
        $dbh->do(q{SET timezone = 'GMT'});
 
        $c->stash(TICK =>$dbh->selectrow_array('SELECT tick()',undef));

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index 96d7cbc5c5e7785282546b73fb18fbc14dc39142..940921c0894efce91a6554fa99e8c4092370791d 100644 (file)
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -19,7 +19,7 @@
        <li><a href="/logout">Log out ([% c.user.username %])</a></li>
 [% ELSE %]
        <li>
-       <form action="/login" method="post">
+       <form action="[% sslurl(c.uri_for('/login')) %]" method="post">
                <p>
                Username: <input type="text" name="user" value="">
                Password: <input type="password" name="password" value="">