--- trunk/phpmyadmin/config.inc	2015/08/17 11:57:38	2687
+++ trunk/phpmyadmin/config.inc	2015/08/17 12:01:30	2688
@@ -1,15 +1,23 @@
 <?php
+/**
+ * phpMyAdmin configuration file, you can use it as base for the manual
+ * configuration. For easier setup you can use "setup/".
+ *
+ * All directives are explained in Documentation.html and on phpMyAdmin
+ * wiki <http://wiki.phpmyadmin.net>.
+ */
 
 /*
  * This is needed for cookie based authentication to encrypt password in
  * cookie
  */
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['blowfish_secret'] = 'MUSTBECHANGEDONINSTALL'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
 
 /**
  * Server(s) configuration
  */
 $i = 0;
+
 // The $cfg['Servers'] array starts with $cfg['Servers'][1].  Do not use
 // $cfg['Servers'][0]. You can disable a server config entry by setting host
 // to ''. If you want more than one server, just copy following section
@@ -20,7 +28,7 @@
 $cfg['Servers'][$i]['port']          = '';          // MySQL port - leave blank for default port
 $cfg['Servers'][$i]['socket']        = '';          // Path to the socket - leave blank for default socket
 $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
-$cfg['Servers'][$i]['extension']     = 'mysql';     // The php MySQL extension to use ('mysql' or 'mysqli')
+$cfg['Servers'][$i]['extension']     = 'mysqli';    // The php MySQL extension to use ('mysql' or 'mysqli')
 $cfg['Servers'][$i]['compress']      = FALSE;       // Use compressed protocol for the MySQL connection
                                                     // (requires PHP >= 4.3.0)
 $cfg['Servers'][$i]['controluser']   = '';          // MySQL control user settings
@@ -30,7 +38,7 @@
                                                     // The controluser is also
                                                     // used for all relational
                                                     // features (pmadb)
-$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
 $cfg['Servers'][$i]['user']          = '';          // MySQL user
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                     // with 'config' auth_type)
@@ -73,7 +81,31 @@
                                      = '';
 $cfg['Servers'][$i]['AllowDeny']['rules']           // Host authentication rules, leave blank for defaults
                                      = array();
+$cfg['Servers'][$i]['AllowNoPassword']              // Allow logins without a password. Do not change the FALSE
+                                     = FALSE;       // default unless you're running a passwordless MySQL server
+$cfg['Servers'][$i]['designer_coords']              // Leave blank (default) for no Designer support, otherwise
+                                     = '';          // set to suggested 'pma_designer_coords' if really needed
+$cfg['Servers'][$i]['bs_garbage_threshold']         // Blobstreaming: Recommented default value from upstream
+                                     = 50;          //   DEFAULT: '50'
+$cfg['Servers'][$i]['bs_repository_threshold']      // Blobstreaming: Recommented default value from upstream
+                                     = '32M';       //   DEFAULT: '32M'
+$cfg['Servers'][$i]['bs_temp_blob_timeout']         // Blobstreaming: Recommented default value from upstream
+                                     = 600;         //   DEFAULT: '600'
+$cfg['Servers'][$i]['bs_temp_log_threshold']        // Blobstreaming: Recommented default value from upstream
+                                     = '32M';       //   DEFAULT: '32M'
+/*
+ * End of servers configuration
+ */
 
-$cfg['DisplayDatabasesList']         = FALSE;       // show a drop-down menu for databases
+/*
+ * Directories for saving/loading files from server
+ */
+$cfg['UploadDir'] = '/var/lib/phpmyadmin/upload';
+$cfg['SaveDir']   = '/var/lib/phpmyadmin/save';
 
+/*
+ * Disable the default warning that is displayed on the DB Details Structure
+ * page if any of the required Tables for the relation features is not found
+ */
+$cfg['PmaNoRelation_DisableWarning'] = TRUE;
 ?>