diff options
author | taca <taca@pkgsrc.org> | 2015-08-31 15:31:26 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2015-08-31 15:31:26 +0000 |
commit | efe4e80c6284674d9aa9f1ee64d17c8448ea63d4 (patch) | |
tree | 3e43003d3c8f0fe35c0a15e856c483fba07c211c /mail | |
parent | 2d08e8c82b15b30a31239a2f5211ffcae2b0cc8d (diff) | |
download | pkgsrc-efe4e80c6284674d9aa9f1ee64d17c8448ea63d4.tar.gz |
Make roundcube to support not only Apache but also Nginx based on
PR pkg/50041.
Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/roundcube/Makefile | 9 | ||||
-rw-r--r-- | mail/roundcube/files/apache.conf (renamed from mail/roundcube/files/roundcube.conf) | 7 | ||||
-rw-r--r-- | mail/roundcube/files/nginx.conf | 17 | ||||
-rw-r--r-- | mail/roundcube/options.mk | 28 |
4 files changed, 51 insertions, 10 deletions
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index f95eee5452c..2c80335c4fe 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2015/08/23 15:43:00 taca Exp $ +# $NetBSD: Makefile,v 1.76 2015/08/31 15:31:26 taca Exp $ DISTNAME= roundcubemail-1.1.2 PKGNAME= ${DISTNAME:S/mail-/-/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} @@ -37,9 +37,6 @@ INSTALLATION_DIRS+= ${RCDIR}/bin ${RCDIR}/SQL ${DOCDIR} ${EGDIR} PKG_SYSCONFSUBDIR?= roundcube -WWW_USER?= ${APACHE_USER} -WWW_GROUP?= ${APACHE_GROUP} - PKG_GROUPS_VARS+= WWW_GROUP PKG_USERS_VARS= WWW_USER BUILD_DEFS+= VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP @@ -106,7 +103,7 @@ REPLACE_FILES.php= bin/*.sh REPLACE_PYTHON= plugins/password/helpers/chpass-wrapper.py post-extract: - ${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf + ${CP} ${FILESDIR}/${WWW_CONF_FILE} ${WRKSRC}/roundcube.conf do-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR} diff --git a/mail/roundcube/files/roundcube.conf b/mail/roundcube/files/apache.conf index 1f83e4a0379..781c866e387 100644 --- a/mail/roundcube/files/roundcube.conf +++ b/mail/roundcube/files/apache.conf @@ -1,4 +1,4 @@ -# $NetBSD: roundcube.conf,v 1.6 2013/06/15 16:08:09 taca Exp $ +# $NetBSD: apache.conf,v 1.1 2015/08/31 15:31:27 taca Exp $ # # RoundCube configuration file fragment for Apache @@ -11,8 +11,13 @@ <Directory "@RCDIR@"> AllowOverride All DirectoryIndex index.php +<IfModule !mod_authz_core.c> Order allow,deny Allow from all +</IfModule> +<IfModule mod_authz_core.c> + Require all granted +</IfModule> </Directory> # diff --git a/mail/roundcube/files/nginx.conf b/mail/roundcube/files/nginx.conf new file mode 100644 index 00000000000..474f3a762f5 --- /dev/null +++ b/mail/roundcube/files/nginx.conf @@ -0,0 +1,17 @@ +# $NetBSD: nginx.conf,v 1.1 2015/08/31 15:31:27 taca Exp $ +# +# RoundCube configuration file fragment for nginx + +server { + location /roundube { + root @RCDIR@; + index index.php; + } + + location ~ \.php$ { + include @PKG_SYSCONFDIR@/fastcgi_params; + fastcgi_pass unix:@VARBASE@/run/php-fpm.sock; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_index index.php; + } +} diff --git a/mail/roundcube/options.mk b/mail/roundcube/options.mk index d66166686fd..aa4c889b1a3 100644 --- a/mail/roundcube/options.mk +++ b/mail/roundcube/options.mk @@ -1,13 +1,14 @@ -# $NetBSD: options.mk,v 1.11 2015/08/23 15:39:02 taca Exp $ +# $NetBSD: options.mk,v 1.12 2015/08/31 15:31:26 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.roundcube -PKG_OPTIONS_REQUIRED_GROUPS= db converters +PKG_OPTIONS_REQUIRED_GROUPS= db converters webserver PKG_OPTIONS_GROUP.db= mysql pgsql sqlite PKG_OPTIONS_GROUP.converters= iconv multibyte +PKG_OPTIONS_GROUP.webserver= apache nginx PKG_SUPPORTED_OPTIONS= ldap sockets gd -PKG_SUGGESTED_OPTIONS= mysql iconv sockets gd +PKG_SUGGESTED_OPTIONS= mysql iconv sockets gd apache .include "../../mk/bsd.options.mk" @@ -47,6 +48,27 @@ DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.1:../../converters/php-mbstring .endif ### +### Use apache web server +### +.if !empty(PKG_OPTIONS:Mapache) +WWW_USER?= ${APACHE_USER} +WWW_GROUP?= ${APACHE_GROUP} +BUILD_DEFS+= APACHE_USER APACHE_GROUP +WWW_CONF_FILE?= apache.conf +.include "../../mk/apache.mk" +.endif + +### +### Use apache web server +### +.if !empty(PKG_OPTIONS:Mnginx) +DEPENDS+= nginx-[0-9]*:../../www/nginx +WWW_USER?= nginx +WWW_GROUP?= nginx +WWW_CONF_FILE?= nginx.conf +.endif + +### ### Use OpenLDAP for storing data. ### .if !empty(PKG_OPTIONS:Mldap) |