updating docs

Author: Julien Neuhart

README.md

@@ -136,9 +136,9 @@ It will enable Xdebug on the Apache container. See also: [Use Xdebug with PhpSto
 
 ### SSL support
 
-Open your `.env` file in your favorite editor, set the variable `NGINX_ENABLE_SSL=1` and run `make kickoff`. 
+Open your `.env` file in your favorite editor, set the variable `REVERSE_PROXY_ENABLE_SSL=1` and run `make kickoff`. 
 
-It will enable SSL on the NGINX container. Make sure that you have defined the correct path to your certifications in `NGINX_CERTS_PATH`!
+It will enable SSL on the reverse proxy container. Make sure that you have defined the correct path to your certifications in `REVERSE_PROXY_CERTS_PATH`!
 
 You will find more information on how to make SSL work here: https://github.com/jwilder/nginx-proxy#ssl-support
 
@@ -178,7 +178,7 @@ Yep, this seems to be a current limitation of Docker on MacOS (see [#8076](https
 
 **Xdebug is not working on MacOS**
 
-Add the `xdebug.idekey` variable with your corresponding value in the `ext-xdebug.ini` file. You might also have to update the `xdebug.remote_host` variable's value with the IP address of your container (`docker inspect YOUR_APACHE_CONTAINER_NAME`).
+Add the `xdebug.idekey` variable with your corresponding value in the `ext-xdebug.ini` file located in the `apache/conf.d` directory. You might also have to update the `xdebug.remote_host` variable's value with the IP address of your container (`docker inspect YOUR_APACHE_CONTAINER_NAME`).
 
 ## Credits
 

docs/gulp.md

@@ -2,7 +2,7 @@
 
 First, launch your environment with `make kickoff` and install gulp with `make npm cmd="install --save-dev gulp"`.
 
-Then, create a `_gulp` file in the bin folder with this content:
+Then, create a `_gulp` file in the `_bin` folder with this content:
 
 ```
 #!/bin/bash
@@ -28,10 +28,10 @@ missing_arg()
 
 gulp()
 {
-     /bin/bash ${DIR}/_health_check --container_name ${APACHE_CONTAINER_NAME};
+     /bin/bash ${DIR}/utils/_health_check --container_name ${APACHE_CONTAINER_NAME};
 
     if [ $? -eq 1 ]; then
-        /bin/bash ${DIR}/_whalesay --say "Apache container (${APACHE_CONTAINER_NAME}) is not running.";
+        /bin/bash ${DIR}/misc/_whalesay --say "Apache container (${APACHE_CONTAINER_NAME}) is not running.";
         exit 1;
     fi;
 

docs/postfix.md

@@ -7,7 +7,7 @@ By chance, there is a cool docker image which will help us with that: https://gi
 First, update your `.env.template` file by adding:
 
 ```
-# postfix
+# [postfix]
 POSTFIX_SERVICE_NAME=postfix
 POSTFIX_CONTAINER_NAME=${PROJECT_NAME}_${POSTFIX_SERVICE_NAME}_${ENV}
 MAIL_DOMAIN=${APACHE_VIRTUAL_HOST}
@@ -31,15 +31,22 @@ ${POSTFIX_SERVICE_NAME}:
     - ${BASE_NETWORK}
 ```
 
-Add the following lines in the `prepare()` method of the `_prepare` script (in `bin` directory):
+Create a `_prepare_postfix` file in the `_bin/prepare` directory and add the following lines:
 
 ```
-# postfix
-sedi "s/\${POSTFIX_SERVICE_NAME}/${POSTFIX_SERVICE_NAME}/g" ${ROOT}/docker-compose.yml;
-sedi "s/\${POSTFIX_CONTAINER_NAME}/${POSTFIX_CONTAINER_NAME}/g" ${ROOT}/docker-compose.yml;
-sedi "s/\${MAIL_DOMAIN}/${MAIL_DOMAIN}/g" ${ROOT}/docker-compose.yml;
-sedi "s/\${NO_REPLY_EMAIL}/${NO_REPLY_EMAIL}/g" ${ROOT}/docker-compose.yml;
-sedi "s/\${SMTP_PASSWORD}/${SMTP_PASSWORD}/g" ${ROOT}/docker-compose.yml;
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
+ROOT=${DIR}/../..;
+
+# environment variables
+source ${ROOT}/.env;
+
+/bin/bash ${ROOT}/_bin/utils/_sedi "s/\${POSTFIX_SERVICE_NAME}/${POSTFIX_SERVICE_NAME}/g" ${ROOT}/docker-compose.yml;
+/bin/bash ${ROOT}/_bin/utils/_sedi "s/\${POSTFIX_CONTAINER_NAME}/${POSTFIX_CONTAINER_NAME}/g" ${ROOT}/docker-compose.yml;
+/bin/bash ${ROOT}/_bin/utils/_sedi "s/\${MAIL_DOMAIN}/${MAIL_DOMAIN}/g" ${ROOT}/docker-compose.yml;
+/bin/bash ${ROOT}/_bin/utils/_sedi "s/\${NO_REPLY_EMAIL}/${NO_REPLY_EMAIL}/g" ${ROOT}/docker-compose.yml;
+/bin/bash ${ROOT}/_bin/utils/_sedi "s/\${SMTP_PASSWORD}/${SMTP_PASSWORD}/g" ${ROOT}/docker-compose.yml;
 ```
 
 Last but not least, run `cp .env.template .env` and `make kickoff`! You have now at your disposal a nice Postfix container :smiley: