diff options
| -rw-r--r-- | config/asterisk/asterisk.inc | 22 | ||||
| -rw-r--r-- | config/siproxd/siproxd.inc | 1 | ||||
| -rw-r--r-- | config/siproxd/siproxd_registered_phones.php | 6 | ||||
| -rw-r--r-- | pkg_config.10.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 4 |
6 files changed, 31 insertions, 10 deletions
diff --git a/config/asterisk/asterisk.inc b/config/asterisk/asterisk.inc index ed835b25..899fc370 100644 --- a/config/asterisk/asterisk.inc +++ b/config/asterisk/asterisk.inc @@ -28,6 +28,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +require_once("config.inc"); +require_once("service-utils.inc"); +require_once("util.inc"); + define('ASTERISK_CONF_DIR', '/conf/asterisk'); $pf_version=substr(trim(file_get_contents("/etc/version")), 0, 3); if ($pf_version == "2.1" || $pf_version == "2.2") { @@ -43,6 +47,7 @@ function asterisk_install() { } function sync_package_asterisk() { + global $g; conf_mount_rw(); // For NanoBSD compatibility, move the /etc/asterisk configuration directory to /conf, and symlink it back @@ -401,13 +406,26 @@ EOF; 'start' => $start, 'stop' => $stop )); - restart_service("asterisk"); - // Prepare backup for factory defaults restoring feature if (!file_exists("/conf.default/asterisk_factory_defaults_config.tgz")) { system("cd /conf/asterisk/ && /usr/bin/tar czf /conf.default/asterisk_factory_defaults_config.tgz *"); } + /* Do not (re)start the service on boot */ + if (function_exists("platform_booting")) { + if (platform_booting()) { + return; + } + } elseif ($g['booting']) { + return; + } else { + if (is_service_running("asterisk")) { + restart_service("asterisk"); + } else { + start_service("asterisk"); + } + } + conf_mount_ro(); } diff --git a/config/siproxd/siproxd.inc b/config/siproxd/siproxd.inc index 9eae2567..eb5658b9 100644 --- a/config/siproxd/siproxd.inc +++ b/config/siproxd/siproxd.inc @@ -146,6 +146,7 @@ function sync_package_siproxd() { } $siproxd_conffile = SIPROXD . '/etc/siproxd.conf'; $siproxd_pwfile = SIPROXD . '/etc/siproxd_passwd.cfg'; + $siproxd_chroot = "/var/siproxd/"; $pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3); if ($pfs_version == '2.2') { diff --git a/config/siproxd/siproxd_registered_phones.php b/config/siproxd/siproxd_registered_phones.php index 0648aa2f..429b5338 100644 --- a/config/siproxd/siproxd_registered_phones.php +++ b/config/siproxd/siproxd_registered_phones.php @@ -40,8 +40,10 @@ require_once("guiconfig.inc"); -$phonetext = file_get_contents("/var/siproxd/siproxd_registrations"); -$phonedata = explode("\n", $phonetext); +if (file_exists("/var/siproxd/siproxd_registrations")) { + $phonetext = file_get_contents("/var/siproxd/siproxd_registrations"); + $phonedata = explode("\n", $phonetext); +} if (!is_array($phonedata)) { $phonedata = array(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 55f533e9..4dd76ed7 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -39,7 +39,7 @@ </descr> <website>http://www.asterisk.org/</website> <category>Services</category> - <version>0.3.3</version> + <version>0.3.4</version> <status>BETA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/asterisk/asterisk.xml</config_file> @@ -568,7 +568,7 @@ <build_pbi> <port>net/siproxd</port> </build_pbi> - <version>1.0.7</version> + <version>1.0.8</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>siproxd.xml</configurationfile> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index a081c1be..f6737de3 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -34,7 +34,7 @@ <descr><![CDATA[Asterisk is an open source framework for building communications applications.<br />Asterisk turns an ordinary computer into a communications server.]]></descr> <website>http://www.asterisk.org/</website> <category>Services</category> - <version>1.8.26.1 pkg v0.3.3</version> + <version>1.8.26.1 pkg v0.3.4</version> <status>Beta</status> <required_version>2.0</required_version> <config_file>https://packages.pfsense.org/packages/config/asterisk/asterisk.xml</config_file> @@ -593,7 +593,7 @@ <depends_on_package_pbi>siproxd-0.8.0-i386.pbi</depends_on_package_pbi> <pkginfolink>https://doc.pfsense.org/index.php/Siproxd_package</pkginfolink> <build_port_path>/usr/ports/net/siproxd</build_port_path> - <version>0.8.0_1 pkg v1.0.7</version> + <version>0.8.0_1 pkg v1.0.8</version> <status>Beta</status> <required_version>2.1</required_version> <configurationfile>siproxd.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 7113b826..5a75922a 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -34,7 +34,7 @@ <descr><![CDATA[Asterisk is an open source framework for building communications applications.<br />Asterisk turns an ordinary computer into a communications server.]]></descr> <website>http://www.asterisk.org/</website> <category>Services</category> - <version>1.8.26.1 pkg v0.3.3</version> + <version>1.8.26.1 pkg v0.3.4</version> <status>Beta</status> <required_version>2.0</required_version> <config_file>https://packages.pfsense.org/packages/config/asterisk/asterisk.xml</config_file> @@ -580,7 +580,7 @@ <depends_on_package_pbi>siproxd-0.8.0-amd64.pbi</depends_on_package_pbi> <pkginfolink>https://doc.pfsense.org/index.php/Siproxd_package</pkginfolink> <build_port_path>/usr/ports/net/siproxd</build_port_path> - <version>0.8.0_1 pkg v1.0.7</version> + <version>0.8.0_1 pkg v1.0.8</version> <status>Beta</status> <required_version>2.1</required_version> <configurationfile>siproxd.xml</configurationfile> |