Changeset 629

Timestamp:

02/22/06 01:26:26 (7 years ago)

Author:

anarcat

Message:

[project @ alternc: changeset 2005-04-29 04:20:46 by anarcat]
après une repo-copie de install/scripts/etc/phpmyadmin/config.inc.php
vers install/etc/alternc/phpmyadmin.inc.php, retirer le config.inc.php
du joug de alternc.install, et *ajouter* la configuration d'alternc à
la configuration phpMyAdmin déjà existante on fait ceci en installant
un fichier de config de phpmyadmin dans /etc/alternc, assez similaire
à l'original, mais qui est inclus à la fin de config.inc.php, ce qui
permet de conserver des configurations locales qui survivent aux
upgrades alternc

Original author: anarcat
Date: 2005-04-29 04:20:46

Files:

• debian/postinst (modified) (1 diff)
• debian/rules (modified) (1 diff)
• install/etc/alternc/phpmyadmin.inc.php (modified) (3 diffs)
• install/scripts/alternc.install (modified) (1 diff)
• install/scripts/etc/phpmyadmin (deleted)

debian/postinst

@@ -119 +119 @@
     /usr/share/alternc/install/upgrade_check.sh $2
 
-    echo "running alternc.install"
     # important: postinst gele sans ca
     db_stop
+
+    echo "config phpmyadmin"
+    include_str='include_once("/etc/alternc/phpmyadmin.inc.php")'
+    pma_config=/etc/phpmyadmin/config.inc.php
+    if ! grep -e "$include_str" $pma_config > /dev/null 2>&1; then
+        echo "<?php $include_str ?>" >> $pma_config
+    fi
+    echo "running alternc.install"
     alternc.install
 

debian/rules

@@ -53 +53 @@
         install -o root -g www-data -m0750 -d debian/alternc/etc/alternc
         sed -e "s/@@VERSION@@/$(VERSION)/g" >debian/alternc/etc/alternc/alternc.conf < install/etc/alternc/alternc.conf 
+        install -o root -g root -m644 install/etc/alternc/phpmyadmin.inc.php debian/alternc/etc/alternc
         chown www-data debian/alternc/etc/alternc/alternc.conf
         chmod 750 debian/alternc/etc/alternc/alternc.conf

install/etc/alternc/phpmyadmin.inc.php

@@ -1 +1 @@
 <?php
+
 /**
- * Debian local configuration file
+ * Special phpmyadmin configuration for AlternC
  *
- * This file overrides global configuration file
+ * We setup two new servers:
+ *
+ * i: a server with a hardcoded username/password corresponding to the
+ * one setup in the AlternC panels
+ *
+ * i+1: a regular server with a cookie-based auth
+ *
+ * the content of this file will be included in the
+ * /etc/phpmyadmin/config.inc.php
  */
 
-
-/**
- * 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 ''.
 $i++;
 
-// Uncomment to override the default configuration
 $cfg['Servers'][$i]['host']          = 'localhost'; // MySQL hostname or IP address
 $cfg['Servers'][$i]['port']          = '';          // MySQL port - leave blank for default port
@@ -34 +35 @@
 $cfg['Servers'][$i]['password']      = $_COOKIE["REMOTE_PASSWORD"]; ;          // MySQL password (only needed
 //                                                    // with 'config' auth_type)
-$cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only
-//                                                    // this db is displayed in left frame
-//                                                    // It may also be an array of db-names, where sorting order is relevant.
-$cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname
-//
-//$cfg['Servers'][$i]['pmadb']         = 'phpmyadmin';// Database used for Relation, Bookmark and PDF Features
-//                                                    // (see scripts/create_tables.sql)
-//                                                    //   - leave blank for no support
-//                                                    //     DEFAULT: 'phpmyadmin'
-//$cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';// Bookmark table
-//                                                    //   - leave blank for no bookmark support
-//                                                    //     DEFAULT: 'pma_bookmark'
-//$cfg['Servers'][$i]['relation']      = 'pma_relation';// table to describe the relation between links (see doc)
-//                                                    //   - leave blank for no relation-links support
-//                                                    //     DEFAULT: 'pma_relation'
-//$cfg['Servers'][$i]['table_info']    = 'pma_table_info';// table to describe the display fields
-//                                                    //   - leave blank for no display fields support
-//                                                    //     DEFAULT: 'pma_table_info'
-//$cfg['Servers'][$i]['table_coords']  = 'pma_table_coords';// table to describe the tables position for the PDF schema
-//                                                    //   - leave blank for no PDF schema support
-//                                                    //     DEFAULT: 'pma_table_coords'
-//$cfg['Servers'][$i]['pdf_pages']     = 'pma_pdf_pages';// table to describe pages of relationpdf
-//                                                    //   - leave blank if you don't want to use this
-//                                                    //     DEFAULT: 'pma_pdf_pages'
-//$cfg['Servers'][$i]['column_info']   = 'pma_column_info';// table to store column information
-//                                                    //   - leave blank for no column comments/mime types
-//                                                    //     DEFAULT: 'pma_column_info'
-//$cfg['Servers'][$i]['history']       = 'pma_history';// table to store SQL history
-//                                                    //   - leave blank for no SQL query history
-//                                                    //     DEFAULT: 'pma_history'
-//$cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your pma_* tables
-//                                                    // are up to date. This prevents compatibility
-//                                                    // checks and thereby increases performance.
-//$cfg['Servers'][$i]['AllowRoot']     = TRUE;        // whether to allow root login
-//$cfg['Servers'][$i]['AllowDeny']['order']           // Host authentication order, leave blank to not use
-//                                     = '';
-//$cfg['Servers'][$i]['AllowDeny']['rules']           // Host authentication rules, leave blank for defaults
-//                                     = array();
-
 
 $i++;
@@ -94 +56 @@
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
 //                                                    // with 'config' auth_type)
-$cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only
-//                                                    // this db is displayed in left frame
-//                                                    // It may also be an array of db-names, where sorting order is relevant.
-$cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname
-
-
-
 
 ?>

install/scripts/alternc.install

@@ -148 +148 @@
 %conf_vars = (
 
-         # PHPMYAdmin, Config file,
-         "etc/phpmyadmin/config.inc.php" => "[PHPMyAdmin] Config File",
-
          # Scripts-Shells generaux :
          "local.php" => "[General] Fichier de configuration general du Bureau virtuel",