From ff4ff7c79ee0f37e84471e93804a95074b8e84ae Mon Sep 17 00:00:00 2001
From: Joe Rayhawk <jrayhawk@omgwallhack.org>
Date: Sun, 22 May 2011 22:19:16 -0700
Subject: Attempt to support core.sharedRepository

---
 pinyconfigs/Makefile                         |  7 +++++--
 pinyconfigs/etc/apache2/sites-available/piny | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'pinyconfigs')

diff --git a/pinyconfigs/Makefile b/pinyconfigs/Makefile
index 8a23b38..aea5e63 100644
--- a/pinyconfigs/Makefile
+++ b/pinyconfigs/Makefile
@@ -2,9 +2,11 @@ build:
 
 install:
 	install -o root -g root -m 755 -d \
-	  $(DESTDIR)/etc/apache2/piny-available \
-	  $(DESTDIR)/etc/apache2/piny-enabled \
+	  $(DESTDIR)/etc/apache2/piny/www \
+	  $(DESTDIR)/etc/apache2/piny/secure \
+	  $(DESTDIR)/etc/apache2/piny/global \
 	  $(DESTDIR)/etc/apache2/sites-available \
+	  $(DESTDIR)/etc/apache2/conf.d \
 	  $(DESTDIR)/etc/cron.weekly \
 	  $(DESTDIR)/etc/ikiwiki/wikilist.d \
 	  $(DESTDIR)/etc/sudoers.d \
@@ -13,6 +15,7 @@ install:
 	install -o root -g root -m 644 etc/cgitrc etc/piny-default.conf etc/piny-override.conf $(DESTDIR)/etc
 	install -o root -g root -m 644 etc/apache2/envvars $(DESTDIR)/etc/apache2
 	install -o root -g root -m 644 etc/apache2/sites-available/piny $(DESTDIR)/etc/apache2/sites-available
+	install -o root -g root -m 644 etc/apache2/conf.d/piny $(DESTDIR)/etc/apache2/conf.d
 	install -o root -g root -m 755 etc/cron.weekly/piny $(DESTDIR)/etc/cron.weekly
 	install -o root -g root -m 600 etc/sudoers.d/pinyadmin $(DESTDIR)/etc/sudoers.d
 	install -o root -g root -m 755 etc/sv/git-daemon/run $(DESTDIR)/etc/sv/git-daemon
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>
-- 
cgit v1.2.3