From fc0fecb4768d696db3324bcf6dd03325bb4cd513 Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Thu, 17 Jul 2014 21:17:28 +0000
Subject: [PATCH] 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/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 Makefile                                             | 4 ++--
 UPGRADE.txt                                          | 3 +++
 configs/{ => samples}/acl.conf.sample                | 0
 configs/{ => samples}/adsi.conf.sample               | 0
 configs/{ => samples}/agents.conf.sample             | 0
 configs/{ => samples}/alarmreceiver.conf.sample      | 0
 configs/{ => samples}/alsa.conf.sample               | 0
 configs/{ => samples}/amd.conf.sample                | 0
 configs/{ => samples}/app_mysql.conf.sample          | 0
 configs/{ => samples}/app_skel.conf.sample           | 0
 configs/{ => samples}/ari.conf.sample                | 0
 configs/{ => samples}/asterisk.adsi                  | 0
 configs/{ => samples}/asterisk.conf.sample           | 0
 configs/{ => samples}/calendar.conf.sample           | 0
 configs/{ => samples}/ccss.conf.sample               | 0
 configs/{ => samples}/cdr.conf.sample                | 0
 configs/{ => samples}/cdr_adaptive_odbc.conf.sample  | 0
 configs/{ => samples}/cdr_custom.conf.sample         | 0
 configs/{ => samples}/cdr_manager.conf.sample        | 0
 configs/{ => samples}/cdr_mysql.conf.sample          | 0
 configs/{ => samples}/cdr_odbc.conf.sample           | 0
 configs/{ => samples}/cdr_pgsql.conf.sample          | 6 +++---
 configs/{ => samples}/cdr_sqlite3_custom.conf.sample | 0
 configs/{ => samples}/cdr_syslog.conf.sample         | 0
 configs/{ => samples}/cdr_tds.conf.sample            | 0
 configs/{ => samples}/cel.conf.sample                | 0
 configs/{ => samples}/cel_custom.conf.sample         | 0
 configs/{ => samples}/cel_odbc.conf.sample           | 0
 configs/{ => samples}/cel_pgsql.conf.sample          | 4 ++--
 configs/{ => samples}/cel_sqlite3_custom.conf.sample | 0
 configs/{ => samples}/cel_tds.conf.sample            | 0
 configs/{ => samples}/chan_dahdi.conf.sample         | 0
 configs/{ => samples}/chan_mobile.conf.sample        | 0
 configs/{ => samples}/cli.conf.sample                | 0
 configs/{ => samples}/cli_aliases.conf.sample        | 0
 configs/{ => samples}/cli_permissions.conf.sample    | 0
 configs/{ => samples}/codecs.conf.sample             | 0
 configs/{ => samples}/confbridge.conf.sample         | 0
 configs/{ => samples}/config_test.conf.sample        | 0
 configs/{ => samples}/console.conf.sample            | 0
 configs/{ => samples}/dbsep.conf.sample              | 0
 configs/{ => samples}/dnsmgr.conf.sample             | 0
 configs/{ => samples}/dsp.conf.sample                | 0
 configs/{ => samples}/dundi.conf.sample              | 0
 configs/{ => samples}/enum.conf.sample               | 0
 configs/{ => samples}/extconfig.conf.sample          | 0
 configs/{ => samples}/extensions.ael.sample          | 0
 configs/{ => samples}/extensions.conf.sample         | 0
 configs/{ => samples}/extensions.lua.sample          | 0
 configs/{ => samples}/extensions_minivm.conf.sample  | 0
 configs/{ => samples}/features.conf.sample           | 0
 configs/{ => samples}/festival.conf.sample           | 0
 configs/{ => samples}/followme.conf.sample           | 0
 configs/{ => samples}/func_odbc.conf.sample          | 0
 configs/{ => samples}/hep.conf.sample                | 0
 configs/{ => samples}/http.conf.sample               | 0
 configs/{ => samples}/iax.conf.sample                | 0
 configs/{ => samples}/iaxprov.conf.sample            | 0
 configs/{ => samples}/indications.conf.sample        | 0
 configs/{ => samples}/logger.conf.sample             | 0
 configs/{ => samples}/manager.conf.sample            | 0
 configs/{ => samples}/meetme.conf.sample             | 0
 configs/{ => samples}/mgcp.conf.sample               | 0
 configs/{ => samples}/minivm.conf.sample             | 0
 configs/{ => samples}/misdn.conf.sample              | 0
 configs/{ => samples}/modules.conf.sample            | 0
 configs/{ => samples}/motif.conf.sample              | 0
 configs/{ => samples}/musiconhold.conf.sample        | 0
 configs/{ => samples}/muted.conf.sample              | 0
 configs/{ => samples}/ooh323.conf.sample             | 0
 configs/{ => samples}/osp.conf.sample                | 0
 configs/{ => samples}/oss.conf.sample                | 0
 configs/{ => samples}/phone.conf.sample              | 0
 configs/{ => samples}/phoneprov.conf.sample          | 0
 configs/{ => samples}/pjsip.conf.sample              | 2 --
 configs/{ => samples}/pjsip_notify.conf.sample       | 0
 configs/{ => samples}/queuerules.conf.sample         | 0
 configs/{ => samples}/queues.conf.sample             | 0
 configs/{ => samples}/res_config_mysql.conf.sample   | 0
 configs/{ => samples}/res_config_sqlite.conf.sample  | 0
 configs/{ => samples}/res_config_sqlite3.conf.sample | 0
 configs/{ => samples}/res_corosync.conf.sample       | 0
 configs/{ => samples}/res_curl.conf.sample           | 0
 configs/{ => samples}/res_fax.conf.sample            | 0
 configs/{ => samples}/res_ldap.conf.sample           | 0
 configs/{ => samples}/res_odbc.conf.sample           | 0
 configs/{ => samples}/res_parking.conf.sample        | 0
 configs/{ => samples}/res_pgsql.conf.sample          | 2 +-
 configs/{ => samples}/res_pktccops.conf.sample       | 0
 configs/{ => samples}/res_snmp.conf.sample           | 0
 configs/{ => samples}/res_stun_monitor.conf.sample   | 0
 configs/{ => samples}/rtp.conf.sample                | 0
 configs/{ => samples}/say.conf.sample                | 0
 configs/{ => samples}/sip.conf.sample                | 0
 configs/{ => samples}/sip_notify.conf.sample         | 0
 configs/{ => samples}/skinny.conf.sample             | 0
 configs/{ => samples}/sla.conf.sample                | 0
 configs/{ => samples}/smdi.conf.sample               | 0
 configs/{ => samples}/sorcery.conf.sample            | 0
 configs/{ => samples}/ss7.timers.sample              | 0
 configs/{ => samples}/statsd.conf.sample             | 0
 configs/{ => samples}/telcordia-1.adsi               | 0
 configs/{ => samples}/test_sorcery.conf.sample       | 0
 configs/{ => samples}/udptl.conf.sample              | 0
 configs/{ => samples}/unistim.conf.sample            | 0
 configs/{ => samples}/users.conf.sample              | 0
 configs/{ => samples}/voicemail.conf.sample          | 0
 configs/{ => samples}/vpb.conf.sample                | 0
 configs/{ => samples}/xmpp.conf.sample               | 0
 109 files changed, 11 insertions(+), 10 deletions(-)
 rename configs/{ => samples}/acl.conf.sample (100%)
 rename configs/{ => samples}/adsi.conf.sample (100%)
 rename configs/{ => samples}/agents.conf.sample (100%)
 rename configs/{ => samples}/alarmreceiver.conf.sample (100%)
 rename configs/{ => samples}/alsa.conf.sample (100%)
 rename configs/{ => samples}/amd.conf.sample (100%)
 rename configs/{ => samples}/app_mysql.conf.sample (100%)
 rename configs/{ => samples}/app_skel.conf.sample (100%)
 rename configs/{ => samples}/ari.conf.sample (100%)
 rename configs/{ => samples}/asterisk.adsi (100%)
 rename configs/{ => samples}/asterisk.conf.sample (100%)
 rename configs/{ => samples}/calendar.conf.sample (100%)
 rename configs/{ => samples}/ccss.conf.sample (100%)
 rename configs/{ => samples}/cdr.conf.sample (100%)
 rename configs/{ => samples}/cdr_adaptive_odbc.conf.sample (100%)
 rename configs/{ => samples}/cdr_custom.conf.sample (100%)
 rename configs/{ => samples}/cdr_manager.conf.sample (100%)
 rename configs/{ => samples}/cdr_mysql.conf.sample (100%)
 rename configs/{ => samples}/cdr_odbc.conf.sample (100%)
 rename configs/{ => samples}/cdr_pgsql.conf.sample (67%)
 rename configs/{ => samples}/cdr_sqlite3_custom.conf.sample (100%)
 rename configs/{ => samples}/cdr_syslog.conf.sample (100%)
 rename configs/{ => samples}/cdr_tds.conf.sample (100%)
 rename configs/{ => samples}/cel.conf.sample (100%)
 rename configs/{ => samples}/cel_custom.conf.sample (100%)
 rename configs/{ => samples}/cel_odbc.conf.sample (100%)
 rename configs/{ => samples}/cel_pgsql.conf.sample (93%)
 rename configs/{ => samples}/cel_sqlite3_custom.conf.sample (100%)
 rename configs/{ => samples}/cel_tds.conf.sample (100%)
 rename configs/{ => samples}/chan_dahdi.conf.sample (100%)
 rename configs/{ => samples}/chan_mobile.conf.sample (100%)
 rename configs/{ => samples}/cli.conf.sample (100%)
 rename configs/{ => samples}/cli_aliases.conf.sample (100%)
 rename configs/{ => samples}/cli_permissions.conf.sample (100%)
 rename configs/{ => samples}/codecs.conf.sample (100%)
 rename configs/{ => samples}/confbridge.conf.sample (100%)
 rename configs/{ => samples}/config_test.conf.sample (100%)
 rename configs/{ => samples}/console.conf.sample (100%)
 rename configs/{ => samples}/dbsep.conf.sample (100%)
 rename configs/{ => samples}/dnsmgr.conf.sample (100%)
 rename configs/{ => samples}/dsp.conf.sample (100%)
 rename configs/{ => samples}/dundi.conf.sample (100%)
 rename configs/{ => samples}/enum.conf.sample (100%)
 rename configs/{ => samples}/extconfig.conf.sample (100%)
 rename configs/{ => samples}/extensions.ael.sample (100%)
 rename configs/{ => samples}/extensions.conf.sample (100%)
 rename configs/{ => samples}/extensions.lua.sample (100%)
 rename configs/{ => samples}/extensions_minivm.conf.sample (100%)
 rename configs/{ => samples}/features.conf.sample (100%)
 rename configs/{ => samples}/festival.conf.sample (100%)
 rename configs/{ => samples}/followme.conf.sample (100%)
 rename configs/{ => samples}/func_odbc.conf.sample (100%)
 rename configs/{ => samples}/hep.conf.sample (100%)
 rename configs/{ => samples}/http.conf.sample (100%)
 rename configs/{ => samples}/iax.conf.sample (100%)
 rename configs/{ => samples}/iaxprov.conf.sample (100%)
 rename configs/{ => samples}/indications.conf.sample (100%)
 rename configs/{ => samples}/logger.conf.sample (100%)
 rename configs/{ => samples}/manager.conf.sample (100%)
 rename configs/{ => samples}/meetme.conf.sample (100%)
 rename configs/{ => samples}/mgcp.conf.sample (100%)
 rename configs/{ => samples}/minivm.conf.sample (100%)
 rename configs/{ => samples}/misdn.conf.sample (100%)
 rename configs/{ => samples}/modules.conf.sample (100%)
 rename configs/{ => samples}/motif.conf.sample (100%)
 rename configs/{ => samples}/musiconhold.conf.sample (100%)
 rename configs/{ => samples}/muted.conf.sample (100%)
 rename configs/{ => samples}/ooh323.conf.sample (100%)
 rename configs/{ => samples}/osp.conf.sample (100%)
 rename configs/{ => samples}/oss.conf.sample (100%)
 rename configs/{ => samples}/phone.conf.sample (100%)
 rename configs/{ => samples}/phoneprov.conf.sample (100%)
 rename configs/{ => samples}/pjsip.conf.sample (99%)
 rename configs/{ => samples}/pjsip_notify.conf.sample (100%)
 rename configs/{ => samples}/queuerules.conf.sample (100%)
 rename configs/{ => samples}/queues.conf.sample (100%)
 rename configs/{ => samples}/res_config_mysql.conf.sample (100%)
 rename configs/{ => samples}/res_config_sqlite.conf.sample (100%)
 rename configs/{ => samples}/res_config_sqlite3.conf.sample (100%)
 rename configs/{ => samples}/res_corosync.conf.sample (100%)
 rename configs/{ => samples}/res_curl.conf.sample (100%)
 rename configs/{ => samples}/res_fax.conf.sample (100%)
 rename configs/{ => samples}/res_ldap.conf.sample (100%)
 rename configs/{ => samples}/res_odbc.conf.sample (100%)
 rename configs/{ => samples}/res_parking.conf.sample (100%)
 rename configs/{ => samples}/res_pgsql.conf.sample (99%)
 rename configs/{ => samples}/res_pktccops.conf.sample (100%)
 rename configs/{ => samples}/res_snmp.conf.sample (100%)
 rename configs/{ => samples}/res_stun_monitor.conf.sample (100%)
 rename configs/{ => samples}/rtp.conf.sample (100%)
 rename configs/{ => samples}/say.conf.sample (100%)
 rename configs/{ => samples}/sip.conf.sample (100%)
 rename configs/{ => samples}/sip_notify.conf.sample (100%)
 rename configs/{ => samples}/skinny.conf.sample (100%)
 rename configs/{ => samples}/sla.conf.sample (100%)
 rename configs/{ => samples}/smdi.conf.sample (100%)
 rename configs/{ => samples}/sorcery.conf.sample (100%)
 rename configs/{ => samples}/ss7.timers.sample (100%)
 rename configs/{ => samples}/statsd.conf.sample (100%)
 rename configs/{ => samples}/telcordia-1.adsi (100%)
 rename configs/{ => samples}/test_sorcery.conf.sample (100%)
 rename configs/{ => samples}/udptl.conf.sample (100%)
 rename configs/{ => samples}/unistim.conf.sample (100%)
 rename configs/{ => samples}/users.conf.sample (100%)
 rename configs/{ => samples}/voicemail.conf.sample (100%)
 rename configs/{ => samples}/vpb.conf.sample (100%)
 rename configs/{ => samples}/xmpp.conf.sample (100%)

diff --git a/Makefile b/Makefile
index 6a517889d3..886f976f8d 100644
--- 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 \
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 4dab291215..84b3e8d5a1 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -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.
diff --git a/configs/acl.conf.sample b/configs/samples/acl.conf.sample
similarity index 100%
rename from configs/acl.conf.sample
rename to configs/samples/acl.conf.sample
diff --git a/configs/adsi.conf.sample b/configs/samples/adsi.conf.sample
similarity index 100%
rename from configs/adsi.conf.sample
rename to configs/samples/adsi.conf.sample
diff --git a/configs/agents.conf.sample b/configs/samples/agents.conf.sample
similarity index 100%
rename from configs/agents.conf.sample
rename to configs/samples/agents.conf.sample
diff --git a/configs/alarmreceiver.conf.sample b/configs/samples/alarmreceiver.conf.sample
similarity index 100%
rename from configs/alarmreceiver.conf.sample
rename to configs/samples/alarmreceiver.conf.sample
diff --git a/configs/alsa.conf.sample b/configs/samples/alsa.conf.sample
similarity index 100%
rename from configs/alsa.conf.sample
rename to configs/samples/alsa.conf.sample
diff --git a/configs/amd.conf.sample b/configs/samples/amd.conf.sample
similarity index 100%
rename from configs/amd.conf.sample
rename to configs/samples/amd.conf.sample
diff --git a/configs/app_mysql.conf.sample b/configs/samples/app_mysql.conf.sample
similarity index 100%
rename from configs/app_mysql.conf.sample
rename to configs/samples/app_mysql.conf.sample
diff --git a/configs/app_skel.conf.sample b/configs/samples/app_skel.conf.sample
similarity index 100%
rename from configs/app_skel.conf.sample
rename to configs/samples/app_skel.conf.sample
diff --git a/configs/ari.conf.sample b/configs/samples/ari.conf.sample
similarity index 100%
rename from configs/ari.conf.sample
rename to configs/samples/ari.conf.sample
diff --git a/configs/asterisk.adsi b/configs/samples/asterisk.adsi
similarity index 100%
rename from configs/asterisk.adsi
rename to configs/samples/asterisk.adsi
diff --git a/configs/asterisk.conf.sample b/configs/samples/asterisk.conf.sample
similarity index 100%
rename from configs/asterisk.conf.sample
rename to configs/samples/asterisk.conf.sample
diff --git a/configs/calendar.conf.sample b/configs/samples/calendar.conf.sample
similarity index 100%
rename from configs/calendar.conf.sample
rename to configs/samples/calendar.conf.sample
diff --git a/configs/ccss.conf.sample b/configs/samples/ccss.conf.sample
similarity index 100%
rename from configs/ccss.conf.sample
rename to configs/samples/ccss.conf.sample
diff --git a/configs/cdr.conf.sample b/configs/samples/cdr.conf.sample
similarity index 100%
rename from configs/cdr.conf.sample
rename to configs/samples/cdr.conf.sample
diff --git a/configs/cdr_adaptive_odbc.conf.sample b/configs/samples/cdr_adaptive_odbc.conf.sample
similarity index 100%
rename from configs/cdr_adaptive_odbc.conf.sample
rename to configs/samples/cdr_adaptive_odbc.conf.sample
diff --git a/configs/cdr_custom.conf.sample b/configs/samples/cdr_custom.conf.sample
similarity index 100%
rename from configs/cdr_custom.conf.sample
rename to configs/samples/cdr_custom.conf.sample
diff --git a/configs/cdr_manager.conf.sample b/configs/samples/cdr_manager.conf.sample
similarity index 100%
rename from configs/cdr_manager.conf.sample
rename to configs/samples/cdr_manager.conf.sample
diff --git a/configs/cdr_mysql.conf.sample b/configs/samples/cdr_mysql.conf.sample
similarity index 100%
rename from configs/cdr_mysql.conf.sample
rename to configs/samples/cdr_mysql.conf.sample
diff --git a/configs/cdr_odbc.conf.sample b/configs/samples/cdr_odbc.conf.sample
similarity index 100%
rename from configs/cdr_odbc.conf.sample
rename to configs/samples/cdr_odbc.conf.sample
diff --git a/configs/cdr_pgsql.conf.sample b/configs/samples/cdr_pgsql.conf.sample
similarity index 67%
rename from configs/cdr_pgsql.conf.sample
rename to configs/samples/cdr_pgsql.conf.sample
index 286baab42f..c5a989f31c 100644
--- a/configs/cdr_pgsql.conf.sample
+++ b/configs/samples/cdr_pgsql.conf.sample
@@ -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
diff --git a/configs/cdr_sqlite3_custom.conf.sample b/configs/samples/cdr_sqlite3_custom.conf.sample
similarity index 100%
rename from configs/cdr_sqlite3_custom.conf.sample
rename to configs/samples/cdr_sqlite3_custom.conf.sample
diff --git a/configs/cdr_syslog.conf.sample b/configs/samples/cdr_syslog.conf.sample
similarity index 100%
rename from configs/cdr_syslog.conf.sample
rename to configs/samples/cdr_syslog.conf.sample
diff --git a/configs/cdr_tds.conf.sample b/configs/samples/cdr_tds.conf.sample
similarity index 100%
rename from configs/cdr_tds.conf.sample
rename to configs/samples/cdr_tds.conf.sample
diff --git a/configs/cel.conf.sample b/configs/samples/cel.conf.sample
similarity index 100%
rename from configs/cel.conf.sample
rename to configs/samples/cel.conf.sample
diff --git a/configs/cel_custom.conf.sample b/configs/samples/cel_custom.conf.sample
similarity index 100%
rename from configs/cel_custom.conf.sample
rename to configs/samples/cel_custom.conf.sample
diff --git a/configs/cel_odbc.conf.sample b/configs/samples/cel_odbc.conf.sample
similarity index 100%
rename from configs/cel_odbc.conf.sample
rename to configs/samples/cel_odbc.conf.sample
diff --git a/configs/cel_pgsql.conf.sample b/configs/samples/cel_pgsql.conf.sample
similarity index 93%
rename from configs/cel_pgsql.conf.sample
rename to configs/samples/cel_pgsql.conf.sample
index 10e3285ecb..2298b2ddc6 100644
--- a/configs/cel_pgsql.conf.sample
+++ b/configs/samples/cel_pgsql.conf.sample
@@ -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
diff --git a/configs/cel_sqlite3_custom.conf.sample b/configs/samples/cel_sqlite3_custom.conf.sample
similarity index 100%
rename from configs/cel_sqlite3_custom.conf.sample
rename to configs/samples/cel_sqlite3_custom.conf.sample
diff --git a/configs/cel_tds.conf.sample b/configs/samples/cel_tds.conf.sample
similarity index 100%
rename from configs/cel_tds.conf.sample
rename to configs/samples/cel_tds.conf.sample
diff --git a/configs/chan_dahdi.conf.sample b/configs/samples/chan_dahdi.conf.sample
similarity index 100%
rename from configs/chan_dahdi.conf.sample
rename to configs/samples/chan_dahdi.conf.sample
diff --git a/configs/chan_mobile.conf.sample b/configs/samples/chan_mobile.conf.sample
similarity index 100%
rename from configs/chan_mobile.conf.sample
rename to configs/samples/chan_mobile.conf.sample
diff --git a/configs/cli.conf.sample b/configs/samples/cli.conf.sample
similarity index 100%
rename from configs/cli.conf.sample
rename to configs/samples/cli.conf.sample
diff --git a/configs/cli_aliases.conf.sample b/configs/samples/cli_aliases.conf.sample
similarity index 100%
rename from configs/cli_aliases.conf.sample
rename to configs/samples/cli_aliases.conf.sample
diff --git a/configs/cli_permissions.conf.sample b/configs/samples/cli_permissions.conf.sample
similarity index 100%
rename from configs/cli_permissions.conf.sample
rename to configs/samples/cli_permissions.conf.sample
diff --git a/configs/codecs.conf.sample b/configs/samples/codecs.conf.sample
similarity index 100%
rename from configs/codecs.conf.sample
rename to configs/samples/codecs.conf.sample
diff --git a/configs/confbridge.conf.sample b/configs/samples/confbridge.conf.sample
similarity index 100%
rename from configs/confbridge.conf.sample
rename to configs/samples/confbridge.conf.sample
diff --git a/configs/config_test.conf.sample b/configs/samples/config_test.conf.sample
similarity index 100%
rename from configs/config_test.conf.sample
rename to configs/samples/config_test.conf.sample
diff --git a/configs/console.conf.sample b/configs/samples/console.conf.sample
similarity index 100%
rename from configs/console.conf.sample
rename to configs/samples/console.conf.sample
diff --git a/configs/dbsep.conf.sample b/configs/samples/dbsep.conf.sample
similarity index 100%
rename from configs/dbsep.conf.sample
rename to configs/samples/dbsep.conf.sample
diff --git a/configs/dnsmgr.conf.sample b/configs/samples/dnsmgr.conf.sample
similarity index 100%
rename from configs/dnsmgr.conf.sample
rename to configs/samples/dnsmgr.conf.sample
diff --git a/configs/dsp.conf.sample b/configs/samples/dsp.conf.sample
similarity index 100%
rename from configs/dsp.conf.sample
rename to configs/samples/dsp.conf.sample
diff --git a/configs/dundi.conf.sample b/configs/samples/dundi.conf.sample
similarity index 100%
rename from configs/dundi.conf.sample
rename to configs/samples/dundi.conf.sample
diff --git a/configs/enum.conf.sample b/configs/samples/enum.conf.sample
similarity index 100%
rename from configs/enum.conf.sample
rename to configs/samples/enum.conf.sample
diff --git a/configs/extconfig.conf.sample b/configs/samples/extconfig.conf.sample
similarity index 100%
rename from configs/extconfig.conf.sample
rename to configs/samples/extconfig.conf.sample
diff --git a/configs/extensions.ael.sample b/configs/samples/extensions.ael.sample
similarity index 100%
rename from configs/extensions.ael.sample
rename to configs/samples/extensions.ael.sample
diff --git a/configs/extensions.conf.sample b/configs/samples/extensions.conf.sample
similarity index 100%
rename from configs/extensions.conf.sample
rename to configs/samples/extensions.conf.sample
diff --git a/configs/extensions.lua.sample b/configs/samples/extensions.lua.sample
similarity index 100%
rename from configs/extensions.lua.sample
rename to configs/samples/extensions.lua.sample
diff --git a/configs/extensions_minivm.conf.sample b/configs/samples/extensions_minivm.conf.sample
similarity index 100%
rename from configs/extensions_minivm.conf.sample
rename to configs/samples/extensions_minivm.conf.sample
diff --git a/configs/features.conf.sample b/configs/samples/features.conf.sample
similarity index 100%
rename from configs/features.conf.sample
rename to configs/samples/features.conf.sample
diff --git a/configs/festival.conf.sample b/configs/samples/festival.conf.sample
similarity index 100%
rename from configs/festival.conf.sample
rename to configs/samples/festival.conf.sample
diff --git a/configs/followme.conf.sample b/configs/samples/followme.conf.sample
similarity index 100%
rename from configs/followme.conf.sample
rename to configs/samples/followme.conf.sample
diff --git a/configs/func_odbc.conf.sample b/configs/samples/func_odbc.conf.sample
similarity index 100%
rename from configs/func_odbc.conf.sample
rename to configs/samples/func_odbc.conf.sample
diff --git a/configs/hep.conf.sample b/configs/samples/hep.conf.sample
similarity index 100%
rename from configs/hep.conf.sample
rename to configs/samples/hep.conf.sample
diff --git a/configs/http.conf.sample b/configs/samples/http.conf.sample
similarity index 100%
rename from configs/http.conf.sample
rename to configs/samples/http.conf.sample
diff --git a/configs/iax.conf.sample b/configs/samples/iax.conf.sample
similarity index 100%
rename from configs/iax.conf.sample
rename to configs/samples/iax.conf.sample
diff --git a/configs/iaxprov.conf.sample b/configs/samples/iaxprov.conf.sample
similarity index 100%
rename from configs/iaxprov.conf.sample
rename to configs/samples/iaxprov.conf.sample
diff --git a/configs/indications.conf.sample b/configs/samples/indications.conf.sample
similarity index 100%
rename from configs/indications.conf.sample
rename to configs/samples/indications.conf.sample
diff --git a/configs/logger.conf.sample b/configs/samples/logger.conf.sample
similarity index 100%
rename from configs/logger.conf.sample
rename to configs/samples/logger.conf.sample
diff --git a/configs/manager.conf.sample b/configs/samples/manager.conf.sample
similarity index 100%
rename from configs/manager.conf.sample
rename to configs/samples/manager.conf.sample
diff --git a/configs/meetme.conf.sample b/configs/samples/meetme.conf.sample
similarity index 100%
rename from configs/meetme.conf.sample
rename to configs/samples/meetme.conf.sample
diff --git a/configs/mgcp.conf.sample b/configs/samples/mgcp.conf.sample
similarity index 100%
rename from configs/mgcp.conf.sample
rename to configs/samples/mgcp.conf.sample
diff --git a/configs/minivm.conf.sample b/configs/samples/minivm.conf.sample
similarity index 100%
rename from configs/minivm.conf.sample
rename to configs/samples/minivm.conf.sample
diff --git a/configs/misdn.conf.sample b/configs/samples/misdn.conf.sample
similarity index 100%
rename from configs/misdn.conf.sample
rename to configs/samples/misdn.conf.sample
diff --git a/configs/modules.conf.sample b/configs/samples/modules.conf.sample
similarity index 100%
rename from configs/modules.conf.sample
rename to configs/samples/modules.conf.sample
diff --git a/configs/motif.conf.sample b/configs/samples/motif.conf.sample
similarity index 100%
rename from configs/motif.conf.sample
rename to configs/samples/motif.conf.sample
diff --git a/configs/musiconhold.conf.sample b/configs/samples/musiconhold.conf.sample
similarity index 100%
rename from configs/musiconhold.conf.sample
rename to configs/samples/musiconhold.conf.sample
diff --git a/configs/muted.conf.sample b/configs/samples/muted.conf.sample
similarity index 100%
rename from configs/muted.conf.sample
rename to configs/samples/muted.conf.sample
diff --git a/configs/ooh323.conf.sample b/configs/samples/ooh323.conf.sample
similarity index 100%
rename from configs/ooh323.conf.sample
rename to configs/samples/ooh323.conf.sample
diff --git a/configs/osp.conf.sample b/configs/samples/osp.conf.sample
similarity index 100%
rename from configs/osp.conf.sample
rename to configs/samples/osp.conf.sample
diff --git a/configs/oss.conf.sample b/configs/samples/oss.conf.sample
similarity index 100%
rename from configs/oss.conf.sample
rename to configs/samples/oss.conf.sample
diff --git a/configs/phone.conf.sample b/configs/samples/phone.conf.sample
similarity index 100%
rename from configs/phone.conf.sample
rename to configs/samples/phone.conf.sample
diff --git a/configs/phoneprov.conf.sample b/configs/samples/phoneprov.conf.sample
similarity index 100%
rename from configs/phoneprov.conf.sample
rename to configs/samples/phoneprov.conf.sample
diff --git a/configs/pjsip.conf.sample b/configs/samples/pjsip.conf.sample
similarity index 99%
rename from configs/pjsip.conf.sample
rename to configs/samples/pjsip.conf.sample
index 58774dc7c0..3aa05a96b3 100644
--- a/configs/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -435,8 +435,6 @@
 ;  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: "")
