Changeset 3554

Timestamp:

01/08/07 19:42:50 (2 years ago)

Author:

qldrob

Message:

OK, lets try it with this patch.

Files:

• misc/deb/trunk/debian/patches/clean-install-amp.dpatch (modified) (14 diffs)

misc/deb/trunk/debian/patches/clean-install-amp.dpatch

@@ -5 +5 @@
-## DP: Change some stupid defaults in freepbx, like wrong paths, making useless files
-## DP: on the webroot, etc.
- 
+
-## DP: By default Debian's version of this script will not install files,
-## DP: but only take chaege of installing the needed updates. I also removed
- 
+
-## DP: dpkg.
+##
+## RT: Update for 2.2.0
-
-
-
-
-
-
+
+
+
+
-        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("  --no-files               Just run updates without installing files");
-+       out("  --no-files               Just run updates without installing files (default)");
-+       out("  --install-files          Just run updates and install files (dagerous!)");
-}
-
-function install_parse_amportal_conf($filename) {
-196,7 +197
-} while(1
+      out("  --install-moh            Install default music-on-hold files (normally doesn't, unless ");
+      out("                           it's a new installation)");
+      out("  --my-svn-is-correct      Ignore Asterisk version, assume it is correct");
+241,7 +242
+return ($retVal != 0
- }
- 
@@ -34 +34 @@
-        $ntmp = sscanf($mode,"%o",$modenum); //assumes all inputs are octal
-        if (version_compare(phpversion(), 5.0) < 0) {
-05,6 +206
+50,6 +251
-                        $output = false;
-                        $return_value = false;
@@ -42 +42 @@
-                } else {
-                        return mkdir($directory, $modenum);
-259,7 +261
+311,7 +313
-                        if (is_dir($source)) {
-                                if (!file_exists($destination)) {
@@ -51 +51 @@
-                                }
-                        }
-452,7 +454
+534,7 +536
-                else $amp_conf["AMPWEBROOT"] = rtrim($key,'/');
-                if (is_dir($amp_conf["AMPWEBROOT"])) {
@@ -60 +60 @@
-                        break;
-                } else {
-
+
+
-        } while(1);
-        
+-       // Really no need to ask, is there.
+-       $amp_conf["FOPWEBROOT"]=$amp_conf["AMPWEBROOT"]."/panel";
++       do {
++               out("Enter the path to use for your FOP web root:\n [/usr/share/op-panel] ");
++               $key = trim(fgets(STDIN,1024));
++               if (preg_match('/^$/',$key)) $amp_conf["FOPWEBROOT"] = "/usr/share/op-panel";
++               else $amp_conf["FOPWEBROOT"] = rtrim($key,'/');
++               if (is_dir($amp_conf["FOPWEBROOT"])) {
++                       break;
++               } else if (amp_mkdir($amp_conf["FOPWEBROOT"],"0775",true)){
++                       out("Created ".$amp_conf["FOPWEBROOT"]);
++                       break;
++               } else {
++                       fatal("Cannot create ".$amp_conf["FOPWEBROOT"]."!");
++               }
++       } while(1);
++
+        
+        outn("Enter the IP ADDRESS or hostname used to access the AMP web-admin:\n [xx.xx.xx.xx] ");
+        $key = trim(fgets(STDIN,1024));
+@@ -561,13 +576,13 @@
+        else $amp_conf["AMPEXTENSIONS"] = $key;
+        
-        do {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                $key = trim(fgets(STDIN,1024));
--               if (preg_match('/^$/',$key)) $amp_conf["AMPBIN"] = "/var/lib/asterisk/bin";
@@ -103 +101 @@
-                        break;
-                } else {
-21,7 +523
+82,7 +597
-                else $amp_conf["AMPSBIN"] = rtrim($key,'/');
-                if (is_dir($amp_conf["AMPSBIN"])) {
@@ -112 +110 @@
-                        break;
-                } else {
-551,7 +553
+612,7 +627
- outn("Checking for PEAR DB..");
- if (! @ include('DB.php')) {
@@ -121 +119 @@
- out("OK");
- 
-560,7 +562
+621,7 +636
- outn("Checking for PEAR Console::Getopt..");
- if (! @ include("Console/Getopt.php")) {
@@ -130 +128 @@
- out("OK");
- 
-577,7 +579
+638,7 +653
- 
- $debug = false;
- $dryrun = false;
--$install_files = true;
-// by default, do not install any files
-
-//initialize variables to avoid php notices
-dbhost = null; 
-17,6 +619
+ // Do not install files in a packaged environment
+$override_astvers = false;
+
+install_moh = false;
+86,6 +701
-                case "--no-files":
-                        $install_files = false;
@@ -145 +143 @@
-+               case "--install-files":
-+                       $install_files = true;
-y
+
-                break;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
- 
--// **** Check for amportal.conf, create if necessary
-+// **** Check for asterisk.conf, create if necessary
- 
+ outn("Checking for ".AMP_CONF."..");
+ if (!file_exists(AMP_CONF)) {
+@@ -776,17 +794,17 @@
+ 
+ if (!array_key_exists("AMPWEBROOT",$amp_conf)) {
+        out("Adding AMPWEBROOT option to amportal.conf - using AMP default");
+-       $amp_conf["AMPWEBROOT"] = "/var/www/html";
++       $amp_conf["AMPWEBROOT"] = "/usr/share/freepbx";
+ }
+ 
+ if (!array_key_exists("FOPWEBROOT",$amp_conf)) {
+        out("Adding FOPWEBROOT option to amportal.conf - using AMP default");
+-       $amp_conf["FOPWEBROOT"] = $amp_conf["AMPWEBROOT"]."/panel";
++       $amp_conf["FOPWEBROOT"] = "/usr/share/op-panel";
+ }
+ 
+ if (!array_key_exists("AMPBIN",$amp_conf)) {
+        out("Adding AMPBIN option to amportal.conf - using AMP default");
+-       $amp_conf["AMPBIN"] = "/var/lib/asterisk/bin";
++       $amp_conf["AMPBIN"] = "/usr/share/asterisk/bin";
+ }
+ 
+ if (!array_key_exists("AMPSBIN",$amp_conf)) {
+@@ -822,7 +840,7 @@
+ // write amportal.conf
+ write_amportal_conf(AMP_CONF, $amp_conf);
+ 
+-// **** Check for amportal.conf, create if necessary
++// **** Check for asterisk.conf, create if necessary
+ 
- outn("Checking for ".ASTERISK_CONF."..");
- if (!file_exists(ASTERISK_CONF)) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                // datasource in in this style: dbengine://username:password@host/database 
-                if (!function_exists($db_engine.'_connect')) {
@@ -212 +195 @@
-        
-                $datasource = $db_engine.'://'.$db_user.':'.$db_pass.'@'.$db_host.'/'.$db_name;
-847,7 +845
+1009,7 +1027
-        $md5sums = read_md5_file(UPGRADE_DIR."/".$version.".md5");
-        recursive_copy("amp_conf", "", $md5sums);
@@ -221 +204 @@
- }
- 
-855,8 +853
+1017,8 +1035
- debug("Running ".dirname(__FILE__)."/apply_conf.sh");
- outn("Configuring install for your environment..");
@@ -230 +213 @@
- }
- out("OK");
-868,18 +864
+1030,18 +1046
-        amp_mkdir($asterisk_conf["astspooldir"]."/fax","0766",true);
- 
@@ -249 +232 @@
- 
- outn("Checking for upgrades..");
-920,14 +904
+1082,14 +1086
- out("OK");
-