Changeset 12357

Timestamp:

08/04/11 17:30:20 (2 years ago)

Author:

xrobau

Message:

Minor fixes for installer, and add the ability to symlink any asterisk path to elsewhere, and it'll still work.

Files:

• freepbx/branches/2.9/amp_conf/bin/freepbx_engine (modified) (1 diff)
• freepbx/branches/2.9/amp_conf/bin/freepbx_setting (modified) (1 diff)
• freepbx/branches/2.9/install_amp (modified) (11 diffs)

freepbx/branches/2.9/amp_conf/bin/freepbx_engine

@@ -160 +160 @@
-  chmod 640 /etc/amportal.conf
-  chmod 640 $FREEPBX_CONF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  if [ "$FPBXDBUGFILE" != "" -a -e "$FPBXDBUGFILE" ]; then
-FPBXDBUGFILE
+(readlink -f $FPBXDBUGFILE)
-  fi
-
-  if [ "$FPBX_LOG_FILE" != "" -a -e "$FPBX_LOG_FILE" ]; then
-FPBX_LOG_FILE
+(readlink -f $FPBX_LOG_FILE)
-  fi
-    
-  if [ "$ASTAGIDIR" != "" ]; then
-    chmod u+x $ASTAGIDIR/*
-ASTAGIDIR
+(readlink -f $ASTAGIDIR)
-  else
-ASTVARLIBDIR/agi-bin/*
+(readlink -f $ASTVARLIBDIR/agi-bin)
-  fi
-

freepbx/branches/2.9/amp_conf/bin/freepbx_setting

@@ -47 +47 @@
-$user = trim(`whoami`);
-$sudo_command = trim(getenv('SUDO_COMMAND'));
-
-
+
+
+
-  out(sprintf(_("trying to run as user %s:"),$web_user));
-  out('');

freepbx/branches/2.9/install_amp

@@ -54 +54 @@
-  out("  --asteriskuser <user>    Asterisk Manager username",false);
-  out("  --asteriskpass <pass>    Asterisk Manager password",false);
-  out("  --systemconfig <path>    System config files",false);
-  out("  --debug                  Enable debug output",false);
-  out("  --dry-run                Don't actually do anything",false);
@@ -69 +68 @@
-  out("  --my-svn-is-correct      Ignore Asterisk version, assume it is correct",false);
-  out("  --engine <name>          Use the specified PBX Engine ('asterisk')",false);
+  out("  --uid <user>             Set ownership of files to user",false);
+  out("  --gid <group>            Set ownership of files to group",false);
+  out("  --scripted               Scripted install. Do not ask any questions.",false);
+  out("                           (Intended for unattended installers only)",false);
-}
-
@@ -225 +228 @@
-  global $asterisk_user;
-  global $asterisk_pass;
+  global $scripted;
+  global $freepbxip;
+  global $runas_uid;
+  global $runas_gid;
-
-  out("Creating new $filename");
-  
+  if ($scripted == true) {
+    # Scripted install. Everything should have been set for us, don't ask questions.
+    out("Scripted install. Accepting command line params.");
+    $amp_conf["AMPDBUSER"] = $dbuser;
+    $amp_conf["AMPDBPASS"] = $dbpass;
+    $amp_conf["AMPDBHOST"] = $dbhost;
+    $amp_conf["AMPDBNAME"] = $dbname;
+    $amp_conf["AMPMGRUSER"] = "admin";
+    $amp_conf["AMPMGRPASS"] = "unset";
+    $amp_conf["AMPWEBROOT"] = $webroot;
+    $amp_conf["FOPWEBROOT"] = ($fopwebroot ? $fopwebroot : $webroot."/panel");
+    $amp_conf["AMPWEBADDRESS"] = $freepbxip;
+    $amp_conf["FOPPASSWORD"] = "passw0rd";
+    $amp_conf["AMPEXTENSIONS"] = "extensions";
+    $amp_conf["AMPBIN"] = $ampbin_dir;
+    $amp_conf["AMPSBIN"] = "$ampsbin_dir";
+    $amp_conf["AMPASTERISKWEBUSER"] = $runas_uid;
+    $amp_conf["AMPASTERISKWEBGROUP"] = $runas_gid;
+    $amp_conf["AMPASTERISKUSER"] = $runas_uid;
+    $amp_conf["AMPASTERISKGROUP"] = $runas_gid;
+    $amp_conf["AMPDEVUSER"] = $runas_uid;
+    $amp_conf["AMPDEVGROUP"] = $runas_gid;
+    write_amportal_conf($filename, $amp_conf);
+    outn(AMP_CONF." written");
+    return;
+  }
+    
-  outn("Enter your USERNAME to connect to the '$dbname' database:\n [".($dbuser ? $dbuser : $asterisk_user) . "] ");
-  $key = trim(fgets(STDIN,1024));
@@ -283 +317 @@
-    $amp_conf["FOPWEBROOT"] = $fopwebroot;
-  
-xx.xx.xx.xx
+$freepbxip
-  $key = trim(fgets(STDIN,1024));
-"xx.xx.xx.xx"
+$freepbxip
-  else $amp_conf["AMPWEBADDRESS"] = $key;
-  
@@ -542 +576 @@
-// **** Parse out command-line options
-$shortopts = "h?u:p:";
-
+,"uid=","gid=","scripted","freepbxip="
-
-$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
@@ -555 +589 @@
-$install_files = true;
-$override_astvers = false;
+$scripted = false;
-
-$install_moh = false;
@@ -563 +598 @@
-//initialize variables to avoid php notices
-$dbhost = null; 
-null
+'asterisk'
-$new_username = null;
-$new_password = null;
+
+$runas_uid = "asterisk";
+$runas_gid = "asterisk";
+$freepbxip = "192.168.1.1";
-
-foreach ($args[0] as $arg) {
@@ -654 +693 @@
-    case "--sbin":
-      $ampsbin_dir = $arg[1];
-r
+t
-    break;
-    case "--asteriskuser":
@@ -664 +703 @@
-      out("Using asteriskpass ".str_repeat("*",strlen($arg[1])));
-    break;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  }
@@ -710 +758 @@
-  // this file contains password and should not be a+r
-  // this addresses http://freepbx.org/trac/ticket/1878
-"asterisk"
-"asterisk"
+$runas_uid
+$runas_gid
-  chmod(AMP_CONF, 0640); 
-
-'asterisk'
+$dbname
-
-  out("Assuming new install, --install-moh added to command line");
@@ -1036 +1084 @@
-}
-
+// Ensure executables are executable
+chmod($amp_conf["AMPBIN"]."/freepbx_setting", 0755);
-outn("Configuring install for your environment..");
+exec($amp_conf["AMPBIN"]."/freepbx_setting AMPASTERISKWEBGROUP $runas_gid");
+exec($amp_conf["AMPBIN"]."/freepbx_setting AMPASTERISKWEBUSER $runas_uid");
+exec($amp_conf["AMPBIN"]."/freepbx_setting AMPASTERISKGROUP $runas_gid");
+exec($amp_conf["AMPBIN"]."/freepbx_setting AMPASTERISKUSER $runas_uid");
+exec($amp_conf["AMPBIN"]."/freepbx_setting AMPDEVGROUP $runas_gid");
+exec($amp_conf["AMPBIN"]."/freepbx_setting AMPDEVUSER $runas_uid");
-if (!$dryrun) {
-  $asteriskuser = isset($amp_conf['AMPASTERISKUSER']) && $amp_conf['AMPASTERISKUSER'] ? $amp_conf['AMPASTERISKUSER'] : 'asterisk';