Tidy up travis.yml a bit

Author: mitchellkrogza

.travis.yml

@@ -1,62 +1,22 @@
 language: php
-
 env:
     - WEB_PORT_80_TCP_ADDR=localhost
-
 sudo: required
 dist: trusty
-
 php:
     - 5.4
     - 5.5
     - 5.6
     - 7.0
-
 addons:
   hosts:
     - local.dev
-    
 matrix:
   fast_finish: true
-
 cache:
   - apt
-
 before_install:
-  ############################################################
-  # Let us Setup Apache2 for Ubuntu 16.04 with Php 7 and MySQL
-  ############################################################
-  # Set Server Host Name - Travis hostnames resolve to 127.0.53.53 - Not having any effect on fixing Travis "Hostname was NOT found in DNS cache" error - not a problem though
-  #- echo "127.0.0.1  local.dev" | sudo tee -a /etc/hosts
-  #- echo "127.0.53.53  local.dev" | sudo tee -a /etc/hosts
-  #- echo "169.254.169.254 local.dev" | sudo tee -a /etc/hosts
-  # Install Apache2
-  - sudo apt-get update
-  - sudo apt-get install -y --force-yes apache2
-  # Add PHP 7.0 Repository
-  - sudo add-apt-repository -y ppa:ondrej/php
-  # Install PHP 7.0
-  - sudo apt-get update
-  - sudo apt-get install -y --force-yes php7.0 libapache2-mod-php7.0 php7.0-fpm
-  # Copy our virtual host template to sites-enabled overwriting the default site conf
-  - sudo cp travisCI/defaultsite.tpl /etc/apache2/sites-available/000-default.conf
-  # Copy basic testing files into /var/www
-  - sudo cp www/info.php /var/www/info.php
-  - sudo cp www/apache.php /var/www/apache.php
-  # Enable mod rewrite module
-  - sudo a2enmod rewrite
-  # Set ServerName Globally
-  - sudo cp travisCI/servername.tpl /etc/apache2/conf-available/servername.conf
-  # Add testing of Apache Bad Bot Blocker
-  - sudo mkdir /etc/apache2/custom.d
-  - cd /etc/apache2/custom.d
-  - sudo wget https://raw.githubusercontent.com/mitchellkrogza/apache-ultimate-bad-bot-blocker/master/custom.d/globalblacklist.conf
-  - sudo a2enconf servername
-  # Restart apache
-  - sudo service apache2 restart
-  # Restart PHP
-  - sudo service php7.0-fpm restart
-
+  - travisCI/install-nginx.sh
 script:
   # Do a lookup on local.dev hostname set above 
   - nslookup local.dev

travisCI/install-apache.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+############################################################
+# Let us Setup Apache2 for Ubuntu 16.04 with Php 7 and MySQL
+############################################################
+# Install Apache2
+sudo apt-get update
+sudo apt-get install -y --force-yes apache2
+# Add PHP 7.0 Repository
+sudo add-apt-repository -y ppa:ondrej/php
+# Install PHP 7.0
+sudo apt-get update
+sudo apt-get install -y --force-yes php7.0 libapache2-mod-php7.0 php7.0-fpm
+# Copy our virtual host template to sites-enabled overwriting the default site conf
+sudo cp travisCI/defaultsite.tpl /etc/apache2/sites-available/000-default.conf
+# Copy basic testing files into /var/www
+sudo cp www/info.php /var/www/info.php
+sudo cp www/apache.php /var/www/apache.php
+# Enable mod rewrite module
+sudo a2enmod rewrite
+# Set ServerName Globally
+sudo cp travisCI/servername.tpl /etc/apache2/conf-available/servername.conf
+# Add testing of Apache Bad Bot Blocker
+sudo mkdir /etc/apache2/custom.d
+cd /etc/apache2/custom.d
+sudo wget https://raw.githubusercontent.com/mitchellkrogza/apache-ultimate-bad-bot-blocker/master/custom.d/globalblacklist.conf
+sudo a2enconf servername
+# Restart apache
+sudo service apache2 restart
+# Restart PHP
+sudo service php7.0-fpm restart