From e75da747a9ce41568443b8a2ea820b54bc47e3d9 Mon Sep 17 00:00:00 2001
From: Mahmoud Zalt <mahmoud.z@msn.com>
Date: Fri, 19 Aug 2016 03:05:36 +0300
Subject: [PATCH] general clean up

---
 docker-compose.yml                           | 27 +++++---------------
 nginx/sites/framework-examples/drupal_8.conf |  6 ++---
 nginx/sites/laravel.conf                     |  2 +-
 nginx/sites/site_a.conf                      |  2 +-
 xdebugPhpFpm                                 |  2 +-
 5 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 355d4581..1c89a00a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,8 +8,8 @@ services:
         build:
             context: ./workspace
             args:
-                - INSTALL_MONGO=false
                 - INSTALL_XDEBUG=false
+                - INSTALL_MONGO=false
                 - INSTALL_NODE=false
                 - INSTALL_DRUSH=false
                 - COMPOSER_GLOBAL_INSTALL=false
@@ -18,9 +18,7 @@ services:
         volumes_from:
             - volumes_source
         extra_hosts:
-            # IMPORTANT: Replace with your Docker Host IP
-            # this will be appended to /etc/hosts
-            # Note that this IP can perhaps be better injected via .env
+            # IMPORTANT: Replace with your Docker Host IP (will be appended to /etc/hosts)
             - "dockerhost:10.0.75.1"
         tty: true
 
@@ -30,8 +28,8 @@ services:
         build:
             context: ./php-fpm
             args:
-                - INSTALL_MONGO=false
                 - INSTALL_XDEBUG=false
+                - INSTALL_MONGO=false
                 - INSTALL_ZIP_ARCHIVE=false
                 - INSTALL_MEMCACHED=false
                 - INSTALL_OPCACHE=false
@@ -43,15 +41,10 @@ services:
         links:
             - workspace
         extra_hosts:
-            # IMPORTANT: Replace with your Docker Host IP
-            # this will be appended to /etc/hosts
-            # Note that this IP can perhaps be better injected via .env
+            # IMPORTANT: Replace with your Docker Host IP (will be appended to /etc/hosts)
             - "dockerhost:10.0.75.1"
         environment:
-            # IMPORTANT: You must have a Remote Interpreter entry matching this name
-            # In settings, search for interpreter...
-            # PHP > Languages & Frameworks > PHP > Interpreter > click on [...]
-            # Need to have a Remote Interpreter named 'laravel'
+            # IMPORTANT: Set the Remote Interpreter entry matching name to `laravel`
             - PHP_IDE_CONFIG="serverName=laravel"
 
 ### Nginx Server Container ##################################
@@ -221,18 +214,10 @@ services:
         build: ./volumes/application
         volumes:
             - ../:/var/www/laravel
-
-            # By default, site_a and site_b are mirroring the parent Laravel app.
-            # This is because the nginx container has these domains
-            # enabled to demonstrate how to support multiple sites
-            - ../:/var/www/site_a
-            - ../:/var/www/site_b
-
-            # This demonstrates example of where you may mount sites
+            # Demonstration of how to mount multiple sites
             # - ../../site_a/:/var/www/site_a
             # - ../../site_b/:/var/www/site_b
 
-
 ### Databases Data Container ################################
 
     volumes_data:
diff --git a/nginx/sites/framework-examples/drupal_8.conf b/nginx/sites/framework-examples/drupal_8.conf
index a5d398a1..fea06905 100644
--- a/nginx/sites/framework-examples/drupal_8.conf
+++ b/nginx/sites/framework-examples/drupal_8.conf
@@ -1,5 +1,5 @@
 server {
-    listen   80;
+    listen 80;
     listen [::]:80;
 
     #domain name
@@ -11,7 +11,6 @@ server {
     # This is the full path to your index file
     index index.php index.html index.htm;
 
-
     ## serve imagecache files directly or redirect to drupal if they do not exist.
     location ~* files/styles {
       access_log off;
@@ -43,7 +42,6 @@ server {
         rewrite ^/(.*)$ /index.php?q=$1 last;
     }
 
-
     location @rewrite {
         # Some modules enforce no slash (/) at the end of the URL
         # Else this rewrite block wouldn&#39;t be needed (GlobalRedirect)
@@ -56,4 +54,4 @@ server {
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;
     }
-}
\ No newline at end of file
+}
diff --git a/nginx/sites/laravel.conf b/nginx/sites/laravel.conf
index c1803830..a40a7f14 100644
--- a/nginx/sites/laravel.conf
+++ b/nginx/sites/laravel.conf
@@ -3,7 +3,7 @@ server {
     listen 80 default_server;
     listen [::]:80 default_server ipv6only=on;
 
-    server_name  laravel;
+    server_name laravel;
     root /var/www/laravel/public;
     index index.php index.html index.htm;
 
diff --git a/nginx/sites/site_a.conf b/nginx/sites/site_a.conf
index 04eec45b..6bd32690 100644
--- a/nginx/sites/site_a.conf
+++ b/nginx/sites/site_a.conf
@@ -3,7 +3,7 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name  site_a;
+    server_name site_a;
     root /var/www/site_a/public;
     index index.php index.html index.htm;
 
diff --git a/xdebugPhpFpm b/xdebugPhpFpm
index f1847448..1a343ce5 100644
--- a/xdebugPhpFpm
+++ b/xdebugPhpFpm
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-# NOTE: At the moment, this has only been confirmed to work PHP 7
+# NOTE: At the moment, this has only been confirmed to work with PHP 7
 
 
 # Grab full name of php-fpm container