浏览代码

FreeBSD Update multiple changes
- remove memcache
- update switch url
- switch package require postgresql 15
- portsnap enabled

FusionPBX 1 年之前
父节点
当前提交
e906b0caf2

+ 3 - 3
freebsd/resources/config.sh

@@ -8,7 +8,7 @@ system_branch=5.2               # master, 5.2
 # FreeSWITCH Settings
 # FreeSWITCH Settings
 switch_enabled=true             # true or false
 switch_enabled=true             # true or false
 switch_branch=stable            # master, stable (master requires source)
 switch_branch=stable            # master, stable (master requires source)
-switch_source=package           # package, port, source
+switch_source=port              # package, port, source
 switch_tls=true                 # true or false
 switch_tls=true                 # true or false
 
 
 # Database Settings
 # Database Settings
@@ -27,8 +27,8 @@ firewall_enabled=true           # true or false
 # General Settings
 # General Settings
 interface_name=auto             # auto, em0, igb0, vtnet0, or other valid names
 interface_name=auto             # auto, em0, igb0, vtnet0, or other valid names
 php_version=8.1                 # PHP version 8.1, 7.4
 php_version=8.1                 # PHP version 8.1, 7.4
-portsnap_enabled=false           # true or false
+portsnap_enabled=true           # true or false
 sngrep_enabled=true             # true or false
 sngrep_enabled=true             # true or false
-fail2ban_enabled=true           # true or false
+fail2ban_enabled=false          # true or false
 nginx_enabled=true              # true or false
 nginx_enabled=true              # true or false
 monit_enabled=false             # true or false
 monit_enabled=false             # true or false

+ 1 - 1
freebsd/resources/postgresql.sh

@@ -26,7 +26,7 @@ echo "Install PostgreSQL and create the database and users\n"
 #postgres install
 #postgres install
 if [ ."$database_version" = ."16" ]; then
 if [ ."$database_version" = ."16" ]; then
 	pkg install --yes postgresql16-server
 	pkg install --yes postgresql16-server
-	#cd /usr/ports/databases/postgresql15-server/ && make install clean BATCH=yes
+	#cd /usr/ports/databases/postgresql16-server/ && make install clean BATCH=yes
 fi
 fi
 if [ ."$database_version" = ."15" ]; then
 if [ ."$database_version" = ."15" ]; then
 	pkg install --yes postgresql15-server
 	pkg install --yes postgresql15-server

+ 4 - 1
freebsd/resources/switch/dsn.sh

@@ -51,7 +51,10 @@ do
 done
 done
 
 
 #flush memcache
 #flush memcache
