diff options
author | Joe Rayhawk <jrayhawk@richardiv.omgwallhack.org> | 2010-10-30 07:31:35 -0700 |
---|---|---|
committer | Joe Rayhawk <jrayhawk@richardiv.omgwallhack.org> | 2010-10-30 07:31:35 -0700 |
commit | c952a7e6d5e66e2ecd653bb5c177609b59619808 (patch) | |
tree | d2be5d0dee505ae00c4b85a5f4129efc2456d5f6 /etc/apache2/sites-available/001-piny | |
parent | d03e1eb495c79c19dc70bbe8eab81eadce98210a (diff) | |
parent | 79c284badd015f88d8fd42d941e30bca70dd4eb9 (diff) | |
download | piny-code-c952a7e6d5e66e2ecd653bb5c177609b59619808.tar.gz piny-code-c952a7e6d5e66e2ecd653bb5c177609b59619808.zip |
Merge branch 'master' of piny.be:/srv/git/piny-code
Diffstat (limited to 'etc/apache2/sites-available/001-piny')
-rw-r--r-- | etc/apache2/sites-available/001-piny | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/etc/apache2/sites-available/001-piny b/etc/apache2/sites-available/001-piny deleted file mode 100644 index 6e5c3fd..0000000 --- a/etc/apache2/sites-available/001-piny +++ /dev/null @@ -1,63 +0,0 @@ -<VirtualHost *:80> - ServerName piny.be - - DocumentRoot /srv/www/piny.be - - <Directory /> - Options Indexes FollowSymLinks MultiViews - AllowOverride None - </Directory> - - RedirectMatch 301 ^/$ http://piny.be/piny-web/ -</VirtualHost> - -<VirtualHost *:80> - ServerName www.piny.be - RedirectMatch 301 (.*) http://piny.be$1 -</VirtualHost> - -<VirtualHost *:443> - ServerName piny.be - DocumentRoot /srv/www/piny.be - - <Directory /> - Options Indexes FollowSymLinks MultiViews - AllowOverride None - </Directory> - - RedirectMatch 301 ^/$ http://piny.be/piny-web/ - - SSLEngine On - SSLCertificateFile /etc/ssl/private/secure.piny.be.pem - SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem -</VirtualHost> - -<VirtualHost *:80> - ServerName secure.piny.be - RedirectMatch 301 (.*) https://secure.piny.be$1 -</VirtualHost> - -<VirtualHost *:443> - ServerName secure.piny.be - DocumentRoot /srv/www/secure.piny.be - - <Directory "/srv/www/secure.piny.be"> - SSLRequireSSL - SetHandler cgi-script - AllowOverride None - Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - </Directory> - - ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi - - Include /etc/apache2/piny-enabled - - SSLEngine On - SSLCertificateFile /etc/ssl/private/secure.piny.be.pem - SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem -</VirtualHost> - -<VirtualHost *:80> - ServerName piny.svcs.cs.pdx.edu - RedirectMatch 301 (.*) http://piny.be$1 -</VirtualHost> |