diff options
| -rw-r--r-- | www/apache2/Makefile | 4 | ||||
| -rw-r--r-- | www/apache2/files/patch-docs:conf:httpd-std.conf.in | 4 | ||||
| -rw-r--r-- | www/apache20/Makefile | 4 | ||||
| -rw-r--r-- | www/apache20/files/patch-docs:conf:httpd-std.conf.in | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index ecaad59fbe21..4b21f69232c1 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -224,7 +224,9 @@ pre-configure: post-configure: @FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\ - ${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS," \ + ${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS, ; \ + s,%%WWWOWN%%,${WWWOWN}, ; \ + s,%%WWWGRP%%,${WWWGRP}, " \ ${WRKSRC}/docs/conf/httpd-std.conf pre-install: diff --git a/www/apache2/files/patch-docs:conf:httpd-std.conf.in b/www/apache2/files/patch-docs:conf:httpd-std.conf.in index 12128e97a5a1..16abb83030ba 100644 --- a/www/apache2/files/patch-docs:conf:httpd-std.conf.in +++ b/www/apache2/files/patch-docs:conf:httpd-std.conf.in @@ -15,8 +15,8 @@ # -User nobody -Group #-1 -+User www -+Group www ++User %%WWWOWN%% ++Group %%WWWGRP%% </IfModule> </IfModule> diff --git a/www/apache20/Makefile b/www/apache20/Makefile index ecaad59fbe21..4b21f69232c1 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -224,7 +224,9 @@ pre-configure: post-configure: @FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\ - ${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS," \ + ${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS, ; \ + s,%%WWWOWN%%,${WWWOWN}, ; \ + s,%%WWWGRP%%,${WWWGRP}, " \ ${WRKSRC}/docs/conf/httpd-std.conf pre-install: diff --git a/www/apache20/files/patch-docs:conf:httpd-std.conf.in b/www/apache20/files/patch-docs:conf:httpd-std.conf.in index 12128e97a5a1..16abb83030ba 100644 --- a/www/apache20/files/patch-docs:conf:httpd-std.conf.in +++ b/www/apache20/files/patch-docs:conf:httpd-std.conf.in @@ -15,8 +15,8 @@ # -User nobody -Group #-1 -+User www -+Group www ++User %%WWWOWN%% ++Group %%WWWGRP%% </IfModule> </IfModule> |