Improve README. Use webmaster as example admin account.

7 files changed, 19 insertions, 19 deletions

diff --git a/apache2/sites-available/0_default b/apache2/sites-available/0_default
index 5b96849..e84d60a 100644
--- a/apache2/sites-available/0_default
+++ b/apache2/sites-available/0_default
@@ -1,7 +1,7 @@
 <VirtualHost *:443>
 	ServerName	wrong.example.com
 	ServerAdmin	webmaster@example.com
-	DocumentRoot	/home/jonas/websites/wrong.example.com
+	DocumentRoot	/home/webmaster/websites/wrong.example.com
 
 	Include		/etc/apache2/conf.d/local-ssl.conf
 
@@ -15,7 +15,7 @@
 	ServerName	wrong.example.com
 	ServerAlias	wrong
 	ServerAdmin	webmaster@example.com
-	DocumentRoot	/home/jonas/websites/wrong.example.com
+	DocumentRoot	/home/webmaster/websites/wrong.example.com
 
 	<Location />
 		Options		+MultiViews
diff --git a/apache2/sites-available/README b/apache2/sites-available/README
index 80a6006..0a542a2 100644
--- a/apache2/sites-available/README
+++ b/apache2/sites-available/README
@@ -1,12 +1,12 @@
 # These are example files for Apache2 virtual hosts.
 # They need a little tweaking (at least change the domainname).
 #
-# Uncomment unconditional laoding of conf.d snippets in main conffile.
+# Uncomment unconditional loading of conf.d snippets in main conffile.
 #
-# Some of the stuff is tied to the concept of recompiling suexec to have
-# the files located below /home instead of /var/www (this - among other
-# issues - allows for putting ftp access within a chroot and still allow
-# web designers into their websites).
+# Some of the stuff is tied to the concept of websites below /home.
+# This allows more seamless integration with various filesharing
+# protocols, and chroot'ed ftp access to the docroots of several vhosts.
+# If using suexec, this needs recompilation as the docroot is hardcoded.
 #
 # TODO:
 #  * Write these as m4 scripts
diff --git a/apache2/sites-available/lists.secure-example.com b/apache2/sites-available/lists.secure-example.com
index dd28c88..9115930 100644
--- a/apache2/sites-available/lists.secure-example.com
+++ b/apache2/sites-available/lists.secure-example.com
@@ -2,7 +2,7 @@
 	ServerName	lists.secure-example.com:443
 	ServerAlias	lists
 	ServerAdmin	webmaster@secure-example.com
-	DocumentRoot	/home/admin/public_websites/lists.secure-example.com/
+	DocumentRoot	/home/webmaster/public_websites/lists.secure-example.com/
 
 	Include		/etc/apache2/conf.d/local-ssl.conf
 
@@ -20,8 +20,8 @@
 	</Location>
 
 	Include		/etc/apache2/conf.d/local-log-vhosts.conf
-	CustomLog	"| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/admin/weblogs" combined_vlogger
-	ErrorLog	"| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/admin/weblogs/ERRORS"
+	CustomLog	"| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/webmaster/weblogs" combined_vlogger
+	ErrorLog	"| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS"
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName	www.lists.secure-example.com:443
diff --git a/apache2/sites-available/mail.secure-example.com b/apache2/sites-available/mail.secure-example.com
index acb0029..ce9bd8f 100644
--- a/apache2/sites-available/mail.secure-example.com
+++ b/apache2/sites-available/mail.secure-example.com
@@ -2,7 +2,7 @@
 	ServerName	mail.secure-example.com:443
 	ServerAlias	mail
 	ServerAdmin	webmaster@secure-example.com
-	DocumentRoot	/home/admin/public_websites/mail.secure-example.com/
+	DocumentRoot	/home/webmaster/public_websites/mail.secure-example.com/
 
 	Include /etc/apache2/conf.d/local-ssl.conf
 
diff --git a/apache2/sites-available/people.secure-example.com b/apache2/sites-available/people.secure-example.com
index 1a83355..c561513 100644
--- a/apache2/sites-available/people.secure-example.com
+++ b/apache2/sites-available/people.secure-example.com
@@ -2,7 +2,7 @@
 	ServerName	people.secure-example.com
 	ServerAlias	people
 	ServerAdmin	webmaster@secure-example.com
-	DocumentRoot	/home/admin/public_websites/people.secure-example.com/
+	DocumentRoot	/home/webmaster/public_websites/people.secure-example.com/
 
 	Include		/etc/apache2/conf.d/local-userdir.conf
 	Include		/etc/apache2/conf.d/local-macvolumes.conf
@@ -12,8 +12,8 @@
 	RewriteRule	^/([^~].*)$	http://people.secure-example.com/~$1	[R]
 
 	Include		/etc/apache2/conf.d/local-log-vhosts.conf
-	CustomLog	"| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/admin/weblogs" combined_vlogger
-	ErrorLog	"| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/admin/weblogs/ERRORS"
+	CustomLog	"| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/webmaster/weblogs" combined_vlogger
+	ErrorLog	"| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS"
 </VirtualHost>
 <VirtualHost *:80>
 	ServerName	www.people.secure-example.com
diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com
index f36ddf0..f77da15 100644
--- a/apache2/sites-available/wiki.secure-example.com
+++ b/apache2/sites-available/wiki.secure-example.com
@@ -44,8 +44,8 @@
 #	RewriteRule	^/?(.*)		moin/$1			[last,type=application/x-python-code]
 
 	Include		/etc/apache2/conf.d/local-log-vhosts.conf
-	CustomLog	"| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/admin/weblogs" combined_vlogger
-	ErrorLog	"| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/admin/weblogs/ERRORS"
+	CustomLog	"| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/webmaster/weblogs" combined_vlogger
+	ErrorLog	"| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS"
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName	www.wiki.secure-example.com:443
diff --git a/apache2/sites-available/www.secure-example.com b/apache2/sites-available/www.secure-example.com
index ee756ae..4d9d940 100644
--- a/apache2/sites-available/www.secure-example.com
+++ b/apache2/sites-available/www.secure-example.com
@@ -2,11 +2,11 @@
 	ServerName	www.secure-example.com
 	ServerAlias	www
 	ServerAdmin	webmaster@secure-example.com
-	DocumentRoot	/home/admin/public_websites/www.secure-example.com/
+	DocumentRoot	/home/webmaster/public_websites/www.secure-example.com/
 
 	Include		/etc/apache2/conf.d/local-log-vhosts.conf
-	CustomLog	"| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/admin/weblogs" combined_vlogger
-	ErrorLog	"| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/admin/weblogs/ERRORS"
+	CustomLog	"| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/webmaster/weblogs" combined_vlogger
+	ErrorLog	"| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS"
 </VirtualHost>
 <VirtualHost *:80>
 	ServerName	secure-example.com