diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index c9a44e986..919edb862 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.16 $ +# Author : $Author: tomas $ +# Version : $Revision: 1.17 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $ #------------------------------------------------------------------------------- @@ -312,6 +312,7 @@ ${TMP_DIR}/modules_setup.stamp: cd ${STORAGE_ADMIN_DIR} && ./configure --prefix=${prefix} cd ${STORAGE_SERVER_DIR} && \ ./configure --prefix=${prefix} \ + --with-apache-group=${APACHE_GROUP} \ --with-hostname=${HOSTNAME} \ --with-www-port=${WWW_PORT} \ --with-scheduler-port=${SCHEDULER_PORT} \ diff --git a/livesupport/modules/storageServer/etc/Makefile.in b/livesupport/modules/storageServer/etc/Makefile.in index dbd9e085a..8ccad6e3d 100644 --- a/livesupport/modules/storageServer/etc/Makefile.in +++ b/livesupport/modules/storageServer/etc/Makefile.in @@ -19,8 +19,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: sebastian $ -# Version : $Revision: 1.4 $ +# Author : $Author: tomas $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/etc/Makefile.in,v $ # # @configure_input@ @@ -85,6 +85,7 @@ PEAR_INSTALLER = ${PEAR_TOOL_DIR}/bin/install.sh DEST_DIR = ${USR_VAR_DIR}/LiveSupport/storageServer/var HOSTNAME = @HOSTNAME@ +APACHE_GROUP = @APACHE_GROUP@ WWW_PORT = @WWW_PORT@ DB_SERVER = @DB_SERVER@ DATABASE = @DATABASE@ @@ -189,6 +190,15 @@ copy_files: ${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \ > ${DEST_DIR}/conf.php + chgrp ${APACHE_GROUP} ${DEST_DIR}/access + chgrp ${APACHE_GROUP} ${DEST_DIR}/stor + chgrp ${APACHE_GROUP} ${DEST_DIR}/stor/buffer + chgrp ${APACHE_GROUP} ${DEST_DIR}/trans + chmod g+sw ${DEST_DIR}/access + chmod g+sw ${DEST_DIR}/stor + chmod g+sw ${DEST_DIR}/stor/buffer + chmod g+sw ${DEST_DIR}/trans + ${RM} ${WWW_DOCROOT}/livesupport ln -sf ${USR_VAR_DIR}/LiveSupport ${WWW_DOCROOT}/livesupport diff --git a/livesupport/modules/storageServer/etc/configure.ac b/livesupport/modules/storageServer/etc/configure.ac index 5db443fd2..b14c77e3b 100644 --- a/livesupport/modules/storageServer/etc/configure.ac +++ b/livesupport/modules/storageServer/etc/configure.ac @@ -20,8 +20,8 @@ dnl along with LiveSupport; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl -dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.3 $ +dnl Author : $Author: tomas $ +dnl Version : $Revision: 1.4 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(StorageServer, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.3 $) +AC_REVISION($Revision: 1.4 $) AC_CONFIG_SRCDIR(../var/BasicStor.php) @@ -82,6 +82,19 @@ AC_ARG_WITH([hostname], AC_MSG_RESULT([using hostname: ${HOSTNAME}]) +dnl----------------------------------------------------------------------------- +dnl specify group in which apache is running +dnl----------------------------------------------------------------------------- +AC_SUBST(APACHE_GROUP) + +AC_ARG_WITH([apache-group], + AC_HELP_STRING([--with-apache-group], + [use apache running in the specified group (apache)]), + [APACHE_GROUP=${withval}], [APACHE_GROUP=apache]) + +AC_MSG_RESULT([using apache group: ${APACHE_GROUP}]) + + dnl----------------------------------------------------------------------------- dnl specify the web server port dnl-----------------------------------------------------------------------------