Changeset 14052 for freepbx/branches/2.10/install_amp

Timestamp:

05/04/12 11:26:35 (1 year ago)

Author:

p_lindheimer

Message:

revert r12549 merged in error as well as remove undefined index all re #5692 which may fix issues but needs testing

Files:

• freepbx/branches/2.10/install_amp (modified) (4 diffs)

freepbx/branches/2.10/install_amp

@@ -967 +967 @@
-$tmpoutput = array();
-$tmpout = exec("getenforce 2>/dev/null", $tmpoutput, $sereturn);
-
+isset($tmpoutput[0]) && 
-        // this method seems better because disabled and permissive are the same
-        // if a user installs and realizes selinux is running the other method 
@@ -1101 +1101 @@
-}
-
-
-// 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';
@@ -1132 +1122 @@
-    outn("no freepbx_engine..");
-  }
-  // TODO: we just did this above
-  if (file_exists($amp_conf["AMPBIN"]."/freepbx_setting")) {
-    exec("chmod 755 ".$amp_conf["AMPBIN"]."/freepbx_setting");
@@ -1146 +1135 @@
-  }
-  out("done");
-
-
+
-  // Ensure UIDs are set correctly before any chowns happen
+  // Note - freepbx_engine must be used the first time to ensure that freepbx.conf exists.
+  exec($amp_conf["AMPBIN"]."/freepbx_engine admin freepbx_setting AMPASTERISKWEBGROUP $runas_gid");
-  exec($amp_conf["AMPBIN"]."/freepbx_setting AMPASTERISKWEBGROUP $runas_gid");
-  exec($amp_conf["AMPBIN"]."/freepbx_setting AMPASTERISKWEBUSER $runas_uid");