diff options
Diffstat (limited to 'etc/apache2/sites-available/001-piny')
| -rw-r--r-- | etc/apache2/sites-available/001-piny | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/etc/apache2/sites-available/001-piny b/etc/apache2/sites-available/001-piny index 5e29fe0..6e5c3fd 100644 --- a/etc/apache2/sites-available/001-piny +++ b/etc/apache2/sites-available/001-piny @@ -1,46 +1,47 @@ <VirtualHost *:80> - ServerName piny.svcs.cs.pdx.edu + ServerName piny.be - DocumentRoot /srv/www/piny.svcs.cs.pdx.edu + DocumentRoot /srv/www/piny.be <Directory /> Options Indexes FollowSymLinks MultiViews AllowOverride None </Directory> - RedirectMatch 301 ^/$ http://piny.svcs.cs.pdx.edu/piny-web/ + RedirectMatch 301 ^/$ http://piny.be/piny-web/ </VirtualHost> <VirtualHost *:80> - ServerName secure.piny.svcs.cs.pdx.edu - RedirectMatch 301 (.*) https://secure.piny.svcs.cs.pdx.edu$1 + ServerName www.piny.be + RedirectMatch 301 (.*) http://piny.be$1 </VirtualHost> <VirtualHost *:443> - ServerName secure.piny.svcs.cs.pdx.edu - DocumentRoot /srv/www/secure.piny.svcs.cs.pdx.edu + ServerName piny.be + DocumentRoot /srv/www/piny.be <Directory /> Options Indexes FollowSymLinks MultiViews AllowOverride None </Directory> - RedirectMatch 301 ^/$ http://piny.svcs.cs.pdx.edu/piny-web/ + RedirectMatch 301 ^/$ http://piny.be/piny-web/ SSLEngine On - SSLCertificateFile /etc/ssl/private/wildcard.piny.svcs.cs.pdx.edu.pem + SSLCertificateFile /etc/ssl/private/secure.piny.be.pem + SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem </VirtualHost> <VirtualHost *:80> - ServerName cgi.piny.svcs.cs.pdx.edu - RedirectMatch 301 (.*) https://cgi.piny.svcs.cs.pdx.edu$1 + ServerName secure.piny.be + RedirectMatch 301 (.*) https://secure.piny.be$1 </VirtualHost> <VirtualHost *:443> - ServerName cgi.piny.svcs.cs.pdx.edu - DocumentRoot /srv/www/cgi.piny.svcs.cs.pdx.edu + ServerName secure.piny.be + DocumentRoot /srv/www/secure.piny.be - <Directory "/srv/www/cgi.piny.svcs.cs.pdx.edu"> + <Directory "/srv/www/secure.piny.be"> SSLRequireSSL SetHandler cgi-script AllowOverride None @@ -52,5 +53,11 @@ Include /etc/apache2/piny-enabled SSLEngine On - SSLCertificateFile /etc/ssl/private/wildcard.piny.svcs.cs.pdx.edu.pem + 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> |