Change the wording in MESSAGE; DAViCal could be installed on a host

different from the one where the database server is running.

Change the configuration files permissions. administration.yml is really
for davical_dba, config.php is for davical_app (web application). While
here, fix the Apache example.

No revision bump; package content is the same.

3 files changed, 40 insertions, 30 deletions

diff --git a/www/davical/MESSAGE b/www/davical/MESSAGE
index d81f5d3cfeb..c2c85e6907b 100644
--- a/www/davical/MESSAGE
+++ b/www/davical/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2010/05/23 21:36:30 jym Exp $
+$NetBSD: MESSAGE,v 1.2 2010/06/02 23:27:56 jym Exp $
 
 For pkgsrc installations, DAViCal's package is installed in non-default
 locations:
@@ -9,7 +9,9 @@ locations:
 
 To complete the installation of DAViCal, follow these steps:
 
-1. Create DAViCal's app (application) and dba (database admin) acounts:
+1. Create DAViCal's app (application) and dba (database admin) acounts.
+   Depending on your PostgreSQL setup, this could be done in different
+   ways, like:
 
 	$ su pgsql
 	$ createuser -D -R -S --pwprompt davical_app
@@ -17,27 +19,28 @@ To complete the installation of DAViCal, follow these steps:
 	$ createuser -D -R -S --pwprompt davical_dba
 	<enter davical_dba passwd>
 
-2. Edit pg_hba.conf file to add the davical_dba and davical_app users
+   Consider editing pg_hba.conf file to grant access for both accounts
+   to the soon to be created 'davical' database.
 
-	local   davical     davical_app   md5
-	local   davical     davical_dba   md5
+2. Adapt DAViCal's configuration files to your setup:
 
-   then restart pgsql.
+	${PKG_SYSCONFDIR}/administration.yml	(used for davical_dba)
+	${PKG_SYSCONFDIR}/config.php		(used for davical_app)
 
-3. Create DAViCal's database
+   Look for 'pg_connect', 'system_name', 'admin_email', and 'default_locale'
+   in config.php.
 
-       su pgsql ${DAVICALDIR}/dba/create-database.sh
+3. To ease DAViCal's database creation, you can use the following script:
 
-   The script will output the password of 'admin' account for DAViCal.
-   Keep it in mind, it will be used at step 6.
+	${DAVICALDIR}/dba/create-database.sh
 
-4. Adapt DAViCal configuration file to your setup:
+   To work properly, it needs to be executed with a PostgreSQL's superuser
+   account, and requires access to administration.yml file (see step 2.).
 
-	${PKG_SYSCONFDIR}/config.php
-	
-   Look for 'pg_connect', 'system_name', 'admin_email', and 'default_locale'.
+   At the end, the script will output the password of the www 'admin'
+   account for DAViCal. Keep it in mind, it will be used at step 5.
 
-5. You will need to make DAViCal accessible through your HTTP server.
+4. You will need to make DAViCal accessible through your HTTP server.
    If you are running Apache and ap-php, you can use the following file:
 
 	${PKG_SYSCONFDIR}/davical.conf
@@ -48,9 +51,8 @@ To complete the installation of DAViCal, follow these steps:
 
    then restart Apache.
 
-6. You should now be able to access DAViCal through the URL configured
-   within DAViCal's configuration file. At login page, enter the following
-   credentials:
+5. You should now be able to access DAViCal through the URL configured
+   at step 4. At login page, enter the following credentials:
 
 	Login: admin
 	Password: <the one obtained in step 3.>
@@ -58,6 +60,6 @@ To complete the installation of DAViCal, follow these steps:
    Validate, then follow the steps to create user accounts. See DAViCal
    online documentation for further information:
 
-	http://www.davical.org/
+	${HOMEPAGE}
 
 ===========================================================================
diff --git a/www/davical/Makefile b/www/davical/Makefile
index 768f7f09459..8f13fd5a41e 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/23 21:36:30 jym Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/02 23:27:56 jym Exp $
 #
 
 DISTNAME=	davical-${DAVICAL_VERSION}
@@ -18,10 +18,11 @@ DAVICALDIR=	${PREFIX}/share/davical
 EGDIR=		${PREFIX}/share/examples/davical
 DOCDIR=		${PREFIX}/share/doc/davical
 
-BUILD_DEFS=	APACHE_USER APACHE_GROUP
+BUILD_DEFS=	APACHE_USER APACHE_GROUP PGUSER PGGROUP
 
-DAVICAL_USER?=	${APACHE_USER}
-DAVICAL_GROUP?=	${APACHE_GROUP}
+# davical_dba account
+DAVICAL_USER?=	${PGUSER}
+DAVICAL_GROUP?=	${PGGROUP}
 
 USE_TOOLS=	pax msgfmt perl:build
 
@@ -41,20 +42,21 @@ DEPENDS+=	pwgen>=2.06:../../sysutils/pwgen
 DEPENDS+=	postgresql${PGSQL_VERSION}-client-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-client
 
 PKG_SYSCONFSUBDIR=	davical
-PKG_SYSCONFDIR_PERMS=	${DAVICAL_USER} ${DAVICAL_GROUP} 0700
 
 MESSAGE_SUBST+=		DAVICALDIR=${DAVICALDIR:Q} DOCDIR=${DOCDIR:Q}
 MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE:Q}
 
 CONF_FILES=		${EGDIR}/davical.conf	\
 			${PKG_SYSCONFDIR}/davical.conf
 
-CONF_FILES+=		${EGDIR}/config/example-administration.yml	\
-			${PKG_SYSCONFDIR}/administration.yml
+CONF_FILES_PERMS+=	${EGDIR}/config/example-administration.yml	\
+			${PKG_SYSCONFDIR}/administration.yml		\
+			${DAVICAL_USER} ${DAVICAL_GROUP} 0600
 
 CONF_FILES_PERMS+=	${EGDIR}/config/example-config.php	\
 			${PKG_SYSCONFDIR}/config.php		\
-			${DAVICAL_USER} ${DAVICAL_GROUP} 0640
+			${APACHE_USER} ${APACHE_GROUP} 0640
 
 REPLACE_INTERPRETER+=	perl
 REPLACE.perl.old=	.*/bin/perl
diff --git a/www/davical/files/davical.conf b/www/davical/files/davical.conf
index 05fa8326564..582165282db 100644
--- a/www/davical/files/davical.conf
+++ b/www/davical/files/davical.conf
@@ -15,10 +15,16 @@ Alias /davical "@DAVICALDIR@/htdocs"
 # http(s)://davical.example.net/caldav.php/<username>
 #<VirtualHost *>
 #	DocumentRoot "@DAVICALDIR@/htdocs"
-#	AllowOverride All
-#	DirectoryIndex index.php
+#
 #	ServerName davical.example.net
 #	ServerAlias calendar.example.net
-#	Alias /images/ "@DAVICALDIR@/htdocs/images/"
+#
+#	DirectoryIndex index.php
+#
+#	<Location />
+#		Order allow,deny
+#		Allow from all
+#	</Location>
+#
 #	php_value include_path "@LIBAWLPATH@"
 #</VirtualHost>