[svn-commits] russell: trunk r261364 - in /trunk: Makefile configs/asterisk.conf.sample

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed May 5 15:48:18 CDT 2010


Author: russell
Date: Wed May  5 15:48:15 2010
New Revision: 261364

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261364
Log:
Restore previous asterisk.conf syntax, where the directories aren't commented out.

This fixes some breakage in the test suite, that uses the contents of asterisk.conf
to discover the install layout on the system.

Modified:
    trunk/Makefile
    trunk/configs/asterisk.conf.sample

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=261364&r1=261363&r2=261364
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed May  5 15:48:15 2010
@@ -705,16 +705,16 @@
 	if [ "$(OVERWRITE)" = "y" ]; then \
 		echo "Updating asterisk.conf"; \
 		sed \
-			-e 's|^;astetcdir.*$$|;astetcdir => $(ASTETCDIR)|' \
-			-e 's|^;astmoddir.*$$|;astmoddir => $(MODULES_DIR)|' \
-			-e 's|^;astvarlibdir.*$$|;astvarlibdir => $(ASTVARLIBDIR)|' \
-			-e 's|^;astdbdir.*$$|;astdbdir => $(ASTDBDIR)|' \
-			-e 's|^;astkeydir.*$$|;astkeydir => $(ASTKEYDIR)|' \
-			-e 's|^;astdatadir.*$$|;astdatadir => $(ASTDATADIR)|' \
-			-e 's|^;astagidir.*$$|;astagidir => $(AGI_DIR)|' \
-			-e 's|^;astspooldir.*$$|;astspooldir => $(ASTSPOOLDIR)|' \
-			-e 's|^;astrundir.*$$|;astrundir => $(ASTVARRUNDIR)|' \
-			-e 's|^;astlogdir.*$$|;astlogdir => $(ASTLOGDIR)|' \
+			-e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
+			-e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \
+			-e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \
+			-e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \
+			-e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \
+			-e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \
+			-e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \
+			-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
+			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
+			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
 			$(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp \
 			&& mv $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH); \
 	fi ;\

Modified: trunk/configs/asterisk.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/asterisk.conf.sample?view=diff&rev=261364&r1=261363&r2=261364
==============================================================================
--- trunk/configs/asterisk.conf.sample (original)
+++ trunk/configs/asterisk.conf.sample Wed May  5 15:48:15 2010
@@ -1,14 +1,14 @@
-[directories]
-;astetcdir => /etc/asterisk
-;astmoddir => /usr/lib/asterisk/modules
-;astvarlibdir => /var/lib/asterisk
-;astdbdir => /var/lib/asterisk
-;astkeydir => /var/lib/asterisk
-;astdatadir => /var/lib/asterisk
-;astagidir => /var/lib/asterisk/agi-bin
-;astspooldir => /var/spool/asterisk
-;astrundir => /var/run/asterisk
-;astlogdir => /var/log/asterisk
+[directories](!)
+astetcdir => /etc/asterisk
+astmoddir => /usr/lib/asterisk/modules
+astvarlibdir => /var/lib/asterisk
+astdbdir => /var/lib/asterisk
+astkeydir => /var/lib/asterisk
+astdatadir => /var/lib/asterisk
+astagidir => /var/lib/asterisk/agi-bin
+astspooldir => /var/spool/asterisk
+astrundir => /var/run/asterisk
+astlogdir => /var/log/asterisk
 
 [options]
 ;verbose = 3




More information about the svn-commits mailing list