From 2011847b92fd5d3d4aae02fffe351903c591f4bb Mon Sep 17 00:00:00 2001
From: Akolzin Dmitry <akolzinvs@gmail.com>
Date: Thu, 18 Jul 2019 14:31:35 +0300
Subject: [PATCH] Apache settings

---
 .travis.yml                |  1 +
 tests/bin/before_script.sh |  1 -
 tests/bin/setup-apache.sh  | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100755 tests/bin/setup-apache.sh

diff --git a/.travis.yml b/.travis.yml
index c160e2b..537115e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ matrix:
 
 before_script:
   - bash tests/bin/clone_prestashop.sh
+  - bash tests/bin/setup-apache.sh
   - bash tests/bin/before_script.sh
 
 script:
diff --git a/tests/bin/before_script.sh b/tests/bin/before_script.sh
index b1b300a..0c5dacd 100644
--- a/tests/bin/before_script.sh
+++ b/tests/bin/before_script.sh
@@ -15,7 +15,6 @@ if [ -z $BRANCH ]; then
         cp tests-legacy/parameters.yml.travis app/config/parameters.yml
     fi
 
-    (php -S localhost:80 &) 2> /dev/null > /dev/null
     bash travis-scripts/install-prestashop
 else
     bash travis-scripts/install-prestashop.sh
diff --git a/tests/bin/setup-apache.sh b/tests/bin/setup-apache.sh
new file mode 100755
index 0000000..42e93c2
--- /dev/null
+++ b/tests/bin/setup-apache.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
+
+cd $PRESTASHOP_DIR
+
+bash travis-scripts/setup-php-fpm.sh
+
+echo "* Preparing Apache ...";
+
+sudo a2enmod rewrite actions fastcgi alias
+
+# Use default config
+sudo cp -f tests/travis-ci-apache-vhost /etc/apache2/sites-available/000-default.conf
+sudo sed -e "s?%PRESTASHOP_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
+sudo chmod 777 -R $HOME
+
+# Starting Apache
+sudo service apache2 restart