[svn-commits] mjordan: trunk r418870 - in /trunk: ./ configs/ configs/samples/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Jul 17 16:17:41 CDT 2014
Author: mjordan
Date: Thu Jul 17 16:17:28 2014
New Revision: 418870
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418870
Log:
configs: Move sample config files into a subdirectory of configs
This moves all samples configs from configs/ to configs/samples. This allows
for additional sets of sample configuration files to be added in the future.
Review: https://reviewboard.asterisk.org/r/3804/
Added:
trunk/configs/samples/
trunk/configs/samples/acl.conf.sample
- copied unchanged from r418711, trunk/configs/acl.conf.sample
trunk/configs/samples/adsi.conf.sample
- copied unchanged from r418711, trunk/configs/adsi.conf.sample
trunk/configs/samples/agents.conf.sample
- copied unchanged from r418711, trunk/configs/agents.conf.sample
trunk/configs/samples/alarmreceiver.conf.sample
- copied unchanged from r418711, trunk/configs/alarmreceiver.conf.sample
trunk/configs/samples/alsa.conf.sample
- copied unchanged from r418711, trunk/configs/alsa.conf.sample
trunk/configs/samples/amd.conf.sample
- copied unchanged from r418711, trunk/configs/amd.conf.sample
trunk/configs/samples/app_mysql.conf.sample
- copied unchanged from r418711, trunk/configs/app_mysql.conf.sample
trunk/configs/samples/app_skel.conf.sample
- copied unchanged from r418711, trunk/configs/app_skel.conf.sample
trunk/configs/samples/ari.conf.sample
- copied unchanged from r418711, trunk/configs/ari.conf.sample
trunk/configs/samples/asterisk.adsi
- copied unchanged from r418711, trunk/configs/asterisk.adsi
trunk/configs/samples/asterisk.conf.sample
- copied unchanged from r418711, trunk/configs/asterisk.conf.sample
trunk/configs/samples/calendar.conf.sample
- copied unchanged from r418711, trunk/configs/calendar.conf.sample
trunk/configs/samples/ccss.conf.sample
- copied unchanged from r418711, trunk/configs/ccss.conf.sample
trunk/configs/samples/cdr.conf.sample
- copied unchanged from r418711, trunk/configs/cdr.conf.sample
trunk/configs/samples/cdr_adaptive_odbc.conf.sample
- copied unchanged from r418711, trunk/configs/cdr_adaptive_odbc.conf.sample
trunk/configs/samples/cdr_custom.conf.sample
- copied unchanged from r418711, trunk/configs/cdr_custom.conf.sample
trunk/configs/samples/cdr_manager.conf.sample
- copied unchanged from r418711, trunk/configs/cdr_manager.conf.sample
trunk/configs/samples/cdr_mysql.conf.sample
- copied unchanged from r418711, trunk/configs/cdr_mysql.conf.sample
trunk/configs/samples/cdr_odbc.conf.sample
- copied unchanged from r418711, trunk/configs/cdr_odbc.conf.sample
trunk/configs/samples/cdr_pgsql.conf.sample
- copied, changed from r418711, trunk/configs/cdr_pgsql.conf.sample
trunk/configs/samples/cdr_sqlite3_custom.conf.sample
- copied unchanged from r418711, trunk/configs/cdr_sqlite3_custom.conf.sample
trunk/configs/samples/cdr_syslog.conf.sample
- copied unchanged from r418711, trunk/configs/cdr_syslog.conf.sample
trunk/configs/samples/cdr_tds.conf.sample
- copied unchanged from r418711, trunk/configs/cdr_tds.conf.sample
trunk/configs/samples/cel.conf.sample
- copied unchanged from r418711, trunk/configs/cel.conf.sample
trunk/configs/samples/cel_custom.conf.sample
- copied unchanged from r418711, trunk/configs/cel_custom.conf.sample
trunk/configs/samples/cel_odbc.conf.sample
- copied unchanged from r418711, trunk/configs/cel_odbc.conf.sample
trunk/configs/samples/cel_pgsql.conf.sample
- copied, changed from r418711, trunk/configs/cel_pgsql.conf.sample
trunk/configs/samples/cel_sqlite3_custom.conf.sample
- copied unchanged from r418711, trunk/configs/cel_sqlite3_custom.conf.sample
trunk/configs/samples/cel_tds.conf.sample
- copied unchanged from r418711, trunk/configs/cel_tds.conf.sample
trunk/configs/samples/chan_dahdi.conf.sample
- copied unchanged from r418711, trunk/configs/chan_dahdi.conf.sample
trunk/configs/samples/chan_mobile.conf.sample
- copied unchanged from r418711, trunk/configs/chan_mobile.conf.sample
trunk/configs/samples/cli.conf.sample
- copied unchanged from r418711, trunk/configs/cli.conf.sample
trunk/configs/samples/cli_aliases.conf.sample
- copied unchanged from r418711, trunk/configs/cli_aliases.conf.sample
trunk/configs/samples/cli_permissions.conf.sample
- copied unchanged from r418711, trunk/configs/cli_permissions.conf.sample
trunk/configs/samples/codecs.conf.sample
- copied unchanged from r418711, trunk/configs/codecs.conf.sample
trunk/configs/samples/confbridge.conf.sample
- copied unchanged from r418711, trunk/configs/confbridge.conf.sample
trunk/configs/samples/config_test.conf.sample
- copied unchanged from r418711, trunk/configs/config_test.conf.sample
trunk/configs/samples/console.conf.sample
- copied unchanged from r418711, trunk/configs/console.conf.sample
trunk/configs/samples/dbsep.conf.sample
- copied unchanged from r418711, trunk/configs/dbsep.conf.sample
trunk/configs/samples/dnsmgr.conf.sample
- copied unchanged from r418711, trunk/configs/dnsmgr.conf.sample
trunk/configs/samples/dsp.conf.sample
- copied unchanged from r418711, trunk/configs/dsp.conf.sample
trunk/configs/samples/dundi.conf.sample
- copied unchanged from r418711, trunk/configs/dundi.conf.sample
trunk/configs/samples/enum.conf.sample
- copied unchanged from r418711, trunk/configs/enum.conf.sample
trunk/configs/samples/extconfig.conf.sample
- copied unchanged from r418711, trunk/configs/extconfig.conf.sample
trunk/configs/samples/extensions.ael.sample
- copied unchanged from r418711, trunk/configs/extensions.ael.sample
trunk/configs/samples/extensions.conf.sample
- copied unchanged from r418711, trunk/configs/extensions.conf.sample
trunk/configs/samples/extensions.lua.sample
- copied unchanged from r418711, trunk/configs/extensions.lua.sample
trunk/configs/samples/extensions_minivm.conf.sample
- copied unchanged from r418711, trunk/configs/extensions_minivm.conf.sample
trunk/configs/samples/features.conf.sample
- copied unchanged from r418711, trunk/configs/features.conf.sample
trunk/configs/samples/festival.conf.sample
- copied unchanged from r418711, trunk/configs/festival.conf.sample
trunk/configs/samples/followme.conf.sample
- copied unchanged from r418711, trunk/configs/followme.conf.sample
trunk/configs/samples/func_odbc.conf.sample
- copied unchanged from r418711, trunk/configs/func_odbc.conf.sample
trunk/configs/samples/hep.conf.sample
- copied unchanged from r418711, trunk/configs/hep.conf.sample
trunk/configs/samples/http.conf.sample
- copied unchanged from r418711, trunk/configs/http.conf.sample
trunk/configs/samples/iax.conf.sample
- copied unchanged from r418711, trunk/configs/iax.conf.sample
trunk/configs/samples/iaxprov.conf.sample
- copied unchanged from r418711, trunk/configs/iaxprov.conf.sample
trunk/configs/samples/indications.conf.sample
- copied unchanged from r418711, trunk/configs/indications.conf.sample
trunk/configs/samples/logger.conf.sample
- copied unchanged from r418711, trunk/configs/logger.conf.sample
trunk/configs/samples/manager.conf.sample
- copied unchanged from r418711, trunk/configs/manager.conf.sample
trunk/configs/samples/meetme.conf.sample
- copied unchanged from r418711, trunk/configs/meetme.conf.sample
trunk/configs/samples/mgcp.conf.sample
- copied unchanged from r418711, trunk/configs/mgcp.conf.sample
trunk/configs/samples/minivm.conf.sample
- copied unchanged from r418711, trunk/configs/minivm.conf.sample
trunk/configs/samples/misdn.conf.sample
- copied unchanged from r418711, trunk/configs/misdn.conf.sample
trunk/configs/samples/modules.conf.sample
- copied unchanged from r418711, trunk/configs/modules.conf.sample
trunk/configs/samples/motif.conf.sample
- copied unchanged from r418711, trunk/configs/motif.conf.sample
trunk/configs/samples/musiconhold.conf.sample
- copied unchanged from r418711, trunk/configs/musiconhold.conf.sample
trunk/configs/samples/muted.conf.sample
- copied unchanged from r418711, trunk/configs/muted.conf.sample
trunk/configs/samples/ooh323.conf.sample
- copied unchanged from r418711, trunk/configs/ooh323.conf.sample
trunk/configs/samples/osp.conf.sample
- copied unchanged from r418711, trunk/configs/osp.conf.sample
trunk/configs/samples/oss.conf.sample
- copied unchanged from r418711, trunk/configs/oss.conf.sample
trunk/configs/samples/phone.conf.sample
- copied unchanged from r418711, trunk/configs/phone.conf.sample
trunk/configs/samples/phoneprov.conf.sample
- copied unchanged from r418711, trunk/configs/phoneprov.conf.sample
trunk/configs/samples/pjsip.conf.sample
- copied unchanged from r418711, trunk/configs/pjsip.conf.sample
trunk/configs/samples/pjsip_notify.conf.sample
- copied unchanged from r418711, trunk/configs/pjsip_notify.conf.sample
trunk/configs/samples/queuerules.conf.sample
- copied unchanged from r418711, trunk/configs/queuerules.conf.sample
trunk/configs/samples/queues.conf.sample
- copied unchanged from r418711, trunk/configs/queues.conf.sample
trunk/configs/samples/res_config_mysql.conf.sample
- copied unchanged from r418711, trunk/configs/res_config_mysql.conf.sample
trunk/configs/samples/res_config_sqlite.conf.sample
- copied unchanged from r418711, trunk/configs/res_config_sqlite.conf.sample
trunk/configs/samples/res_config_sqlite3.conf.sample
- copied unchanged from r418711, trunk/configs/res_config_sqlite3.conf.sample
trunk/configs/samples/res_corosync.conf.sample
- copied unchanged from r418711, trunk/configs/res_corosync.conf.sample
trunk/configs/samples/res_curl.conf.sample
- copied unchanged from r418711, trunk/configs/res_curl.conf.sample
trunk/configs/samples/res_fax.conf.sample
- copied unchanged from r418711, trunk/configs/res_fax.conf.sample
trunk/configs/samples/res_ldap.conf.sample
- copied unchanged from r418711, trunk/configs/res_ldap.conf.sample
trunk/configs/samples/res_odbc.conf.sample
- copied unchanged from r418711, trunk/configs/res_odbc.conf.sample
trunk/configs/samples/res_parking.conf.sample
- copied unchanged from r418711, trunk/configs/res_parking.conf.sample
trunk/configs/samples/res_pgsql.conf.sample
- copied, changed from r418711, trunk/configs/res_pgsql.conf.sample
trunk/configs/samples/res_pktccops.conf.sample
- copied unchanged from r418711, trunk/configs/res_pktccops.conf.sample
trunk/configs/samples/res_snmp.conf.sample
- copied unchanged from r418711, trunk/configs/res_snmp.conf.sample
trunk/configs/samples/res_stun_monitor.conf.sample
- copied unchanged from r418711, trunk/configs/res_stun_monitor.conf.sample
trunk/configs/samples/rtp.conf.sample
- copied unchanged from r418711, trunk/configs/rtp.conf.sample
trunk/configs/samples/say.conf.sample
- copied unchanged from r418711, trunk/configs/say.conf.sample
trunk/configs/samples/sip.conf.sample
- copied unchanged from r418711, trunk/configs/sip.conf.sample
trunk/configs/samples/sip_notify.conf.sample
- copied unchanged from r418711, trunk/configs/sip_notify.conf.sample
trunk/configs/samples/skinny.conf.sample
- copied unchanged from r418711, trunk/configs/skinny.conf.sample
trunk/configs/samples/sla.conf.sample
- copied unchanged from r418711, trunk/configs/sla.conf.sample
trunk/configs/samples/smdi.conf.sample
- copied unchanged from r418711, trunk/configs/smdi.conf.sample
trunk/configs/samples/sorcery.conf.sample
- copied unchanged from r418711, trunk/configs/sorcery.conf.sample
trunk/configs/samples/ss7.timers.sample
- copied unchanged from r418711, trunk/configs/ss7.timers.sample
trunk/configs/samples/statsd.conf.sample
- copied unchanged from r418711, trunk/configs/statsd.conf.sample
trunk/configs/samples/telcordia-1.adsi
- copied unchanged from r418711, trunk/configs/telcordia-1.adsi
trunk/configs/samples/test_sorcery.conf.sample
- copied unchanged from r418711, trunk/configs/test_sorcery.conf.sample
trunk/configs/samples/udptl.conf.sample
- copied unchanged from r418711, trunk/configs/udptl.conf.sample
trunk/configs/samples/unistim.conf.sample
- copied unchanged from r418711, trunk/configs/unistim.conf.sample
trunk/configs/samples/users.conf.sample
- copied unchanged from r418711, trunk/configs/users.conf.sample
trunk/configs/samples/voicemail.conf.sample
- copied unchanged from r418711, trunk/configs/voicemail.conf.sample
trunk/configs/samples/vpb.conf.sample
- copied unchanged from r418711, trunk/configs/vpb.conf.sample
trunk/configs/samples/xmpp.conf.sample
- copied unchanged from r418711, trunk/configs/xmpp.conf.sample
Removed:
trunk/configs/acl.conf.sample
trunk/configs/adsi.conf.sample
trunk/configs/agents.conf.sample
trunk/configs/alarmreceiver.conf.sample
trunk/configs/alsa.conf.sample
trunk/configs/amd.conf.sample
trunk/configs/app_mysql.conf.sample
trunk/configs/app_skel.conf.sample
trunk/configs/ari.conf.sample
trunk/configs/asterisk.adsi
trunk/configs/asterisk.conf.sample
trunk/configs/calendar.conf.sample
trunk/configs/ccss.conf.sample
trunk/configs/cdr.conf.sample
trunk/configs/cdr_adaptive_odbc.conf.sample
trunk/configs/cdr_custom.conf.sample
trunk/configs/cdr_manager.conf.sample
trunk/configs/cdr_mysql.conf.sample
trunk/configs/cdr_odbc.conf.sample
trunk/configs/cdr_pgsql.conf.sample
trunk/configs/cdr_sqlite3_custom.conf.sample
trunk/configs/cdr_syslog.conf.sample
trunk/configs/cdr_tds.conf.sample
trunk/configs/cel.conf.sample
trunk/configs/cel_custom.conf.sample
trunk/configs/cel_odbc.conf.sample
trunk/configs/cel_pgsql.conf.sample
trunk/configs/cel_sqlite3_custom.conf.sample
trunk/configs/cel_tds.conf.sample
trunk/configs/chan_dahdi.conf.sample
trunk/configs/chan_mobile.conf.sample
trunk/configs/cli.conf.sample
trunk/configs/cli_aliases.conf.sample
trunk/configs/cli_permissions.conf.sample
trunk/configs/codecs.conf.sample
trunk/configs/confbridge.conf.sample
trunk/configs/config_test.conf.sample
trunk/configs/console.conf.sample
trunk/configs/dbsep.conf.sample
trunk/configs/dnsmgr.conf.sample
trunk/configs/dsp.conf.sample
trunk/configs/dundi.conf.sample
trunk/configs/enum.conf.sample
trunk/configs/extconfig.conf.sample
trunk/configs/extensions.ael.sample
trunk/configs/extensions.conf.sample
trunk/configs/extensions.lua.sample
trunk/configs/extensions_minivm.conf.sample
trunk/configs/features.conf.sample
trunk/configs/festival.conf.sample
trunk/configs/followme.conf.sample
trunk/configs/func_odbc.conf.sample
trunk/configs/hep.conf.sample
trunk/configs/http.conf.sample
trunk/configs/iax.conf.sample
trunk/configs/iaxprov.conf.sample
trunk/configs/indications.conf.sample
trunk/configs/logger.conf.sample
trunk/configs/manager.conf.sample
trunk/configs/meetme.conf.sample
trunk/configs/mgcp.conf.sample
trunk/configs/minivm.conf.sample
trunk/configs/misdn.conf.sample
trunk/configs/modules.conf.sample
trunk/configs/motif.conf.sample
trunk/configs/musiconhold.conf.sample
trunk/configs/muted.conf.sample
trunk/configs/ooh323.conf.sample
trunk/configs/osp.conf.sample
trunk/configs/oss.conf.sample
trunk/configs/phone.conf.sample
trunk/configs/phoneprov.conf.sample
trunk/configs/pjsip.conf.sample
trunk/configs/pjsip_notify.conf.sample
trunk/configs/queuerules.conf.sample
trunk/configs/queues.conf.sample
trunk/configs/res_config_mysql.conf.sample
trunk/configs/res_config_sqlite.conf.sample
trunk/configs/res_config_sqlite3.conf.sample
trunk/configs/res_corosync.conf.sample
trunk/configs/res_curl.conf.sample
trunk/configs/res_fax.conf.sample
trunk/configs/res_ldap.conf.sample
trunk/configs/res_odbc.conf.sample
trunk/configs/res_parking.conf.sample
trunk/configs/res_pgsql.conf.sample
trunk/configs/res_pktccops.conf.sample
trunk/configs/res_snmp.conf.sample
trunk/configs/res_stun_monitor.conf.sample
trunk/configs/rtp.conf.sample
trunk/configs/say.conf.sample
trunk/configs/sip.conf.sample
trunk/configs/sip_notify.conf.sample
trunk/configs/skinny.conf.sample
trunk/configs/sla.conf.sample
trunk/configs/smdi.conf.sample
trunk/configs/sorcery.conf.sample
trunk/configs/ss7.timers.sample
trunk/configs/statsd.conf.sample
trunk/configs/telcordia-1.adsi
trunk/configs/test_sorcery.conf.sample
trunk/configs/udptl.conf.sample
trunk/configs/unistim.conf.sample
trunk/configs/users.conf.sample
trunk/configs/voicemail.conf.sample
trunk/configs/vpb.conf.sample
trunk/configs/xmpp.conf.sample
Modified:
trunk/Makefile
trunk/UPGRADE.txt
Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=418870&r1=418869&r2=418870
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jul 17 16:17:28 2014
@@ -660,7 +660,7 @@
adsi:
@echo Installing adsi config files...
$(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
- @for x in configs/*.adsi; do \
+ @for x in configs/samples/*.adsi; do \
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
if [ -f "$${dst}" ] ; then \
echo "Overwriting $$x" ; \
@@ -672,7 +672,7 @@
samples: adsi
@echo Installing other config files...
- @for x in configs/*.sample; do \
+ @for x in configs/samples/*.sample; do \
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=418870&r1=418869&r2=418870
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Thu Jul 17 16:17:28 2014
@@ -23,6 +23,9 @@
From 12 to 13:
+ - Sample config files have been moved from configs/ to a subfolder of that
+ directory, 'samples'.
+
- The menuselect utility has been pulled into the Asterisk repository. As a
result, the libxml2 development library is now a required dependency for
Asterisk.
Copied: trunk/configs/samples/cdr_pgsql.conf.sample (from r418711, trunk/configs/cdr_pgsql.conf.sample)
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/samples/cdr_pgsql.conf.sample?view=diff&rev=418870&p1=trunk/configs/cdr_pgsql.conf.sample&r1=418711&p2=trunk/configs/samples/cdr_pgsql.conf.sample&r2=418870
==============================================================================
--- trunk/configs/cdr_pgsql.conf.sample (original)
+++ trunk/configs/samples/cdr_pgsql.conf.sample Thu Jul 17 16:17:28 2014
@@ -10,6 +10,7 @@
;dbname=asterisk
;password=password
;user=postgres
+;appname=asterisk ; Postgres application_name support (optional). Whitespace not allowed.
;table=cdr ;SQL table where CDRs will be inserted
;encoding=LATIN9 ; Encoding of logged characters in Asterisk
;timezone=UTC ; Uncomment if you want datetime fields in UTC/GMT
Copied: trunk/configs/samples/cel_pgsql.conf.sample (from r418711, trunk/configs/cel_pgsql.conf.sample)
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/samples/cel_pgsql.conf.sample?view=diff&rev=418870&p1=trunk/configs/cel_pgsql.conf.sample&r1=418711&p2=trunk/configs/samples/cel_pgsql.conf.sample&r2=418870
==============================================================================
--- trunk/configs/cel_pgsql.conf.sample (original)
+++ trunk/configs/samples/cel_pgsql.conf.sample Thu Jul 17 16:17:28 2014
@@ -65,3 +65,4 @@
;password=password
;user=postgres
;table=cel ;SQL table where CEL's will be inserted
+;appname=asterisk ; Postgres application_name support (optional). Whitespace not allowed.
Copied: trunk/configs/samples/res_pgsql.conf.sample (from r418711, trunk/configs/res_pgsql.conf.sample)
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/samples/res_pgsql.conf.sample?view=diff&rev=418870&p1=trunk/configs/res_pgsql.conf.sample&r1=418711&p2=trunk/configs/samples/res_pgsql.conf.sample&r2=418870
==============================================================================
--- trunk/configs/res_pgsql.conf.sample (original)
+++ trunk/configs/samples/res_pgsql.conf.sample Thu Jul 17 16:17:28 2014
@@ -12,6 +12,7 @@
dbname=asterisk
dbuser=asterisk
dbpass=password
+;dbappname=asterisk ; Postgres application_name support (optional). Whitespace not allowed.
;
; dbsock is specified as the directory where the socket file may be found. The
; actual socket is constructed as a combination of dbsock and dbport. For
More information about the svn-commits
mailing list