configs: Move sample config files into a subdirectory of configs
authorMatthew Jordan <mjordan@digium.com>
Thu, 17 Jul 2014 21:17:28 +0000 (21:17 +0000)
committerMatthew Jordan <mjordan@digium.com>
Thu, 17 Jul 2014 21:17:28 +0000 (21:17 +0000)
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/

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418870 65c4cc65-6c06-0410-ace0-fbb531ad65f3

109 files changed:
Makefile
UPGRADE.txt
configs/samples/acl.conf.sample [moved from configs/acl.conf.sample with 100% similarity]
configs/samples/adsi.conf.sample [moved from configs/adsi.conf.sample with 100% similarity]
configs/samples/agents.conf.sample [moved from configs/agents.conf.sample with 100% similarity]
configs/samples/alarmreceiver.conf.sample [moved from configs/alarmreceiver.conf.sample with 100% similarity]
configs/samples/alsa.conf.sample [moved from configs/alsa.conf.sample with 100% similarity]
configs/samples/amd.conf.sample [moved from configs/amd.conf.sample with 100% similarity]
configs/samples/app_mysql.conf.sample [moved from configs/app_mysql.conf.sample with 100% similarity]
configs/samples/app_skel.conf.sample [moved from configs/app_skel.conf.sample with 100% similarity]
configs/samples/ari.conf.sample [moved from configs/ari.conf.sample with 100% similarity]
configs/samples/asterisk.adsi [moved from configs/asterisk.adsi with 100% similarity]
configs/samples/asterisk.conf.sample [moved from configs/asterisk.conf.sample with 100% similarity]
configs/samples/calendar.conf.sample [moved from configs/calendar.conf.sample with 100% similarity]
configs/samples/ccss.conf.sample [moved from configs/ccss.conf.sample with 100% similarity]
configs/samples/cdr.conf.sample [moved from configs/cdr.conf.sample with 100% similarity]
configs/samples/cdr_adaptive_odbc.conf.sample [moved from configs/cdr_adaptive_odbc.conf.sample with 100% similarity]
configs/samples/cdr_custom.conf.sample [moved from configs/cdr_custom.conf.sample with 100% similarity]
configs/samples/cdr_manager.conf.sample [moved from configs/cdr_manager.conf.sample with 100% similarity]
configs/samples/cdr_mysql.conf.sample [moved from configs/cdr_mysql.conf.sample with 100% similarity]
configs/samples/cdr_odbc.conf.sample [moved from configs/cdr_odbc.conf.sample with 100% similarity]
configs/samples/cdr_pgsql.conf.sample [moved from configs/cdr_pgsql.conf.sample with 67% similarity]
configs/samples/cdr_sqlite3_custom.conf.sample [moved from configs/cdr_sqlite3_custom.conf.sample with 100% similarity]
configs/samples/cdr_syslog.conf.sample [moved from configs/cdr_syslog.conf.sample with 100% similarity]
configs/samples/cdr_tds.conf.sample [moved from configs/cdr_tds.conf.sample with 100% similarity]
configs/samples/cel.conf.sample [moved from configs/cel.conf.sample with 100% similarity]
configs/samples/cel_custom.conf.sample [moved from configs/cel_custom.conf.sample with 100% similarity]
configs/samples/cel_odbc.conf.sample [moved from configs/cel_odbc.conf.sample with 100% similarity]
configs/samples/cel_pgsql.conf.sample [moved from configs/cel_pgsql.conf.sample with 93% similarity]
configs/samples/cel_sqlite3_custom.conf.sample [moved from configs/cel_sqlite3_custom.conf.sample with 100% similarity]
configs/samples/cel_tds.conf.sample [moved from configs/cel_tds.conf.sample with 100% similarity]
configs/samples/chan_dahdi.conf.sample [moved from configs/chan_dahdi.conf.sample with 100% similarity]
configs/samples/chan_mobile.conf.sample [moved from configs/chan_mobile.conf.sample with 100% similarity]
configs/samples/cli.conf.sample [moved from configs/cli.conf.sample with 100% similarity]
configs/samples/cli_aliases.conf.sample [moved from configs/cli_aliases.conf.sample with 100% similarity]
configs/samples/cli_permissions.conf.sample [moved from configs/cli_permissions.conf.sample with 100% similarity]
configs/samples/codecs.conf.sample [moved from configs/codecs.conf.sample with 100% similarity]
configs/samples/confbridge.conf.sample [moved from configs/confbridge.conf.sample with 100% similarity]
configs/samples/config_test.conf.sample [moved from configs/config_test.conf.sample with 100% similarity]
configs/samples/console.conf.sample [moved from configs/console.conf.sample with 100% similarity]
configs/samples/dbsep.conf.sample [moved from configs/dbsep.conf.sample with 100% similarity]
configs/samples/dnsmgr.conf.sample [moved from configs/dnsmgr.conf.sample with 100% similarity]
configs/samples/dsp.conf.sample [moved from configs/dsp.conf.sample with 100% similarity]
configs/samples/dundi.conf.sample [moved from configs/dundi.conf.sample with 100% similarity]
configs/samples/enum.conf.sample [moved from configs/enum.conf.sample with 100% similarity]
configs/samples/extconfig.conf.sample [moved from configs/extconfig.conf.sample with 100% similarity]
configs/samples/extensions.ael.sample [moved from configs/extensions.ael.sample with 100% similarity]
configs/samples/extensions.conf.sample [moved from configs/extensions.conf.sample with 100% similarity]
configs/samples/extensions.lua.sample [moved from configs/extensions.lua.sample with 100% similarity]
configs/samples/extensions_minivm.conf.sample [moved from configs/extensions_minivm.conf.sample with 100% similarity]
configs/samples/features.conf.sample [moved from configs/features.conf.sample with 100% similarity]
configs/samples/festival.conf.sample [moved from configs/festival.conf.sample with 100% similarity]
configs/samples/followme.conf.sample [moved from configs/followme.conf.sample with 100% similarity]
configs/samples/func_odbc.conf.sample [moved from configs/func_odbc.conf.sample with 100% similarity]
configs/samples/hep.conf.sample [moved from configs/hep.conf.sample with 100% similarity]
configs/samples/http.conf.sample [moved from configs/http.conf.sample with 100% similarity]
configs/samples/iax.conf.sample [moved from configs/iax.conf.sample with 100% similarity]
configs/samples/iaxprov.conf.sample [moved from configs/iaxprov.conf.sample with 100% similarity]
configs/samples/indications.conf.sample [moved from configs/indications.conf.sample with 100% similarity]
configs/samples/logger.conf.sample [moved from configs/logger.conf.sample with 100% similarity]
configs/samples/manager.conf.sample [moved from configs/manager.conf.sample with 100% similarity]
configs/samples/meetme.conf.sample [moved from configs/meetme.conf.sample with 100% similarity]
configs/samples/mgcp.conf.sample [moved from configs/mgcp.conf.sample with 100% similarity]
configs/samples/minivm.conf.sample [moved from configs/minivm.conf.sample with 100% similarity]
configs/samples/misdn.conf.sample [moved from configs/misdn.conf.sample with 100% similarity]
configs/samples/modules.conf.sample [moved from configs/modules.conf.sample with 100% similarity]
configs/samples/motif.conf.sample [moved from configs/motif.conf.sample with 100% similarity]
configs/samples/musiconhold.conf.sample [moved from configs/musiconhold.conf.sample with 100% similarity]
configs/samples/muted.conf.sample [moved from configs/muted.conf.sample with 100% similarity]
configs/samples/ooh323.conf.sample [moved from configs/ooh323.conf.sample with 100% similarity]
configs/samples/osp.conf.sample [moved from configs/osp.conf.sample with 100% similarity]
configs/samples/oss.conf.sample [moved from configs/oss.conf.sample with 100% similarity]
configs/samples/phone.conf.sample [moved from configs/phone.conf.sample with 100% similarity]
configs/samples/phoneprov.conf.sample [moved from configs/phoneprov.conf.sample with 100% similarity]
configs/samples/pjsip.conf.sample [moved from configs/pjsip.conf.sample with 99% similarity]
configs/samples/pjsip_notify.conf.sample [moved from configs/pjsip_notify.conf.sample with 100% similarity]
configs/samples/queuerules.conf.sample [moved from configs/queuerules.conf.sample with 100% similarity]
configs/samples/queues.conf.sample [moved from configs/queues.conf.sample with 100% similarity]
configs/samples/res_config_mysql.conf.sample [moved from configs/res_config_mysql.conf.sample with 100% similarity]
configs/samples/res_config_sqlite.conf.sample [moved from configs/res_config_sqlite.conf.sample with 100% similarity]
configs/samples/res_config_sqlite3.conf.sample [moved from configs/res_config_sqlite3.conf.sample with 100% similarity]
configs/samples/res_corosync.conf.sample [moved from configs/res_corosync.conf.sample with 100% similarity]
configs/samples/res_curl.conf.sample [moved from configs/res_curl.conf.sample with 100% similarity]
configs/samples/res_fax.conf.sample [moved from configs/res_fax.conf.sample with 100% similarity]
configs/samples/res_ldap.conf.sample [moved from configs/res_ldap.conf.sample with 100% similarity]
configs/samples/res_odbc.conf.sample [moved from configs/res_odbc.conf.sample with 100% similarity]
configs/samples/res_parking.conf.sample [moved from configs/res_parking.conf.sample with 100% similarity]
configs/samples/res_pgsql.conf.sample [moved from configs/res_pgsql.conf.sample with 99% similarity]
configs/samples/res_pktccops.conf.sample [moved from configs/res_pktccops.conf.sample with 100% similarity]
configs/samples/res_snmp.conf.sample [moved from configs/res_snmp.conf.sample with 100% similarity]
configs/samples/res_stun_monitor.conf.sample [moved from configs/res_stun_monitor.conf.sample with 100% similarity]
configs/samples/rtp.conf.sample [moved from configs/rtp.conf.sample with 100% similarity]
configs/samples/say.conf.sample [moved from configs/say.conf.sample with 100% similarity]
configs/samples/sip.conf.sample [moved from configs/sip.conf.sample with 100% similarity]
configs/samples/sip_notify.conf.sample [moved from configs/sip_notify.conf.sample with 100% similarity]
configs/samples/skinny.conf.sample [moved from configs/skinny.conf.sample with 100% similarity]
configs/samples/sla.conf.sample [moved from configs/sla.conf.sample with 100% similarity]
configs/samples/smdi.conf.sample [moved from configs/smdi.conf.sample with 100% similarity]
configs/samples/sorcery.conf.sample [moved from configs/sorcery.conf.sample with 100% similarity]
configs/samples/ss7.timers.sample [moved from configs/ss7.timers.sample with 100% similarity]
configs/samples/statsd.conf.sample [moved from configs/statsd.conf.sample with 100% similarity]
configs/samples/telcordia-1.adsi [moved from configs/telcordia-1.adsi with 100% similarity]
configs/samples/test_sorcery.conf.sample [moved from configs/test_sorcery.conf.sample with 100% similarity]
configs/samples/udptl.conf.sample [moved from configs/udptl.conf.sample with 100% similarity]
configs/samples/unistim.conf.sample [moved from configs/unistim.conf.sample with 100% similarity]
configs/samples/users.conf.sample [moved from configs/users.conf.sample with 100% similarity]
configs/samples/voicemail.conf.sample [moved from configs/voicemail.conf.sample with 100% similarity]
configs/samples/vpb.conf.sample [moved from configs/vpb.conf.sample with 100% similarity]
configs/samples/xmpp.conf.sample [moved from configs/xmpp.conf.sample with 100% similarity]

index 6a51788..886f976 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -660,7 +660,7 @@ upgrade: bininstall
 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 @@ adsi:
 
 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 \
index 4dab291..84b3e8d 100644 (file)
@@ -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.
similarity index 67%
rename from configs/cdr_pgsql.conf.sample
rename to configs/samples/cdr_pgsql.conf.sample
index 286baab..c5a989f 100644 (file)
@@ -11,6 +11,6 @@
 ;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
+;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
similarity index 93%
rename from configs/cel_pgsql.conf.sample
rename to configs/samples/cel_pgsql.conf.sample
index 10e3285..2298b2d 100644 (file)
@@ -64,5 +64,5 @@
 ;dbname=asterisk
 ;password=password
 ;user=postgres
-;table=cel          ; SQL table where CEL's will be inserted
-;appname=asterisk   ; Postgres application_name support (optional). Whitespace not allowed.
+;table=cel             ;SQL table where CEL's will be inserted
+;appname=asterisk   ; Postgres application_name support (optional). Whitespace not allowed.
\ No newline at end of file
similarity index 99%
rename from configs/pjsip.conf.sample
rename to configs/samples/pjsip.conf.sample
index 58774dc..3aa05a9 100644 (file)
 ;  SYNOPSIS: Endpoint
 ;100rel=yes     ; Allow support for RFC3262 provisional ACK tags (default:
                 ; "yes")
-;accountcode=foo        ; Set a default account code for channels created for
-                        ; this endpoint
 ;aggregate_mwi=yes      ;  (default: "yes")
 ;allow= ; Media Codec s to allow (default: "")
 ;aors=  ; AoR s to be used with the endpoint (default: "")
similarity index 99%
rename from configs/res_pgsql.conf.sample
rename to configs/samples/res_pgsql.conf.sample
index 015d68c..cc7442f 100644 (file)
@@ -18,7 +18,7 @@ dbpass=password
 ; actual socket is constructed as a combination of dbsock and dbport.  For
 ; example, the values of '/tmp' and '5432', respectively, will specify a socket
 ; file of '/tmp/.s.PGSQL.5432'.
-;
+; 
 ;dbsock=/tmp
 ;
 ; requirements - At startup, each realtime family will make requirements