From 5d194c948d57f1a6f0ff48b39117aa6070a65bf3 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Fri, 9 May 2008 00:06:13 -0400 Subject: [PATCH] check in (part of?) the Apache config svn path=/trunk/packages/sipb-xen-www/; revision=509 --- debian/changelog | 6 ++ files/etc/apache2/conf.d/sipb-xen-repository | 17 +++++ files/etc/apache2/sites-available/default | 54 ++++++++++++++++ files/etc/apache2/sites-available/ssl | 88 ++++++++++++++++++++++++++ files/etc/apache2/sites-available/svn | 35 ++++++++++ files/etc/apache2/sites-enabled/000-default | 1 + files/etc/apache2/sites-enabled/ssl | 1 + files/etc/apache2/sites-enabled/svn | 1 + 8 files changed, 203 insertions(+) create mode 100644 files/etc/apache2/conf.d/sipb-xen-repository create mode 100644 files/etc/apache2/sites-available/default create mode 100644 files/etc/apache2/sites-available/ssl create mode 100644 files/etc/apache2/sites-available/svn create mode 120000 files/etc/apache2/sites-enabled/000-default create mode 120000 files/etc/apache2/sites-enabled/ssl create mode 120000 files/etc/apache2/sites-enabled/svn diff --git a/debian/changelog b/debian/changelog index aaf5846..14b7db9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sipb-xen-www (3.2) unstable; urgency=low + + * Check in (part of?) the Apache config. + + -- Greg Price Fri, 9 May 2008 00:03:08 -0400 + sipb-xen-www (3.1) unstable; urgency=low * Fixed the crontab definition diff --git a/files/etc/apache2/conf.d/sipb-xen-repository b/files/etc/apache2/conf.d/sipb-xen-repository new file mode 100644 index 0000000..73c6229 --- /dev/null +++ b/files/etc/apache2/conf.d/sipb-xen-repository @@ -0,0 +1,17 @@ +Alias /sipb-xen /srv/repository + +Alias /debian/ /debian/ + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Order allow,deny + allow from all + + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Order allow,deny + allow from all + diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default new file mode 100644 index 0000000..dc99744 --- /dev/null +++ b/files/etc/apache2/sites-available/default @@ -0,0 +1,54 @@ +NameVirtualHost *:80 + + ServerAdmin webmaster@localhost + + DocumentRoot /var/www/ + + Options Indexes FollowSymLinks MultiViews ExecCGI + AllowOverride None + Order allow,deny + allow from all + # This directive allows us to have apache2's default start page + # in /apache2-default/, but still have / go to the right place + #RedirectMatch ^/$ /apache2-default/ + #Redirect / https://sipb-xen-dev.mit.edu/ + #RedirectMatch ^/(!?trac) https://sipb-xen-dev.mit.edu/ + + + RewriteEngine On + #RewriteRule ^/trac - [L] + RewriteRule ^/trac.fcgi(.*) - [L] + RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L] + RewriteRule ^/trac/login(.*) https://sipb-xen-dev.mit.edu/trac/login$1 [L] + RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L] + RewriteRule ^/sipb-xen - [L] + RewriteRule ^(.*) https://sipb-xen-dev.mit.edu$1 + + ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ + + AllowOverride None + Options ExecCGI -MultiViews +SymLinksIfOwnerMatch + Order allow,deny + Allow from all + #Redirect / https://sipb-xen-dev.mit.edu/ + + + ErrorLog /var/log/apache2/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel notice + + CustomLog /var/log/apache2/access.log combined + ServerSignature On + + Alias /doc/ "/usr/share/doc/" + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order deny,allow + Deny from all + Allow from 127.0.0.0/255.0.0.0 ::1/128 + + + diff --git a/files/etc/apache2/sites-available/ssl b/files/etc/apache2/sites-available/ssl new file mode 100644 index 0000000..da1f9bc --- /dev/null +++ b/files/etc/apache2/sites-available/ssl @@ -0,0 +1,88 @@ + + ServerAdmin sipb-xen@mit.edu + ServerName sipb-xen-dev.mit.edu:443 + + DocumentRoot /var/www/sipb-xen-www + + Options Indexes FollowSymLinks MultiViews ExecCGI + AllowOverride None + Order allow,deny + allow from all + + + Require valid-user + AuthType SSLCert + AuthSSLCertVar SSL_CLIENT_S_DN_Email + AuthSSLCertStripSuffix "@MIT.EDU" + + + RewriteEngine On + RewriteRule ^/static(.*) - [L] + RewriteRule ^/trac.fcgi(.*) - [L] + RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L] + RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L] + RewriteRule ^/var(.*) - [L] + RewriteRule ^/wiki(.*) - [L] + RewriteRule ^/(.*) /var/www/sipb-xen-www/main.py/$1 [L] + + RewriteLog /var/log/apache2/rewrite.log + RewriteLogLevel 0 + + ErrorLog /var/log/apache2/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ssl_access.log combined + ServerSignature On + + SSLEngine on + + SSLCertificateFile ssl/server.crt + SSLCertificateKeyFile ssl/server.key + + SSLCACertificateFile ssl/mitCAclient.pem + SSLVerifyClient optional + SSLVerifyDepth 10 + + SSLOptions +StdEnvVars + + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + + + Redirect /wiki https://sipb-xen-dev.mit.edu/trac/wiki + + + + ServerAdmin sipb-xen@mit.edu + ServerName sipb-xen-dev.mit.edu:446 + + DocumentRoot /var/www/sipb-xen-www + + Options Indexes FollowSymLinks MultiViews ExecCGI + AllowOverride None + Order allow,deny + allow from all + + + ErrorLog /var/log/apache2/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ssl_nocert_access.log combined + ServerSignature On + + SSLEngine on + + SSLCertificateFile ssl/server.crt + SSLCertificateKeyFile ssl/server.key + + SSLVerifyClient none + + SSLOptions +StdEnvVars + + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + diff --git a/files/etc/apache2/sites-available/svn b/files/etc/apache2/sites-available/svn new file mode 100644 index 0000000..7145f96 --- /dev/null +++ b/files/etc/apache2/sites-available/svn @@ -0,0 +1,35 @@ + + ServerAdmin sipb-xen@mit.edu + ServerName sipb-xen-dev.mit.edu:1111 + + + Options FollowSymLinks + AllowOverride None + + + DAV svn + SVNPath /afs/sipb.mit.edu/project/xen/svn + AuthType Basic + AuthName "sipb-xen.mit.edu subversion repository" + AuthUserFile /etc/apache2/dav_svn.passwd + + Require valid-user + + + + ErrorLog /var/log/apache2/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ssl_access.log combined + ServerSignature On + + SSLEngine on + + SSLCertificateFile ssl/server.crt + SSLCertificateKeyFile ssl/server.key + + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + \ No newline at end of file diff --git a/files/etc/apache2/sites-enabled/000-default b/files/etc/apache2/sites-enabled/000-default new file mode 120000 index 0000000..6d9ba33 --- /dev/null +++ b/files/etc/apache2/sites-enabled/000-default @@ -0,0 +1 @@ +../sites-available/default \ No newline at end of file diff --git a/files/etc/apache2/sites-enabled/ssl b/files/etc/apache2/sites-enabled/ssl new file mode 120000 index 0000000..f3ebe5c --- /dev/null +++ b/files/etc/apache2/sites-enabled/ssl @@ -0,0 +1 @@ +../sites-available/ssl \ No newline at end of file diff --git a/files/etc/apache2/sites-enabled/svn b/files/etc/apache2/sites-enabled/svn new file mode 120000 index 0000000..694248e --- /dev/null +++ b/files/etc/apache2/sites-enabled/svn @@ -0,0 +1 @@ +../sites-available/svn \ No newline at end of file -- 1.7.9.5