From 3f1a226e71e63df7593bd1b7c1687b3d96fddcc5 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Fri, 29 Mar 2024 16:46:52 +0100 Subject: [PATCH 1/9] pks install typo --- src/pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pks b/src/pks index f4b03b5d..d352fa5c 100755 --- a/src/pks +++ b/src/pks @@ -390,7 +390,7 @@ installFunc(){ # [[ -f "${DATA_DIR}/pks/db/version" ]] || curl -fsSL -o "${DATA_DIR}/pks/db/version" "$PKS_GIT_URL/$VERSION/src/sip/db/version" ## Define env variables - if [ -f "${DATA_DIR}/pks/.install.lock" ]; then + if [[ -f "${DATA_DIR}/pks/.install.lock" ]]; then printf " %b %b Not a new install. Edit manually .env file for any changes! %b\\n" "${TICK}" "${COL_YELLOW}" "${COL_NC}" else # Set DBTEXT as DB From d1c2aa0af01b78493d053bde3e5d44af43914946 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Tue, 16 Apr 2024 09:50:26 +0200 Subject: [PATCH 2/9] Update caddy volume --- src/sip/docker-compose.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/sip/docker-compose.yml b/src/sip/docker-compose.yml index 1b6df205..55c285c4 100644 --- a/src/sip/docker-compose.yml +++ b/src/sip/docker-compose.yml @@ -116,8 +116,8 @@ services: restart: unless-stopped volumes: - $PWD/Caddyfile:/etc/caddy/Caddyfile - - caddy-config:/config - - caddy-data:/data + - pks-caddy-config:/config + - pks-caddy-data:/data logging: driver: "json-file" options: @@ -165,3 +165,15 @@ volumes: type: 'none' o: 'bind' device: '/srv/pks/db' + pks-caddy-config: + driver: local + driver_opts: + type: 'none' + o: 'bind' + device: '/srv/pks/caddy/config' + pks-caddy-data: + driver: local + driver_opts: + type: 'none' + o: 'bind' + device: '/srv/pks/caddy/data' From 7b564fa013d089c883fea29194cd5a3d1437c855 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Tue, 16 Apr 2024 09:51:49 +0200 Subject: [PATCH 3/9] Update pks : create caddy directories --- src/pks | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pks b/src/pks index d352fa5c..5fca9d75 100755 --- a/src/pks +++ b/src/pks @@ -377,6 +377,9 @@ installFunc(){ # Create necessary directories install -d "${DATA_DIR}/pks/db" install -d "${DATA_DIR}/pks/redis" + install -d "${DATA_DIR}/pks/caddy" + install -d "${DATA_DIR}/pks/caddy/config" + install -d "${DATA_DIR}/pks/caddy/data" # Create files for configuration [[ -f "${DATA_DIR}/pks/.env" ]] || touch "${DATA_DIR}/pks/.env" From 2393b9ce8941baea6656f9435881a097ff7962fb Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Mon, 29 Apr 2024 15:49:48 +0200 Subject: [PATCH 4/9] UPdate to install latest version --- src/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic-install.sh b/src/basic-install.sh index 7811af01..f9f65509 100755 --- a/src/basic-install.sh +++ b/src/basic-install.sh @@ -13,7 +13,7 @@ export PATH+=':/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' readonly PKS_GIT_URL="https://raw.githubusercontent.com/mwolff44/pyfreebilling" readonly PKS_INSTALL_DIR="/srv/pks/scripts" readonly PKS_BIN_DIR="/usr/local/bin" -readonly VERSION="v4.0.1" +readonly VERSION="v4.1.1" # Install the PKS script from repository installScript() { From a16c042066b970b5b7dedc1f9635a7a2b6c00f25 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Tue, 30 Apr 2024 11:14:20 +0200 Subject: [PATCH 5/9] Remove validation r-Uri number --- src/sip/kamailio.cfg | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/sip/kamailio.cfg b/src/sip/kamailio.cfg index c6127e9d..956232a1 100644 --- a/src/sip/kamailio.cfg +++ b/src/sip/kamailio.cfg @@ -504,14 +504,6 @@ route[REQINIT] { xlog("Malformed SIP request from $si:$sp\n"); exit; } - - if (is_method("INVITE")) { - if !($rU =~ "^[0-9]{1,15}$") { - # we expect the R-URI username to consist of up to 15 digits only - xlog("Malformed R-URI username: '$rU'\n"); - exit; - } - } } # Handle requests within SIP dialogs From 304231dea61e5acb7b80ed80f7e507fe7c383911 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Tue, 30 Apr 2024 11:15:01 +0200 Subject: [PATCH 6/9] Update version --- src/pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pks b/src/pks index a65eb3ab..f3b8fdb2 100755 --- a/src/pks +++ b/src/pks @@ -10,7 +10,7 @@ export PATH+=':/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' # Variables -VERSION="v4.1.1" +VERSION="v4.1.2" readonly PKS_GIT_URL="https://raw.githubusercontent.com/mwolff44/pyfreebilling" readonly DATA_DIR="/srv" ENV_FILE="/srv/pks/.env" From d3fad3ae9e69591443e3347dbcdfea49c478803b Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Tue, 30 Apr 2024 11:15:19 +0200 Subject: [PATCH 7/9] Update version --- src/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic-install.sh b/src/basic-install.sh index f9f65509..76c1f2da 100755 --- a/src/basic-install.sh +++ b/src/basic-install.sh @@ -13,7 +13,7 @@ export PATH+=':/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' readonly PKS_GIT_URL="https://raw.githubusercontent.com/mwolff44/pyfreebilling" readonly PKS_INSTALL_DIR="/srv/pks/scripts" readonly PKS_BIN_DIR="/usr/local/bin" -readonly VERSION="v4.1.1" +readonly VERSION="v4.1.2" # Install the PKS script from repository installScript() { From ac5697d6a2aabef9957d1d4ba44cda44d1f61503 Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Tue, 30 Apr 2024 11:15:42 +0200 Subject: [PATCH 8/9] Update version --- src/sip/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sip/docker-compose.yml b/src/sip/docker-compose.yml index f2dec966..007aabd3 100644 --- a/src/sip/docker-compose.yml +++ b/src/sip/docker-compose.yml @@ -8,7 +8,7 @@ services: pks-sip: container_name: pks-sip hostname: sip.pks.local - image: mwolff44w/pks-sipproxy:v4.1.1 + image: mwolff44w/pks-sipproxy:v4.1.2 restart: unless-stopped volumes: - pks-db-data:/etc/kamailio/db:ro From bfedeb1f43346f8120558a8c22ed4c4a80eea46b Mon Sep 17 00:00:00 2001 From: Mathias WOLFF Date: Mon, 6 May 2024 17:24:39 +0200 Subject: [PATCH 9/9] Update pks-admin to 1.3.1 --- src/sip/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sip/docker-compose.yml b/src/sip/docker-compose.yml index 007aabd3..b6549ab5 100644 --- a/src/sip/docker-compose.yml +++ b/src/sip/docker-compose.yml @@ -132,7 +132,7 @@ services: pks-admin: container_name: pks-admin hostname: admin.pks.local - image: mwolff44w/pks-admin:v1.3.0 + image: mwolff44w/pks-admin:v1.3.1 restart: unless-stopped depends_on: pks-db: