Serghey Rodin před 6 roky
rodič
revize
70319b6a94
2 změnil soubory, kde provedl 74 přidání a 59 odebrání
  1. 66 55
      install/rhel/7/pma/config.inc.conf
  2. 8 4
      install/vst-install-rhel.sh

+ 66 - 55
install/rhel/7/pma/config.inc.conf

@@ -4,24 +4,24 @@
  * phpMyAdmin sample configuration, you can use it as base for
  * phpMyAdmin sample configuration, you can use it as base for
  * manual configuration. For easier setup you can use setup/
  * manual configuration. For easier setup you can use setup/
  *
  *
- * All directives are explained in Documentation.html and on phpMyAdmin
- * wiki <http://wiki.phpmyadmin.net>.
+ * All directives are explained in documentation in the doc/ folder
+ * or at <https://docs.phpmyadmin.net/>.
  *
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
  */
 
 
-/*
+/**
  * This is needed for cookie based authentication to encrypt password in
  * This is needed for cookie based authentication to encrypt password in
- * cookie
+ * cookie. Needs to be 32 chars long.
  */
  */
 $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
 $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
 
 
-/*
+/**
  * Servers configuration
  * Servers configuration
  */
  */
 $i = 0;
 $i = 0;
 
 
-/*
+/**
  * First server
  * First server
  */
  */
 $i++;
 $i++;
@@ -29,44 +29,57 @@ $i++;
 $cfg['Servers'][$i]['auth_type'] = 'cookie';
 $cfg['Servers'][$i]['auth_type'] = 'cookie';
 /* Server parameters */
 /* Server parameters */
 $cfg['Servers'][$i]['host'] = 'localhost';
 $cfg['Servers'][$i]['host'] = 'localhost';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
 $cfg['Servers'][$i]['compress'] = false;
 $cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
 $cfg['Servers'][$i]['AllowNoPassword'] = false;
 $cfg['Servers'][$i]['AllowNoPassword'] = false;
 
 
-/*
+/**
  * phpMyAdmin configuration storage settings.
  * phpMyAdmin configuration storage settings.
  */
  */
 
 
 /* User used to manipulate with storage */
 /* User used to manipulate with storage */
-// $cfg['Servers'][$i]['controluser'] = 'pma';
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
+$cfg['Servers'][$i]['controlhost'] = '';
+$cfg['Servers'][$i]['controlport'] = '';
+$cfg['Servers'][$i]['controluser'] = 'phpmyadmin';
+$cfg['Servers'][$i]['controlpass'] = '%phpmyadmin_pass%';
 
 
 /* Storage database and tables */
 /* Storage database and tables */
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';
-// $cfg['Servers'][$i]['relation'] = 'pma_relation';
-// $cfg['Servers'][$i]['table_info'] = 'pma_table_info';
-// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords';
-// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
-// $cfg['Servers'][$i]['column_info'] = 'pma_column_info';
-// $cfg['Servers'][$i]['history'] = 'pma_history';
-// $cfg['Servers'][$i]['tracking'] = 'pma_tracking';
-// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
-// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
-/* Contrib / Swekey authentication */
-// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
-
-/*
+$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
+$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
+$cfg['Servers'][$i]['relation'] = 'pma__relation';
+$cfg['Servers'][$i]['table_info'] = 'pma__table_info';
+$cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
+$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
+$cfg['Servers'][$i]['column_info'] = 'pma__column_info';
+$cfg['Servers'][$i]['history'] = 'pma__history';
+$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
+$cfg['Servers'][$i]['tracking'] = 'pma__tracking';
+$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
+$cfg['Servers'][$i]['recent'] = 'pma__recent';
+$cfg['Servers'][$i]['favorite'] = 'pma__favorite';
+$cfg['Servers'][$i]['users'] = 'pma__users';
+$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
+$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
+$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
+$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
+$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
+$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
+
+/**
  * End of servers configuration
  * End of servers configuration
  */
  */
 
 
