[sr-dev] git:master: tls.cfg: use local file paths

[Andrei Pelinescu-Onciul]

Module: sip-router
Branch: master
Commit: f503d0a0b9bb10d9dc445219a7ce98f1d3dc918a
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f503d0a0b9bb10d9dc445219a7ce98f1d3dc918a

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Tue Sep  7 19:08:09 2010 +0200

tls.cfg: use local file paths

Use local paths, relative to the source/compile directory
(./modules/tls/*). This allows starting with -A LOCAL_TEST_RUN
with one of the sip-router*.cfg without having to edit any path in
tls.cfg.
On install-cfg, the local path is changed to an absolute path
to the installed certificates/keys/ca list (see 0efe88e).

---

 modules/tls/Makefile |    2 +-
 modules/tls/tls.cfg  |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/tls/Makefile b/modules/tls/Makefile
index f1c0f52..95cf759 100644
--- a/modules/tls/Makefile
+++ b/modules/tls/Makefile
@@ -32,7 +32,7 @@ install-tls-cert: $(cfg_prefix)/$(cfg_dir)
 install-cfg:  install-tls-cert
 	@$(call try_err, $(INSTALL_TOUCH) \
 			"$(cfg_prefix)/$(cfg_dir)tls.cfg.sample" )
-	@sed -e "s#/usr/local/etc/ser/#$(cfg_prefix)/$(cfg_dir)#g" \
+	@sed -e "s#\./modules/tls/#$(cfg_prefix)/$(cfg_dir)#g" \
 			-e "s#ser-selfsigned#$(MAIN_NAME)-selfsigned#g" \
 				< ./tls.cfg > "$(cfg_prefix)/$(cfg_dir)tls.cfg.sample"
 	@if [ -z "${skip_cfg_install}" -a \
diff --git a/modules/tls/tls.cfg b/modules/tls/tls.cfg
index 81d0a43..223d607 100644
--- a/modules/tls/tls.cfg
+++ b/modules/tls/tls.cfg
@@ -17,8 +17,8 @@
 method = TLSv1
 verify_certificate = no
 require_certificate = no
-private_key = /usr/local/etc/ser/ser-selfsigned.key
-certificate = /usr/local/etc/ser/ser-selfsigned.pem
+private_key = ./modules/tls/ser-selfsigned.key
+certificate = ./modules/tls/ser-selfsigned.pem
 
 # This is the default client domain, settings
 # in this domain will be used for all outgoing
@@ -42,8 +42,8 @@ require_certificate = yes
 #method = SSLv23
 #verify_certificate = yes
 #require_certificate = no
-#private_key = /usr/local/etc/ser/local_key.pem
-#certificate = /usr/local/etc/ser/local_cert.pem
+#private_key = ./modules/tls/local_key.pem
+#certificate = ./modules/tls/local_cert.pem
 #verify_depth = 3
 #ca_list = local_ca.pem
 
@@ -56,6 +56,6 @@ require_certificate = yes
 #
 #[client:195.37.77.101:5061]
 #verify_certificate = no
-#certificate = /usr/local/etc/ser/iptel_client.pem
-#private_key = /usr/local/etc/ser/iptel_key.pem
-#ca_list = /usr/local/etc/ser/iptel_ca.pem
+#certificate = ./modules/tls/iptel_client.pem
+#private_key = ./modules/tls/iptel_key.pem
+#ca_list = ./modules/tls/iptel_ca.pem