From b16abeb1c6ad05ed081a3eba4fbd3f07e4b79c9c Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Sun, 20 Jul 2008 14:26:13 +0200 Subject: [PATCH] Converted the apache config, including switch to mod_fastcgi --- apache-conf.conf | 246 +++++++--------------------------------------- htdocs/.gitignore | 1 - startup.pl | 63 ------------ 3 files changed, 35 insertions(+), 275 deletions(-) delete mode 100644 htdocs/.gitignore delete mode 100644 startup.pl diff --git a/apache-conf.conf b/apache-conf.conf index 998b486..a58d0a7 100644 --- a/apache-conf.conf +++ b/apache-conf.conf @@ -12,145 +12,33 @@ # 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 - - 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 - - # - # 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 - + RewriteRule ^/(.*) https://%{SERVER_NAME}%{REQUEST_URI} [R] - # - # 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 - - - - AuthName "NewDawn authentication" - AuthType basic - - PerlAuthenHandler NDWeb::AuthHandler - - Order Deny,Allow - Require valid-user - - + +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 ErrorLog /var/log/apache2/ndawn_error_log @@ -159,103 +47,39 @@ Listen 1337 CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\"" - - 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 - 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 /favicon.ico /var/www/ndawn/root/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" + + 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 - diff --git a/htdocs/.gitignore b/htdocs/.gitignore deleted file mode 100644 index a4d9b91..0000000 --- a/htdocs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -favicon.ico diff --git a/startup.pl b/startup.pl deleted file mode 100644 index 45fa8e6..0000000 --- a/startup.pl +++ /dev/null @@ -1,63 +0,0 @@ -use lib qw(/var/www/ndawn/); - - -use CGI qw/:standard/; -use HTML::Template; -use Tie::File; -use POSIX; - -use Apache::DBI(); -DBI->install_driver("Pg"); -use DBI; -use DBD::Pg qw(:pg_types); - -use GD::Graph::lines; - -use BBCode::Parser; - -use Mail::Sendmail; - -use ND; -use ND::DB; -use ND::Include; -use NDWeb::AuthHandler; -use NDWeb::Include; -use NDWeb::Forum; -use NDWeb::Graph; - -use NDWeb::Page; -use NDWeb::Image; -use NDWeb::XMLPage; - -use NDWeb::Pages::Main; -use NDWeb::Pages::AddIntel; -use NDWeb::Pages::Points; -use NDWeb::Pages::LaunchConfirmation; -use NDWeb::Pages::CovOp; -use NDWeb::Pages::PlanetRankings; -use NDWeb::Pages::DefRequest; -use NDWeb::Pages::Check; -use NDWeb::Pages::Raids; -use NDWeb::Pages::EditRaid; -use NDWeb::Pages::Calls; -use NDWeb::Pages::Users; -use NDWeb::Pages::Intel; -use NDWeb::Pages::Alliances; -use NDWeb::Pages::MemberIntel; -use NDWeb::Pages::Resources; -use NDWeb::Pages::PlanetNaps; -use NDWeb::Pages::Motd; -use NDWeb::Pages::Forum; -use NDWeb::Pages::Forum::Search; -use NDWeb::Pages::Settings; -use NDWeb::Pages::Graph; -use NDWeb::Pages::Mail; -use NDWeb::Pages::HostileAlliances; -use NDWeb::Pages::AllianceRankings; -use NDWeb::Pages::GalaxyRankings; -use NDWeb::Pages::TargetList; -use NDWeb::Pages::DefLeeches; - - - -1; -- 2.39.2