[interchange-cvs] interchange - racke modified 4 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Wed Mar 2 04:01:10 EST 2005
User: racke
Date: 2005-03-02 09:01:10 GMT
Modified: debian interchange.config interchange.postinst
Modified: interchange.templates makecat.wrapper
Log:
check whether Apache2 is available and ask user for preferred webserver, exit on real debconf errors
Revision Changes Path
2.9 +40 -19 interchange/debian/interchange.config
rev 2.9, prev_rev 2.8
Index: interchange.config
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.config,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -r2.8 -r2.9
--- interchange.config 21 Apr 2004 12:17:35 -0000 2.8
+++ interchange.config 2 Mar 2005 09:01:09 -0000 2.9
@@ -23,7 +23,7 @@
# Check for thread enabled Perl
PERLTHREADS=`perl -MConfig -e 'print $Config{usethreads} || $Config{useithreads} || $Config{use5005threads}'`
if [ "$PERLTHREADS" ]; then
- db_input critical interchange/threadenabledperl || true
+ db_input critical interchange/threadenabledperl || [ $? -eq 30 ]
fi
if [ -e /etc/interchange/init.cfg ]; then
@@ -38,15 +38,24 @@
fi
db_set interchange/group $GROUP
db_set interchange/user $USER
+ if [ "$DOCROOT" ]; then
+ db_set interchange/docroot $DOCROOT
+ fi
+ if [ "$GPGHOME" ]; then
+ db_set interchange/gpghome $GPGHOME
+ fi
+ if [ "$WEBSERVER" ]; then
+ db_set interchange/webserver $WEBSERVER
+ fi
fi
# Which mode we should use ?
-db_input medium interchange/mode || true
+db_input medium interchange/mode || [ $? -eq 30 ]
db_go
# Remember old interchange user/group configuration
-db_get interchange/user || true
+db_get interchange/user || [ $? -eq 30 ]
OLDUSER=$RET
db_set interchange/olduser $OLDUSER
@@ -54,7 +63,7 @@
HAVEUSER=0
while [ $HAVEUSER -eq 0 ]; do
- db_input medium interchange/user || true
+ db_input medium interchange/user || [ $? -eq 30 ]
db_go
db_get interchange/user
USER=$RET
@@ -64,15 +73,15 @@
fi
if [ "$USER" = root ]; then
- db_input medium interchange/usernoroot || true
+ db_input medium interchange/usernoroot || [ $? -eq 30 ]
db_go
elif grep -q ^$USER: /etc/passwd; then
HAVEUSER=1
else
db_subst interchange/createuser USER $USER
- db_input medium interchange/createuser || true
+ db_input medium interchange/createuser || [ $? -eq 30 ]
db_go
- db_get interchange/createuser || true
+ db_get interchange/createuser || [ $? -eq 30 ]
CREATEUSER=$RET
if [ "$CREATEUSER" = true ]; then
HAVEUSER=1
@@ -91,7 +100,7 @@
HAVEGROUP=0
while [ $HAVEGROUP -eq 0 ]; do
- db_input medium interchange/group || true
+ db_input medium interchange/group || [ $? -eq 30 ]
db_go
db_get interchange/group
GROUP=$RET
@@ -101,15 +110,15 @@
fi
if [ "$GROUP" = root ]; then
- db_input medium interchange/groupnoroot || true
+ db_input medium interchange/groupnoroot || [ $? -eq 30 ]
db_go
elif grep -q ^$GROUP: /etc/group; then
HAVEGROUP=1
else
db_subst interchange/creategroup GROUP $GROUP
- db_input medium interchange/creategroup || true
+ db_input medium interchange/creategroup || [ $? -eq 30 ]
db_go
- db_get interchange/creategroup || true
+ db_get interchange/creategroup || [ $? -eq 30 ]
CREATEGROUP=$RET
if [ "$CREATEGROUP" = true ]; then
HAVEGROUP=1
@@ -154,33 +163,45 @@
fi
# FullURL directive
-db_input low interchange/full_url || true
+db_input low interchange/full_url || [ $? -eq 30 ]
db_go
# SOAP server
if /usr/bin/perl -MSOAP::Lite -e '' 2>/dev/null; then
db_set interchange/cansoap true
- db_input low interchange/soap || true
+ db_input low interchange/soap || [ $? -eq 30 ]
else
- db_input low interchange/cansoap || true
+ db_input low interchange/cansoap || [ $? -eq 30 ]
fi
# Inclusion of robots directives
-db_input low interchange/robots || true
+db_input low interchange/robots || [ $? -eq 30 ]
db_go
# Traffic mode
-db_input medium interchange/traffic || true
+db_input medium interchange/traffic || [ $? -eq 30 ]
db_go
# Debugging support
-db_input low interchange/debug || true
+db_input low interchange/debug || [ $? -eq 30 ]
db_go
# GNUPG Home
-db_input low interchange/gpghome || true
+db_input low interchange/gpghome || [ $? -eq 30 ]
db_go
+# Webserver
+if [ -x /usr/sbin/apache2ctl ]; then
+ if [ -x /usr/sbin/apachectl ]; then
+ db_input medium interchange/webserver || [ $? -eq 30 ]
+ db_go
+ else
+ db_set interchange/webserver Apache2
+ fi
+else
+ db_set interchange/webserver Apache
+fi
+
# Catalog configuration
-db_input medium interchange/docroot || true
+db_input medium interchange/docroot || [ $? -eq 30 ]
db_go
2.21 +3 -0 interchange/debian/interchange.postinst
rev 2.21, prev_rev 2.20
Index: interchange.postinst
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.postinst,v
retrieving revision 2.20
retrieving revision 2.21
diff -u -r2.20 -r2.21
--- interchange.postinst 19 Oct 2004 15:59:32 -0000 2.20
+++ interchange.postinst 2 Mar 2005 09:01:09 -0000 2.21
@@ -84,6 +84,9 @@
echo USER=$USER >> $INITCFG
echo GROUP=$GROUP >> $INITCFG
+db_get interchange/webserver
+echo WEBSERVER=$RET >> $INITCFG
+
db_get interchange/docroot
echo DOCROOT=$RET >> $INITCFG
2.7 +8 -0 interchange/debian/interchange.templates
rev 2.7, prev_rev 2.6
Index: interchange.templates
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.templates,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- interchange.templates 2 Apr 2004 23:34:27 -0000 2.6
+++ interchange.templates 2 Mar 2005 09:01:09 -0000 2.7
@@ -51,6 +51,14 @@
Default: ""
Description:
+Template: interchange/webserver
+Type: select
+__Choices: Apache2, Apache
+Default: Apache2
+_Description: Which webserver are you running ?
+ This information is necessary for the makecat script. Please specify
+ which webserver you want to use for your Interchange applications.
+
Template: interchange/docroot
Type: string
Default: /var/www/shops
2.2 +4 -0 interchange/debian/makecat.wrapper
rev 2.2, prev_rev 2.1
Index: makecat.wrapper
===================================================================
RCS file: /var/cvs/interchange/debian/makecat.wrapper,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- makecat.wrapper 2 Sep 2001 17:12:20 -0000 2.1
+++ makecat.wrapper 2 Mar 2005 09:01:09 -0000 2.2
@@ -2,6 +2,10 @@
. /etc/interchange/init.cfg
OPTS="--interchangeuser=$USER --linkprogram=/usr/lib/cgi-bin/ic/vlink --documentroot=$DOCROOT --catalogconf=/etc/interchange/catalogs.cfg"
+if [ "$WEBSERVER" = "Apache2" ]; then
+ OPTS="$OPTS --serverconf=/etc/apache2/apache2.conf"
+fi
+
CMD="/usr/lib/interchange/bin/makecat $OPTS $@"
if [ "$UID" -eq 0 ]; then
su -s /bin/sh -c "$CMD" $USER
More information about the interchange-cvs
mailing list