]> ruin.nu Git - ndwebbie.git/blobdiff - apache-conf.conf
Only run password trigger when password is changed
[ndwebbie.git] / apache-conf.conf
index ba4d9275fca771dc65e3ee08506edd662609e06a..f8d0a60dbc0b89c61b56931b80d01004aee13419 100644 (file)
 # You may use the command line option '-S' to verify your virtual host
 # configuration.
 
-#
-# Use name-based virtual hosting.
-#
-#NameVirtualHost guranga.org:80
 
-#
-# VirtualHost example:
-# Almost any Apache directive may go into a VirtualHost container.
-# The first VirtualHost section is used for requests without a known
-# server name.
-#
-#<VirtualHost *:80>
-#    ServerAdmin webmaster@dummy-host.example.com
-#    DocumentRoot /www/docs/dummy-host.example.com
-#    ServerName dummy-host.example.com
-#    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
-#    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
-#</VirtualHost>
+<VirtualHost *:80>
+       ServerName nd.ruin.nu
+       ServerAlias ndtest.ruin.nu
+
+       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\" PUB"
+       </IfModule>
 
+       Alias /static /var/www/ndawn/root/static
+       Alias /robots.txt /var/www/ndawn/root/robots.txt
+       Alias /favicon.ico /var/www/ndawn/root/static/favicon.ico
 
-#
-# The First Virtual Host is also your DEFAULT Virtual Host.
-# This means any requests that do not match any other vhosts will 
-# goto this virtual host.
-#
+       FastCgiExternalServer /tmp/ndwebpub.fcgi -socket /tmp/ndweb.socket
+       Alias / /tmp/ndwebpub.fcgi/
 
-<VirtualHost *:80>
+       <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
+
+<VirtualHost *:1337>
        ServerName nd.ruin.nu
-       ServerAlias webbie.ndawn.com
+
+       SSLEngine on
+       SSLCertificateFile /etc/apache2/ssl/nd.crt
+       SSLCertificateKeyFile /etc/apache2/ssl/nd.key
 
        RewriteEngine On
-        RewriteCond %{HTTPS} !=on
        RewriteRule ^/(.*) https://%{SERVER_NAME}%{REQUEST_URI} [R]
+
 </VirtualHost>
 
-<VirtualHost *:443>
+NameVirtualHost *:443
 
+<VirtualHost *:443>
        ServerName nd.ruin.nu
-       ServerAlias webbie.ndawn.com
+       ServerAlias ndtest.ruin.nu
 
-       ErrorLog logs/ndawn_error_log
+       ErrorLog /var/log/apache2/ndawn_error_log
        <IfModule mod_log_config.c>
                #TransferLog logs/ndawn_access_log
-               CustomLog logs/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\""
+               CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\" SSL"
        </IfModule>
 
-       <IfModule mod_setenvif.c>
-               SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown \
-               downgrade-1.0 force-response-1.0
-       </IfModule>
-    #
-    # DocumentRoot: The directory out of which you will serve your
-    # documents. By default, all requests are taken from this directory, but
-    # symbolic links and aliases may be used to point to other locations.
-    #
-    DocumentRoot "/var/www/ndawn/htdocs"
-
-    #
-    # This should be changed to whatever you set DocumentRoot to.
-    #
-    <Directory "/var/www/ndawn/htdocs">
-
-        #
-        # Possible values for the Options directive are "None", "All",
-        # or any combination of:
-        #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-        #
-        # Note that "MultiViews" must be named *explicitly* --- "Options All"
-        # doesn't give it to you.
-        #
-        # The Options directive is both complicated and important.  Please see
-        # http://httpd.apache.org/docs-2.0/mod/core.html#options
-        # for more information.
-        #
-        Options Indexes FollowSymLinks
-
-        #
-        # AllowOverride controls what directives may be placed in .htaccess files.
-        # It can be "All", "None", or any combination of the keywords:
-        #   Options FileInfo AuthConfig Limit
-        #
-        AllowOverride None
-    </Directory>
-       <Location />
+       SSLEngine on
+       SSLCertificateFile /etc/apache2/ssl/server.crt
+       SSLCertificateKeyFile /etc/apache2/ssl/server.key
 
-       AuthName "NewDawn authentication"
-       AuthType basic
 
-       PerlAuthenHandler ND::Web::AuthHandler
-
-       Order Deny,Allow
-       Require valid-user
+       <IfModule setenvif_module>
+               BrowserMatch ".*MSIE.*" \
+                       nokeepalive ssl-unclean-shutdown \
+                       downgrade-1.0 force-response-1.0
+       </IfModule>
 
-       </Location>
+       Alias /static /var/www/ndawn/root/static
+       Alias /robots.txt /var/www/ndawn/root/robots.txt
+       Alias /favicon.ico /var/www/ndawn/root/static/favicon.ico
 
+       FastCgiExternalServer /tmp/ndweb.fcgi -socket /tmp/ndweb.socket
+       Alias / /tmp/ndweb.fcgi/
 
-    # Disallow browsing of Subversion working copy administrative dirs.  
-    <locationmatch "/.svn/>  
-       Order allow,deny  
-       Deny from all  
-    </locationmatch> 
-    <Location .*/\.svn/.*>
-       Order allow,deny  
-       Deny from all  
-    </Location>
-
-       PerlSwitches -T -I/var/www/ndawn/code/
-       PerlRequire /var/www/ndawn/code/startup.pl
-       <Location ~ "^/((\w+\.(pl|php|pm))|[^.]*)$">
-               SetHandler perl-script
-               PerlResponseHandler ND
+       <Location />
+               Allow from all
        </Location>
 
-       <Location /perl-status>
-               SetHandler perl-script
-               PerlResponseHandler Apache2::Status
-               Order deny,allow
-               Deny from all
-               Allow from 127.0.0.1
-               Allow from 193.11.248.227
+       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"
+               Header append Cache-Control "public"
+
+               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>
-
-       
-    <IfModule peruser.c>
-        # this must match a Processor
-        ServerEnvironment apache apache
-        
-        # these are optional - defaults to the values specified in httpd.conf
-        MinSpareProcessors 4
-        MaxProcessors 20
-    </IfModule>
 </VirtualHost>
-