From e00a0f1e6cef347f3c50374a6564f6aca9d88938 Mon Sep 17 00:00:00 2001 From: Ricardo de Vries Date: Fri, 1 Dec 2017 20:59:28 +0100 Subject: [PATCH 1/5] Added the Flex node for Apache. --- setup/web_server_configuration.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst index 9f15c1ac815..a84f8414677 100644 --- a/setup/web_server_configuration.rst +++ b/setup/web_server_configuration.rst @@ -31,6 +31,16 @@ to use PHP :ref:`with Nginx `. .. _web-server-apache-mod-php: +Using Symfony Flex in Apache +---------------------------- + +The recommended way is to install the apache recipe by executing the following command: + +.. code-block:: terminal + + $ cd my-project/ + $ composer require symfony/apache-pack + Apache with mod_php/PHP-CGI --------------------------- From d71d22a770d9037cd219f26ee0e8ef6715e5f97e Mon Sep 17 00:00:00 2001 From: Ricardo de Vries Date: Sat, 2 Dec 2017 12:46:12 +0100 Subject: [PATCH 2/5] Improvements on the apache section. --- setup/web_server_configuration.rst | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst index a84f8414677..defc2edceca 100644 --- a/setup/web_server_configuration.rst +++ b/setup/web_server_configuration.rst @@ -31,16 +31,22 @@ to use PHP :ref:`with Nginx `. .. _web-server-apache-mod-php: -Using Symfony Flex in Apache ----------------------------- +Adding Rewrite Rules +-------------------- -The recommended way is to install the apache recipe by executing the following command: +The easiest way is to install the apache recipe by executing the following command: .. code-block:: terminal - $ cd my-project/ $ composer require symfony/apache-pack +This recipe will install the ``.htaccess` file in the ``public/`` directory. + +.. tip:: + + A performance improvement can be achieved by putting the rewrite rules in your + VirtualHost block and changing ``AllowOverride All`` to ``AllowOverride None``. + Apache with mod_php/PHP-CGI --------------------------- From 02cc3dad4934dbd1faca5e7932a560d38f68dfff Mon Sep 17 00:00:00 2001 From: Ricardo de Vries Date: Sat, 2 Dec 2017 12:48:47 +0100 Subject: [PATCH 3/5] Forgot a apostrophe. --- setup/web_server_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst index defc2edceca..4c554b9b9b4 100644 --- a/setup/web_server_configuration.rst +++ b/setup/web_server_configuration.rst @@ -40,7 +40,7 @@ The easiest way is to install the apache recipe by executing the following comma $ composer require symfony/apache-pack -This recipe will install the ``.htaccess` file in the ``public/`` directory. +This recipe will install the ``.htaccess`` file in the ``public/`` directory. .. tip:: From 07abdb887ea30424f3cb54551fe895de94695f3e Mon Sep 17 00:00:00 2001 From: Ricardo de Vries Date: Sat, 2 Dec 2017 18:03:19 +0100 Subject: [PATCH 4/5] Update article block from pull request feedback. --- setup/web_server_configuration.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst index 4c554b9b9b4..60c2d2adc65 100644 --- a/setup/web_server_configuration.rst +++ b/setup/web_server_configuration.rst @@ -40,12 +40,13 @@ The easiest way is to install the apache recipe by executing the following comma $ composer require symfony/apache-pack -This recipe will install the ``.htaccess`` file in the ``public/`` directory. +This recipe will install a ``.htaccess`` file containing the rewrite rules in the ``public/`` directory. .. tip:: - A performance improvement can be achieved by putting the rewrite rules in your - VirtualHost block and changing ``AllowOverride All`` to ``AllowOverride None``. + A performance improvement can be achieved by putting the rewrite rules from the ``.htaccess`` + file to the VirtualHost block of your Apache configuration and disallowing ``.htaccess`` from + override by changing ``AllowOverride All`` to ``AllowOverride None`` in your VirtualHost block. Apache with mod_php/PHP-CGI --------------------------- From 843653f2ec98bc3e935c7fa4039a1b73028e52fc Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Sun, 3 Dec 2017 20:03:48 +0100 Subject: [PATCH 5/5] Minor changes --- setup/web_server_configuration.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst index 60c2d2adc65..daf8c876106 100644 --- a/setup/web_server_configuration.rst +++ b/setup/web_server_configuration.rst @@ -34,13 +34,13 @@ to use PHP :ref:`with Nginx `. Adding Rewrite Rules -------------------- -The easiest way is to install the apache recipe by executing the following command: +The easiest way is to install the Apache recipe by executing the following command: .. code-block:: terminal $ composer require symfony/apache-pack -This recipe will install a ``.htaccess`` file containing the rewrite rules in the ``public/`` directory. +This recipe installs a ``.htaccess`` file containing the rewrite rules in the ``public/`` directory. .. tip::