diff --git a/database/fusionpbx.sql.gz b/database/fusionpbx.sql.gz
index 082cbd7..5c9bfaa 100644
Binary files a/database/fusionpbx.sql.gz and b/database/fusionpbx.sql.gz differ
diff --git a/database/postgres_globals.sql b/database/postgres_globals.sql
index 15515ec..b332841 100644
--- a/database/postgres_globals.sql
+++ b/database/postgres_globals.sql
@@ -2,7 +2,7 @@
-- PostgreSQL database cluster dump
--
-\restrict Od0IzV5mhglrt8MzjmvsA3ocE5pzZ8HQqka3Ookg5CoXJ9CyOnrxHXoOL0feAiZ
+\restrict N1SADG49YPGHscLNeUAYzzlMwF5iJd8oaYv0L100epmw6FIi1TAaVkueaQ2YEkn
SET default_transaction_read_only = off;
@@ -14,7 +14,7 @@ SET standard_conforming_strings = on;
--
CREATE ROLE fusionpbx;
-ALTER ROLE fusionpbx WITH SUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN NOREPLICATION NOBYPASSRLS PASSWORD 'SCRAM-SHA-256$4096:JOYKSj+lfw3sxgcuge2NEQ==$k1piq39UiU0yXVkXwXp4kq6uf1R+x4f1OJjXkJCWRE8=:iEQk9HFcFZ4tZOtuZ2hWHbCQCv1CFbe+rQsHNk7Nqx0=';
+ALTER ROLE fusionpbx WITH SUPERUSER INHERIT NOCREATEROLE NOCREATEDB LOGIN NOREPLICATION NOBYPASSRLS PASSWORD 'SCRAM-SHA-256$4096:YKw5wvglkJ1SKTn9LxXgHg==$8C9W0SrbgXHglWTB/yIik0/z0QU+idBIRNoH8k10fmg=:TU0w/pHUmOSb0hVwCLY6A7nNFeKQrUQGeaInUwHDDBw=';
CREATE ROLE postgres;
ALTER ROLE postgres WITH SUPERUSER INHERIT CREATEROLE CREATEDB LOGIN REPLICATION BYPASSRLS;
@@ -29,7 +29,7 @@ ALTER ROLE postgres WITH SUPERUSER INHERIT CREATEROLE CREATEDB LOGIN REPLICATION
-\unrestrict Od0IzV5mhglrt8MzjmvsA3ocE5pzZ8HQqka3Ookg5CoXJ9CyOnrxHXoOL0feAiZ
+\unrestrict N1SADG49YPGHscLNeUAYzzlMwF5iJd8oaYv0L100epmw6FIi1TAaVkueaQ2YEkn
--
-- PostgreSQL database cluster dump complete
diff --git a/fail2ban/jail.local b/fail2ban/jail.local
index 9bf919c..6f6b703 100755
--- a/fail2ban/jail.local
+++ b/fail2ban/jail.local
@@ -1,6 +1,3 @@
-[DEFAULT]
-ignoreip = 127.0.0.1/8 ::1 107.178.2.130 97.154.109.245
-
[ssh]
enabled = true
port = 22
diff --git a/freeswitch/autoload_configs/modules.conf.xml b/freeswitch/autoload_configs/modules.conf.xml
index cba3bb0..fb40bff 100644
--- a/freeswitch/autoload_configs/modules.conf.xml
+++ b/freeswitch/autoload_configs/modules.conf.xml
@@ -17,27 +17,27 @@
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
-
-
+
+
-
-
@@ -59,20 +59,18 @@
+
+
-
-
-
-
+
+
-
-
-
+
\ No newline at end of file
diff --git a/freeswitch/vars.xml b/freeswitch/vars.xml
index 9a952e0..07f5945 100644
--- a/freeswitch/vars.xml
+++ b/freeswitch/vars.xml
@@ -19,8 +19,8 @@
-
-
+
+
@@ -57,22 +57,22 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/network/50-cloud-init.yaml b/network/50-cloud-init.yaml
index a989249..a8c2ba9 100644
--- a/network/50-cloud-init.yaml
+++ b/network/50-cloud-init.yaml
@@ -7,34 +7,15 @@ network:
version: 2
ethernets:
eth0:
- accept-ra: false
addresses:
- - 2604:A880:0400:00D1:0000:0004:7377:4001/64
- - 134.209.72.226/20
- - 10.10.0.5/16
+ - 10.48.200.130/24
+ gateway4: 10.48.200.1
match:
- macaddress: fa:01:e4:87:a2:9b
- mtu: 1500
+ macaddress: bc:24:11:ca:b9:3a
nameservers:
addresses:
- - 67.207.67.2
- - 67.207.67.3
- search: []
- routes:
- - to: ::/0
- via: 2604:A880:0400:00D1:0000:0000:0000:0001
- - to: 0.0.0.0/0
- via: 134.209.64.1
+ - 8.8.8.8
+ - 1.1.1.1
+ search:
+ - tail7dfd0c.ts.net
set-name: eth0
- eth1:
- addresses:
- - 10.116.0.3/20
- match:
- macaddress: 32:a5:04:32:aa:0b
- mtu: 1500
- nameservers:
- addresses:
- - 67.207.67.2
- - 67.207.67.3
- search: []
- set-name: eth1
diff --git a/network/hostname b/network/hostname
index 233d3e6..02226e7 100644
--- a/network/hostname
+++ b/network/hostname
@@ -1 +1 @@
-fusion
+fusion.orbishosting.com
diff --git a/network/hosts b/network/hosts
index 41d3dee..9cf658a 100644
--- a/network/hosts
+++ b/network/hosts
@@ -5,8 +5,8 @@
# b.) change or remove the value of 'manage_etc_hosts' in
# /etc/cloud/cloud.cfg or cloud-config from user-data
#
+127.0.1.1 FusionPBX-130 FusionPBX-130
127.0.0.1 localhost
-127.0.1.1 fusion.orbishosting.com
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
diff --git a/nginx/fusionpbx.conf b/nginx/fusionpbx.conf
index 3bd6f9d..ebad6b8 100755
--- a/nginx/fusionpbx.conf
+++ b/nginx/fusionpbx.conf
@@ -53,14 +53,9 @@ server {
}
server {
- if ($host = fusion.orbishosting.com) {
- return 301 https://$host$request_uri;
- } # managed by Certbot
-
-
listen [::]:80;
listen 80;
- server_name fusion.orbishosting.com 134.209.72.226;
+ server_name fusionpbx;
#redirect letsencrypt to dehydrated
location ^~ /.well-known/acme-challenge {
@@ -69,11 +64,7 @@ server {
alias /var/www/dehydrated;
}
- #rewrite rule - send to https with an exception for provisioning
- if ($uri !~* ^.*(provision|xml_cdr|firmware).*$) {
- rewrite ^(.*) https://$host$1 permanent;
- break;
- }
+ #rewrite rule disabled 2026-07-08: NPM (reverse proxy) now terminates TLS externally and sets ssl_forced; this in-VM redirect created a loop since NPM talks to this nginx over plain HTTP
#REST api
if ($uri ~* ^.*/api/.*$) {
@@ -103,8 +94,8 @@ server {
#rewrite "^.*/provision/([A-Fa-f0-9]{12})(\.(cfg))?$" /app/provision/?mac=$1 last;
#yealink
- rewrite "^.*/provision/(y[0-9]{12})(\.cfg|\.boot)?$" /app/provision/index.php?file=$1$2;
- rewrite "^.*/provision/([A-Fa-f0-9]{12})(\.boot)$" /app/provision/index.php?mac=$1&file=%7b%24mac%7d.boot;
+ #rewrite "^.*/provision/(y[0-9]{12})(\.cfg|\.boot)?$" /app/provision/index.php?file=$1$2;
+ rewrite "^.*/provision/(y[0-9]{12})(\.cfg)?$" /app/provision/index.php?file=$1.cfg;
rewrite "^.*/provision/([A-Fa-f0-9]{12})(\.(xml|cfg))?$" /app/provision/index.php?mac=$1 last;
#polycom
@@ -186,17 +177,16 @@ server {
location ~ /\. {
deny all;
}
-
-
}
server {
listen [::]:443 ssl;
listen 443 ssl;
#listen 443 ssl http2;
- server_name fusion.orbishosting.com 134.209.72.226;
- ssl_certificate /etc/letsencrypt/live/fusion.orbishosting.com/fullchain.pem; # managed by Certbot
- ssl_certificate_key /etc/letsencrypt/live/fusion.orbishosting.com/privkey.pem; # managed by Certbot
+ server_name fusionpbx;
+
+ ssl_certificate /etc/ssl/certs/nginx.crt;
+ ssl_certificate_key /etc/ssl/private/nginx.key;
#ssl_protocols TLSv1.2 TLSv1.3;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
ssl_prefer_server_ciphers on;
@@ -252,8 +242,8 @@ server {
#rewrite "^.*/provision/([A-Fa-f0-9]{12})(\.(cfg))?$" /app/provision/?mac=$1 last;
#yealink
- rewrite "^.*/provision/(y[0-9]{12})(\.cfg|\.boot)?$" /app/provision/index.php?file=$1$2;
- rewrite "^.*/provision/([A-Fa-f0-9]{12})(\.boot)$" /app/provision/index.php?mac=$1&file=%7b%24mac%7d.boot;
+ #rewrite "^.*/provision/(y[0-9]{12})(\.cfg|\.boot)?$" /app/provision/index.php?file=$1$2;
+ rewrite "^.*/provision/(y[0-9]{12})(\.cfg)?$" /app/provision/index.php?file=$1.cfg;
rewrite "^.*/provision/([A-Fa-f0-9]{12})(\.(xml|cfg))?$" /app/provision/index.php?mac=$1 last;
#polycom
@@ -335,7 +325,6 @@ server {
location ~ /\. {
deny all;
}
-
}
diff --git a/systemd/email_queue.service b/systemd/email_queue.service
index f4682da..29c9446 100644
--- a/systemd/email_queue.service
+++ b/systemd/email_queue.service
@@ -1,5 +1,5 @@
; Author: Mark J Crane
-; cp /var/www/fusionpbx/app/email_queue/resources/service/debian.service /etc/systemd/system/email_queue.service
+; cp /var/www/fusionpbx/app/email_queue/resources/service/debian/email_queue.service /etc/systemd/system/email_queue.service
; systemctl daemon-reload
; systemctl enable email_queue
; systemctl start email_queue
diff --git a/systemd/event_guard.service b/systemd/event_guard.service
index b1753df..b5fdc86 100644
--- a/systemd/event_guard.service
+++ b/systemd/event_guard.service
@@ -1,5 +1,5 @@
; Author: Mark J Crane
-; cp /var/www/fusionpbx/app/event_guard/resources/service/debian.service /etc/systemd/system/event_guard.service
+; cp /var/www/fusionpbx/app/event_guard/resources/service/debian/event_guard.service /etc/systemd/system/event_guard.service
; systemctl daemon-reload
; systemctl enable event_guard
; systemctl start event_guard
diff --git a/systemd/fax_queue.service b/systemd/fax_queue.service
index 758212b..bfed793 100644
--- a/systemd/fax_queue.service
+++ b/systemd/fax_queue.service
@@ -1,5 +1,5 @@
; Author: Mark J Crane
-; cp /var/www/fusionpbx/app/fax_queue/resources/service/debian.service /etc/systemd/system/fax_queue.service
+; cp /var/www/fusionpbx/app/fax_queue/resources/service/debian/fax_queue.service /etc/systemd/system/fax_queue.service
; systemctl daemon-reload
; systemctl enable fax_queue
; systemctl start fax_queue
diff --git a/systemd/system_status.service b/systemd/system_status.service
index e3d1c4b..c9165ed 100644
--- a/systemd/system_status.service
+++ b/systemd/system_status.service
@@ -1,5 +1,5 @@
; Author: Mark J Crane
-; cp /var/www/fusionpbx/app/system/resources/service/debian.service /etc/systemd/system/system_status.service
+; cp /var/www/fusionpbx/app/system/resources/service/debian/system_status.service /etc/systemd/system/system_status.service
; systemctl daemon-reload
; systemctl enable --now system_status
diff --git a/systemd/xml_cdr.service b/systemd/xml_cdr.service
index 82fc1a0..c1ed5c6 100644
--- a/systemd/xml_cdr.service
+++ b/systemd/xml_cdr.service
@@ -1,5 +1,5 @@
; Author: Mark J Crane
-; cp /var/www/fusionpbx/app/xml_cdr/resources/service/debian.service /etc/systemd/system/xml_cdr.service
+; cp /var/www/fusionpbx/app/xml_cdr/resources/service/debian/xml_cdr.service /etc/systemd/system/xml_cdr.service
; systemctl daemon-reload
; systemctl enable xml_cdr
; systemctl start xml_cdr