X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=inline;f=apache-conf.conf;h=998b486101ca843f23abb74ad246618d7c5f3242;hb=fe92f95649f91029d18ec050252382332fe0fb96;hp=3406de13e4fad1a1ba9cec0fa06b625727dea8bc;hpb=b0f108eb4600f42fe3391acbe86381ce0c2d4681;p=ndwebbie.git
diff --git a/apache-conf.conf b/apache-conf.conf
index 3406de1..998b486 100644
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -40,22 +40,19 @@
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]
-
ServerName nd.ruin.nu
- ServerAlias webbie.ndawn.com
- ErrorLog logs/ndawn_error_log
+ ErrorLog /var/log/apache2/ndawn_error_log
#TransferLog logs/ndawn_access_log
- CustomLog logs/ndawn_access_log "%h %l %u %t \"%r\" %>s %b \"%{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\""
@@ -69,6 +66,12 @@
#
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.
#
@@ -95,38 +98,129 @@
#
AllowOverride None
-
+
AuthName "NewDawn authentication"
AuthType basic
- Auth_PG_host localhost
- Auth_PG_user ndawn
- Auth_PG_pwd Ni7ueYae
- Auth_PG_database ndawn
- Auth_PG_hash_type MD5
+ PerlAuthenHandler NDWeb::AuthHandler
+
+ Order Deny,Allow
+ Require valid-user
+
+
+
+
+ # 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
+
+
+
+
+ # 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
+
+
+ ServerName nd.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\""
+
+
- Auth_PG_pwd_table users
- Auth_PG_uid_field username
- Auth_PG_pwd_field password
+ 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
- Auth_PG_grp_table usersingroup
- Auth_PG_grp_group_field groupname
- Auth_PG_grp_user_field username
+
+ 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"
- #Auth_PG_log_table access_log
- #Auth_PG_log_uname_field login
- #Auth_PG_log_date_field date
- #Auth_PG_log_uri_field request
- #Auth_PG_log_addrs_field ip_address
+ 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.
+ #
+
#
- # Controls who can get stuff from this server.
+ # Possible values for the Options directive are "None", "All",
+ # or any combination of:
+ # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
#
- Order Deny,Allow
+ # 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
-
+
# Disallow browsing of Subversion working copy administrative dirs.
@@ -139,9 +233,9 @@
Deny from all
- PerlSwitches -T -I/var/www/ndawn/code/
- PerlRequire /var/www/ndawn/code/startup.pl
-
+ PerlSwitches -T -I/var/www/ndawn/
+ PerlRequire /var/www/ndawn/startup.pl
+
SetHandler perl-script
PerlResponseHandler ND
@@ -165,4 +259,3 @@
MaxProcessors 20
-