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

@@ -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 \

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.

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

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
+;table=cel		;SQL table where CEL's will be inserted
 ;appname=asterisk   ; Postgres application_name support (optional). Whitespace not allowed.

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: "")