diff --git a/configs/pjsip_notify.conf.sample b/configs/samples/pjsip_notify.conf.sample
similarity index 100%
rename from configs/pjsip_notify.conf.sample
rename to configs/samples/pjsip_notify.conf.sample
diff --git a/configs/queuerules.conf.sample b/configs/samples/queuerules.conf.sample
similarity index 100%
rename from configs/queuerules.conf.sample
rename to configs/samples/queuerules.conf.sample
diff --git a/configs/queues.conf.sample b/configs/samples/queues.conf.sample
similarity index 100%
rename from configs/queues.conf.sample
rename to configs/samples/queues.conf.sample
diff --git a/configs/res_config_mysql.conf.sample b/configs/samples/res_config_mysql.conf.sample
similarity index 100%
rename from configs/res_config_mysql.conf.sample
rename to configs/samples/res_config_mysql.conf.sample
diff --git a/configs/res_config_sqlite.conf.sample b/configs/samples/res_config_sqlite.conf.sample
similarity index 100%
rename from configs/res_config_sqlite.conf.sample
rename to configs/samples/res_config_sqlite.conf.sample
diff --git a/configs/res_config_sqlite3.conf.sample b/configs/samples/res_config_sqlite3.conf.sample
similarity index 100%
rename from configs/res_config_sqlite3.conf.sample
rename to configs/samples/res_config_sqlite3.conf.sample
diff --git a/configs/res_corosync.conf.sample b/configs/samples/res_corosync.conf.sample
similarity index 100%
rename from configs/res_corosync.conf.sample
rename to configs/samples/res_corosync.conf.sample
diff --git a/configs/res_curl.conf.sample b/configs/samples/res_curl.conf.sample
similarity index 100%
rename from configs/res_curl.conf.sample
rename to configs/samples/res_curl.conf.sample
diff --git a/configs/res_fax.conf.sample b/configs/samples/res_fax.conf.sample
similarity index 100%
rename from configs/res_fax.conf.sample
rename to configs/samples/res_fax.conf.sample
diff --git a/configs/res_ldap.conf.sample b/configs/samples/res_ldap.conf.sample
similarity index 100%
rename from configs/res_ldap.conf.sample
rename to configs/samples/res_ldap.conf.sample
diff --git a/configs/res_odbc.conf.sample b/configs/samples/res_odbc.conf.sample
similarity index 100%
rename from configs/res_odbc.conf.sample
rename to configs/samples/res_odbc.conf.sample
diff --git a/configs/res_parking.conf.sample b/configs/samples/res_parking.conf.sample
similarity index 100%
rename from configs/res_parking.conf.sample
rename to configs/samples/res_parking.conf.sample
diff --git a/configs/res_pgsql.conf.sample b/configs/samples/res_pgsql.conf.sample
similarity index 99%
rename from configs/res_pgsql.conf.sample
rename to configs/samples/res_pgsql.conf.sample
index 015d68c13c..cc7442fd09 100644
--- a/configs/res_pgsql.conf.sample
+++ b/configs/samples/res_pgsql.conf.sample
@@ -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
diff --git a/configs/res_pktccops.conf.sample b/configs/samples/res_pktccops.conf.sample
similarity index 100%
rename from configs/res_pktccops.conf.sample
rename to configs/samples/res_pktccops.conf.sample
diff --git a/configs/res_snmp.conf.sample b/configs/samples/res_snmp.conf.sample
similarity index 100%
rename from configs/res_snmp.conf.sample
rename to configs/samples/res_snmp.conf.sample
diff --git a/configs/res_stun_monitor.conf.sample b/configs/samples/res_stun_monitor.conf.sample
similarity index 100%
rename from configs/res_stun_monitor.conf.sample
rename to configs/samples/res_stun_monitor.conf.sample
diff --git a/configs/rtp.conf.sample b/configs/samples/rtp.conf.sample
similarity index 100%
rename from configs/rtp.conf.sample
rename to configs/samples/rtp.conf.sample
diff --git a/configs/say.conf.sample b/configs/samples/say.conf.sample
similarity index 100%
rename from configs/say.conf.sample
rename to configs/samples/say.conf.sample
diff --git a/configs/sip.conf.sample b/configs/samples/sip.conf.sample
similarity index 100%
rename from configs/sip.conf.sample
rename to configs/samples/sip.conf.sample
diff --git a/configs/sip_notify.conf.sample b/configs/samples/sip_notify.conf.sample
similarity index 100%
rename from configs/sip_notify.conf.sample
rename to configs/samples/sip_notify.conf.sample
diff --git a/configs/skinny.conf.sample b/configs/samples/skinny.conf.sample
similarity index 100%
rename from configs/skinny.conf.sample
rename to configs/samples/skinny.conf.sample
diff --git a/configs/sla.conf.sample b/configs/samples/sla.conf.sample
similarity index 100%
rename from configs/sla.conf.sample
rename to configs/samples/sla.conf.sample
diff --git a/configs/smdi.conf.sample b/configs/samples/smdi.conf.sample
similarity index 100%
rename from configs/smdi.conf.sample
rename to configs/samples/smdi.conf.sample
diff --git a/configs/sorcery.conf.sample b/configs/samples/sorcery.conf.sample
similarity index 100%
rename from configs/sorcery.conf.sample
rename to configs/samples/sorcery.conf.sample
diff --git a/configs/ss7.timers.sample b/configs/samples/ss7.timers.sample
similarity index 100%
rename from configs/ss7.timers.sample
rename to configs/samples/ss7.timers.sample
diff --git a/configs/statsd.conf.sample b/configs/samples/statsd.conf.sample
similarity index 100%
rename from configs/statsd.conf.sample
rename to configs/samples/statsd.conf.sample
diff --git a/configs/telcordia-1.adsi b/configs/samples/telcordia-1.adsi
similarity index 100%
rename from configs/telcordia-1.adsi
rename to configs/samples/telcordia-1.adsi
diff --git a/configs/test_sorcery.conf.sample b/configs/samples/test_sorcery.conf.sample
similarity index 100%
rename from configs/test_sorcery.conf.sample
rename to configs/samples/test_sorcery.conf.sample
diff --git a/configs/udptl.conf.sample b/configs/samples/udptl.conf.sample
similarity index 100%
rename from configs/udptl.conf.sample
rename to configs/samples/udptl.conf.sample
diff --git a/configs/unistim.conf.sample b/configs/samples/unistim.conf.sample
similarity index 100%
rename from configs/unistim.conf.sample
rename to configs/samples/unistim.conf.sample
diff --git a/configs/users.conf.sample b/configs/samples/users.conf.sample
similarity index 100%
rename from configs/users.conf.sample
rename to configs/samples/users.conf.sample
diff --git a/configs/voicemail.conf.sample b/configs/samples/voicemail.conf.sample
similarity index 100%
rename from configs/voicemail.conf.sample
rename to configs/samples/voicemail.conf.sample
diff --git a/configs/vpb.conf.sample b/configs/samples/vpb.conf.sample
similarity index 100%
rename from configs/vpb.conf.sample
rename to configs/samples/vpb.conf.sample
diff --git a/configs/xmpp.conf.sample b/configs/samples/xmpp.conf.sample
similarity index 100%
rename from configs/xmpp.conf.sample
rename to configs/samples/xmpp.conf.sample