From 865bdbc954f0e8f4c530e25ed51e4669a674cc03 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 5 May 2010 20:48:15 +0000
Subject: [PATCH] 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.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@261364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 Makefile                     | 20 ++++++++++----------
 configs/asterisk.conf.sample | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index f01ddfb73b..f47fcd948c 100644
--- a/Makefile
+++ b/Makefile
@@ -705,16 +705,16 @@ samples: adsi
 	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 ;\
diff --git a/configs/asterisk.conf.sample b/configs/asterisk.conf.sample
index 06c7d6f976..b8d6b3ea98 100644
--- a/configs/asterisk.conf.sample
+++ b/configs/asterisk.conf.sample
@@ -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
-- 
GitLab