From 5087fc727a11b25ce428b9d218c6d1c31e58eb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 29 Aug 2016 10:14:02 +0200 Subject: [PATCH 1/3] Revert "Remove documentation for Docker PMA_ABSOLUTE_URI" This reverts commit c00cc4a15a5c0ee7b2ba047c08430f2d415d7794. --- doc/setup.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/setup.rst b/doc/setup.rst index 35da825f13..5f6a45f848 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -178,6 +178,11 @@ environment variables: Port of the databse server to use. +.. envvar:: PMA_ABSOLUTE_URI + + The fully-qualified path (``https://pma.example.net/``) where the reverse + proxy makes phpMyAdmin available. + .. envvar:: PHP_UPLOAD_MAX_FILESIZE Define upload_max_filesize and post_max_size PHP settings. From d239d6cc49b66ab07681921489e00860b06b4b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 29 Aug 2016 10:15:24 +0200 Subject: [PATCH 2/3] Add link to related configuration directives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/setup.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 5f6a45f848..3dbd6e06fe 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -155,8 +155,9 @@ environment variables: .. envvar:: PMA_ARBITRARY - Allows you to enter database server hostname on login form (see - :config:option:`$cfg['AllowArbitraryServer']`). + Allows you to enter database server hostname on login form. + + .. seealso:: :config:option:`$cfg['AllowArbitraryServer']` .. envvar:: PMA_HOST @@ -183,6 +184,8 @@ environment variables: The fully-qualified path (``https://pma.example.net/``) where the reverse proxy makes phpMyAdmin available. + .. seealso:: :config:option:`$cfg['PmaAbsoluteUri']` + .. envvar:: PHP_UPLOAD_MAX_FILESIZE Define upload_max_filesize and post_max_size PHP settings. From 001aff0e8c3cfd6a3dec96f3dec54f199e4b6a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 29 Aug 2016 10:15:41 +0200 Subject: [PATCH 3/3] Remove no longer valid options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/setup.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 3dbd6e06fe..4336ffe1cd 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -186,14 +186,6 @@ environment variables: .. seealso:: :config:option:`$cfg['PmaAbsoluteUri']` -.. envvar:: PHP_UPLOAD_MAX_FILESIZE - - Define upload_max_filesize and post_max_size PHP settings. - -.. envvar:: PHP_MAX_INPUT_VARS - - Define max_input_vars PHP setting. - By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and :envvar:`PMA_PASSWORD` are set, it is switched to :ref:`auth_config`.