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