-/*
+/**
  * Directories for saving/loading files from server
  * Directories for saving/loading files from server
  */
  */
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
+$cfg['UploadDir'] = '/var/lib/phpMyAdmin/upload';
+$cfg['SaveDir'] = '/var/lib/phpMyAdmin/save';
+
+/**
+ * Whether to display icons or text or both icons and text in table row
+ * action segment. Value can be either of 'icons', 'text' or 'both'.
+ * default = 'both'
+ */
+//$cfg['RowActionType'] = 'icons';
 
 
 /**
 /**
  * Defines whether a user should be displayed a "show all (records)"
  * Defines whether a user should be displayed a "show all (records)"
@@ -78,25 +91,21 @@ $cfg['SaveDir'] = '';
 /**
 /**
  * Number of rows displayed when browsing a result set. If the result
  * Number of rows displayed when browsing a result set. If the result
  * set contains more rows, "Previous" and "Next".
  * set contains more rows, "Previous" and "Next".
- * default = 30
+ * Possible values: 25, 50, 100, 250, 500
+ * default = 25
  */
  */
 //$cfg['MaxRows'] = 50;
 //$cfg['MaxRows'] = 50;
 
 
 /**
 /**
- * Use graphically less intense menu tabs
- * default = false
- */
-//$cfg['LightTabs'] = true;
-
-/**
- * disallow editing of binary fields
+ * Disallow editing of binary fields
  * valid values are:
  * valid values are:
- *   false  allow editing
- *   'blob' allow editing except for BLOB fields
- *   'all'  disallow editing
- * default = blob
+ *   false    allow editing
+ *   'blob'   allow editing except for BLOB fields
+ *   'noblob' disallow editing except for BLOB fields
+ *   'all'    disallow editing
+ * default = 'blob'
  */
  */
-//$cfg['ProtectBinary'] = 'false';
+//$cfg['ProtectBinary'] = false;
 
 
 /**
 /**
  * Default language to use, if not browser-defined or user-defined
  * Default language to use, if not browser-defined or user-defined
@@ -107,12 +116,6 @@ $cfg['SaveDir'] = '';
 //$cfg['DefaultLang'] = 'en';
 //$cfg['DefaultLang'] = 'en';
 //$cfg['DefaultLang'] = 'de';
 //$cfg['DefaultLang'] = 'de';
 
 
-/**
- * default display direction (horizontal|vertical|horizontalflipped)
- */
-//$cfg['DefaultDisplay'] = 'vertical';
-
-
 /**
 /**
  * How many columns should be used for table display of a database?
  * How many columns should be used for table display of a database?
  * (a value larger than 1 results in some information being hidden)
  * (a value larger than 1 results in some information being hidden)
@@ -131,13 +134,21 @@ $cfg['SaveDir'] = '';
 
 
 /**
 /**
  * When using DB-based query history, how many entries should be kept?
  * When using DB-based query history, how many entries should be kept?
- *
  * default = 25
  * default = 25
  */
  */
 //$cfg['QueryHistoryMax'] = 100;
 //$cfg['QueryHistoryMax'] = 100;
 
 
-/*
- * You can find more configuration options in Documentation.html
- * or here: http://wiki.phpmyadmin.net/pma/Config
+/**
+ * Whether or not to query the user before sending the error report to
+ * the phpMyAdmin team when a JavaScript error occurs
+ *
+ * Available options
+ * ('ask' | 'always' | 'never')
+ * default = 'ask'
+ */
+//$cfg['SendErrorReports'] = 'always';
+
+/**
+ * You can find more configuration options in the documentation
+ * in the doc/ folder or at <https://docs.phpmyadmin.net/>.
  */
  */
-?>

+ 8 - 4
install/vst-install-rhel.sh

@@ -83,9 +83,6 @@ gen_pass() {
     echo "$PASS"
     echo "$PASS"
 }
 }
 
 
-# Defining 32 char blowfish_secret
-blowfish_secret=`openssl rand -base64 32`;
-
 # Defining return code check function
 # Defining return code check function
 check_result() {
 check_result() {
     if [ $1 -ne 0 ]; then
     if [ $1 -ne 0 ]; then
@@ -1045,8 +1042,15 @@ if [ "$mysql" = 'yes' ]; then
     if [ "$apache" = 'yes' ]; then
     if [ "$apache" = 'yes' ]; then
         cp -f $vestacp/pma/phpMyAdmin.conf /etc/httpd/conf.d/
         cp -f $vestacp/pma/phpMyAdmin.conf /etc/httpd/conf.d/
     fi
     fi
+    mysql < /usr/share/phpMyAdmin/sql/create_tables.sql
+    p=$(gen_pass)
+    mysql -e "GRANT ALL ON phpmyadmin.*
+        TO phpmyadmin@localhost IDENTIFIED BY '$p'"
     cp -f $vestacp/pma/config.inc.conf /etc/phpMyAdmin/config.inc.php
     cp -f $vestacp/pma/config.inc.conf /etc/phpMyAdmin/config.inc.php
-    sed -i "s#%blowfish_secret#$blowfish_secret#g" /etc/phpMyAdmin/config.inc.php
+    sed -i "s/%blowfish_secret%/$(gen_pass 32)/g" /etc/phpMyAdmin/config.inc.php
+    sed -i "s/%phpmyadmin_pass%/$p/g" /etc/phpMyAdmin/config.inc.php
+    chmod 777 /var/lib/phpMyAdmin/temp
+    chmod 777 /var/lib/phpMyAdmin/save
 fi
 fi