From a6314d1dde2c420d8fa61264f63e0eecf57a121b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2012 13:25:42 +0100 Subject: [PATCH 1/6] Do not document no longer included things --- contrib/README | 8 -------- 1 file changed, 8 deletions(-) diff --git a/contrib/README b/contrib/README index ac8ef6c8af..84bcb626ee 100644 --- a/contrib/README +++ b/contrib/README @@ -6,15 +6,7 @@ useful to other. There is no guarantee it will work for you. Current content of this directory: -packaging - Contains files needed for creating packages for various - distributions. Please prefer official packages from your vendor if - possible. - swekey.sample.conf SweKey authentication configuration example. -htaccess - Sample Apache configuration for limit access for bots. - # vim: expandtab ts=4 sw=4 sts=4 tw=78 From 281673677c41bf2f75165dbf7a5cb1091561ac9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2012 13:27:48 +0100 Subject: [PATCH 2/6] Move swekey config file to exxamples folder --- Documentation.html | 2 +- {contrib => examples}/swekey.sample.conf | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {contrib => examples}/swekey.sample.conf (100%) diff --git a/Documentation.html b/Documentation.html index 96c5de4c52..320f399d53 100644 --- a/Documentation.html +++ b/Documentation.html @@ -559,7 +559,7 @@ $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey.conf'; You then have to create the swekey.conf file that will associate each user with their Swekey Id. It is important to place this file outside of your web server's document root (in the example, it is located in /etc). A self documented sample file is provided -in the contrib directory. Feel free to use it with your own +in the examples directory. Feel free to use it with your own users' information.

If you want to purchase a Swekey please visit http://phpmyadmin.net/auth_key diff --git a/contrib/swekey.sample.conf b/examples/swekey.sample.conf similarity index 100% rename from contrib/swekey.sample.conf rename to examples/swekey.sample.conf From 850b202e8227b9fdef621b785c1a240de87f7f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2012 13:29:31 +0100 Subject: [PATCH 3/6] Move signon and openid examples to examples folder --- {scripts => examples}/openid.php | 0 {scripts => examples}/signon-script.php | 0 {scripts => examples}/signon.php | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {scripts => examples}/openid.php (100%) rename {scripts => examples}/signon-script.php (100%) rename {scripts => examples}/signon.php (100%) diff --git a/scripts/openid.php b/examples/openid.php similarity index 100% rename from scripts/openid.php rename to examples/openid.php diff --git a/scripts/signon-script.php b/examples/signon-script.php similarity index 100% rename from scripts/signon-script.php rename to examples/signon-script.php diff --git a/scripts/signon.php b/examples/signon.php similarity index 100% rename from scripts/signon.php rename to examples/signon.php From c25a7dcaaccca2248526ec54bbacbb7c947f9936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2012 13:30:22 +0100 Subject: [PATCH 4/6] Document moving signon and openid examples to examples folder --- Documentation.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 320f399d53..45219ece97 100644 --- a/Documentation.html +++ b/Documentation.html @@ -770,9 +770,9 @@ since this link provides funding for phpMyAdmin. session data or using supplied PHP script. This is useful for implementing single signon from another application. - Sample way how to seed session is in signon example: scripts/signon.php. - There is also alternative example using OpenID - scripts/openid.php and - example for scripts based solution - scripts/signon-script.php. + Sample way how to seed session is in signon example: examples/signon.php. + There is also alternative example using OpenID - examples/openid.php and + example for scripts based solution - examples/signon-script.php. You need to configure signon. The script needs to provide function get_login_credentials which returns list of username and password, accepting single parameter of existing username (can be empty). - See scripts/signon-script.php for an example. + See examples/signon-script.php for an example.
$cfg['Servers'][$i]['SignonSession'] string
Name of session which will be used for signon authentication method. From 8548929e03e93bcbb3df92c9ecc134b60e6a65a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2012 13:32:00 +0100 Subject: [PATCH 5/6] Add example for many hosts configuration Taken from Debian package as I think it might be useful for others as well. --- examples/config.manyhosts.inc.php | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 examples/config.manyhosts.inc.php diff --git a/examples/config.manyhosts.inc.php b/examples/config.manyhosts.inc.php new file mode 100644 index 0000000000..d006cde699 --- /dev/null +++ b/examples/config.manyhosts.inc.php @@ -0,0 +1,43 @@ + Date: Mon, 13 Feb 2012 13:32:36 +0100 Subject: [PATCH 6/6] Say goodbye to contrib folder --- contrib/README | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 contrib/README diff --git a/contrib/README b/contrib/README deleted file mode 100644 index 84bcb626ee..0000000000 --- a/contrib/README +++ /dev/null @@ -1,12 +0,0 @@ -phpMyAdmin Third Party Contributions -==================================== - -This directory contains various stuff contributed by users that might be -useful to other. There is no guarantee it will work for you. - -Current content of this directory: - -swekey.sample.conf - SweKey authentication configuration example. - -# vim: expandtab ts=4 sw=4 sts=4 tw=78