Merge branch 'v0.70' of https://github.com/dOpensource/dsiprouter int…

…o v0.70
dOpensource · Oct 11, 2022 · eeb5386 · eeb5386
2 parents 84bd75c + 4452960
commit eeb5386
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 13 deletions.
diff --git a/kamailio/almalinux/8.sh b/kamailio/almalinux/8.sh
@@ -156,7 +156,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-bundle.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/kamailio/amzn/2.sh b/kamailio/amzn/2.sh
@@ -144,7 +144,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-bundle.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/kamailio/centos/7.sh b/kamailio/centos/7.sh
@@ -142,7 +142,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     cp ${DSIP_PROJECT_DIR}/kamailio/ca-list.pem ${DSIP_SSL_CA}
 
     # Setup dSIPRouter Module

diff --git a/kamailio/centos/8.sh b/kamailio/centos/8.sh
@@ -138,7 +138,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     cp ${DSIP_PROJECT_DIR}/kamailio/ca-list.pem ${DSIP_SSL_CA}
 
     # Setup dSIPRouter Module

diff --git a/kamailio/configs/kamailio.cfg b/kamailio/configs/kamailio.cfg
@@ -338,7 +338,7 @@ stir_shaken.stir_shaken_prefix_b = "" # Default Empty
 stir_shaken.stir_shaken_prefix_c = "" # Default Empty
 stir_shaken.stir_shaken_prefix_invalid = "" # Default Empty
 stir_shaken.stir_shaken_block_invalid = 0 # Default Disabled
-stir_shaken.stir_shaken_key_path = "/etc/dsiprouter/certs/stirshaken-key.pem" # Default
+stir_shaken.stir_shaken_key_path = "/etc/dsiprouter/certs/stirshaken/stirshaken-key.pem" # Default
 stir_shaken.stir_shaken_cert_url = " https://cr.example.com/xK/order/xk" # Default
 
 # MSTeams Settings

diff --git a/kamailio/debian/10.sh b/kamailio/debian/10.sh
@@ -155,7 +155,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-certificates.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/kamailio/debian/11.sh b/kamailio/debian/11.sh
@@ -156,7 +156,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-certificates.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/kamailio/debian/9.sh b/kamailio/debian/9.sh
@@ -151,7 +151,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-certificates.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/kamailio/rhel/8.sh b/kamailio/rhel/8.sh
@@ -155,7 +155,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-bundle.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/kamailio/rocky/8.sh b/kamailio/rocky/8.sh
@@ -156,7 +156,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-bundle.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/kamailio/ubuntu/20.sh b/kamailio/ubuntu/20.sh
@@ -162,7 +162,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-certificates.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/kamailio/ubuntu/22.sh b/kamailio/ubuntu/22.sh
@@ -163,7 +163,7 @@ EOF
     cp -f ${DSIP_PROJECT_DIR}/resources/logrotate/kamailio /etc/logrotate.d/kamailio
 
     # Setup Kamailio to use the CA cert's that are shipped with the OS
-    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs
+    mkdir -p ${DSIP_SYSTEM_CONFIG_DIR}/certs/stirshaken
     ln -s /etc/ssl/certs/ca-certificates.crt ${DSIP_SSL_CA}
     updateCACertsDir
 

diff --git a/nginx/configs/dsiprouter.conf b/nginx/configs/dsiprouter.conf
@@ -29,6 +29,11 @@ server {
         proxy_set_header X-Forwarded-Port $server_port;
     }
 
+    location /stirshaken_certs {
+         alias /etc/dsiprouter/certs/stirshaken;
+    }
+
+
     # redirect http to https
     error_page 497 https://$host:DSIP_PORT$request_uri;
 }
diff --git a/resources/terraform/do/main.tf b/resources/terraform/do/main.tf
@@ -33,7 +33,7 @@ resource "digitalocean_droplet" "dsiprouter" {
 
         provisioner "remote-exec" {
           inline = [
-	"apt-get update -y && apt-get install -y git && cd /opt && git clone https://github.com/dOpensource/dsiprouter.git -b ${var.branch} && cd dsiprouter && ./dsiprouter.sh install -all && ${var.additional_commands}"
+	"apt-get update -y && sleep 30 && apt-get install -y git && cd /opt && git clone https://github.com/dOpensource/dsiprouter.git -b ${var.branch} && cd dsiprouter && ./dsiprouter.sh install -all && ${var.additional_commands}"
         ]
       }
 }