X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=blobdiff_plain;f=apache-conf.conf;h=f8d0a60dbc0b89c61b56931b80d01004aee13419;hb=662008b9ac4dff24044f7e406e1c79217d67367b;hp=998b486101ca843f23abb74ad246618d7c5f3242;hpb=4c37bdde40b1abcc5b93337f39b2935e3de700be;p=ndwebbie.git
diff --git a/apache-conf.conf b/apache-conf.conf
index 998b486..f8d0a60 100644
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -12,250 +12,115 @@
# 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.
-#
-#
-# 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
-#
-
-
-#
-# 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.
-#
ServerName nd.ruin.nu
-
- RewriteEngine On
- RewriteCond %{HTTPS} !=on
- RewriteRule ^/(.*) https://%{SERVER_NAME}:1337%{REQUEST_URI} [R]
-
-
-
- ServerName nd.ruin.nu
+ ServerAlias ndtest.ruin.nu
ErrorLog /var/log/apache2/ndawn_error_log
#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\""
-
-
-
- SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
+ 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"
- #
- # 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
+ 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/ndwebpub.fcgi -socket /tmp/ndweb.socket
+ Alias / /tmp/ndwebpub.fcgi/
- #
- # This should be changed to whatever you set DocumentRoot to.
- #
-
-
- #
- # 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
-
+ Allow from all
+
- AuthName "NewDawn authentication"
- AuthType basic
-
- PerlAuthenHandler NDWeb::AuthHandler
-
- Order Deny,Allow
- Require valid-user
-
+ DeflateFilterNote ratio
+
+ 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
+
+Listen 1337
- # Disallow browsing of Subversion working copy administrative dirs.
-
- Order allow,deny
- Deny from all
-
-
- Order allow,deny
- Deny from all
-
+
+ ServerName nd.ruin.nu
- PerlSwitches -T -I/var/www/ndawn/
- PerlRequire /var/www/ndawn/startup.pl
-
- SetHandler perl-script
- PerlResponseHandler ND
-
+ SSLEngine on
+ SSLCertificateFile /etc/apache2/ssl/nd.crt
+ SSLCertificateKeyFile /etc/apache2/ssl/nd.key
-
- SetHandler perl-script
- PerlResponseHandler Apache2::Status
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1
- Allow from 193.11.248.227
-
+ RewriteEngine On
+ RewriteRule ^/(.*) https://%{SERVER_NAME}%{REQUEST_URI} [R]
-
-
- # this must match a Processor
- ServerEnvironment apache apache
-
- # these are optional - defaults to the values specified in httpd.conf
- MinSpareProcessors 4
- MaxProcessors 20
-
-Listen 1337
+NameVirtualHost *:443
-
+
ServerName nd.ruin.nu
+ ServerAlias ndtest.ruin.nu
ErrorLog /var/log/apache2/ndawn_error_log
#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\""
+ 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"
-
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
+ SSLCertificateFile /etc/apache2/ssl/server.crt
+ SSLCertificateKeyFile /etc/apache2/ssl/server.key
+
BrowserMatch ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
downgrade-1.0 force-response-1.0
- #
- # 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
+ 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
- #
- # This should be changed to whatever you set DocumentRoot to.
- #
-
+ FastCgiExternalServer /tmp/ndweb.fcgi -socket /tmp/ndweb.socket
+ Alias / /tmp/ndweb.fcgi/
- #
- # 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
-
-
- AuthName "NewDawn authentication"
- AuthType basic
-
- PerlAuthenHandler NDWeb::AuthHandler
-
- Order Deny,Allow
- Require valid-user
-
+ Allow from all
-
- # Disallow browsing of Subversion working copy administrative dirs.
-
- Order allow,deny
- Deny from all
-
-
- Order allow,deny
- Deny from all
-
-
- PerlSwitches -T -I/var/www/ndawn/
- PerlRequire /var/www/ndawn/startup.pl
-
- SetHandler perl-script
- PerlResponseHandler ND
-
-
-
- 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
+
+ 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
-
-
-
- # this must match a Processor
- ServerEnvironment apache apache
-
- # these are optional - defaults to the values specified in httpd.conf
- MinSpareProcessors 4
- MaxProcessors 20
-