Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

LS apache config installation added. (#1001)

Browse source
This commit is contained in:
tomas 2005-06-15 22:06:13 +00:00
parent fd1e34a8e1
commit 01ab98afaa
3 changed files with 54 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
livesupport/bin/copyInstall.sh
View file

@ -21,8 +21,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author: fgerlits $ # Author : $Author: tomas $
# Version : $Revision: 1.10 $ # Version : $Revision: 1.11 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -184,6 +184,7 @@ cp -pPR $products_dir/gLiveSupport/tmp/gLiveSupport*.res $install_var
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
cp -pPR $bindir/postInstallScheduler.sh $install_bin cp -pPR $bindir/postInstallScheduler.sh $install_bin
cp -pPR $bindir/postInstallGLiveSupport.sh $install_bin cp -pPR $bindir/postInstallGLiveSupport.sh $install_bin
cp -pPR $etcdir/apache $install_etc
cp -pPR $products_dir/scheduler/etc/scheduler.xml.template $install_etc cp -pPR $products_dir/scheduler/etc/scheduler.xml.template $install_etc
cp -pPR $products_dir/scheduler/etc/odbcinst_template $install_etc cp -pPR $products_dir/scheduler/etc/odbcinst_template $install_etc
cp -pPR $products_dir/scheduler/etc/odbcinst_debian_template $install_etc cp -pPR $products_dir/scheduler/etc/odbcinst_debian_template $install_etc

50
livesupport/bin/postInstallScheduler.sh
View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: tomas $ # Author : $Author: tomas $
# Version : $Revision: 1.5 $ # Version : $Revision: 1.6 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -449,6 +449,54 @@ chmod g+sw $install_var/htmlUI/var/templates_c
chmod g+sw $install_var/htmlUI/var/html/img chmod g+sw $install_var/htmlUI/var/html/img
#-------------------------------------------------------------------------------
# Configuring Apache
#-------------------------------------------------------------------------------
echo "Configuring apache ..."
CONFFILE=90_php_livesupport.conf
AP_DDIR_FOUND=no
for APACHE_DDIR in \
/etc/apache/conf.d /etc/apache2/conf/modules.d /etc/httpd/conf.d
do
echo -n "$APACHE_DDIR "
if [ -d $APACHE_DDIR ]; then
echo "Y"
AP_DDIR_FOUND=yes
cp $basedir/etc/apache/$CONFFILE $APACHE_DDIR
else
echo "N"
fi
done
if [ "$AP_DDIR_FOUND" != "yes" ]; then
echo "###############################"
echo " Could not configure Apache"
echo " include following file into apache config manually:"
echo " $basedir/etc/apache/$CONFFILE"
echo "###############################"
fi
echo "done"
echo "Restarting apache...";
AP_SCR_FOUND=no
for APACHE_SCRIPT in apache apache2 httpd ; do
echo -n "$APACHE_SCRIPT "
if [ -x /etc/init.d/$APACHE_SCRIPT ]; then
echo "Y"
AP_SCR_FOUND=yes
/etc/init.d/$APACHE_SCRIPT restart
else
echo "N"
fi
done
if [ "$AP_SCR_FOUND" != "yes" ]; then
echo "###############################"
echo " Could not reload Apache"
echo " please reload apache manually"
echo "###############################"
fi
echo "done"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Create symlinks # Create symlinks
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

2
livesupport/etc/debian/rules
View file

@ -101,6 +101,8 @@ install-arch:
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/bin \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/bin \
$(CURDIR)/debian/livesupport/opt/livesupport/usr/var \ $(CURDIR)/debian/livesupport/opt/livesupport/usr/var \
$(CURDIR)/debian/livesupport-station/opt/livesupport/usr $(CURDIR)/debian/livesupport-station/opt/livesupport/usr
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/apache \
$(CURDIR)/debian/livesupport-station/opt/livesupport/etc
# now separate the studio (client) files into debian/livesupport-studio # now separate the studio (client) files into debian/livesupport-studio
mkdir -p $(CURDIR)/debian/livesupport-studio mkdir -p $(CURDIR)/debian/livesupport-studio