summaryrefslogtreecommitdiff
path: root/pinyconfigs/etc/apache2/sites-available/piny
diff options
context:
space:
mode:
Diffstat (limited to 'pinyconfigs/etc/apache2/sites-available/piny')
-rw-r--r--pinyconfigs/etc/apache2/sites-available/piny16
1 files changed, 12 insertions, 4 deletions
diff --git a/pinyconfigs/etc/apache2/sites-available/piny b/pinyconfigs/etc/apache2/sites-available/piny
index 691c238..3ac13f5 100644
--- a/pinyconfigs/etc/apache2/sites-available/piny
+++ b/pinyconfigs/etc/apache2/sites-available/piny
@@ -11,6 +11,8 @@
Alias /js /usr/share/javascript
RedirectMatch 301 ^/$ http://piny.be/piny-hosting/
+
+ Include /etc/apache2/piny/www
</VirtualHost>
<VirtualHost *:80>
@@ -34,6 +36,8 @@
SSLEngine On
SSLCertificateFile /etc/ssl/private/secure.piny.be.pem
SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem
+
+ Include /etc/apache2/piny/www
</VirtualHost>
<VirtualHost *:80>
@@ -45,10 +49,14 @@
ServerName secure.piny.be
DocumentRoot /srv/www/secure.piny.be
- <Directory "/srv/www/secure.piny.be">
+ <Directory />
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ </Directory>
+
+ <Directory "/srv/www/secure.piny.be/write">
SSLRequireSSL
SetHandler cgi-script
- AllowOverride None
Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
</Directory>
@@ -67,11 +75,11 @@
ScriptAlias /piny-validate /usr/lib/cgi-bin/piny/checkconstraint.cgi
ScriptAlias /auth /usr/lib/cgi-bin/piny/auth
- Include /etc/apache2/piny-enabled
-
SSLEngine On
SSLCertificateFile /etc/ssl/private/secure.piny.be.pem
SSLCACertificateFile /etc/ssl/private/GandiStandardSSLCA.pem
+
+ Include /etc/apache2/piny/secure
</VirtualHost>
<VirtualHost *:80>