瀏覽代碼

core: moved radius dictionary files from etc to auth_radius module

Daniel-Constantin Mierla 7 年之前
父節點
當前提交
7464ce3c9c

+ 0 - 3
src/Makefile

@@ -766,9 +766,6 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
 				fi ; \
 			fi ; \
 			: ; done; true
-	@# radius dictionary
-	@$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME)
-	@$(INSTALL_CFG) ../etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)
 	@echo "config files installed"
 
 install-cfg-pkg: $(cfg_prefix)/$(cfg_dir)

+ 15 - 0
src/modules/auth_radius/Makefile

@@ -13,3 +13,18 @@ NAME=auth_radius.so
 DEFS+=-DKAMAILIO_MOD_INTERFACE
 
 include ../../Makefile.modules
+
+install-cfg:
+	@if ! [ -d $(cfg_prefix)/$(cfg_dir) ]; then \
+		mkdir -p "$(cfg_prefix)/$(cfg_dir)" ; \
+	fi
+	@$(call try_err, $(INSTALL_TOUCH) \
+			"$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME).sample" )
+	@$(call try_err, $(INSTALL_CFG) \
+			"cfg/dictionary.$(CFG_NAME).sample" \
+			"$(cfg_prefix)/$(cfg_dir)" )
+	@if [ -z "${skip_cfg_install}" -a \
+			! -f "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME)" ]; then \
+		mv -f "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME).sample" \
+						"$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME)" ; \
+	fi

+ 0 - 0
etc/dictionary.kamailio → src/modules/auth_radius/cfg/dictionary.kamailio


+ 0 - 0
etc/dictionary.sip-router → src/modules/auth_radius/cfg/dictionary.sip-router