From d57a0c3888cc3cb0d2f1543f84d94bc5ada72822 Mon Sep 17 00:00:00 2001
From: Mahmoud Zalt <mahmoud.z@msn.com>
Date: Fri, 19 Aug 2016 03:03:45 +0300
Subject: [PATCH] rename and refactor xdebug config files

---
 php-fpm/xdebug.ini                 | 12 ++++++++++++
 php-fpm/xdebug_settings_only.ini   | 21 ---------------------
 workspace/xdebug.ini               | 12 ++++++++++++
 workspace/xdebug_settings_only.ini | 20 --------------------
 4 files changed, 24 insertions(+), 41 deletions(-)
 create mode 100644 php-fpm/xdebug.ini
 delete mode 100644 php-fpm/xdebug_settings_only.ini
 create mode 100644 workspace/xdebug.ini
 delete mode 100644 workspace/xdebug_settings_only.ini

diff --git a/php-fpm/xdebug.ini b/php-fpm/xdebug.ini
new file mode 100644
index 0000000..06eef4a
--- /dev/null
+++ b/php-fpm/xdebug.ini
@@ -0,0 +1,12 @@
+; NOTE: The actual debug.so extention is NOT SET HERE but rather (/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini)
+
+xdebug.remote_autostart=1
+xdebug.remote_enable=1
+xdebug.remote_connect_back=1
+xdebug.cli_color=1
+xdebug.remote_handler=dbgp
+xdebug.remote_mode=req
+
+xdebug.remote_port=9000
+xdebug.remote_host=dockerhost
+xdebug.idekey=PHPSTORM
diff --git a/php-fpm/xdebug_settings_only.ini b/php-fpm/xdebug_settings_only.ini
deleted file mode 100644
index 51bfc62..0000000
--- a/php-fpm/xdebug_settings_only.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-; NOTE: The actual debug.so extention is NOT SET HERE but rather
-; /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-; For example:
-; zend_extension=xdebug.so
-
-xdebug.remote_autostart=1
-xdebug.remote_enable=1
-xdebug.remote_handler=dbgp
-xdebug.remote_mode=req
-
-; In PHPStorm: Settings > Languages & Frameworks > PHP > Debug > Xdebug > Debug port
-xdebug.remote_port=9000
-
-; This is passed with by docker-compose / workspace / extra_hosts / - "dockerhost:10.0.75.1"
-; It will set 10.0.75.1 dockerhost
-; This will allow xdebug to connect to the host running PHPStorm.
-xdebug.remote_host=dockerhost
-
-; PHPStorm needs this
-xdebug.idekey=PHPSTORM
-
diff --git a/workspace/xdebug.ini b/workspace/xdebug.ini
new file mode 100644
index 0000000..06eef4a
--- /dev/null
+++ b/workspace/xdebug.ini
@@ -0,0 +1,12 @@
+; NOTE: The actual debug.so extention is NOT SET HERE but rather (/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini)
+
+xdebug.remote_autostart=1
+xdebug.remote_enable=1
+xdebug.remote_connect_back=1
+xdebug.cli_color=1
+xdebug.remote_handler=dbgp
+xdebug.remote_mode=req
+
+xdebug.remote_port=9000
+xdebug.remote_host=dockerhost
+xdebug.idekey=PHPSTORM
diff --git a/workspace/xdebug_settings_only.ini b/workspace/xdebug_settings_only.ini
deleted file mode 100644
index 9399614..0000000
--- a/workspace/xdebug_settings_only.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-; NOTE: The actual debug.so extention is NOT SET HERE but rather
-; /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-; For example:
-; zend_extension=xdebug.so
-
-xdebug.remote_autostart=1
-xdebug.remote_enable=1
-xdebug.remote_handler=dbgp
-xdebug.remote_mode=req
-
-; In PHPStorm: Settings > Languages & Frameworks > PHP > Debug > Xdebug > Debug port
-xdebug.remote_port=9000
-
-; This is passed with by docker-compose / workspace / extra_hosts / - "dockerhost:10.0.75.1"
-; It will set 10.0.75.1 dockerhost
-; This will allow xdebug to connect to the host running PHPStorm.
-xdebug.remote_host=dockerhost
-
-; PHPStorm needs this
-xdebug.idekey=PHPSTORM