Ver Fonte

Merge pull request #282 from kamailio/vseva/tls_no_install_certs

tls: install-cfg: do not generate tls-cert by default
Victor Seva há 10 anos atrás
pai
commit
3163c43b7b
2 ficheiros alterados com 9 adições e 1 exclusões
  1. 4 1
      modules/tls/Makefile
  2. 5 0
      modules/tls/doc/history.xml

+ 4 - 1
modules/tls/Makefile

@@ -40,7 +40,10 @@ include ../../Makefile.modules
 install-tls-cert: $(cfg_prefix)/$(cfg_dir)
 install-tls-cert: $(cfg_prefix)/$(cfg_dir)
 	MAIN_NAME=$(MAIN_NAME) ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir)
 	MAIN_NAME=$(MAIN_NAME) ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir)
 
 
-install-cfg:  install-tls-cert
+install-cfg:
+	@if ! [ -d $(cfg_prefix)/$(cfg_dir) ]; then \
+		mkdir -p "$(cfg_prefix)/$(cfg_dir)" ; \
+	fi
 	@$(call try_err, $(INSTALL_TOUCH) \
 	@$(call try_err, $(INSTALL_TOUCH) \
 			"$(cfg_prefix)/$(cfg_dir)tls.cfg.sample" )
 			"$(cfg_prefix)/$(cfg_dir)tls.cfg.sample" )
 	@sed -e "s#\/usr/local/etc/kamailio/#$(cfg_target)#g" \
 	@sed -e "s#\/usr/local/etc/kamailio/#$(cfg_target)#g" \

+ 5 - 0
modules/tls/doc/history.xml

@@ -29,5 +29,10 @@
 			The code is currently maintained by Andrei Pelinescu-Onciul
 			The code is currently maintained by Andrei Pelinescu-Onciul
 			<email>[email protected]</email>.
 			<email>[email protected]</email>.
 		</para>
 		</para>
+		<para>
+			Install does not generate self-signed certificates by default
+			anymore. In order to generate them now you should do
+			"make install-tls-cert"
+		</para>
 	</section>
 	</section>
 </section>
 </section>