diff --git a/etc/kamailio-basic.cfg b/misc/examples/pkg/kamailio-basic.cfg similarity index 100% rename from etc/kamailio-basic.cfg rename to misc/examples/pkg/kamailio-basic.cfg diff --git a/etc/kamailio-oob.cfg b/misc/examples/pkg/kamailio-oob.cfg similarity index 100% rename from etc/kamailio-oob.cfg rename to misc/examples/pkg/kamailio-oob.cfg diff --git a/etc/sip-router-basic.cfg b/misc/examples/pkg/sip-router-basic.cfg similarity index 100% rename from etc/sip-router-basic.cfg rename to misc/examples/pkg/sip-router-basic.cfg diff --git a/etc/sip-router-oob.cfg b/misc/examples/pkg/sip-router-oob.cfg similarity index 100% rename from etc/sip-router-oob.cfg rename to misc/examples/pkg/sip-router-oob.cfg diff --git a/src/Makefile b/src/Makefile index 542afa76a3b..d0faa5d4739 100644 --- a/src/Makefile +++ b/src/Makefile @@ -702,6 +702,7 @@ $(man_prefix)/$(man_dir)/man5: # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) install-cfg: $(cfg_prefix)/$(cfg_dir) + @# main configuration file @if [ -f ../etc/$(CFG_NAME).cfg ]; then \ sed $(foreach m,$(modules_dirs),\ -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)\([:/\"]\)#$($(m)_target)\1#g") \ @@ -715,34 +716,7 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ fi; \ fi - @if [ -f ../etc/$(CFG_NAME)-basic.cfg ]; then \ - sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)\([:/\"]\)#$($(m)_target)\1#g") \ - -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ - < ../etc/$(CFG_NAME)-basic.cfg \ - > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ - chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ - if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg ]; then \ - mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg; \ - fi; \ - fi - @if [ -f ../etc/$(CFG_NAME)-oob.cfg ]; then \ - sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)\([:/\"]\)#$($(m)_target)\1#g") \ - -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ - < ../etc/$(CFG_NAME)-oob.cfg \ - > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample; \ - chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample; \ - if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg ]; \ - then \ - mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ - fi; \ - fi - @# other configs + @# other configuration files @for r in $(C_INSTALL_CFGS) ""; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ @@ -768,6 +742,36 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) : ; done; true @echo "config files installed" +# additional examples of configuration files +install-cfg-extras: $(cfg_prefix)/$(cfg_dir) + @if [ -f ../misc/examples/pkg/$(CFG_NAME)-basic.cfg ]; then \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)\([:/\"]\)#$($(m)_target)\1#g") \ + -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ + < ../misc/examples/pkg/$(CFG_NAME)-basic.cfg \ + > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ + chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ + if [ -z "${skip_cfg_install}" -a \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg; \ + fi; \ + fi + @if [ -f ../misc/examples/pkg/$(CFG_NAME)-oob.cfg ]; then \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)\([:/\"]\)#$($(m)_target)\1#g") \ + -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ + < ../misc/examples/pkg/$(CFG_NAME)-oob.cfg \ + > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample; \ + chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample; \ + if [ -z "${skip_cfg_install}" -a \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg ]; \ + then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ + fi; \ + fi + install-cfg-pkg: $(cfg_prefix)/$(cfg_dir) @if [ -f ../misc/examples/pkg/sipcapture.cfg ]; then \ sed $(foreach m,$(modules_dirs),\