]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
conf: mv conf/* -> conf/vanilla/*
authorKen Rice <krice@tollfreegateway.com>
Mon, 9 Jan 2012 20:13:57 +0000 (15:13 -0500)
committerTravis Cross <tc@traviscross.com>
Sat, 24 Mar 2012 03:19:32 +0000 (03:19 +0000)
170 files changed:
Makefile.am
conf/vanilla/README_IMPORTANT.txt [moved from conf/README_IMPORTANT.txt with 100% similarity]
conf/vanilla/autoload_configs/abstraction.conf.xml [moved from conf/autoload_configs/abstraction.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/acl.conf.xml [moved from conf/autoload_configs/acl.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/alsa.conf.xml [moved from conf/autoload_configs/alsa.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/blacklist.conf.xml [moved from conf/autoload_configs/blacklist.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/callcenter.conf.xml [moved from conf/autoload_configs/callcenter.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/cdr_csv.conf.xml [moved from conf/autoload_configs/cdr_csv.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/cdr_mongodb.conf.xml [moved from conf/autoload_configs/cdr_mongodb.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/cdr_pg_csv.conf.xml [moved from conf/autoload_configs/cdr_pg_csv.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/cdr_sqlite.conf.xml [moved from conf/autoload_configs/cdr_sqlite.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/cepstral.conf.xml [moved from conf/autoload_configs/cepstral.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/cidlookup.conf.xml [moved from conf/autoload_configs/cidlookup.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/conference.conf.xml [moved from conf/autoload_configs/conference.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/console.conf.xml [moved from conf/autoload_configs/console.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/db.conf.xml [moved from conf/autoload_configs/db.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/dialplan_directory.conf.xml [moved from conf/autoload_configs/dialplan_directory.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/dingaling.conf.xml [moved from conf/autoload_configs/dingaling.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/directory.conf.xml [moved from conf/autoload_configs/directory.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/distributor.conf.xml [moved from conf/autoload_configs/distributor.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/easyroute.conf.xml [moved from conf/autoload_configs/easyroute.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/enum.conf.xml [moved from conf/autoload_configs/enum.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/erlang_event.conf.xml [moved from conf/autoload_configs/erlang_event.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/event_multicast.conf.xml [moved from conf/autoload_configs/event_multicast.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/event_socket.conf.xml [moved from conf/autoload_configs/event_socket.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/fax.conf.xml [moved from conf/autoload_configs/fax.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/fifo.conf.xml [moved from conf/autoload_configs/fifo.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/hash.conf.xml [moved from conf/autoload_configs/hash.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/httapi.conf.xml [moved from conf/autoload_configs/httapi.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/http_cache.conf.xml [moved from conf/autoload_configs/http_cache.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/ivr.conf.xml [moved from conf/autoload_configs/ivr.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/java.conf.xml [moved from conf/autoload_configs/java.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/lcr.conf.xml [moved from conf/autoload_configs/lcr.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/local_stream.conf.xml [moved from conf/autoload_configs/local_stream.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/logfile.conf.xml [moved from conf/autoload_configs/logfile.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/lua.conf.xml [moved from conf/autoload_configs/lua.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/memcache.conf.xml [moved from conf/autoload_configs/memcache.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/modules.conf.xml [moved from conf/autoload_configs/modules.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/mongo.conf.xml [moved from conf/autoload_configs/mongo.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/nibblebill.conf.xml [moved from conf/autoload_configs/nibblebill.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/opal.conf.xml [moved from conf/autoload_configs/opal.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/osp.conf.xml [moved from conf/autoload_configs/osp.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/perl.conf.xml [moved from conf/autoload_configs/perl.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/pocketsphinx.conf.xml [moved from conf/autoload_configs/pocketsphinx.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/portaudio.conf.xml [moved from conf/autoload_configs/portaudio.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/post_load_modules.conf.xml [moved from conf/autoload_configs/post_load_modules.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/presence_map.conf.xml [moved from conf/autoload_configs/presence_map.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/python.conf.xml [moved from conf/autoload_configs/python.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/redis.conf.xml [moved from conf/autoload_configs/redis.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/rss.conf.xml [moved from conf/autoload_configs/rss.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/rtmp.conf.xml [moved from conf/autoload_configs/rtmp.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/sangoma_codec.conf.xml [moved from conf/autoload_configs/sangoma_codec.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/shout.conf.xml [moved from conf/autoload_configs/shout.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/skinny.conf.xml [moved from conf/autoload_configs/skinny.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/sofia.conf.xml [moved from conf/autoload_configs/sofia.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/spandsp.conf.xml [moved from conf/autoload_configs/spandsp.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/spidermonkey.conf.xml [moved from conf/autoload_configs/spidermonkey.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/switch.conf.xml [moved from conf/autoload_configs/switch.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/syslog.conf.xml [moved from conf/autoload_configs/syslog.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/timezones.conf.xml [moved from conf/autoload_configs/timezones.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/tts_commandline.conf.xml [moved from conf/autoload_configs/tts_commandline.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/unicall.conf.xml [moved from conf/autoload_configs/unicall.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/unimrcp.conf.xml [moved from conf/autoload_configs/unimrcp.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/voicemail.conf.xml [moved from conf/autoload_configs/voicemail.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/voicemail_ivr.conf.xml [moved from conf/autoload_configs/voicemail_ivr.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/xml_cdr.conf.xml [moved from conf/autoload_configs/xml_cdr.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/xml_curl.conf.xml [moved from conf/autoload_configs/xml_curl.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/xml_rpc.conf.xml [moved from conf/autoload_configs/xml_rpc.conf.xml with 100% similarity]
conf/vanilla/autoload_configs/zeroconf.conf.xml [moved from conf/autoload_configs/zeroconf.conf.xml with 100% similarity]
conf/vanilla/chatplan/default.xml [moved from conf/chatplan/default.xml with 100% similarity]
conf/vanilla/config.FS0 [moved from conf/config.FS0 with 100% similarity]
conf/vanilla/dialplan/default.xml [moved from conf/dialplan/default.xml with 100% similarity]
conf/vanilla/dialplan/default/00_ladspa.xml [moved from conf/dialplan/default/00_ladspa.xml with 100% similarity]
conf/vanilla/dialplan/default/00_pizza_demo.xml [moved from conf/dialplan/default/00_pizza_demo.xml with 100% similarity]
conf/vanilla/dialplan/default/01_Talking_Clock.xml [moved from conf/dialplan/default/01_Talking_Clock.xml with 100% similarity]
conf/vanilla/dialplan/default/01_example.com.xml [moved from conf/dialplan/default/01_example.com.xml with 100% similarity]
conf/vanilla/dialplan/default/ideasip.com.noload [moved from conf/dialplan/default/ideasip.com.noload with 100% similarity]
conf/vanilla/dialplan/default/pulver.com.noload [moved from conf/dialplan/default/pulver.com.noload with 100% similarity]
conf/vanilla/dialplan/default/sipbroker.com.noload [moved from conf/dialplan/default/sipbroker.com.noload with 100% similarity]
conf/vanilla/dialplan/default/sipphone.com.noload [moved from conf/dialplan/default/sipphone.com.noload with 100% similarity]
conf/vanilla/dialplan/default/tollfreegateway.com.noload [moved from conf/dialplan/default/tollfreegateway.com.noload with 100% similarity]
conf/vanilla/dialplan/features.xml [moved from conf/dialplan/features.xml with 100% similarity]
conf/vanilla/dialplan/public.xml [moved from conf/dialplan/public.xml with 100% similarity]
conf/vanilla/dialplan/public/00_inbound_did.xml [moved from conf/dialplan/public/00_inbound_did.xml with 100% similarity]
conf/vanilla/dialplan/skinny-patterns.xml [moved from conf/dialplan/skinny-patterns.xml with 100% similarity]
conf/vanilla/dialplan/skinny-patterns/20-Demo.xml [moved from conf/dialplan/skinny-patterns/20-Demo.xml with 100% similarity]
conf/vanilla/dialplan/skinny-patterns/20-Local_extension.xml [moved from conf/dialplan/skinny-patterns/20-Local_extension.xml with 100% similarity]
conf/vanilla/dialplan/skinny-patterns/90-External.xml [moved from conf/dialplan/skinny-patterns/90-External.xml with 100% similarity]
conf/vanilla/dialplan/skinny-patterns/99-Default_Drop.xml [moved from conf/dialplan/skinny-patterns/99-Default_Drop.xml with 100% similarity]
conf/vanilla/directory/default.xml [moved from conf/directory/default.xml with 100% similarity]
conf/vanilla/directory/default/1000.xml [moved from conf/directory/default/1000.xml with 100% similarity]
conf/vanilla/directory/default/1001.xml [moved from conf/directory/default/1001.xml with 100% similarity]
conf/vanilla/directory/default/1002.xml [moved from conf/directory/default/1002.xml with 100% similarity]
conf/vanilla/directory/default/1003.xml [moved from conf/directory/default/1003.xml with 100% similarity]
conf/vanilla/directory/default/1004.xml [moved from conf/directory/default/1004.xml with 100% similarity]
conf/vanilla/directory/default/1005.xml [moved from conf/directory/default/1005.xml with 100% similarity]
conf/vanilla/directory/default/1006.xml [moved from conf/directory/default/1006.xml with 100% similarity]
conf/vanilla/directory/default/1007.xml [moved from conf/directory/default/1007.xml with 100% similarity]
conf/vanilla/directory/default/1008.xml [moved from conf/directory/default/1008.xml with 100% similarity]
conf/vanilla/directory/default/1009.xml [moved from conf/directory/default/1009.xml with 100% similarity]
conf/vanilla/directory/default/1010.xml [moved from conf/directory/default/1010.xml with 100% similarity]
conf/vanilla/directory/default/1011.xml [moved from conf/directory/default/1011.xml with 100% similarity]
conf/vanilla/directory/default/1012.xml [moved from conf/directory/default/1012.xml with 100% similarity]
conf/vanilla/directory/default/1013.xml [moved from conf/directory/default/1013.xml with 100% similarity]
conf/vanilla/directory/default/1014.xml [moved from conf/directory/default/1014.xml with 100% similarity]
conf/vanilla/directory/default/1015.xml [moved from conf/directory/default/1015.xml with 100% similarity]
conf/vanilla/directory/default/1016.xml [moved from conf/directory/default/1016.xml with 100% similarity]
conf/vanilla/directory/default/1017.xml [moved from conf/directory/default/1017.xml with 100% similarity]
conf/vanilla/directory/default/1018.xml [moved from conf/directory/default/1018.xml with 100% similarity]
conf/vanilla/directory/default/1019.xml [moved from conf/directory/default/1019.xml with 100% similarity]
conf/vanilla/directory/default/brian.xml [moved from conf/directory/default/brian.xml with 100% similarity]
conf/vanilla/directory/default/default.xml [moved from conf/directory/default/default.xml with 100% similarity]
conf/vanilla/directory/default/example.com.xml [moved from conf/directory/default/example.com.xml with 100% similarity]
conf/vanilla/directory/default/skinny-example.xml [moved from conf/directory/default/skinny-example.xml with 100% similarity]
conf/vanilla/extensions.conf [moved from conf/extensions.conf with 100% similarity]
conf/vanilla/freeswitch.xml [moved from conf/freeswitch.xml with 100% similarity]
conf/vanilla/fur_elise.ttml [moved from conf/fur_elise.ttml with 100% similarity]
conf/vanilla/ivr_menus/demo_ivr.xml [moved from conf/ivr_menus/demo_ivr.xml with 100% similarity]
conf/vanilla/jingle_profiles/client.xml [moved from conf/jingle_profiles/client.xml with 100% similarity]
conf/vanilla/jingle_profiles/server.xml [moved from conf/jingle_profiles/server.xml with 100% similarity]
conf/vanilla/lang/de/de.xml [moved from conf/lang/de/de.xml with 100% similarity]
conf/vanilla/lang/de/demo/demo.xml [moved from conf/lang/de/demo/demo.xml with 100% similarity]
conf/vanilla/lang/de/vm/sounds.xml [moved from conf/lang/de/vm/sounds.xml with 100% similarity]
conf/vanilla/lang/de/vm/tts.xml [moved from conf/lang/de/vm/tts.xml with 100% similarity]
conf/vanilla/lang/en/demo/demo-ivr.xml [moved from conf/lang/en/demo/demo-ivr.xml with 100% similarity]
conf/vanilla/lang/en/demo/demo.xml [moved from conf/lang/en/demo/demo.xml with 100% similarity]
conf/vanilla/lang/en/dir/sounds.xml [moved from conf/lang/en/dir/sounds.xml with 100% similarity]
conf/vanilla/lang/en/dir/tts.xml [moved from conf/lang/en/dir/tts.xml with 100% similarity]
conf/vanilla/lang/en/en.xml [moved from conf/lang/en/en.xml with 100% similarity]
conf/vanilla/lang/en/ivr/sounds.xml [moved from conf/lang/en/ivr/sounds.xml with 100% similarity]
conf/vanilla/lang/en/vm/sounds.xml [moved from conf/lang/en/vm/sounds.xml with 100% similarity]
conf/vanilla/lang/en/vm/tts.xml [moved from conf/lang/en/vm/tts.xml with 100% similarity]
conf/vanilla/lang/en/vm/voicemail_ivr.xml [moved from conf/lang/en/vm/voicemail_ivr.xml with 100% similarity]
conf/vanilla/lang/fr/demo/demo.xml [moved from conf/lang/fr/demo/demo.xml with 100% similarity]
conf/vanilla/lang/fr/dir/sounds.xml [moved from conf/lang/fr/dir/sounds.xml with 100% similarity]
conf/vanilla/lang/fr/dir/tts.xml [moved from conf/lang/fr/dir/tts.xml with 100% similarity]
conf/vanilla/lang/fr/fr.xml [moved from conf/lang/fr/fr.xml with 100% similarity]
conf/vanilla/lang/fr/vm/sounds.xml [moved from conf/lang/fr/vm/sounds.xml with 100% similarity]
conf/vanilla/lang/he/demo/demo-ivr.xml [moved from conf/lang/he/demo/demo-ivr.xml with 100% similarity]
conf/vanilla/lang/he/demo/demo.xml [moved from conf/lang/he/demo/demo.xml with 100% similarity]
conf/vanilla/lang/he/dir/sounds.xml [moved from conf/lang/he/dir/sounds.xml with 100% similarity]
conf/vanilla/lang/he/he.xml [moved from conf/lang/he/he.xml with 100% similarity]
conf/vanilla/lang/he/vm/sounds.xml [moved from conf/lang/he/vm/sounds.xml with 100% similarity]
conf/vanilla/lang/ru/demo/demo-ivr.xml [moved from conf/lang/ru/demo/demo-ivr.xml with 100% similarity]
conf/vanilla/lang/ru/demo/demo.xml [moved from conf/lang/ru/demo/demo.xml with 100% similarity]
conf/vanilla/lang/ru/dir/sounds.xml [moved from conf/lang/ru/dir/sounds.xml with 100% similarity]
conf/vanilla/lang/ru/dir/tts.xml [moved from conf/lang/ru/dir/tts.xml with 100% similarity]
conf/vanilla/lang/ru/ru.xml [moved from conf/lang/ru/ru.xml with 100% similarity]
conf/vanilla/lang/ru/vm/sounds.xml [moved from conf/lang/ru/vm/sounds.xml with 100% similarity]
conf/vanilla/lang/ru/vm/tts.xml [moved from conf/lang/ru/vm/tts.xml with 100% similarity]
conf/vanilla/mime.types [moved from conf/mime.types with 100% similarity]
conf/vanilla/mrcp_profiles/loquendo-7-mrcp-v2.xml [moved from conf/mrcp_profiles/loquendo-7-mrcp-v2.xml with 100% similarity]
conf/vanilla/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml [moved from conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml with 100% similarity]
conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v1.xml [moved from conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml with 100% similarity]
conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v2.xml [moved from conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml with 100% similarity]
conf/vanilla/mrcp_profiles/unimrcpserver-mrcp-v1.xml [moved from conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml with 100% similarity]
conf/vanilla/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml [moved from conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml with 100% similarity]
conf/vanilla/notify-voicemail.tpl [moved from conf/notify-voicemail.tpl with 100% similarity]
conf/vanilla/sip_profiles/external.xml [moved from conf/sip_profiles/external.xml with 100% similarity]
conf/vanilla/sip_profiles/external/example.xml [moved from conf/sip_profiles/external/example.xml with 100% similarity]
conf/vanilla/sip_profiles/internal-ipv6.xml [moved from conf/sip_profiles/internal-ipv6.xml with 100% similarity]
conf/vanilla/sip_profiles/internal.xml [moved from conf/sip_profiles/internal.xml with 100% similarity]
conf/vanilla/sip_profiles/internal/example.xml [moved from conf/sip_profiles/internal/example.xml with 100% similarity]
conf/vanilla/skinny_profiles/internal.xml [moved from conf/skinny_profiles/internal.xml with 100% similarity]
conf/vanilla/tetris.ttml [moved from conf/tetris.ttml with 100% similarity]
conf/vanilla/vars.xml [moved from conf/vars.xml with 100% similarity]
conf/vanilla/voicemail.tpl [moved from conf/voicemail.tpl with 100% similarity]
conf/vanilla/web-vm.tpl [moved from conf/web-vm.tpl with 100% similarity]
conf/vanilla/yaml/extensions.yaml [moved from conf/yaml/extensions.yaml with 100% similarity]
conf/vanilla/yaml/mod_yaml.yaml [moved from conf/yaml/mod_yaml.yaml with 100% similarity]

index 0261b709b021086f008334b007ec20cac4776844..dfe8197bb1f8f5ca6a40bfce08938fdc8cdde3c7 100644 (file)
@@ -466,7 +466,7 @@ libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
 ##
 yaml-files:
        @echo `mkdir $(DESTDIR)$(sysconfdir)/yaml 2>/dev/null`
-       $(INSTALL) -m 644 $(switch_srcdir)/conf/yaml/*.yaml $(DESTDIR)$(sysconfdir)/yaml
+       $(INSTALL) -m 644 $(switch_srcdir)/conf/default/yaml/*.yaml $(DESTDIR)$(sysconfdir)/yaml
 
 vm-sync:
        test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -474,20 +474,22 @@ vm-sync:
        test -d $(DESTDIR)$(sysconfdir)/lang/en || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en
        test -d $(DESTDIR)$(sysconfdir)/lang/en/demo || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/demo
        test -d $(DESTDIR)$(sysconfdir)/lang/en/vm || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/vm
-       $(INSTALL) -m 644 $(switch_srcdir)/conf/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm
-       $(INSTALL) -m 644 $(switch_srcdir)/conf/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo
+       $(INSTALL) -m 644 $(switch_srcdir)/conf/default/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm
+       $(INSTALL) -m 644 $(switch_srcdir)/conf/default/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo
 
-samples-conf:
+config-%:
        test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-       for conffile in `cd $(switch_srcdir)/conf && find . -name \*.xml && find . -name \*.conf && find . -name \*.tpl  && find . -name \*.ttml && find . -name mime.types` ; do \
+       for conffile in `cd $(switch_srcdir)/conf/$* && find . -name \*.xml && find . -name \*.conf && find . -name \*.tpl  && find . -name \*.ttml && find . -name mime.types` ; do \
                dir=`echo $$conffile | sed -e 's|^\.||' | sed -e 's|/[^/]*$$||'`; \
                filename=`echo $$conffile | sed -e 's|^\.||' | sed -e 's|^.*/||'`; \
                test -d $(DESTDIR)$(sysconfdir)$$dir || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)$$dir ; \
                test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename || \
                test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename.noload || \
-                       $(INSTALL) -m 644 $(switch_srcdir)/conf/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir; \
+                       $(INSTALL) -m 644 $(switch_srcdir)/conf/$*/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir; \
        done
 
+samples-conf: config-vanilla
+
 samples-htdocs: 
        test -d $(DESTDIR)$(htdocsdir) || $(mkinstalldirs) $(DESTDIR)$(htdocsdir)
        for htdocsfile in `cd $(switch_srcdir)/htdocs && find . -type f -name \* | sed -e 's|^\.||'` ; do \
@@ -497,6 +499,7 @@ samples-htdocs:
                test -f $(DESTDIR)$(htdocsdir)$$dir/$$filename || $(INSTALL) -m 644 $(switch_srcdir)/htdocs/$$dir/$$filename $(DESTDIR)$(htdocsdir)$$dir 2>/dev/null;  \
        done
 
+
 samples: samples-conf samples-htdocs
 
 install-exec-local:
similarity index 100%
rename from conf/config.FS0
rename to conf/vanilla/config.FS0
similarity index 100%
rename from conf/mime.types
rename to conf/vanilla/mime.types
similarity index 100%
rename from conf/tetris.ttml
rename to conf/vanilla/tetris.ttml
similarity index 100%
rename from conf/vars.xml
rename to conf/vanilla/vars.xml
similarity index 100%
rename from conf/web-vm.tpl
rename to conf/vanilla/web-vm.tpl