[evolvis-commits] r10148: fixed some paths problem by adding CONFFI?==?UTF-8?Q?LEOUTDIR↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:38:45 CET 2011
Author: mirabilos
Date: 2011-02-24 17:38:45 +0100 (Thu, 24 Feb 2011)
New Revision: 10148
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/setup
Log:
fixed some paths problem by adding CONFFILEOUTDIR
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/setup
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/setup 2011-02-24 16:38:44 UTC (rev 10147)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/setup 2011-02-24 16:38:45 UTC (rev 10148)
@@ -209,20 +209,20 @@
echo "Creating $LOCALINC"
for i in $ETCDIR/local.d/0* $ETCDIR/local.d/10database.$database $ETCDIR/local.d/1[1-9]* $ETCDIR/local.d/[2-9]*
do
- $BINDIR/fill-in-the-blanks.pl $i $ETCDIR/`basename $i` $CONFFILEOUT
+ $BINDIR/fill-in-the-blanks.pl $i $CONFFILEOUTDIR/`basename $i` $CONFFILEOUT
done
- ls $ETCDIR/0* $ETCDIR/10database.$database $ETCDIR/1[1-9]* $ETCDIR/[2-9]* | grep -v dpkg | sort | xargs cat > $LOCALINC
- rm $ETCDIR/0* $ETCDIR/10database.$database $ETCDIR/1[1-9]* $ETCDIR/[2-9]*
+ ls $CONFFILEOUTDIR/0* $CONFFILEOUTDIR/10database.$database $CONFFILEOUTDIR/1[1-9]* $CONFFILEOUTDIR/[2-9]* | grep -v dpkg | sort | xargs cat > $LOCALINC
+ rm $CONFFILEOUTDIR/0* $CONFFILEOUTDIR/10database.$database $CONFFILEOUTDIR/1[1-9]* $CONFFILEOUTDIR/[2-9]*
echo "Creating other includes"
#for i in $ETCDIR/templates/[a-z]*
find $ETCDIR/templates -name '[a-z]*' -maxdepth 1 -type f | while read i
do
- $BINDIR/fill-in-the-blanks.pl $i $ETCDIR/`basename $i` $CONFFILEOUT
+ $BINDIR/fill-in-the-blanks.pl $i $CONFFILEOUTDIR/`basename $i` $CONFFILEOUT
done
chmod 600 $HTTPDSECRETS $CONFFILEIN $CONFFILEOUT
- chmod 640 $ETCDIR/local.pl $ETCDIR/database.inc
- chown gforge:gforge $ETCDIR/local.pl $ETCDIR/database.inc
+ chmod 640 $CONFFILEOUTDIR/local.pl $CONFFILEOUTDIR/database.inc
+ chown gforge:gforge $CONFFILEOUTDIR/local.pl $CONFFILEOUTDIR/database.inc
}
doapache() {
@@ -262,13 +262,14 @@
GROUPPATH=/home/groups
SHAREDIR=`pwd`
LIBDIR=`pwd`
+CONFFILEOUTDIR=$ETCDIR
CONFFILEIN=$ETCDIR/gforge.conf
CONFFILEOUT=$ETCDIR/gforge.conf
LOCALINC=$ETCDIR/local.inc
HTTPDCONF=$ETCDIR/httpd.conf
HTTPDSECRETS=$ETCDIR/httpd.secrets
SYSTEM=UNIX
-export ETCDIR BINDIR GFGDIR CONFFILEIN CONFFILEOUT LOCALINC HTTPDCONF HTTPDSECRETS DOAPACHE SYSTEM
+export ETCDIR BINDIR GFGDIR CONFFILEOUTDIR CONFFILEIN CONFFILEOUT LOCALINC HTTPDCONF HTTPDSECRETS DOAPACHE SYSTEM
interact=false
noapache=false
database=env
@@ -311,6 +312,7 @@
;;
-confdir )
shift
+ CONFFILEOUTDIR=$1
CONFFILEIN=$1/gforge.conf
CONFFILEOUT=$1/gforge.conf
LOCALINC=$1/local.inc
@@ -329,6 +331,7 @@
CHROOT=/var/lib/gforge/chroot
SHAREDIR=/usr/share/gforge
LIBDIR=/usr/lib/gforge
+ CONFFILEOUTDIR=/etc/gforge
CONFFILEIN=/etc/gforge/gforge.conf
CONFFILEOUT=/etc/gforge/gforge.conf
LOCALINC=/etc/gforge/local.inc
More information about the evolvis-commits
mailing list