Changeset 2903

Show
Ignore:
Timestamp:
11/02/06 03:43:10 (7 years ago)
Author:
gregmac
Message:

Undo r2901 and r2902 - because we're switching to using $asterisk_conf for paths, and have /etc/asterisk/asterisk.conf and /etc/amportal.conf hardcoded as defines all over the place, this method won't work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amportal.conf

    r2902 r2903  
    114114# and should not be changed. 
    115115# AMPMODULEMSG=http://mirror.freepbx.org/ 
    116  
    117 # Configure various directories used by freePBX.  
    118 #ASTETCDIR=/etc/asterisk 
    119 #ASTMODDIR=/usr/lib/asterisk/modules 
    120 #ASTVARLIBDIR=/var/lib/asterisk 
    121 #ASTAGIDIR=/var/lib/asterisk/agi-bin 
    122 #ASTSPOOLDIR=/var/spool/asterisk 
    123 #ASTRUNDIR=/var/run/asterisk 
    124 #ASTLOGDIR=/var/log/asterisk 

  • freepbx/trunk/install_amp

    r2901 r2903  
    713713outn("Checking for ".AMP_CONF.".."); 
    714714if (!file_exists(AMP_CONF)) { 
    715   $distro = strtolower(exec('uname')); 
    716   if (empty($distro) || !file_exists('amportal.conf.'.$distro)) { 
    717     $distro = 'linux'; 
    718   } 
    719    
    720   out(AMP_CONF.' does not exist, copying default amportal.conf.'.$distro); 
    721   copy('amportal.conf.'.$distro, AMP_CONF); 
    722    
     715  out(AMP_CONF." does not exist, copying default"); 
     716  copy("amportal.conf", AMP_CONF); 
    723717  collect_settings(AMP_CONF, $dbhost, $new_username, $new_password, 'asterisk'); 
    724718}