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

diff --git a/Makefile b/Makefile
index f01ddfb..f47fcd9 100644 (file)
--- 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 06c7d6f..b8d6b3e 100644 (file)
--- 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