Changeset 2086

Timestamp:

06/25/06 05:37:15 (6 years ago)

Author:

qldrob

Message:

Feature request #697 - Add support for a 'named' database, rather than just 'asterisk'. Changing asteriskcdrdb will be harder.

Files:

• freepbx/trunk/amp_conf/bin/ampbackup.pl (modified) (2 diffs)
• freepbx/trunk/amp_conf/bin/retrieve_backup_cron_from_mysql.pl (modified) (1 diff)
• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (2 diffs)
• freepbx/trunk/amp_conf/bin/retrieve_iax_conf_from_mysql.pl (modified) (2 diffs)
• freepbx/trunk/amp_conf/bin/retrieve_op_conf_from_mysql.pl (modified) (2 diffs)
• freepbx/trunk/amp_conf/bin/retrieve_queues_conf_from_mysql.pl (modified) (2 diffs)
• freepbx/trunk/amp_conf/bin/retrieve_sip_conf_from_mysql.pl (modified) (2 diffs)
• freepbx/trunk/amp_conf/bin/retrieve_zap_conf_from_mysql.pl (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php (modified) (1 diff)
• freepbx/trunk/install_amp (modified) (9 diffs)

freepbx/trunk/amp_conf/bin/ampbackup.pl

@@ -51 +51 @@
-$hostname = "localhost";
-# the name of the database our tables are kept
-
+
+
-# scratch file to ftp results with
-$ftpfile = "/tmp/freepbx-backup.ftp";
@@ -71 +72 @@
-# password to connect to the database
-$password = $User_Preferences{"AMPDBPASS"};
+# Database name
+$database = $User_Preferences{"AMPDBNAME"};
-# the WEB ROOT directory 
-$webroot = $User_Preferences{"AMPWEBROOT"};

freepbx/trunk/amp_conf/bin/retrieve_backup_cron_from_mysql.pl

@@ -32 +32 @@
-# WARNING: this file will be substituted by the output of this program
-$Backup_cron = "/etc/asterisk/backup.conf";
-# the name of the database our tables are kept
-$database = "asterisk";
-
-# cool hack by Julien BLACHE <jblache@debian.org>
-$ampconf = parse_amportal_conf( "/etc/amportal.conf" );
+
+################### END OF CONFIGURATION #######################
+
-# the name of the box the MySQL database is running on
-$hostname = $ampconf->{"AMPDBHOST"};
-
-################### END OF CONFIGURATION #######################
-open(FILE, "/etc/amportal.conf") || die "Failed to open amportal.conf\n";
-while (<FILE>) {
-    chomp;                  # no newline
-    s/#.*//;                # no comments
-    s/^\s+//;               # no leading white
-    s/\s+$//;               # no trailing white
-    next unless length;     # anything left?
-    my ($var, $value) = split(/\s*=\s*/, $_, 2);
-    $User_Preferences{$var} = $value;
-} 
-close(FILE);
-
-# username to connect to the database
-User_Preferences
+ampconf->
-# password to connect to the database
-
+
+
+
-
-

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -149 +149 @@
-outn("Connecting to database..");
-
-/*
-$db_user = $amp_conf["AMPDBUSER"];
-$db_pass = $amp_conf["AMPDBPASS"];
-$db_host = $amp_conf["AMPDBHOST"];
-$db_name = 'asterisk';
-$db_engine = 'mysql';
-
-$datasource = $db_engine.'://'.$db_user.':'.$db_pass.'@'.$db_host.'/'.$db_name;
-
-if (!function_exists($db_engine.'_connect')) {
-  out("FAILED");
-  fatal($db_engine." PHP libraries not installed");
-}
-
-$db = DB::connect($datasource); // attempt connection
-*/
-
-# the engine to be used for the SQL queries,
-# if none supplied, backfall to mysql
@@ -183 +166 @@
-    $db_pass = $amp_conf["AMPDBPASS"];
-    $db_host = $amp_conf["AMPDBHOST"];
-'asterisk'
+$amp_cond["AMPDBNAME"]
-  
-    $datasource = $db_engine.'://'.$db_user.':'.$db_pass.'@'.$db_host.'/'.$db_name;

freepbx/trunk/amp_conf/bin/retrieve_iax_conf_from_mysql.pl

@@ -20 +20 @@
-# WARNING: this file will be substituted by the output of this program
-$iax_conf = "/etc/asterisk/iax_additional.conf";
-# the name of the database our tables are kept
-$database = "asterisk";
-
-# cool hack by Julien BLACHE <jblache@debian.org>
@@ -31 +29 @@
-# the name of the box the MySQL database is running on
-$hostname = $ampconf->{"AMPDBHOST"};
+# the name of the database our tables are kept
+$database = $ampconf->{"AMPDBNAME"};
-
-# the engine to be used for the SQL queries,

freepbx/trunk/amp_conf/bin/retrieve_op_conf_from_mysql.pl

@@ -101 +101 @@
-#@conferences=(@conferences,[ "811","Conf.11" ]);
-
-
-# the name of the database our tables are kept
-$database = "asterisk";
-
-# cool hack by Julien BLACHE <jblache@debian.org>
-$ampconf = parse_amportal_conf( "/etc/amportal.conf" );
@@ -116 +112 @@
-# the name of the box the MySQL database is running on
-$hostname = $ampconf->{"AMPDBHOST"};
+# the name of the database our tables are kept
+$database = $ampconf->{"AMPDBNAME"};
-#sort option: extension or lastname
-$sortoption = $ampconf->{"FOPSORT"};

freepbx/trunk/amp_conf/bin/retrieve_queues_conf_from_mysql.pl

@@ -16 +16 @@
-# WARNING: this file will be substituted by the output of this program
-$queues_conf = "/etc/asterisk/queues_additional.conf";
-# the name of the database our tables are kept
-$database = "asterisk";
-
-# cool hack by Julien BLACHE <jblache@debian.org>
@@ -25 +23 @@
-# password to connect to the database
-$password = $ampconf->{"AMPDBPASS"};
+# the name of the database our tables are kept
+$database = $ampconf->{"AMPDBNAME"};
-# the name of the box the MySQL database is running on
-$hostname = $ampconf->{"AMPDBHOST"};

freepbx/trunk/amp_conf/bin/retrieve_sip_conf_from_mysql.pl

@@ -20 +20 @@
-# WARNING: this file will be substituted by the output of this program
-$sip_conf = "/etc/asterisk/sip_additional.conf";
-# the name of the database our tables are kept
-$database = "asterisk";
-
-# cool hack by Julien BLACHE <jblache@debian.org>
@@ -29 +27 @@
-# password to connect to the database
-$password = $ampconf->{"AMPDBPASS"};
+# the name of the database our tables are kept
+$database = $ampconf->{"AMPDBNAME"};
-# the name of the box the MySQL database is running on
-$hostname = $ampconf->{"AMPDBHOST"};

freepbx/trunk/amp_conf/bin/retrieve_zap_conf_from_mysql.pl

@@ -20 +20 @@
-# WARNING: this file will be substituted by the output of this program
-$zap_conf = "/etc/asterisk/zapata_additional.conf";
-# the name of the database our tables are kept
-$database = "asterisk";
-
-# cool hack by Julien BLACHE <jblache@debian.org>
@@ -29 +27 @@
-# password to connect to the database
-$password = $ampconf->{"AMPDBPASS"};
+# the name of the database our tables are kept
+$database = $ampconf->{"AMPDBNAME"};
-# the name of the box the MySQL database is running on
-$hostname = $ampconf->{"AMPDBHOST"};

freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php

@@ -26 +26 @@
-    $db_pass = $amp_conf["AMPDBPASS"];
-    $db_host = $amp_conf["AMPDBHOST"];
-'asterisk'
+$amp_conf["AMPDBNAME"]
-    
-    $datasource = $db_engine.'://'.$db_user.':'.$db_pass.'@'.$db_host.'/'.$db_name;

freepbx/trunk/install_amp

@@ -74 +74 @@
-  out("  --force-version <ver>    Force upgrade from version <ver>");
-  out("  --dbhost <ip address>    Use a remote database server");
+  out("  --dbname databasename    Use database name specified, instead of 'asterisk'");
-  out("  --no-files               Just run updates without installing files");
-}
@@ -418 +419 @@
-/** Collect AMP settings
- */
-
+, $dbname = 'asterisk'
-  out("Creating new /etc/amportal.conf");
-  
-asterisk
+$dbname
-  $key = trim(fgets(STDIN,1024));
-  if (preg_match('/^$/',$key)) $amp_conf["AMPDBUSER"] = ($dbuser ? $dbuser : "asteriskuser");
-  else $amp_conf["AMPDBUSER"] = $key;
-  
-asterisk
+$dbname
-  $key = trim(fgets(STDIN,1024));
-  if (preg_match('/^$/',$key)) $amp_conf["AMPDBPASS"] = ($dbpass ? $dbpass : "amp109");
-  else $amp_conf["AMPDBPASS"] = $key;
-  
-asterisk
+$dbname
-  $key = trim(fgets(STDIN,1024));
-  if (preg_match('/^$/',$key)) $amp_conf["AMPDBHOST"] = ($dbhost ? $dbhost : "localhost");
@@ -567 +568 @@
-// **** Parse out command-line options
-$shortopts = "h?u:p:";
-
+,"dbname="
-
-$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
@@ -582 +583 @@
-//initialize variables to avoid php notices
-$dbhost = null; 
+$dbname = null; 
-$new_username = null;
-$new_password = null;
@@ -614 +616 @@
-      $dbhost = $arg[1];
-      out("Using remote database server at ".$dbhost);
+    break;
+    case "--dbname":
+      $dbname = $arg[1];
+      out("Using database ".$dbname);
-    break;
-    case "--no-files":
@@ -642 +648 @@
-  out(AMP_CONF." does not exist, copying default");
-  copy("amportal.conf", "/etc/amportal.conf");
-
+, $dbname
-}
-out("OK");
@@ -657 +663 @@
-// Ensure our "critical" variables are set.  We absolutely need these to copy in files.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// **** Check for amportal.conf, create if necessary
@@ -717 +717 @@
-  out(ASTERISK_CONF." does not exist, copying default");
-  copy("asterisk.conf", "/etc/asterisk/asterisk.conf");
-  //TODO - need to prompt for asterisk specific directories - using * defaults for now
-  //collect_ast_settings(ASTERISK_CONF, $dbhost, $new_username, $new_password);
-}
-out("OK");
@@ -766 +764 @@
-$db_host = $amp_conf["AMPDBHOST"];
-$db_engine = $amp_conf["AMPDBENGINE"];
-'asterisk'
+$amp_conf["AMPDBNAME"]
-
-// we still support older configurations,  and fall back