diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-05 20:48:15 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-05 20:48:15 +0000 |
| commit | 76e8815fc13aa2b08cc3cee468915fd61e56d60e (patch) | |
| tree | fa4252b6624755b8c8663ed610fe4c4d67649112 | |
| parent | 2bf2f0e0d01a45a25230eafb06d1976b653cc12d (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@261364 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | configs/asterisk.conf.sample | 22 |
2 files changed, 21 insertions, 21 deletions
@@ -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 06c7d6f97..b8d6b3ea9 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 |