From 6b29b5818c48f9f6998abc4dea640f146107138d Mon Sep 17 00:00:00 2001 From: mattf Date: Tue, 2 Jun 2009 18:12:41 +0000 Subject: [PATCH] move copying of -vicidial.conf placeholder files inside the copy default conf files function doc update git-svn-id: svn://192.168.202.10@1139 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/bin/start_asterisk_boot.pl | 12 ++++++++---- agc_2-X/trunk/docs/Ubuntu_Install.txt | 2 +- agc_2-X/trunk/install.pl | 12 ++++++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/agc_2-X/trunk/bin/start_asterisk_boot.pl b/agc_2-X/trunk/bin/start_asterisk_boot.pl index ec6ada53..230e510b 100644 --- a/agc_2-X/trunk/bin/start_asterisk_boot.pl +++ b/agc_2-X/trunk/bin/start_asterisk_boot.pl @@ -47,10 +47,6 @@ use DBI; $dbhA = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass") or die "Couldn't connect to database: " . DBI->errstr; -### Set the conf files to automatically update - $stmtA = "UPDATE servers SET rebuild_conf_files='Y' where server_ip = '$VARserver_ip';"; - $affected_rows = $dbhA->do($stmtA); - ### Grab Server values from the database $stmtA = "SELECT vd_server_logs FROM servers where server_ip = '$VARserver_ip';"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; @@ -112,3 +108,11 @@ else `screen -XS asterisk eval 'stuff "/usr/sbin/asterisk -vvvvgcT\015"'`; print "Asterisk started... screen logging off\n"; } + + +### Set the conf files to automatically update + $stmtA = "UPDATE servers SET rebuild_conf_files='Y' where server_ip = '$VARserver_ip';"; + $affected_rows = $dbhA->do($stmtA); + + +exit; diff --git a/agc_2-X/trunk/docs/Ubuntu_Install.txt b/agc_2-X/trunk/docs/Ubuntu_Install.txt index 0ca53dea..afaa03f8 100644 --- a/agc_2-X/trunk/docs/Ubuntu_Install.txt +++ b/agc_2-X/trunk/docs/Ubuntu_Install.txt @@ -1,4 +1,4 @@ -Ubuntu VICIDIAL Install: 2009-05-12 +Ubuntu VICIDIAL Install: 2009-05-19 ### NOTE ### If you just want a quick setup of ViciDial on Ubuntu, take a look at our diff --git a/agc_2-X/trunk/install.pl b/agc_2-X/trunk/install.pl index 8b65ad56..1be99cd1 100644 --- a/agc_2-X/trunk/install.pl +++ b/agc_2-X/trunk/install.pl @@ -2257,13 +2257,13 @@ if ( ($PROMPTcopy_conf_files =~ /y/i) || ($CLIcopy_conf_files =~ /y/i) ) `cp -f ./docs/conf_examples/logger.conf.sample /etc/asterisk/logger.conf`; `cp -f ./docs/conf_examples/dnsmgr.conf.sample /etc/asterisk/dnsmgr.conf`; `cp -f ./docs/conf_examples/features.conf.sample /etc/asterisk/features.conf`; - } -print "Creating auto-generated placeholder conf files in /etc/asterisk/...\n"; -`echo "[vicidial-auto] ;placeholder for auto-generated extensions conf" > /etc/asterisk/extensions-vicidial.conf`; -`echo "[vicidial-auto] ;placeholder for auto-generated iax conf" > /etc/asterisk/iax-vicidial.conf`; -`echo "[vicidial-auto] ;placeholder for auto-generated sip conf" > /etc/asterisk/sip-vicidial.conf`; -`echo "[vicidial-auto] ;placeholder for auto-generated voicemail conf" > /etc/asterisk/voicemail-vicidial.conf`; + print "Creating auto-generated placeholder conf files in /etc/asterisk/...\n"; + `echo "[vicidial-auto] ;placeholder for auto-generated extensions conf" > /etc/asterisk/extensions-vicidial.conf`; + `echo "[vicidial-auto] ;placeholder for auto-generated iax conf" > /etc/asterisk/iax-vicidial.conf`; + `echo "[vicidial-auto] ;placeholder for auto-generated sip conf" > /etc/asterisk/sip-vicidial.conf`; + `echo "[vicidial-auto] ;placeholder for auto-generated voicemail conf" > /etc/asterisk/voicemail-vicidial.conf`; + } ### format the new server_ip dialstring for example to use with extensions.conf