[pkgsrc/trunk]: pkgsrc/databases/phpldapadmin - Update to nb1

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4331a377fe4
branches:  trunk
changeset: 494400:e4331a377fe4
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Mon May 23 22:01:42 2005 +0000

description:
- Update to nb1
- Add apache configuration file fragment
- Use CONF_FILES for config.php and newly added apache file fragment
- Change permissions on installed config.php to www:wheel 0600 as it can
  contain sensitive information in some installations
- Update MESSAGE pointing to new files installed

diffstat:

 databases/phpldapadmin/MESSAGE                 |  23 +++++++++--------------
 databases/phpldapadmin/Makefile                |  25 ++++++++++++++++++++++++-
 databases/phpldapadmin/PLIST                   |   4 ++--
 databases/phpldapadmin/files/phpldapadmin.conf |  20 ++++++++++++++++++++
 4 files changed, 55 insertions(+), 17 deletions(-)

diffs (121 lines):

diff -r 3a9072b43b1e -r e4331a377fe4 databases/phpldapadmin/MESSAGE
--- a/databases/phpldapadmin/MESSAGE    Mon May 23 21:45:21 2005 +0000
+++ b/databases/phpldapadmin/MESSAGE    Mon May 23 22:01:42 2005 +0000
@@ -1,21 +1,16 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/03/26 11:10:10 seb Exp $
+$NetBSD: MESSAGE,v 1.3 2005/05/23 22:01:42 adrianp Exp $
 
-To enable this web application, first go to
-${PREFIX}/share/phpldapadmin
-
-cp config.php.example config.php
+You will need to edit ${PREFIX}/share/phpldapadmin/config.php to
+initially setup your site.
 
-and edit to taste. Then you need to update your webserver config to serve
-up that directory, either by symlinking it from your document root or
-using an alias , like so:
-
-    Alias /ldapadmin /${PREFIX}/share/phpldapadmin
+You will also need to make phpLDAPAdmin accessible through your HTTP server.
+If you are running Apache then you can add the following line to httpd.conf:
 
-  # strongly recommended
-    <Location /ldapadmin >
-        Require user adminaccount
-    </Location>
+       Include ${PKG_SYSCONFDIR}/httpd/ldapadmin.conf
 
+to make phpLDAPAdmin accessible through:
+
+       http://www.domain.com/ldapadmin/
 
 ===========================================================================
diff -r 3a9072b43b1e -r e4331a377fe4 databases/phpldapadmin/Makefile
--- a/databases/phpldapadmin/Makefile   Mon May 23 21:45:21 2005 +0000
+++ b/databases/phpldapadmin/Makefile   Mon May 23 22:01:42 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/05/19 23:12:17 seb Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/23 22:01:42 adrianp Exp $
 
 DISTNAME=      phpldapadmin-${VERSION}
+PKGREVISION=   1
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
 
@@ -12,10 +13,32 @@
 
 VERSION=       0.9.6c
 NO_BUILD=      YES
+USE_PKGINSTALL=        YES
+APACHE_USER?=  www
+
+CONF_FILES=    ${PREFIX}/share/examples/phpldapadmin/config.php.example \
+               ${PREFIX}/share/phpldapadmin/config.php
+CONF_FILES+=   ${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \
+               ${PKG_SYSCONFDIR}/httpd/phpldapadmin.conf               
+SPECIAL_PERMS= ${PREFIX}/share/phpldapadmin/config.php \
+               ${APACHE_USER} wheel 0600
 
 INSTALLATION_DIRS=     ${PREFIX}/share/phpldapadmin
 
+do-configure:
+       @${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin|g" \
+               ${FILESDIR}/phpldapadmin.conf > ${WRKDIR}/phpldapadmin.conf
+
 do-install:
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpldapadmin
+
+       ${INSTALL_DATA} ${WRKSRC}/config.php.example \
+               ${PREFIX}/share/examples/phpldapadmin
+       ${INSTALL_DATA} ${WRKDIR}/phpldapadmin.conf \
+               ${PREFIX}/share/examples/phpldapadmin
+
+       @${RM} ${WRKSRC}/config.php.example
+
        ${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
        cd ${WRKSRC} && ${PAX}          \
                -s /\.#//               \
diff -r 3a9072b43b1e -r e4331a377fe4 databases/phpldapadmin/PLIST
--- a/databases/phpldapadmin/PLIST      Mon May 23 21:45:21 2005 +0000
+++ b/databases/phpldapadmin/PLIST      Mon May 23 22:01:42 2005 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/19 23:12:17 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/05/23 22:01:42 adrianp Exp $
+share/examples/phpldapadmin/config.php.example
 share/phpldapadmin/INSTALL
 share/phpldapadmin/LICENSE
 share/phpldapadmin/VERSION
@@ -14,7 +15,6 @@
 share/phpldapadmin/common.php
 share/phpldapadmin/compare.php
 share/phpldapadmin/compare_form.php
-share/phpldapadmin/config.php.example
 share/phpldapadmin/copy.php
 share/phpldapadmin/copy_form.php
 share/phpldapadmin/create.php
diff -r 3a9072b43b1e -r e4331a377fe4 databases/phpldapadmin/files/phpldapadmin.conf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpldapadmin/files/phpldapadmin.conf    Mon May 23 22:01:42 2005 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: phpldapadmin.conf,v 1.1 2005/05/23 22:01:42 adrianp Exp $
+#
+# phpLDAPAdmin configuration file fragment for Apache
+
+<IfModule mod_alias.c>
+    Alias /ldapadmin/ "@LDAPADMINDIR@/"
+</IfModule>
+
+<Directory "@LDAPADMINDIR@">
+    Options Indexes
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+# strongly recommended
+#
+<Location /ldapadmin >
+    Require user adminaccount
+</Location>