From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- .../CI/components/apache/scripts/install_apache.sh | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 asdc-tests/src/test/resources/CI/components/apache/scripts/install_apache.sh (limited to 'asdc-tests/src/test/resources/CI/components/apache/scripts/install_apache.sh') diff --git a/asdc-tests/src/test/resources/CI/components/apache/scripts/install_apache.sh b/asdc-tests/src/test/resources/CI/components/apache/scripts/install_apache.sh deleted file mode 100644 index a77f9a13f8..0000000000 --- a/asdc-tests/src/test/resources/CI/components/apache/scripts/install_apache.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -echo "Using apt-get. Installing apache2 on one of the following : Debian, Ubuntu, Mint" -LOCK="/tmp/lockaptget" -DEFAULT_PORT=80 - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "Apache take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done - -sudo rm -f /var/lib/dpkg/lock -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo apt-get install -y -q apache2 || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/apache2 stop -if [ ! -d $DOC_ROOT ]; then - eval "sudo mkdir -p $DOC_ROOT" -fi -eval "sudo chown -R www-data:www-data $DOC_ROOT" - -if [[ ("$PORT" == "$DEFAULT_PORT") ]]; then - echo "Use default port for Apache : $DEFAULT_PORT" -else - echo "Replacing port $DEFAULT_PORT with $PORT..." - sudo sed -i -e "s/$DEFAULT_PORT/$PORT/g" /etc/apache2/ports.conf || exit ${1} -fi - -echo "Change config of apache2" -if sudo test -f "/etc/apache2/sites-available/default"; then - echo "Change the DocumentRoot of apache2 on Ubuntu < 14.04" - sudo sed -i -e "s#DocumentRoot /var/www#DocumentRoot $DOC_ROOT#g" /etc/apache2/sites-available/default -fi -if sudo test -f "/etc/apache2/sites-available/000-default.conf"; then - echo "Change the DocumentRoot of Apache2 on Ubuntu >= 14.04" - sudo sed -i -e "s#DocumentRoot /var/www/html#DocumentRoot $DOC_ROOT#g" /etc/apache2/sites-available/000-default.conf -fi - -sudo bash -c "echo ServerName localhost >> /etc/apache2/apache2.conf" - -echo "Start apache2 whith new conf" -sudo /etc/init.d/apache2 start -echo "End of $0" -- cgit 1.2.3-korg