-/usr/bin/fs_cli -x 'memcache flush'
+#/usr/bin/fs_cli -x 'memcache flush'
+
+#flush the cache
+rm /var/cache/fusionpbx/*
 
 
 #restart freeswitch
 #restart freeswitch
 service freeswitch restart
 service freeswitch restart

+ 0 - 3
freebsd/resources/switch/package-release.sh

@@ -32,11 +32,8 @@ cd $cwd
 #chmod u-w,ugo+x /usr/local/etc/rc.d/freeswitch
 #chmod u-w,ugo+x /usr/local/etc/rc.d/freeswitch
 
 
 #enable the services
 #enable the services
-echo 'memcached_enable="YES"' >> /etc/rc.conf
 echo 'freeswitch_enable="YES"' >> /etc/rc.conf
 echo 'freeswitch_enable="YES"' >> /etc/rc.conf
 echo 'freeswitch_flags="-nonat"' >> /etc/rc.conf
 echo 'freeswitch_flags="-nonat"' >> /etc/rc.conf
 echo 'freeswitch_username="www"' >> /etc/rc.conf
 echo 'freeswitch_username="www"' >> /etc/rc.conf
 echo 'freeswitch_groupname="www"' >> /etc/rc.conf
 echo 'freeswitch_groupname="www"' >> /etc/rc.conf
 
 
-#start the service
-service memcached start

+ 1 - 1
freebsd/resources/switch/source-master.sh

@@ -20,7 +20,7 @@ pkg install --yes wget sudo libsndfile lua52 opus libmemcached libvorbis libogg
 #pkg install --yes libshout mpg123 lame
 #pkg install --yes libshout mpg123 lame
 
 
 #get the source
 #get the source
-git clone https://freeswitch.org/stash/scm/fs/freeswitch.git /usr/src/freeswitch
+git clone https://github.com/signalwire/freeswitch.git /usr/src/freeswitch
 
 
 #prepare the source
 #prepare the source
 cd /usr/src/freeswitch && /bin/sh /usr/src/freeswitch/bootstrap.sh -j
 cd /usr/src/freeswitch && /bin/sh /usr/src/freeswitch/bootstrap.sh -j

+ 3 - 7
freebsd/resources/switch/source-release.sh

@@ -25,15 +25,14 @@ pkg install --yes spandsp sofia-sip postgresql${database_version}-client sox
 #cd /usr/src/freeswitch && /bin/sh /usr/src/freeswitch/bootstrap.sh -j
 #cd /usr/src/freeswitch && /bin/sh /usr/src/freeswitch/bootstrap.sh -j
 
 
 #get the release from https
 #get the release from https
-cd /usr/src && fetch https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz
-cd /usr/src && bsdtar xf freeswitch-1.10.7.-release.tar.xz
-mv /usr/src/freeswitch-1.10.7.-release /usr/src/freeswitch
+cd /usr/src && fetch https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.12.-release.tar.xz
+cd /usr/src && bsdtar xf freeswitch-1.10.12.-release.tar.xz
+mv /usr/src/freeswitch-1.10.12.-release /usr/src/freeswitch
 
 
 #enable the modules
 #enable the modules
 sed -i' ' -e s:'#applications/mod_avmd:applications/mod_avmd:' /usr/src/freeswitch/modules.conf
 sed -i' ' -e s:'#applications/mod_avmd:applications/mod_avmd:' /usr/src/freeswitch/modules.conf
 sed -i' ' -e s:'#applications/mod_callcenter:applications/mod_callcenter:' /usr/src/freeswitch/modules.conf
 sed -i' ' -e s:'#applications/mod_callcenter:applications/mod_callcenter:' /usr/src/freeswitch/modules.conf
 sed -i' ' -e s:'#applications/mod_cidlookup:applications/mod_cidlookup:' /usr/src/freeswitch/modules.conf
 sed -i' ' -e s:'#applications/mod_cidlookup:applications/mod_cidlookup:' /usr/src/freeswitch/modules.conf
-sed -i' ' -e s:'#applications/mod_memcache:applications/mod_memcache:' /usr/src/freeswitch/modules.conf
 sed -i' ' -e s:'#applications/mod_curl:applications/mod_curl:' /usr/src/freeswitch/modules.conf
 sed -i' ' -e s:'#applications/mod_curl:applications/mod_curl:' /usr/src/freeswitch/modules.conf
 #sed -i' ' -e s:'#formats/mod_shout:formats/mod_shout:' /usr/src/freeswitch/modules.conf
 #sed -i' ' -e s:'#formats/mod_shout:formats/mod_shout:' /usr/src/freeswitch/modules.conf
 #sed -i' ' -e s:'#formats/mod_nibblebill:formats/mod_nibblebill:' /usr/src/freeswitch/modules.conf
 #sed -i' ' -e s:'#formats/mod_nibblebill:formats/mod_nibblebill:' /usr/src/freeswitch/modules.conf
@@ -71,9 +70,6 @@ cp "$cwd/rc.d.freeswitch" /usr/local/etc/rc.d/freeswitch
 chmod 0555 /usr/local/etc/rc.d/freeswitch
 chmod 0555 /usr/local/etc/rc.d/freeswitch
 
 
 #enable the services
 #enable the services
-echo 'memcached_enable="YES"' >> /etc/rc.conf
 echo 'freeswitch_enable="YES"' >> /etc/rc.conf
 echo 'freeswitch_enable="YES"' >> /etc/rc.conf
 echo 'freeswitch_flags="-nc -nonat -u www -g www"' >> /etc/rc.conf
 echo 'freeswitch_flags="-nc -nonat -u www -g www"' >> /etc/rc.conf
 
 
-#start the services
-service memcached start