From f2b2efd0df19e8f4ceba30bc81dc24daba00a3f0 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@geeks.cl>
Date: Sat, 14 Aug 2004 10:48:28 +0000
Subject: [PATCH] Alejandro Mery: 	* added suexec options to apache
 config 		* relative path over $localstatedir and absolute paths
 		* current htdocs dir remains as default 		* it
 depends on bdb (prio problem on trunk)

[2004062602014128335] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3806 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/rene/apache/apache.conf | 14 ++++++++++++++
 package/rene/apache/config.in   | 10 ++++++++++
 2 files changed, 24 insertions(+)

diff --git a/package/rene/apache/apache.conf b/package/rene/apache/apache.conf
index a05bdf3e9..3c50c3ff2 100644
--- a/package/rene/apache/apache.conf
+++ b/package/rene/apache/apache.conf
@@ -38,6 +38,20 @@ if [ $pkg = "apache" ] ; then
 --enable-speling --enable-rewrite --enable-so --enable-deflate"
 	# --enable-speling is not a typo!
 
+	if [ "$ROCKCFG_PKG_APACHE_SUEXEC" == "1" ]; then
+	   if [ "${ROCKCFG_PKG_APACHE_DOCROOT:0:1}" == "/" ] ; then
+		docroot="$ROCKCFG_PKG_APACHE_DOCROOT"
+	   else
+		docroot="$localstatedir/$ROCKCFG_PKG_APACHE_DOCROOT"
+	   fi
+	   var_append extraconfopt ' ' \
+		"--with-suexec-docroot=${docroot#$root}"
+#	   var_append extraconfopt ' ' \
+#		"--with-suexec-userdir=$ROCKCFG_PKG_APACHE_USERDIR"
+	   var_append extraconfopt ' ' "--with-suexec-caller=80 \
+--enable-suexec"
+	fi
+
 	[ "$ROCKCFG_PKG_APACHE_INFO" == 1 ] && \
 		var_append extraconfopt " " "--enable-info" 
 
diff --git a/package/rene/apache/config.in b/package/rene/apache/config.in
index 1ed8ffdf1..8d371aa25 100644
--- a/package/rene/apache/config.in
+++ b/package/rene/apache/config.in
@@ -43,9 +43,19 @@ then
 		choice ROCKCFG_PKG_APACHE_BDB $default $list
 	fi
 
+	comment ' '
+
 	bool "Enable info"		ROCKCFG_PKG_APACHE_INFO        0 
 	bool "Enable Auth Digest"	ROCKCFG_PKG_APACHE_AUTH_DIGEST 0 
 
+	bool "Enable suEXEC"		ROCKCFG_PKG_APACHE_SUEXEC      0
+	if [ "$ROCKCFG_PKG_APACHE_SUEXEC" == "1" ]; then
+		text 'suEXEC document root' \
+			ROCKCFG_PKG_APACHE_DOCROOT "lib/htdocs"
+#		text 'suEXEC user directory' \
+#			ROCKCFG_PKG_APACHE_USERDIR "public_html"
+	fi
+
 	menu_end
 fi