Index: /unk/AMP/amp_conf/astetc/asterisk.conf
===================================================================
--- /trunk/AMP/amp_conf/astetc/asterisk.conf (revision 8)
+++  (revision )
@@ -1,8 +1,0 @@
-[directories]
-astetcdir => /etc/asterisk
-astmoddir => /usr/lib/asterisk/modules
-astvarlibdir => /var/lib/asterisk
-astagidir => /var/lib/asterisk/agi-bin
-astspooldir => /var/spool/asterisk
-astrundir => /var/run/asterisk
-astlogdir => /var/log/asterisk
Index: /trunk/AMP/install_amp
===================================================================
--- /trunk/AMP/install_amp (revision 705)
+++ /trunk/AMP/install_amp (revision 728)
@@ -420,5 +420,5 @@
 	
 	do {
-		outn("Enter the path to use for your AMP web root:\n [/var/www/html] ");
+		out("Enter the path to use for your AMP web root:\n [/var/www/html] ");
 		$key = trim(fgets(STDIN,1024));
 		if (preg_match('/^$/',$key)) $amp_conf["AMPWEBROOT"] = "/var/www/html";
@@ -427,5 +427,5 @@
 			break;
 		} else if (mkdir($amp_conf["AMPWEBROOT"],755)){
-			outn("Created ".$amp_conf["AMPWEBROOT"]);
+			out("Created ".$amp_conf["AMPWEBROOT"]);
 			break;
 		} else {
@@ -435,5 +435,5 @@
 	
 	do {
-		outn("Enter the path to use for your FOP web root:\n [/var/www/html/panel] ");
+		out("Enter the path to use for your FOP web root:\n [/var/www/html/panel] ");
 		$key = trim(fgets(STDIN,1024));
 		if (preg_match('/^$/',$key)) $amp_conf["FOPWEBROOT"] = "/var/www/html/panel";
@@ -442,5 +442,5 @@
 			break;
 		} else if (mkdir($amp_conf["FOPWEBROOT"],755)){
-			outn("Created ".$amp_conf["FOPWEBROOT"]);
+			out("Created ".$amp_conf["FOPWEBROOT"]);
 			break;
 		} else {
@@ -474,5 +474,5 @@
 	
 	do {
-		outn("Enter directory in which to store AMP executable scripts:\n [/var/lib/asterisk/bin] ");
+		out("Enter directory in which to store AMP executable scripts:\n [/var/lib/asterisk/bin] ");
 		$key = trim(fgets(STDIN,1024));
 		if (preg_match('/^$/',$key)) $amp_conf["AMPBIN"] = "/var/lib/asterisk/bin";
@@ -481,5 +481,5 @@
 			break;
 		} else if (mkdir($amp_conf["AMPBIN"],755)){
-			outn("Created ".$amp_conf["AMPBIN"]);
+			out("Created ".$amp_conf["AMPBIN"]);
 			break;
 		} else {
@@ -489,5 +489,5 @@
 	
 	do {
-		outn("Enter directory in which to store super-user scripts:\n [/usr/sbin] ");
+		out("Enter directory in which to store super-user scripts:\n [/usr/sbin] ");
 		$key = trim(fgets(STDIN,1024));
 		if (preg_match('/^$/',$key)) $amp_conf["AMPSBIN"] = "/usr/sbin";
@@ -496,5 +496,5 @@
 			break;
 		} else if (mkdir($amp_conf["AMPSBIN"],755)){
-			outn("Created ".$amp_conf["AMPSBIN"]);
+			out("Created ".$amp_conf["AMPSBIN"]);
 			break;
 		} else {
@@ -637,4 +637,15 @@
 }
 
+// **** Check for amportal.conf, create if necessary
+
+outn("Checking for ".ASTERISK_CONF."..");
+if (!file_exists(ASTERISK_CONF)) {
+	out(ASTERISK_CONF." does not exist, copying default");
+	copy("asterisk.conf", "/etc/asterisk/asterisk.conf");
+	//TODO - need to prompt for asterisk specific directories - using * defaults for now
+	//collect_ast_settings(ASTERISK_CONF, $dbhost, $new_username, $new_password);
+}
+out("OK");
+
 // **** read asterisk.conf
 
Index: /trunk/AMP/asterisk.conf
===================================================================
--- /trunk/AMP/asterisk.conf (revision 728)
+++ /trunk/AMP/asterisk.conf (revision 728)
@@ -0,0 +1,8 @@
+[directories]
+astetcdir => /etc/asterisk
+astmoddir => /usr/lib/asterisk/modules
+astvarlibdir => /var/lib/asterisk
+astagidir => /var/lib/asterisk/agi-bin
+astspooldir => /var/spool/asterisk
+astrundir => /var/run/asterisk
+astlogdir => /var/log/asterisk