New apache conf

diff --git a/apache-conf.conf b/apache-conf.conf
index 167819fcaf538059ac1c288e932797f6a544e8ae..998b486101ca843f23abb74ad246618d7c5f3242 100644 (file)
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -40,17 +40,14 @@
 
 <VirtualHost *:80>
        ServerName nd.ruin.nu
-       ServerAlias webbie.ndawn.com
 
        RewriteEngine On
         RewriteCond %{HTTPS} !=on
-       RewriteRule ^/(.*) https://%{SERVER_NAME}%{REQUEST_URI} [R]
+       RewriteRule ^/(.*) https://%{SERVER_NAME}:1337%{REQUEST_URI} [R]
 </VirtualHost>
 
 <VirtualHost *:443>
-
        ServerName nd.ruin.nu
-       ServerAlias webbie.ndawn.com
 
        ErrorLog /var/log/apache2/ndawn_error_log
        <IfModule mod_log_config.c>
@@ -151,3 +148,114 @@
     </IfModule>
 </VirtualHost>
 
+Listen 1337
+
+<VirtualHost *:1337>
+       ServerName nd.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\""
+       </IfModule>
+
+
+       SSLEngine on
+       SSLCertificateFile /etc/apache2/ssl/nd.crt
+       SSLCertificateKeyFile /etc/apache2/ssl/nd.key
+       #SSLCertificateChainFile /etc/apache2/ssl/ca-bundle.crt
+       #SSLCACertificateFile /etc/apache2/ssl/ca-bundle.crt
+
+       <IfModule setenvif_module>
+               BrowserMatch ".*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"
+
+       DeflateFilterNote ratio
+       AddOutputFilterByType DEFLATE text/*
+       AddOutputFilterByType DEFLATE application/xhtml+xml
+       AddOutputFilterByType DEFLATE application/ms* application/vnd* application/postscript
+
+
+    #
+    # 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 />
+
+       AuthName "NewDawn authentication"
+       AuthType basic
+
+       PerlAuthenHandler NDWeb::AuthHandler
+
+       Order Deny,Allow
+       Require valid-user
+
+       </Location>
+
+
+    # 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/
+       PerlRequire /var/www/ndawn/startup.pl
+       <Location ~ "^/((\w+\.(pl|php|pm))|[^.]*)$">
+               SetHandler perl-script
+               PerlResponseHandler ND
+       </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
+       </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>