Changeset 2092

Timestamp:

06/25/06 21:08:53 (7 years ago)

Author:

qldrob

Message:

Start of support for #761 - tidying up install_amp.

Files:

• freepbx/trunk/install_amp (modified) (7 diffs)

freepbx/trunk/install_amp

@@ -68 +68 @@
-  out("Optional parameters:");
-  out("  --help, -h, -?           Show this help");
+  out("  --dbhost <ip address>    Use a remote database server");
+  out("  --dbname databasename    Use database name specified, instead of 'asterisk'");
-  out("  --username <user>        Use <user> to connect to db and write config");
-  out("  --password <pass>        Use <pass> to connect to db and write config");
+/*  out("  --fopwebroot <path>      Web path where fop will be installed");
+  out("  --webroot <path>         Web root where freepbx will be installed");
+  out("  --cgibin <path>          Path where cgi-bin's lives");
+  out("  --bin <path>             Path of asterisk binaries");
+  out("  --sbin <path>            Path of system admin binaries");
+  out("  --asteriskuser <user>    Asterisk Manager username");
+  out("  --asteriskpass <pass>    Asterisk Manager password");
+  out("  --systemconfig <path>    System config files"); */
-  out("  --debug                  Enable debug output");
-  out("  --dry-run                Don't actually do anything");
-  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");
-}
@@ -420 +428 @@
- */
-function collect_settings($filename, $dbhost = '', $dbuser = '', $dbpass = '', $dbname = 'asterisk') {
-/etc/amportal.conf
+$filename
-  
-  outn("Enter your USERNAME to connect to the '$dbname' database:\n [".($dbuser ? $dbuser : "asteriskuser")."] ");
@@ -533 +541 @@
-  // write amportal.conf
-  write_amportal_conf($filename, $amp_conf);
-"/etc/amportal.conf
+AMP_CONF."
-}
-
@@ -625 +633 @@
-      out("Running upgrade only, without installing files.");
-    break;
+/*    case "--fopwebroot":
+      $fopwebroot = $arg[1];
+      out("Using fop at ".$fopwebroot);
+    break;
+    case "--webroot":
+      $webroot = $arg[1];
+      out("Using Webroot at ".$webroot);
+    break;
+    case "--cgibin":
+      $cgibin = $arg[1];
+      out("Using CGI-BIN at ".$cgibin);
+    break;
+    case "--bin":
+      $bin = $arg[1];
+      out("Using bin at ".$bin);
+    break;
+    case "--sbin":
+      $sbin = $arg[1];
+      out("Using sbin ar ".$sbin);
+    break;
+    case "--asteriskuser":
+      $asteriskuser = $arg[1];
+      out("Using Asterisk user ".$asteriskuser);
+    break;
+    case "--asteriskpass":
+      $asteriskpass = $arg[1];
+      out("Using asteriskpass ".str_repeat("*",strlen($arg[1])));
+    break;
+    case "--systemconfig":
+      $systemconfig = $arg[1];
+      out("Using system config at ". $systemconfig);
+    break; */
+
-  }
-}
@@ -647 +688 @@
-if (!file_exists(AMP_CONF)) {
-  out(AMP_CONF." does not exist, copying default");
-"/etc/amportal.conf"
+AMP_CONF
-  collect_settings(AMP_CONF, $dbhost, $new_username, $new_password, $dbname);
-}
@@ -716 +757 @@
-if (!file_exists(ASTERISK_CONF)) {
-  out(ASTERISK_CONF." does not exist, copying default");
-"/etc/asterisk/asterisk.conf"
+AMP_CONF
-}
-out("OK");
@@ -795 +836 @@
-  
-    if (!isset($amp_conf["AMPDBFILE"]))
-/etc/amportal.conf"
+".AMP_CONF
-  
-    if (isset($amp_conf["AMPDBFILE"]) == "")
-/etc/amportal.conf
+".AMP_CONF."
-  
-    $DSN = array (