From d477068cce4bcbbef75b2f3f7f86808020542d46 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Sat, 23 Feb 2013 17:47:23 +0100 Subject: [PATCH 1/4] configuration_overwrite: change title to reverse proxy configuration --- admin_manual/configuration/configuration_overwrite.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_manual/configuration/configuration_overwrite.rst b/admin_manual/configuration/configuration_overwrite.rst index c401ffb57..6afdef903 100644 --- a/admin_manual/configuration/configuration_overwrite.rst +++ b/admin_manual/configuration/configuration_overwrite.rst @@ -1,5 +1,5 @@ -Overwrite Configuration -======================= +Reverse Proxy Configuration +=========================== The automatic hostname, protocol or webroot detection of ownCloud can fail in certain reverse proxy situations. This configuration allows to manually override the automatic detection. From 310a65d60fd096451df33bb1ab203d8a550c104e Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Sat, 23 Feb 2013 18:15:58 +0100 Subject: [PATCH 2/4] configuration_overwrite: use complete code example and add note --- admin_manual/configuration/configuration_overwrite.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin_manual/configuration/configuration_overwrite.rst b/admin_manual/configuration/configuration_overwrite.rst index 6afdef903..aef53e2c5 100644 --- a/admin_manual/configuration/configuration_overwrite.rst +++ b/admin_manual/configuration/configuration_overwrite.rst @@ -19,8 +19,11 @@ If you want to access your ownCloud installation **http://domain.tld/owncloud** .. code-block:: php "ssl-proxy.tld", "overwriteprotocol" => "https", "overwritewebroot" => "/domain.tld/owncloud", "overwritecondaddr" => "^10\.0\.0\.1$", + ); + +.. note:: If you want to use the SSL proxy during installation you have to create the :file:`config/config.php` otherwise you have to extend to existing **$CONFIG** array. From d6a62059be0759c4b028408f37878e996eab702a Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Sat, 23 Feb 2013 18:23:16 +0100 Subject: [PATCH 3/4] configuration_overwrite: wrap text at 80 characters --- .../configuration/configuration_overwrite.rst | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/admin_manual/configuration/configuration_overwrite.rst b/admin_manual/configuration/configuration_overwrite.rst index aef53e2c5..9b94aa9d0 100644 --- a/admin_manual/configuration/configuration_overwrite.rst +++ b/admin_manual/configuration/configuration_overwrite.rst @@ -1,12 +1,26 @@ Reverse Proxy Configuration =========================== -The automatic hostname, protocol or webroot detection of ownCloud can fail in certain reverse proxy situations. This configuration allows to manually override the automatic detection. +The automatic hostname, protocol or webroot detection of ownCloud can fail in +certain reverse proxy situations. This configuration allows to manually override +the automatic detection. Parameters ---------- -If ownCloud fails to automatically detected the hostname, protocol or webroot you can use the **overwrite** parameters inside the :file:`config/config.php`. The **overwritehost** parameter is used to set the hostname of the proxy. You can also specify a port. The **overwriteprotocol** parameter is used to set the protocol of the proxy. You can choose between the two options **http** and **https**. The **overwritewebroot** parameter is used to set the absolute web path of the proxy to the ownCloud folder. When you want to keep the automatic detection of one of the three parameters you can leave the value empty or don't set it. The **overwritecondaddr** parameter is used to overwrite the values dependent on the remote address. The value must be a **regular expression** of the IP addresses of the proxy. This is useful when you use a reverse SSL proxy only for https access and you want to use the automatic detection for http access. +If ownCloud fails to automatically detected the hostname, protocol or webroot +you can use the **overwrite** parameters inside the :file:`config/config.php`. +The **overwritehost** parameter is used to set the hostname of the proxy. You +can also specify a port. The **overwriteprotocol** parameter is used to set the +protocol of the proxy. You can choose between the two options **http** and +**https**. The **overwritewebroot** parameter is used to set the absolute web +path of the proxy to the ownCloud folder. When you want to keep the automatic +detection of one of the three parameters you can leave the value empty or don't +set it. The **overwritecondaddr** parameter is used to overwrite the values +dependent on the remote address. The value must be a **regular expression** of +the IP addresses of the proxy. This is useful when you use a reverse SSL proxy +only for https access and you want to use the automatic detection for http +access. Example ------- @@ -14,7 +28,10 @@ Example Multiple Domains Reverse SSL Proxy ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you want to access your ownCloud installation **http://domain.tld/owncloud** via a multiple domains reverse SSL proxy **https://ssl-proxy.tld/domain.tld/owncloud** with the IP address **10.0.0.1** you can set the following parameters inside the :file:`config/config.php`. +If you want to access your ownCloud installation **http://domain.tld/owncloud** +via a multiple domains reverse SSL proxy +**https://ssl-proxy.tld/domain.tld/owncloud** with the IP address **10.0.0.1** +you can set the following parameters inside the :file:`config/config.php`. .. code-block:: php @@ -26,4 +43,6 @@ If you want to access your ownCloud installation **http://domain.tld/owncloud** "overwritecondaddr" => "^10\.0\.0\.1$", ); -.. note:: If you want to use the SSL proxy during installation you have to create the :file:`config/config.php` otherwise you have to extend to existing **$CONFIG** array. +.. note:: If you want to use the SSL proxy during installation you have to + create the :file:`config/config.php` otherwise you have to extend to existing + **$CONFIG** array. From b04f4de9a9a7d78472b2474801fdb5d30af2a642 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Sat, 23 Feb 2013 20:24:51 +0100 Subject: [PATCH 4/4] configuration_overwrite: rename to configuration_reverseproxy to match title --- ...nfiguration_overwrite.rst => configuration_reverseproxy.rst} | 0 admin_manual/configuration/index.rst | 2 +- admin_manual/index.rst | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename admin_manual/configuration/{configuration_overwrite.rst => configuration_reverseproxy.rst} (100%) diff --git a/admin_manual/configuration/configuration_overwrite.rst b/admin_manual/configuration/configuration_reverseproxy.rst similarity index 100% rename from admin_manual/configuration/configuration_overwrite.rst rename to admin_manual/configuration/configuration_reverseproxy.rst diff --git a/admin_manual/configuration/index.rst b/admin_manual/configuration/index.rst index 09d2b0048..a8be98a0a 100644 --- a/admin_manual/configuration/index.rst +++ b/admin_manual/configuration/index.rst @@ -12,7 +12,7 @@ Configuration configuration_knowledgebase configuration_logging configuration_mail - configuration_overwrite + configuration_reverseproxy custom_mount_config custom_user_backend auth_ldap diff --git a/admin_manual/index.rst b/admin_manual/index.rst index 5598b3101..7d2b5cd69 100644 --- a/admin_manual/index.rst +++ b/admin_manual/index.rst @@ -59,7 +59,7 @@ This chapter covers ownCloud and Webserver configuration. * :doc:`configuration/configuration_knowledgebase` * :doc:`configuration/configuration_logging` * :doc:`configuration/configuration_mail` -* :doc:`configuration/configuration_overwrite` +* :doc:`configuration/configuration_reverseproxy` * :doc:`configuration/custom_mount_config` * :doc:`configuration/custom_user_backend` * :doc:`configuration/auth_ldap`