- Use ${WWWOWN} and ${WWWGRP} for apache's user. (instead of harcoded

www/www). It should help to keep consistancy in www-related ports.
svn path=/head/; revision=119232
2004-10-13 14:03:06 +00:00 · 2004-10-13 14:03:06 +00:00 · 17deeb0cd6 · 2021-03-31 03:12:20 +00:00
commit 17deeb0cd6
parent 2130669c32
4 changed files with 10 additions and 6 deletions
--- 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:
--- 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>
 
--- 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:
--- 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>