Changeset 5123

Show
Ignore:
Timestamp:
10/18/07 15:09:34 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5122 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r5122 | p_lindheimer | 2007-10-18 12:08:08 -0700 (Thu, 18 Oct 2007) | 1 line


modify apply_conf.sh to handle more generic changes then stock installs

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.3

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/trunk:1-4133,4135-4136,4140-5015,5017-5035,5040-5042,5068,5076,5095,5107,5117 to /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/trunk:1-4133,4135-4136,4140-5015,5017-5035,5040-5042,5068,5076,5095,5107,5117,5122

  • freepbx/branches/2.3/amp_conf/bin/bounce_op.sh

    r4535 r5123  
    1 #!/usr/bin/env sh 
     1#!/bin/bash 
    22killall op_server.pl 
    33 

  • freepbx/branches/2.3/apply_conf.sh

    r3994 r5123  
    1 #!/usr/bin/env bash 
     1#!/bin/bash 
    22 
    33if [ "$1" == "-h" ] 
    …… 
    3131 
    3232echo "$ASTETCDIR/cdr_mysql.conf" 
    33 sed -i.bak "s/user=[a-zA-Z0-9]*/user=$AMPDBUSER/" $ASTETCDIR/cdr_mysql.conf 
    34 sed -i.bak "s/password=[a-zA-Z0-9]*/password=$AMPDBPASS/" $ASTETCDIR/cdr_mysql.conf 
    35 sed -i.bak "s/hostname=[a-zA-Z0-9.-]*/hostname=$AMPDBHOST/" $ASTETCDIR/cdr_mysql.conf 
     33sed -i.bak "s/user\s*=.*$/user = $AMPDBUSER/" $ASTETCDIR/cdr_mysql.conf 
     34sed -i.bak "s/password\s*=.*$/password = $AMPDBPASS/" $ASTETCDIR/cdr_mysql.conf 
     35sed -i.bak "s/hostname\s*=.*$/hostname = $AMPDBHOST/" $ASTETCDIR/cdr_mysql.conf 
    3636 
    3737echo "$ASTETCDIR/manager.conf" 
    38 sed -i.bak "s/secret = [a-zA-Z0-9]*/secret = $AMPMGRPASS/" $ASTETCDIR/manager.conf 
    39 sed -i.bak "s/\[AMPMGRUSER\]/\[$AMPMGRUSER\]/" $ASTETCDIR/manager.conf 
     38sed -i.bak "s/secret\s*=.*$/secret = $AMPMGRPASS/" $ASTETCDIR/manager.conf 
     39sed -i.bak "s/\s*\[general\].*$/TEMPCONTEXT/;s/\[.*\]/\[$AMPMGRUSER\]/;s/^TEMPCONTEXT$/\[general\]/" $ASTETCDIR/manager.conf 
    4040 
    4141echo "$ASTETCDIR/vm_email.inc"