Merge pull request #63 from marmelab/magento_lb_master_slave

[RFR] Add Magento example
marmelab · May 29, 2014 · 5086878 · 5086878
2 parents 4885651 + 3aabfbf
commit 5086878
Show file tree

Hide file tree

Showing 232 changed files with 78 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ cgi-bin/
 composer.lock
 vendor/
 bower_components/
+examples/magento-lb-master-slave/htdocs/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,7 @@
 - New components [`python`](https://github.com/marmelab/gaudi/tree/master/example/python), [`django`](https://github.com/marmelab/gaudi/tree/master/example/django) & [`golang`](https://github.com/marmelab/gaudi/tree/master/example/golag)
 - Add an `empty-cmd` option to debug containers
 - Use color in gaudi output
-- Updated [examples](https://github.com/marmelab/gaudi/tree/master/example) with use cases
+- Updated [examples](https://github.com/marmelab/gaudi/tree/master/examples) with use cases
 - Add a check of gaudi version to retrieve new templates
 - Fix #47, #59, #58
 

diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ All templates are listed in [the `templates/` folder](https://github.com/marmela
 
 You can find an example of [how to start a Symfony application](https://github.com/marmelab/gaudi/wiki/HOW-TO:-Run-a-Symfony-Application) in the wiki.
 
-Another examples can be found in [the `example` folder](https://github.com/marmelab/gaudi/tree/master/example).
+Another examples can be found in [the `examples` folder](https://github.com/marmelab/gaudi/tree/master/examples).
 
 # Options
 

diff --git a/example/magento/composer.json b/example/magento/composer.json
diff --git a/example/ambassador-distant/.gaudi.yml → examples/ambassador-distant/.gaudi.yml b/example/ambassador-distant/.gaudi.yml → examples/ambassador-distant/.gaudi.yml
diff --git a/example/ambassador-local/.gaudi.yml → examples/ambassador-local/.gaudi.yml b/example/ambassador-local/.gaudi.yml → examples/ambassador-local/.gaudi.yml
diff --git a/example/apache-php-mysql/.gaudi.yml → examples/apache-php-mysql/.gaudi.yml b/example/apache-php-mysql/.gaudi.yml → examples/apache-php-mysql/.gaudi.yml
diff --git a/example/apache-php-mysql/index.php → examples/apache-php-mysql/index.php b/example/apache-php-mysql/index.php → examples/apache-php-mysql/index.php
diff --git a/example/apache-php/.gaudi.yml → examples/apache-php/.gaudi.yml b/example/apache-php/.gaudi.yml → examples/apache-php/.gaudi.yml
diff --git a/example/apache-php/index.php → examples/apache-php/index.php b/example/apache-php/index.php → examples/apache-php/index.php
diff --git a/example/apache/.gaudi.yml → examples/apache/.gaudi.yml b/example/apache/.gaudi.yml → examples/apache/.gaudi.yml
diff --git a/example/apache/index.html → examples/apache/index.html b/example/apache/index.html → examples/apache/index.html
diff --git a/example/bower/.gaudi.yml → examples/bower/.gaudi.yml b/example/bower/.gaudi.yml → examples/bower/.gaudi.yml
diff --git a/example/cassandra/.gaudi.yml → examples/cassandra/.gaudi.yml b/example/cassandra/.gaudi.yml → examples/cassandra/.gaudi.yml
diff --git a/example/cassandra/app.go → examples/cassandra/app.go b/example/cassandra/app.go → examples/cassandra/app.go
diff --git a/example/composer/.gaudi.yml → examples/composer/.gaudi.yml b/example/composer/.gaudi.yml → examples/composer/.gaudi.yml
diff --git a/example/couchdb/.gaudi.yml → examples/couchdb/.gaudi.yml b/example/couchdb/.gaudi.yml → examples/couchdb/.gaudi.yml
diff --git a/example/couchdb/app.js → examples/couchdb/app.js b/example/couchdb/app.js → examples/couchdb/app.js
diff --git a/example/custom-template/.gaudi.yml → examples/custom-template/.gaudi.yml b/example/custom-template/.gaudi.yml → examples/custom-template/.gaudi.yml
diff --git a/example/custom-template/redis/Dockerfile → examples/custom-template/redis/Dockerfile b/example/custom-template/redis/Dockerfile → examples/custom-template/redis/Dockerfile
diff --git a/example/custom-template/redis/log.txt → examples/custom-template/redis/log.txt b/example/custom-template/redis/log.txt → examples/custom-template/redis/log.txt
diff --git a/example/django-apache/.gaudi.yml → examples/django-apache/.gaudi.yml b/example/django-apache/.gaudi.yml → examples/django-apache/.gaudi.yml
diff --git a/example/django/.gaudi.yml → examples/django/.gaudi.yml b/example/django/.gaudi.yml → examples/django/.gaudi.yml
diff --git a/example/golang/.gaudi.yml → examples/golang/.gaudi.yml b/example/golang/.gaudi.yml → examples/golang/.gaudi.yml
diff --git a/example/golang/app.go → examples/golang/app.go b/example/golang/app.go → examples/golang/app.go
diff --git a/example/hhvm-silex/.gaudi.yml → examples/hhvm-silex/.gaudi.yml b/example/hhvm-silex/.gaudi.yml → examples/hhvm-silex/.gaudi.yml
diff --git a/example/hhvm-silex/composer.json → examples/hhvm-silex/composer.json b/example/hhvm-silex/composer.json → examples/hhvm-silex/composer.json
diff --git a/example/hhvm-silex/web/index.php → examples/hhvm-silex/web/index.php b/example/hhvm-silex/web/index.php → examples/hhvm-silex/web/index.php
diff --git a/example/index-mongodb/.gaudi.yml → examples/index-mongodb/.gaudi.yml b/example/index-mongodb/.gaudi.yml → examples/index-mongodb/.gaudi.yml
diff --git a/example/index-postgres/.gaudi.yml → examples/index-postgres/.gaudi.yml b/example/index-postgres/.gaudi.yml → examples/index-postgres/.gaudi.yml
diff --git a/example/index/.gaudi.yml → examples/index/.gaudi.yml b/example/index/.gaudi.yml → examples/index/.gaudi.yml
diff --git a/example/jekyll/.gaudi.yml → examples/jekyll/.gaudi.yml b/example/jekyll/.gaudi.yml → examples/jekyll/.gaudi.yml
diff --git a/example/jekyll/_config.yml → examples/jekyll/_config.yml b/example/jekyll/_config.yml → examples/jekyll/_config.yml
diff --git a/example/jekyll/_layouts/default.html → examples/jekyll/_layouts/default.html b/example/jekyll/_layouts/default.html → examples/jekyll/_layouts/default.html
diff --git a/example/jekyll/_site/index.html → examples/jekyll/_site/index.html b/example/jekyll/_site/index.html → examples/jekyll/_site/index.html
diff --git a/example/jekyll/index.html → examples/jekyll/index.html b/example/jekyll/index.html → examples/jekyll/index.html
diff --git a/example/magento/.gaudi.yml → examples/magento-lb-master-slave/.gaudi.yml b/example/magento/.gaudi.yml → examples/magento-lb-master-slave/.gaudi.yml
@@ -5,50 +5,69 @@ applications:
             8080: 80
         links: [front1, front2]
         volumes:
-            .: /var/www
+            .: /app
         custom:
             backends: [front1, front2]
+            probe_url: /up.php
 
     front1:
         type: apache
         links: [app1]
         ports:
             8081: 8080
         volumes:
-            .: /var/www
+            .: /app
+        modules: [rewrite]
         custom:
             fastCgi: app1
+            fastCgiIdleTimeout: 500
+            documentRoot: /app/htdocs
 
     front2:
         type: apache
         links: [app2]
         ports:
             8082: 8080
         volumes:
-            .: /var/www
+            .: /app
+        modules: [rewrite]
         custom:
             fastCgi: app2
+            fastCgiIdleTimeout: 500
+            documentRoot: /app/htdocs
 
     app1:
         type: hhvm
         ports:
             9000: 9000
         volumes:
-            .: /var/www
+            .: /app
+        apt_get: [php5-gd, php5-intl]
+        links: [memcached]
+        custom:
+            memoryLimit: 512M
+            maxExecutionTime: 500
 
     app2:
-        type: hhvm
+        type: php-fpm
         ports:
             9001: 9000
         volumes:
-            .: /var/www
+            .: /app
+        apt_get: [php5-gd, php5-intl]
+        links: [memcached]
+        custom:
+            memoryLimit: 512M
+            maxExecutionTime: 500
 
     master:
         type: mysql
         ports:
             3306: 3306
         volumes:
             /var/tmp/data/master: /var/lib/mysql
+        after_script:
+            mysql -e "CREATE DATABASE IF NOT EXISTS magento CHARACTER SET utf8 COLLATE utf8_general_ci;"
         custom:
             repl: master
 
@@ -76,6 +95,12 @@ applications:
             repl: slave
             master: master
 
+    memcached:
+        type: index
+        image: borja/docker-memcached
+        ports:
+            11211: 11211
+
     phpmyadmin:
         type: phpmyadmin
         ports:

diff --git a/examples/magento-lb-master-slave/init.sh b/examples/magento-lb-master-slave/init.sh
@@ -0,0 +1,6 @@
+mkdir htdocs
+wget http://www.magentocommerce.com/downloads/assets/1.9.0.1/magento-1.9.0.1.tar.gz
+tar zxvf magento-1.9.0.1.tar.gz -C htdocs --strip 1
+
+
+echo "<?php echo 'ok';" > htdocs/up.php
diff --git a/example/mysql-master-slave/.gaudi.yml → examples/mysql-master-slave/.gaudi.yml b/example/mysql-master-slave/.gaudi.yml → examples/mysql-master-slave/.gaudi.yml
diff --git a/example/nginx-load-balancing/.gaudi.yml → examples/nginx-load-balancing/.gaudi.yml b/example/nginx-load-balancing/.gaudi.yml → examples/nginx-load-balancing/.gaudi.yml
diff --git a/example/nginx-load-balancing/hello.php → examples/nginx-load-balancing/hello.php b/example/nginx-load-balancing/hello.php → examples/nginx-load-balancing/hello.php
diff --git a/example/nginx-php/.gaudi.yml → examples/nginx-php/.gaudi.yml b/example/nginx-php/.gaudi.yml → examples/nginx-php/.gaudi.yml
diff --git a/example/nginx-php/hello.php → examples/nginx-php/hello.php b/example/nginx-php/hello.php → examples/nginx-php/hello.php
diff --git a/example/nginx/.gaudi.yml → examples/nginx/.gaudi.yml b/example/nginx/.gaudi.yml → examples/nginx/.gaudi.yml
diff --git a/example/nginx/index.html → examples/nginx/index.html b/example/nginx/index.html → examples/nginx/index.html
diff --git a/example/nodejs/.gaudi.yml → examples/nodejs/.gaudi.yml b/example/nodejs/.gaudi.yml → examples/nodejs/.gaudi.yml
diff --git a/example/nodejs/server.js → examples/nodejs/server.js b/example/nodejs/server.js → examples/nodejs/server.js
diff --git a/example/npm/.gaudi.yml → examples/npm/.gaudi.yml b/example/npm/.gaudi.yml → examples/npm/.gaudi.yml
diff --git a/example/php/.gaudi.yml → examples/php/.gaudi.yml b/example/php/.gaudi.yml → examples/php/.gaudi.yml
diff --git a/example/php/hello.php → examples/php/hello.php b/example/php/hello.php → examples/php/hello.php
diff --git a/example/phpmyadmin/.gaudi.yml → examples/phpmyadmin/.gaudi.yml b/example/phpmyadmin/.gaudi.yml → examples/phpmyadmin/.gaudi.yml
diff --git a/example/prebuild/.gaudi.yml → examples/prebuild/.gaudi.yml b/example/prebuild/.gaudi.yml → examples/prebuild/.gaudi.yml
diff --git a/example/prebuild/server.js → examples/prebuild/server.js b/example/prebuild/server.js → examples/prebuild/server.js
diff --git a/example/python-memcached/.gaudi.yml → examples/python-memcached/.gaudi.yml b/example/python-memcached/.gaudi.yml → examples/python-memcached/.gaudi.yml
diff --git a/example/python-memcached/app.py → examples/python-memcached/app.py b/example/python-memcached/app.py → examples/python-memcached/app.py
diff --git a/example/python-postgres/.gaudi.yml → examples/python-postgres/.gaudi.yml b/example/python-postgres/.gaudi.yml → examples/python-postgres/.gaudi.yml
diff --git a/example/python-postgres/app.py → examples/python-postgres/app.py b/example/python-postgres/app.py → examples/python-postgres/app.py
diff --git a/example/python/.gaudi.yml → examples/python/.gaudi.yml b/example/python/.gaudi.yml → examples/python/.gaudi.yml
diff --git a/example/python/hello.py → examples/python/hello.py b/example/python/hello.py → examples/python/hello.py
diff --git a/example/symfony-cmf/.gaudi.yml → examples/symfony-cmf/.gaudi.yml b/example/symfony-cmf/.gaudi.yml → examples/symfony-cmf/.gaudi.yml
diff --git a/example/symfony-cmf/app/.htaccess → examples/symfony-cmf/app/.htaccess b/example/symfony-cmf/app/.htaccess → examples/symfony-cmf/app/.htaccess
diff --git a/example/symfony-cmf/app/AppCache.php → examples/symfony-cmf/app/AppCache.php b/example/symfony-cmf/app/AppCache.php → examples/symfony-cmf/app/AppCache.php
diff --git a/example/symfony-cmf/app/AppKernel.php → examples/symfony-cmf/app/AppKernel.php b/example/symfony-cmf/app/AppKernel.php → examples/symfony-cmf/app/AppKernel.php
diff --git a/...BlogBundle/views/default_layout.html.twig → ...BlogBundle/views/default_layout.html.twig b/...BlogBundle/views/default_layout.html.twig → ...BlogBundle/views/default_layout.html.twig
diff --git a/...impleCmsBundle/views/Page/index.html.twig → ...impleCmsBundle/views/Page/index.html.twig b/...impleCmsBundle/views/Page/index.html.twig → ...impleCmsBundle/views/Page/index.html.twig
diff --git a/...s/LiipSearchBundle/views/layout.html.twig → ...s/LiipSearchBundle/views/layout.html.twig b/...s/LiipSearchBundle/views/layout.html.twig → ...s/LiipSearchBundle/views/layout.html.twig
diff --git a/...wigBundle/views/Exception/error.html.twig → ...wigBundle/views/Exception/error.html.twig b/...wigBundle/views/Exception/error.html.twig → ...wigBundle/views/Exception/error.html.twig
diff --git a/...e/symfony-cmf/app/SymfonyRequirements.php → ...s/symfony-cmf/app/SymfonyRequirements.php b/...e/symfony-cmf/app/SymfonyRequirements.php → ...s/symfony-cmf/app/SymfonyRequirements.php
diff --git a/example/symfony-cmf/app/autoload.php → examples/symfony-cmf/app/autoload.php b/example/symfony-cmf/app/autoload.php → examples/symfony-cmf/app/autoload.php
diff --git a/example/symfony-cmf/app/bootstrap.php.cache → examples/symfony-cmf/app/bootstrap.php.cache b/example/symfony-cmf/app/bootstrap.php.cache → examples/symfony-cmf/app/bootstrap.php.cache
diff --git a/example/symfony-cmf/app/check.php → examples/symfony-cmf/app/check.php b/example/symfony-cmf/app/check.php → examples/symfony-cmf/app/check.php
diff --git a/example/symfony-cmf/app/config/config.yml → examples/symfony-cmf/app/config/config.yml b/example/symfony-cmf/app/config/config.yml → examples/symfony-cmf/app/config/config.yml
diff --git a/...ple/symfony-cmf/app/config/config_dev.yml → ...les/symfony-cmf/app/config/config_dev.yml b/...ple/symfony-cmf/app/config/config_dev.yml → ...les/symfony-cmf/app/config/config_dev.yml
diff --git a/...le/symfony-cmf/app/config/config_prod.yml → ...es/symfony-cmf/app/config/config_prod.yml b/...le/symfony-cmf/app/config/config_prod.yml → ...es/symfony-cmf/app/config/config_prod.yml
diff --git a/...le/symfony-cmf/app/config/config_test.yml → ...es/symfony-cmf/app/config/config_test.yml b/...le/symfony-cmf/app/config/config_test.yml → ...es/symfony-cmf/app/config/config_test.yml
diff --git a/...ple/symfony-cmf/app/config/parameters.php → ...les/symfony-cmf/app/config/parameters.php b/...ple/symfony-cmf/app/config/parameters.php → ...les/symfony-cmf/app/config/parameters.php
diff --git a/...ple/symfony-cmf/app/config/parameters.yml → ...les/symfony-cmf/app/config/parameters.yml b/...ple/symfony-cmf/app/config/parameters.yml → ...les/symfony-cmf/app/config/parameters.yml
diff --git a/...ymfony-cmf/app/config/parameters.yml.dist → ...ymfony-cmf/app/config/parameters.yml.dist b/...ymfony-cmf/app/config/parameters.yml.dist → ...ymfony-cmf/app/config/parameters.yml.dist
diff --git a/example/symfony-cmf/app/config/phpcr.yml → examples/symfony-cmf/app/config/phpcr.yml b/example/symfony-cmf/app/config/phpcr.yml → examples/symfony-cmf/app/config/phpcr.yml
diff --git a/...f/app/config/phpcr_doctrine_dbal.yml.dist → ...f/app/config/phpcr_doctrine_dbal.yml.dist b/...f/app/config/phpcr_doctrine_dbal.yml.dist → ...f/app/config/phpcr_doctrine_dbal.yml.dist
diff --git a/...-cmf/app/config/phpcr_jackrabbit.yml.dist → ...-cmf/app/config/phpcr_jackrabbit.yml.dist b/...-cmf/app/config/phpcr_jackrabbit.yml.dist → ...-cmf/app/config/phpcr_jackrabbit.yml.dist
diff --git a/...f/app/config/phpcr_midgard_mysql.yml.dist → ...f/app/config/phpcr_midgard_mysql.yml.dist b/...f/app/config/phpcr_midgard_mysql.yml.dist → ...f/app/config/phpcr_midgard_mysql.yml.dist
diff --git a/.../app/config/phpcr_midgard_sqlite.yml.dist → .../app/config/phpcr_midgard_sqlite.yml.dist b/.../app/config/phpcr_midgard_sqlite.yml.dist → .../app/config/phpcr_midgard_sqlite.yml.dist
diff --git a/example/symfony-cmf/app/config/routing.yml → examples/symfony-cmf/app/config/routing.yml b/example/symfony-cmf/app/config/routing.yml → examples/symfony-cmf/app/config/routing.yml
diff --git a/...le/symfony-cmf/app/config/routing_dev.yml → ...es/symfony-cmf/app/config/routing_dev.yml b/...le/symfony-cmf/app/config/routing_dev.yml → ...es/symfony-cmf/app/config/routing_dev.yml
diff --git a/example/symfony-cmf/app/config/security.yml → examples/symfony-cmf/app/config/security.yml b/example/symfony-cmf/app/config/security.yml → examples/symfony-cmf/app/config/security.yml
diff --git a/example/symfony-cmf/app/console → examples/symfony-cmf/app/console b/example/symfony-cmf/app/console → examples/symfony-cmf/app/console
diff --git a/example/symfony-cmf/app/phpunit.xml.dist → examples/symfony-cmf/app/phpunit.xml.dist b/example/symfony-cmf/app/phpunit.xml.dist → examples/symfony-cmf/app/phpunit.xml.dist
diff --git a/...fony-cmf/app/tests/AdminDashboardTest.php → ...fony-cmf/app/tests/AdminDashboardTest.php b/...fony-cmf/app/tests/AdminDashboardTest.php → ...fony-cmf/app/tests/AdminDashboardTest.php
diff --git a/example/symfony-cmf/app/tests/AdminTest.php → examples/symfony-cmf/app/tests/AdminTest.php b/example/symfony-cmf/app/tests/AdminTest.php → examples/symfony-cmf/app/tests/AdminTest.php
diff --git a/...e/symfony-cmf/app/tests/BlogAdminTest.php → ...s/symfony-cmf/app/tests/BlogAdminTest.php b/...e/symfony-cmf/app/tests/BlogAdminTest.php → ...s/symfony-cmf/app/tests/BlogAdminTest.php
diff --git a/...fony-cmf/app/tests/BlogControllerTest.php → ...fony-cmf/app/tests/BlogControllerTest.php b/...fony-cmf/app/tests/BlogControllerTest.php → ...fony-cmf/app/tests/BlogControllerTest.php
diff --git a/...le/symfony-cmf/app/tests/HomepageTest.php → ...es/symfony-cmf/app/tests/HomepageTest.php b/...le/symfony-cmf/app/tests/HomepageTest.php → ...es/symfony-cmf/app/tests/HomepageTest.php
diff --git a/example/symfony-cmf/app/tests/SearchTest.php → ...ples/symfony-cmf/app/tests/SearchTest.php b/example/symfony-cmf/app/tests/SearchTest.php → ...ples/symfony-cmf/app/tests/SearchTest.php
diff --git a/.../symfony-cmf/app/tests/StaticPageTest.php → .../symfony-cmf/app/tests/StaticPageTest.php b/.../symfony-cmf/app/tests/StaticPageTest.php → .../symfony-cmf/app/tests/StaticPageTest.php
diff --git a/...ple/symfony-cmf/app/tests/WebTestCase.php → ...les/symfony-cmf/app/tests/WebTestCase.php b/...ple/symfony-cmf/app/tests/WebTestCase.php → ...les/symfony-cmf/app/tests/WebTestCase.php
diff --git a/example/symfony-cmf/app/tests/bootstrap.php → examples/symfony-cmf/app/tests/bootstrap.php b/example/symfony-cmf/app/tests/bootstrap.php → examples/symfony-cmf/app/tests/bootstrap.php
diff --git a/...ony-cmf/app/tests/travis_doctrine_dbal.sh → ...ony-cmf/app/tests/travis_doctrine_dbal.sh b/...ony-cmf/app/tests/travis_doctrine_dbal.sh → ...ony-cmf/app/tests/travis_doctrine_dbal.sh
diff --git a/...ymfony-cmf/app/tests/travis_jackrabbit.sh → ...ymfony-cmf/app/tests/travis_jackrabbit.sh b/...ymfony-cmf/app/tests/travis_jackrabbit.sh → ...ymfony-cmf/app/tests/travis_jackrabbit.sh
diff --git a/...y-cmf/app/tests/travis_midgard_install.sh → ...y-cmf/app/tests/travis_midgard_install.sh b/...y-cmf/app/tests/travis_midgard_install.sh → ...y-cmf/app/tests/travis_midgard_install.sh
diff --git a/...ony-cmf/app/tests/travis_midgard_mysql.sh → ...ony-cmf/app/tests/travis_midgard_mysql.sh b/...ony-cmf/app/tests/travis_midgard_mysql.sh → ...ony-cmf/app/tests/travis_midgard_mysql.sh
diff --git a/...ny-cmf/app/tests/travis_midgard_sqlite.sh → ...ny-cmf/app/tests/travis_midgard_sqlite.sh b/...ny-cmf/app/tests/travis_midgard_sqlite.sh → ...ny-cmf/app/tests/travis_midgard_sqlite.sh
diff --git a/example/symfony-cmf/bin/jackalope → examples/symfony-cmf/bin/jackalope b/example/symfony-cmf/bin/jackalope → examples/symfony-cmf/bin/jackalope
diff --git a/example/symfony-cmf/bin/jackrabbit.sh → examples/symfony-cmf/bin/jackrabbit.sh b/example/symfony-cmf/bin/jackrabbit.sh → examples/symfony-cmf/bin/jackrabbit.sh
diff --git a/example/symfony-cmf/bin/phpcrodm → examples/symfony-cmf/bin/phpcrodm b/example/symfony-cmf/bin/phpcrodm → examples/symfony-cmf/bin/phpcrodm
diff --git a/example/symfony-cmf/bin/phpcrodm.php → examples/symfony-cmf/bin/phpcrodm.php b/example/symfony-cmf/bin/phpcrodm.php → examples/symfony-cmf/bin/phpcrodm.php
diff --git a/example/symfony-cmf/composer.json → examples/symfony-cmf/composer.json b/example/symfony-cmf/composer.json → examples/symfony-cmf/composer.json
diff --git a/example/symfony-cmf/src/.htaccess → examples/symfony-cmf/src/.htaccess b/example/symfony-cmf/src/.htaccess → examples/symfony-cmf/src/.htaccess
diff --git a/...dle/Controller/ContentAdminController.php → ...dle/Controller/ContentAdminController.php b/...dle/Controller/ContentAdminController.php → ...dle/Controller/ContentAdminController.php
diff --git a/...inBundle/Controller/ContentController.php → ...inBundle/Controller/ContentController.php b/...inBundle/Controller/ContentController.php → ...inBundle/Controller/ContentController.php
diff --git a/...inBundle/Controller/DefaultController.php → ...inBundle/Controller/DefaultController.php b/...inBundle/Controller/DefaultController.php → ...inBundle/Controller/DefaultController.php
diff --git a/...undle/DataFixtures/PHPCR/LoadBlogData.php → ...undle/DataFixtures/PHPCR/LoadBlogData.php b/...undle/DataFixtures/PHPCR/LoadBlogData.php → ...undle/DataFixtures/PHPCR/LoadBlogData.php
diff --git a/...undle/DataFixtures/PHPCR/LoadMenuData.php → ...undle/DataFixtures/PHPCR/LoadMenuData.php b/...undle/DataFixtures/PHPCR/LoadMenuData.php → ...undle/DataFixtures/PHPCR/LoadMenuData.php
diff --git a/...le/DataFixtures/PHPCR/LoadRoutingData.php → ...le/DataFixtures/PHPCR/LoadRoutingData.php b/...le/DataFixtures/PHPCR/LoadRoutingData.php → ...le/DataFixtures/PHPCR/LoadRoutingData.php
diff --git a/.../DataFixtures/PHPCR/LoadSimpleCmsData.php → .../DataFixtures/PHPCR/LoadSimpleCmsData.php b/.../DataFixtures/PHPCR/LoadSimpleCmsData.php → .../DataFixtures/PHPCR/LoadSimpleCmsData.php
diff --git a/...DataFixtures/PHPCR/LoadStaticPageData.php → ...DataFixtures/PHPCR/LoadStaticPageData.php b/...DataFixtures/PHPCR/LoadStaticPageData.php → ...DataFixtures/PHPCR/LoadStaticPageData.php
diff --git a/...endencyInjection/SandboxMainExtension.php → ...endencyInjection/SandboxMainExtension.php b/...endencyInjection/SandboxMainExtension.php → ...endencyInjection/SandboxMainExtension.php
diff --git a/.../MainBundle/Document/DemoClassContent.php → .../MainBundle/Document/DemoClassContent.php b/.../MainBundle/Document/DemoClassContent.php → .../MainBundle/Document/DemoClassContent.php
diff --git a/...inBundle/Document/DemoTemplateContent.php → ...inBundle/Document/DemoTemplateContent.php b/...inBundle/Document/DemoTemplateContent.php → ...inBundle/Document/DemoTemplateContent.php
diff --git a/...src/Sandbox/MainBundle/Document/Image.php → ...src/Sandbox/MainBundle/Document/Image.php b/...src/Sandbox/MainBundle/Document/Image.php → ...src/Sandbox/MainBundle/Document/Image.php
diff --git a/...ventListener/SandboxExceptionListener.php → ...ventListener/SandboxExceptionListener.php b/...ventListener/SandboxExceptionListener.php → ...ventListener/SandboxExceptionListener.php
diff --git a/.../MainBundle/Resources/config/services.yml → .../MainBundle/Resources/config/services.yml b/.../MainBundle/Resources/config/services.yml → .../MainBundle/Resources/config/services.yml
diff --git a/...andbox/MainBundle/Resources/data/page.yml → ...andbox/MainBundle/Resources/data/page.yml b/...andbox/MainBundle/Resources/data/page.yml → ...andbox/MainBundle/Resources/data/page.yml
diff --git a/...ic/bootstrap/css/bootstrap-responsive.css → ...ic/bootstrap/css/bootstrap-responsive.css b/...ic/bootstrap/css/bootstrap-responsive.css → ...ic/bootstrap/css/bootstrap-responsive.css
diff --git a/...ootstrap/css/bootstrap-responsive.min.css → ...ootstrap/css/bootstrap-responsive.min.css b/...ootstrap/css/bootstrap-responsive.min.css → ...ootstrap/css/bootstrap-responsive.min.css
diff --git a/...ources/public/bootstrap/css/bootstrap.css → ...ources/public/bootstrap/css/bootstrap.css b/...ources/public/bootstrap/css/bootstrap.css → ...ources/public/bootstrap/css/bootstrap.css
diff --git a/...es/public/bootstrap/css/bootstrap.min.css → ...es/public/bootstrap/css/bootstrap.min.css b/...es/public/bootstrap/css/bootstrap.min.css → ...es/public/bootstrap/css/bootstrap.min.css
diff --git a/...tstrap/img/glyphicons-halflings-white.png → ...tstrap/img/glyphicons-halflings-white.png b/...tstrap/img/glyphicons-halflings-white.png → ...tstrap/img/glyphicons-halflings-white.png
diff --git a/...ic/bootstrap/img/glyphicons-halflings.png → ...ic/bootstrap/img/glyphicons-halflings.png b/...ic/bootstrap/img/glyphicons-halflings.png → ...ic/bootstrap/img/glyphicons-halflings.png
diff --git a/...esources/public/bootstrap/js/bootstrap.js → ...esources/public/bootstrap/js/bootstrap.js b/...esources/public/bootstrap/js/bootstrap.js → ...esources/public/bootstrap/js/bootstrap.js
diff --git a/...rces/public/bootstrap/js/bootstrap.min.js → ...rces/public/bootstrap/js/bootstrap.min.js b/...rces/public/bootstrap/js/bootstrap.min.js → ...rces/public/bootstrap/js/bootstrap.min.js
diff --git a/...MainBundle/Resources/public/css/style.css → ...MainBundle/Resources/public/css/style.css b/...MainBundle/Resources/public/css/style.css → ...MainBundle/Resources/public/css/style.css
diff --git a/...le/Resources/public/images/pager-next.png → ...le/Resources/public/images/pager-next.png b/...le/Resources/public/images/pager-next.png → ...le/Resources/public/images/pager-next.png
diff --git a/...le/Resources/translations/messages.de.yml → ...le/Resources/translations/messages.de.yml b/...le/Resources/translations/messages.de.yml → ...le/Resources/translations/messages.de.yml
diff --git a/...le/Resources/translations/messages.en.yml → ...le/Resources/translations/messages.en.yml b/...le/Resources/translations/messages.en.yml → ...le/Resources/translations/messages.en.yml
diff --git a/...le/Resources/translations/messages.fr.yml → ...le/Resources/translations/messages.fr.yml b/...le/Resources/translations/messages.fr.yml → ...le/Resources/translations/messages.fr.yml
diff --git a/...le/Resources/translations/messages.sk.yml → ...le/Resources/translations/messages.sk.yml b/...le/Resources/translations/messages.sk.yml → ...le/Resources/translations/messages.sk.yml
diff --git a/...rces/views/Admin/switcher_links.html.twig → ...rces/views/Admin/switcher_links.html.twig b/...rces/views/Admin/switcher_links.html.twig → ...rces/views/Admin/switcher_links.html.twig
diff --git a/...esources/views/Admin/user_block.html.twig → ...esources/views/Admin/user_block.html.twig b/...esources/views/Admin/user_block.html.twig → ...esources/views/Admin/user_block.html.twig
diff --git a/...s/views/Block/demo_action_block.html.twig → ...s/views/Block/demo_action_block.html.twig b/...s/views/Block/demo_action_block.html.twig → ...s/views/Block/demo_action_block.html.twig
diff --git a/...Resources/views/Demo/controller.html.twig → ...Resources/views/Demo/controller.html.twig b/...Resources/views/Demo/controller.html.twig → ...Resources/views/Demo/controller.html.twig
diff --git a/...es/views/Demo/template_explicit.html.twig → ...es/views/Demo/template_explicit.html.twig b/...es/views/Demo/template_explicit.html.twig → ...es/views/Demo/template_explicit.html.twig
diff --git a/.../Resources/views/Homepage/index.html.twig → .../Resources/views/Homepage/index.html.twig b/.../Resources/views/Homepage/index.html.twig → .../Resources/views/Homepage/index.html.twig
diff --git a/...s/views/Homepage/switcher_links.html.twig → ...s/views/Homepage/switcher_links.html.twig b/...s/views/Homepage/switcher_links.html.twig → ...s/views/Homepage/switcher_links.html.twig
diff --git a/...le/Resources/views/Image/upload.html.twig → ...le/Resources/views/Image/upload.html.twig b/...le/Resources/views/Image/upload.html.twig → ...le/Resources/views/Image/upload.html.twig
diff --git a/...urces/views/StaticContent/index.html.twig → ...urces/views/StaticContent/index.html.twig b/...urces/views/StaticContent/index.html.twig → ...urces/views/StaticContent/index.html.twig
diff --git a/...Bundle/Resources/views/skeleton.html.twig → ...Bundle/Resources/views/skeleton.html.twig b/...Bundle/Resources/views/skeleton.html.twig → ...Bundle/Resources/views/skeleton.html.twig
diff --git a/.../Sandbox/MainBundle/SandboxMainBundle.php → .../Sandbox/MainBundle/SandboxMainBundle.php b/.../Sandbox/MainBundle/SandboxMainBundle.php → .../Sandbox/MainBundle/SandboxMainBundle.php
diff --git a/.../TestBundle/Controller/TestController.php → .../TestBundle/Controller/TestController.php b/.../TestBundle/Controller/TestController.php → .../TestBundle/Controller/TestController.php
diff --git a/...ndle/Resources/views/Test/index.html.twig → ...ndle/Resources/views/Test/index.html.twig b/...ndle/Resources/views/Test/index.html.twig → ...ndle/Resources/views/Test/index.html.twig
diff --git a/.../Sandbox/TestBundle/SandboxTestBundle.php → .../Sandbox/TestBundle/SandboxTestBundle.php b/.../Sandbox/TestBundle/SandboxTestBundle.php → .../Sandbox/TestBundle/SandboxTestBundle.php
diff --git a/example/symfony-cmf/web/.htaccess → examples/symfony-cmf/web/.htaccess b/example/symfony-cmf/web/.htaccess → examples/symfony-cmf/web/.htaccess
diff --git a/example/symfony-cmf/web/app.php → examples/symfony-cmf/web/app.php b/example/symfony-cmf/web/app.php → examples/symfony-cmf/web/app.php
diff --git a/example/symfony-cmf/web/app_dev.php → examples/symfony-cmf/web/app_dev.php b/example/symfony-cmf/web/app_dev.php → examples/symfony-cmf/web/app_dev.php
diff --git a/example/symfony-cmf/web/config.php → examples/symfony-cmf/web/config.php b/example/symfony-cmf/web/config.php → examples/symfony-cmf/web/config.php
diff --git a/example/symfony-cmf/web/favicon.ico → examples/symfony-cmf/web/favicon.ico b/example/symfony-cmf/web/favicon.ico → examples/symfony-cmf/web/favicon.ico
diff --git a/example/symfony-cmf/web/logo_symfony_cmf.png → ...ples/symfony-cmf/web/logo_symfony_cmf.png b/example/symfony-cmf/web/logo_symfony_cmf.png → ...ples/symfony-cmf/web/logo_symfony_cmf.png
diff --git a/example/symfony-cmf/web/reload-fixtures.php → examples/symfony-cmf/web/reload-fixtures.php b/example/symfony-cmf/web/reload-fixtures.php → examples/symfony-cmf/web/reload-fixtures.php
diff --git a/example/symfony-cmf/web/robots.txt → examples/symfony-cmf/web/robots.txt b/example/symfony-cmf/web/robots.txt → examples/symfony-cmf/web/robots.txt
diff --git a/example/symfony/.gaudi.yml → examples/symfony/.gaudi.yml b/example/symfony/.gaudi.yml → examples/symfony/.gaudi.yml
diff --git a/example/symfony/app/.htaccess → examples/symfony/app/.htaccess b/example/symfony/app/.htaccess → examples/symfony/app/.htaccess
diff --git a/example/symfony/app/AppCache.php → examples/symfony/app/AppCache.php b/example/symfony/app/AppCache.php → examples/symfony/app/AppCache.php
diff --git a/example/symfony/app/AppKernel.php → examples/symfony/app/AppKernel.php b/example/symfony/app/AppKernel.php → examples/symfony/app/AppKernel.php
diff --git a/...ymfony/app/Resources/views/base.html.twig → ...ymfony/app/Resources/views/base.html.twig b/...ymfony/app/Resources/views/base.html.twig → ...ymfony/app/Resources/views/base.html.twig
diff --git a/example/symfony/app/SymfonyRequirements.php → examples/symfony/app/SymfonyRequirements.php b/example/symfony/app/SymfonyRequirements.php → examples/symfony/app/SymfonyRequirements.php
diff --git a/example/symfony/app/autoload.php → examples/symfony/app/autoload.php b/example/symfony/app/autoload.php → examples/symfony/app/autoload.php
diff --git a/example/symfony/app/bootstrap.php.cache → examples/symfony/app/bootstrap.php.cache b/example/symfony/app/bootstrap.php.cache → examples/symfony/app/bootstrap.php.cache
diff --git a/example/symfony/app/check.php → examples/symfony/app/check.php b/example/symfony/app/check.php → examples/symfony/app/check.php
diff --git a/example/symfony/app/config/config.yml → examples/symfony/app/config/config.yml b/example/symfony/app/config/config.yml → examples/symfony/app/config/config.yml
diff --git a/example/symfony/app/config/config_dev.yml → examples/symfony/app/config/config_dev.yml b/example/symfony/app/config/config_dev.yml → examples/symfony/app/config/config_dev.yml
diff --git a/example/symfony/app/config/config_prod.yml → examples/symfony/app/config/config_prod.yml b/example/symfony/app/config/config_prod.yml → examples/symfony/app/config/config_prod.yml
diff --git a/example/symfony/app/config/config_test.yml → examples/symfony/app/config/config_test.yml b/example/symfony/app/config/config_test.yml → examples/symfony/app/config/config_test.yml
diff --git a/example/symfony/app/config/parameters.php → examples/symfony/app/config/parameters.php b/example/symfony/app/config/parameters.php → examples/symfony/app/config/parameters.php
diff --git a/example/symfony/app/config/parameters.yml → examples/symfony/app/config/parameters.yml b/example/symfony/app/config/parameters.yml → examples/symfony/app/config/parameters.yml
diff --git a/...le/symfony/app/config/parameters.yml.dist → ...es/symfony/app/config/parameters.yml.dist b/...le/symfony/app/config/parameters.yml.dist → ...es/symfony/app/config/parameters.yml.dist
diff --git a/example/symfony/app/config/routing.yml → examples/symfony/app/config/routing.yml b/example/symfony/app/config/routing.yml → examples/symfony/app/config/routing.yml
diff --git a/example/symfony/app/config/routing_dev.yml → examples/symfony/app/config/routing_dev.yml b/example/symfony/app/config/routing_dev.yml → examples/symfony/app/config/routing_dev.yml
diff --git a/example/symfony/app/config/security.yml → examples/symfony/app/config/security.yml b/example/symfony/app/config/security.yml → examples/symfony/app/config/security.yml
diff --git a/example/symfony/app/console → examples/symfony/app/console b/example/symfony/app/console → examples/symfony/app/console
diff --git a/example/symfony/app/phpunit.xml.dist → examples/symfony/app/phpunit.xml.dist b/example/symfony/app/phpunit.xml.dist → examples/symfony/app/phpunit.xml.dist
diff --git a/example/symfony/composer.json → examples/symfony/composer.json b/example/symfony/composer.json → examples/symfony/composer.json
diff --git a/example/symfony/src/.htaccess → examples/symfony/src/.htaccess b/example/symfony/src/.htaccess → examples/symfony/src/.htaccess
diff --git a/...ny/src/Acme/DemoBundle/AcmeDemoBundle.php → ...ny/src/Acme/DemoBundle/AcmeDemoBundle.php b/...ny/src/Acme/DemoBundle/AcmeDemoBundle.php → ...ny/src/Acme/DemoBundle/AcmeDemoBundle.php
diff --git a/.../DemoBundle/Command/HelloWorldCommand.php → .../DemoBundle/Command/HelloWorldCommand.php b/.../DemoBundle/Command/HelloWorldCommand.php → .../DemoBundle/Command/HelloWorldCommand.php
diff --git a/.../DemoBundle/Controller/DemoController.php → .../DemoBundle/Controller/DemoController.php b/.../DemoBundle/Controller/DemoController.php → .../DemoBundle/Controller/DemoController.php
diff --git a/...moBundle/Controller/SecuredController.php → ...moBundle/Controller/SecuredController.php b/...moBundle/Controller/SecuredController.php → ...moBundle/Controller/SecuredController.php
diff --git a/...moBundle/Controller/WelcomeController.php → ...moBundle/Controller/WelcomeController.php b/...moBundle/Controller/WelcomeController.php → ...moBundle/Controller/WelcomeController.php
diff --git a/...DependencyInjection/AcmeDemoExtension.php → ...DependencyInjection/AcmeDemoExtension.php b/...DependencyInjection/AcmeDemoExtension.php → ...DependencyInjection/AcmeDemoExtension.php
diff --git a/...mfony/src/Acme/DemoBundle/Entity/User.php → ...mfony/src/Acme/DemoBundle/Entity/User.php b/...mfony/src/Acme/DemoBundle/Entity/User.php → ...mfony/src/Acme/DemoBundle/Entity/User.php
diff --git a/...ndle/EventListener/ControllerListener.php → ...ndle/EventListener/ControllerListener.php b/...ndle/EventListener/ControllerListener.php → ...ndle/EventListener/ControllerListener.php
diff --git a/.../src/Acme/DemoBundle/Form/ContactType.php → .../src/Acme/DemoBundle/Form/ContactType.php b/.../src/Acme/DemoBundle/Form/ContactType.php → .../src/Acme/DemoBundle/Form/ContactType.php
diff --git a/...e/DemoBundle/Resources/config/routing.yml → ...e/DemoBundle/Resources/config/routing.yml b/...e/DemoBundle/Resources/config/routing.yml → ...e/DemoBundle/Resources/config/routing.yml
diff --git a/.../DemoBundle/Resources/config/services.xml → .../DemoBundle/Resources/config/services.xml b/.../DemoBundle/Resources/config/services.xml → .../DemoBundle/Resources/config/services.xml
diff --git a/.../DemoBundle/Resources/public/css/demo.css → .../DemoBundle/Resources/public/css/demo.css b/.../DemoBundle/Resources/public/css/demo.css → .../DemoBundle/Resources/public/css/demo.css
diff --git a/...le/Resources/public/images/blue-arrow.png → ...le/Resources/public/images/blue-arrow.png b/...le/Resources/public/images/blue-arrow.png → ...le/Resources/public/images/blue-arrow.png
diff --git a/...ources/public/images/field-background.gif → ...ources/public/images/field-background.gif b/...ources/public/images/field-background.gif → ...ources/public/images/field-background.gif
diff --git a/...moBundle/Resources/public/images/logo.gif → ...moBundle/Resources/public/images/logo.gif b/...moBundle/Resources/public/images/logo.gif → ...moBundle/Resources/public/images/logo.gif
diff --git a/...Bundle/Resources/public/images/search.png → ...Bundle/Resources/public/images/search.png b/...Bundle/Resources/public/images/search.png → ...Bundle/Resources/public/images/search.png
diff --git a/...urces/public/images/welcome-configure.gif → ...urces/public/images/welcome-configure.gif b/...urces/public/images/welcome-configure.gif → ...urces/public/images/welcome-configure.gif
diff --git a/.../Resources/public/images/welcome-demo.gif → .../Resources/public/images/welcome-demo.gif b/.../Resources/public/images/welcome-demo.gif → .../Resources/public/images/welcome-demo.gif
diff --git a/...rces/public/images/welcome-quick-tour.gif → ...rces/public/images/welcome-quick-tour.gif b/...rces/public/images/welcome-quick-tour.gif → ...rces/public/images/welcome-quick-tour.gif
diff --git a/...le/Resources/views/Demo/contact.html.twig → ...le/Resources/views/Demo/contact.html.twig b/...le/Resources/views/Demo/contact.html.twig → ...le/Resources/views/Demo/contact.html.twig
diff --git a/...ndle/Resources/views/Demo/hello.html.twig → ...ndle/Resources/views/Demo/hello.html.twig b/...ndle/Resources/views/Demo/hello.html.twig → ...ndle/Resources/views/Demo/hello.html.twig
diff --git a/...ndle/Resources/views/Demo/index.html.twig → ...ndle/Resources/views/Demo/index.html.twig b/...ndle/Resources/views/Demo/index.html.twig → ...ndle/Resources/views/Demo/index.html.twig
diff --git a/...e/Resources/views/Secured/hello.html.twig → ...e/Resources/views/Secured/hello.html.twig b/...e/Resources/views/Secured/hello.html.twig → ...e/Resources/views/Secured/hello.html.twig
diff --git a/...ources/views/Secured/helloadmin.html.twig → ...ources/views/Secured/helloadmin.html.twig b/...ources/views/Secured/helloadmin.html.twig → ...ources/views/Secured/helloadmin.html.twig
diff --git a/.../Resources/views/Secured/layout.html.twig → .../Resources/views/Secured/layout.html.twig b/.../Resources/views/Secured/layout.html.twig → .../Resources/views/Secured/layout.html.twig
diff --git a/...e/Resources/views/Secured/login.html.twig → ...e/Resources/views/Secured/login.html.twig b/...e/Resources/views/Secured/login.html.twig → ...e/Resources/views/Secured/login.html.twig
diff --git a/...e/Resources/views/Welcome/index.html.twig → ...e/Resources/views/Welcome/index.html.twig b/...e/Resources/views/Welcome/index.html.twig → ...e/Resources/views/Welcome/index.html.twig
diff --git a/...moBundle/Resources/views/layout.html.twig → ...moBundle/Resources/views/layout.html.twig b/...moBundle/Resources/views/layout.html.twig → ...moBundle/Resources/views/layout.html.twig
diff --git a/...e/Tests/Controller/DemoControllerTest.php → ...e/Tests/Controller/DemoControllerTest.php b/...e/Tests/Controller/DemoControllerTest.php → ...e/Tests/Controller/DemoControllerTest.php
diff --git a/...moBundle/Twig/Extension/DemoExtension.php → ...moBundle/Twig/Extension/DemoExtension.php b/...moBundle/Twig/Extension/DemoExtension.php → ...moBundle/Twig/Extension/DemoExtension.php
diff --git a/example/symfony/web/.htaccess → examples/symfony/web/.htaccess b/example/symfony/web/.htaccess → examples/symfony/web/.htaccess
diff --git a/example/symfony/web/app.php → examples/symfony/web/app.php b/example/symfony/web/app.php → examples/symfony/web/app.php
diff --git a/example/symfony/web/app_dev.php → examples/symfony/web/app_dev.php b/example/symfony/web/app_dev.php → examples/symfony/web/app_dev.php
diff --git a/example/symfony/web/apple-touch-icon.png → examples/symfony/web/apple-touch-icon.png b/example/symfony/web/apple-touch-icon.png → examples/symfony/web/apple-touch-icon.png
diff --git a/example/symfony/web/config.php → examples/symfony/web/config.php b/example/symfony/web/config.php → examples/symfony/web/config.php
diff --git a/example/symfony/web/favicon.ico → examples/symfony/web/favicon.ico b/example/symfony/web/favicon.ico → examples/symfony/web/favicon.ico
diff --git a/example/symfony/web/robots.txt → examples/symfony/web/robots.txt b/example/symfony/web/robots.txt → examples/symfony/web/robots.txt
diff --git a/example/varnish-load-balancing/.gaudi.yml → examples/varnish-load-balancing/.gaudi.yml b/example/varnish-load-balancing/.gaudi.yml → examples/varnish-load-balancing/.gaudi.yml
diff --git a/example/varnish-load-balancing/index.php → examples/varnish-load-balancing/index.php b/example/varnish-load-balancing/index.php → examples/varnish-load-balancing/index.php
diff --git a/example/varnish/.gaudi.yml → examples/varnish/.gaudi.yml b/example/varnish/.gaudi.yml → examples/varnish/.gaudi.yml
diff --git a/example/varnish/index.html → examples/varnish/index.html b/example/varnish/index.html → examples/varnish/index.html
diff --git a/templates/apache/000-default b/templates/apache/000-default
@@ -48,8 +48,9 @@
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
 	[[ $fastCgi := .Collection.Get (.Container.GetCustomValueAsString "fastCgi") (.Collection.GetType "php-fpm")  ]]
+	[[ $fastCgiIdleTimeout := .Container.GetCustomValue "fastCgiIdleTimeout" "30" ]]
 	[[ if $fastCgi ]]
-	FastCgiExternalServer /var/www/cgi-bin/php5.external -host ${[[ $fastCgi.Name | ToUpper ]]_PORT_[[ $fastCgi.GetFirstPort ]]_TCP_ADDR}:${[[ $fastCgi.Name | ToUpper ]]_PORT_[[ $fastCgi.GetFirstPort]]_TCP_PORT}
+	FastCgiExternalServer /var/www/cgi-bin/php5.external -host ${[[ $fastCgi.Name | ToUpper ]]_PORT_[[ $fastCgi.GetFirstLocalPort ]]_TCP_ADDR}:${[[ $fastCgi.Name | ToUpper ]]_PORT_[[ $fastCgi.GetFirstLocalPort]]_TCP_PORT}  -idle-timeout [[ $fastCgiIdleTimeout ]]
 	Alias /cgi-bin/ /var/www/cgi-bin/
 	[[end]]
 </VirtualHost>

diff --git a/templates/apache/Dockerfile b/templates/apache/Dockerfile
@@ -34,6 +34,18 @@ ADD fastcgi.conf /etc/apache2/mods-enabled/fastcgi.conf
 ADD 000-default /etc/apache2/sites-enabled/000-default
 ADD ports.conf /etc/apache2/ports.conf
 
+[[ $fastCgi := .Collection.Get (.Container.GetCustomValueAsString "fastCgi") (.Collection.GetType "php-fpm")  ]]
+[[ if $fastCgi ]]
+	[[ $memoryLimit := $fastCgi.GetCustomValue "memoryLimit" "128M" ]]
+    [[ $maxExecutionTime := $fastCgi.GetCustomValue "maxExecutionTime" "30" ]]
+    [[ $maxInputTime := $fastCgi.GetCustomValue "maxInputTime" "60" ]]
+    [[ $locale := $fastCgi.GetCustomValue "locale" "Europe/Paris" ]]
+
+	RUN sed -i 's|;date.timezone =|date.timezone = "[[ $locale ]]"|g' /etc/php5/fpm/php.ini
+    RUN sed -i 's|memory_limit = 128M|memory_limit = [[ $memoryLimit ]]|g' /etc/php5/fpm/php.ini
+    RUN sed -i 's|max_execution_time = 30|max_execution_time = [[ $maxExecutionTime ]]|g' /etc/php5/fpm/php.ini
+    RUN sed -i 's|max_input_time = 60|max_input_time = [[ $maxInputTime ]]|g' /etc/php5/fpm/php.ini
+[[ end ]]
 # Add custom setup script
 [[ beforeAfterScripts ]]
 

diff --git a/templates/django/setup.sh b/templates/django/setup.sh
@@ -13,7 +13,7 @@ if [ ! -d "/app/[[ .Container.GetCustomValue "project_name" "project" ]]/[[ .Con
 
 	cd /app/[[ $projectName ]]
 	sed -i -e "s/'django.db.backends.sqlite3'/'django.db.backends.mysql'/" ./settings.py
-	sed -i -e "s/'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),/'NAME': 'django',\n\t\t'USER': 'root',\n\t\t'PASSWORD': '',\n\t\t'HOST': os.environ['[[ $firstLinked.Name | ToUpper ]]_PORT_[[ $firstLinked.GetFirstPort]]_TCP_ADDR']/" ./settings.py
+	sed -i -e "s/'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),/'NAME': 'django',\n\t\t'USER': 'root',\n\t\t'PASSWORD': '',\n\t\t'HOST': os.environ['[[ $firstLinked.Name | ToUpper ]]_PORT_[[ $firstLinked.GetFirstLocalPort]]_TCP_ADDR']/" ./settings.py
 
 	sed -i -e "s/# from django.contrib import admin/from django.contrib import admin/" ./urls.py
 	sed -i -e "s/# admin.autodiscover()/admin.autodiscover()/" ./urls.py

diff --git a/templates/hhvm/Dockerfile b/templates/hhvm/Dockerfile
@@ -10,6 +10,10 @@ RUN echo deb http://dl.hhvm.com/debian wheezy main | tee /etc/apt/sources.list.d
 RUN apt-get -y update
 RUN apt-get install -y --force-yes -f hhvm php5-cli curl
 
+[[ $memoryLimit := .Container.GetCustomValue "memoryLimit" "128M" ]]
+[[ $maxExecutionTime := .Container.GetCustomValue "maxExecutionTime" "30" ]]
+RUN sed -i -e 's|; php options|; php options\nmemory_limit = [[ $memoryLimit ]]\nmax_execution_time = [[ $maxExecutionTime ]]\ndisplay_startup_errors = On\nerror_reporting = E_ALL\ndisplay_errors = On|' /etc/hhvm/php.ini
+
 [[ if .EmptyCmd]]
 CMD /bin/bash
 [[ else ]]

diff --git a/templates/mysql/setup.sh b/templates/mysql/setup.sh
@@ -21,12 +21,12 @@ mysql -e "GRANT REPLICATION SLAVE ON *.* TO repl@'%' IDENTIFIED BY 'repl'; FLUSH
 [[ $master := $.Collection.Get $masterName ]]
 
 # Connect to master & retrieve current log file & position
-MASTER_STATUS=$(mysql -u root -h $[[ $masterName | ToUpper ]]_PORT_[[ $master.GetFirstPort ]]_TCP_ADDR -e "show master status\G")
+MASTER_STATUS=$(mysql -u root -h $[[ $masterName | ToUpper ]]_PORT_[[ $master.GetFirstLocalPort ]]_TCP_ADDR -e "show master status\G")
 MASTER_LOG_FILE=$(echo "$MASTER_STATUS" | grep File | sed 's/File://' | sed 's/^ *//;s/ *$//')
 MASTER_LOG_POS=$(echo "$MASTER_STATUS" | grep Position | sed 's/Position://' | sed 's/^ *//;s/ *$//')
 
 sed -i -e "s/\[mysqld\]/[mysqld]\nlog-bin\nserver-id = 2/" /etc/mysql/my.cnf
-mysql -e "CHANGE MASTER TO MASTER_HOST='$[[$masterName | ToUpper ]]_PORT_[[ $master.GetFirstPort ]]_TCP_ADDR', MASTER_LOG_POS=245, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_LOG_FILE='$MASTER_LOG_FILE', MASTER_LOG_POS=$MASTER_LOG_POS; START SLAVE;" -uroot
+mysql -e "CHANGE MASTER TO MASTER_HOST='$[[$masterName | ToUpper ]]_PORT_[[ $master.GetFirstLocalPort ]]_TCP_ADDR', MASTER_LOG_POS=245, MASTER_USER='repl', MASTER_PASSWORD='repl', MASTER_LOG_FILE='$MASTER_LOG_FILE', MASTER_LOG_POS=$MASTER_LOG_POS; START SLAVE;" -uroot
 
 [[ end ]]
 

diff --git a/templates/nginx/default b/templates/nginx/default
@@ -1,7 +1,7 @@
 [[ if (.Container.GetCustomValue "backends")]]
 upstream loadBalancing {
     [[range (.Container.GetCustomValue "backends")]]
-    [[ $port := ($.Collection.Get . ).GetFirstPort ]]
+    [[ $port := ($.Collection.Get . ).GetFirstLocalPort ]]
     server ${[[ . | ToUpper ]]_PORT_[[ $port ]]_TCP_ADDR}:${[[ . | ToUpper ]]_PORT_[[ $port ]]_TCP_PORT};
     [[end]]
 }
@@ -43,7 +43,7 @@ server {
            fastcgi_split_path_info ^(.+\.php)(/.+)$;
 
            [[ $fastCgiName := (.Container.GetCustomValue "fastCgi")]]
-           [[ $fastCgiPort := (.Collection.Get .Container.Custom.fastCgi ).GetFirstPort]]
+           [[ $fastCgiPort := (.Collection.Get .Container.Custom.fastCgi ).GetFirstLocalPort]]
            fastcgi_pass ${[[ $fastCgiName | ToUpper ]]_PORT_[[ $fastCgiPort ]]_TCP_ADDR}:${[[ $fastCgiName | ToUpper ]]_PORT_[[ $fastCgiPort ]]_TCP_PORT};
            fastcgi_index index.php;
            include fastcgi_params;

diff --git a/templates/php-fpm/Dockerfile b/templates/php-fpm/Dockerfile
@@ -9,9 +9,17 @@ RUN apt-get -y -f install php5-fpm php5-cli php5-mysql php5-mcrypt php5-curl cur
 # Install composer
 RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer
 
+[[ $memoryLimit := .Container.GetCustomValue "memoryLimit" "128M" ]]
+[[ $maxExecutionTime := .Container.GetCustomValue "maxExecutionTime" "30" ]]
+[[ $maxInputTime := .Container.GetCustomValue "maxInputTime" "60" ]]
+[[ $locale := .Container.GetCustomValue "locale" "Europe/Paris" ]]
+
 RUN sed -i 's|listen = /var/run/php5-fpm.sock|listen = [[ .Container.GetFirstLocalPort ]]|g' /etc/php5/fpm/pool.d/www.conf
 RUN sed -i 's|;cgi.fix_pathinfo=0|cgi.fix_pathinfo=0|g' /etc/php5/fpm/pool.d/www.conf
-RUN sed -i 's|;date.timezone =|date.timezone = "Europe/Paris"|g' /etc/php5/fpm/php.ini
+RUN sed -i 's|;date.timezone =|date.timezone = "[[ $locale ]]"|g' /etc/php5/fpm/php.ini
+RUN sed -i 's|memory_limit = 128M|memory_limit = [[ $memoryLimit ]]|g' /etc/php5/fpm/php.ini
+RUN sed -i 's|max_execution_time = 30|max_execution_time = [[ $maxExecutionTime ]]|g' /etc/php5/fpm/php.ini
+RUN sed -i 's|max_input_time = 60|max_input_time = [[ $maxInputTime ]]|g' /etc/php5/fpm/php.ini
 
 ADD setup.sh /root/setup.sh
 RUN chmod +x /root/setup.sh

diff --git a/templates/phpmyadmin/Dockerfile b/templates/phpmyadmin/Dockerfile
@@ -15,8 +15,8 @@ RUN cp /usr/share/phpmyadmin/config.sample.inc.php /usr/share/phpmyadmin/config.
 
 [[ $firstLinked := .Container.FirstLinked]]
 
-RUN sed -i "s|if (empty(\$dbserver)) \$dbserver = 'localhost';|if (empty(\$dbserver)) \$dbserver = getenv('[[ $firstLinked.Name | ToUpper ]]_PORT_[[ $firstLinked.GetFirstPort]]_TCP_ADDR');|g" /etc/phpmyadmin/config.inc.php
-RUN sed -i "s|//\$cfg\['Servers'\]\[\$i\]\['host'\] = 'localhost';|\$cfg\['Servers'\]\[\$i\]\['host'\] = getenv('[[ $firstLinked.Name | ToUpper ]]_PORT_[[ $firstLinked.GetFirstPort]]_TCP_ADDR');|g" /etc/phpmyadmin/config.inc.php
+RUN sed -i "s|if (empty(\$dbserver)) \$dbserver = 'localhost';|if (empty(\$dbserver)) \$dbserver = getenv('[[ $firstLinked.Name | ToUpper ]]_PORT_[[ $firstLinked.GetFirstLocalPort]]_TCP_ADDR');|g" /etc/phpmyadmin/config.inc.php
+RUN sed -i "s|//\$cfg\['Servers'\]\[\$i\]\['host'\] = 'localhost';|\$cfg\['Servers'\]\[\$i\]\['host'\] = getenv('[[ $firstLinked.Name | ToUpper ]]_PORT_[[ $firstLinked.GetFirstLocalPort]]_TCP_ADDR');|g" /etc/phpmyadmin/config.inc.php
 RUN sed -i "s|// \$cfg\['Servers'\]\[\$i\]\['AllowNoPassword'\] = TRUE;|\$cfg\['Servers'\]\[\$i\]\['AllowNoPassword'\] = TRUE;|g" /etc/phpmyadmin/config.inc.php
 
 # Add setup script

diff --git a/templates/varnish/default.vcl b/templates/varnish/default.vcl
@@ -1,10 +1,12 @@
+[[ $probeUrl := (.Container.GetCustomValue "probe_url" "/") ]]
+
 [[range (.Container.GetCustomValue "backends")]]
-[[ $port := ($.Collection.Get . ).GetFirstPort ]]
+[[ $port := ($.Collection.Get . ).GetFirstLocalPort ]]
 backend [[.]] {
     .host = "${[[ . | ToUpper ]]_PORT_[[ $port ]]_TCP_ADDR}";
     .port = "${[[ . | ToUpper ]]_PORT_[[ $port ]]_TCP_PORT}";
     .probe = {
-        .url = "/";
+        .url = "[[ $probeUrl ]]";
         .interval = 5s;
         .timeout = 1 s;
         .window = 5;