diff options
| -rw-r--r-- | config/freeswitch_dev/freeswitch.xml | 2 | ||||
| -rw-r--r-- | config/freeswitch_dev/v_config.inc | 29 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 11 |
3 files changed, 22 insertions, 20 deletions
diff --git a/config/freeswitch_dev/freeswitch.xml b/config/freeswitch_dev/freeswitch.xml index ced323ce..44d3fa7f 100644 --- a/config/freeswitch_dev/freeswitch.xml +++ b/config/freeswitch_dev/freeswitch.xml @@ -44,7 +44,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>Settings</name> - <version>0.9.7.21</version> + <version>0.9.7.22</version> <title>Settings</title> <include_file>/usr/local/pkg/v_config.inc</include_file> <menu> diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc index 3b3e093c..02af49e1 100644 --- a/config/freeswitch_dev/v_config.inc +++ b/config/freeswitch_dev/v_config.inc @@ -34,6 +34,7 @@ require_once('globals.inc'); require_once('service-utils.inc'); + //preferences $v_label_show = true; $v_path_show = true; @@ -48,7 +49,7 @@ function v_settings() $config['installedpackages']['freeswitchsettings']['config'][0]['tmp_dir'] = '/tmp'; $config['installedpackages']['freeswitchsettings']['config'][0]['bin_dir'] = '/usr/local/bin'; $config['installedpackages']['freeswitchsettings']['config'][0]['v_startup_script_dir'] = '/usr/local/etc/rc.d'; - $config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = "0.9.7.21"; + $config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = "0.9.7.22"; $config['installedpackages']['freeswitchsettings']['config'][0]['v_build_version'] = "1.0.4"; $config['installedpackages']['freeswitchsettings']['config'][0]['v_build_revision'] = "Release"; $config['installedpackages']['freeswitchsettings']['config'][0]['v_label'] = 'FreeSWITCH'; //FreeSWITCH (TM) http://www.freeswitch.org/ @@ -67,7 +68,7 @@ function v_settings() $config['installedpackages']['freeswitchsettings']['config'][0]['v_scripts_dir'] = '/usr/local/freeswitch/scripts'; $config['installedpackages']['freeswitchsettings']['config'][0]['v_storage_dir'] = '/usr/local/freeswitch/storage'; $config['installedpackages']['freeswitchsettings']['config'][0]['v_recordings_dir'] = '/usr/local/freeswitch/recordings'; - $config['installedpackages']['freeswitchsettings']['config'][0]['v_download_path'] = 'http://www.pfsense.com/packages/config/freeswitch_dev/'; + $config['installedpackages']['freeswitchsettings']['config'][0]['v_download_path'] = 'http://www.pfsense.com/packages/config/freeswitch_dev'; } //Update the settings @@ -3109,7 +3110,7 @@ function pkg_add($pkg_download_path, $pkg_name) //if the package is not installed then download and install it if (!strlen(exec('pkg_info | grep '.$pkg_array[0])) > 0) { chdir('/usr/pkgs/'); - exec("fetch ".$pkg_download_path.$pkg_name); + exec("fetch ".$pkg_download_path.'/'.$pkg_name); exec("pkg_add -F ".$pkg_name); exec("rm ".$pkg_name); } @@ -3338,14 +3339,15 @@ function v_install_phase_2() { exec("fetch ".$v_download_path."disa.js"); exec("fetch ".$v_download_path."originate.js"); exec("cp ".$v_htdocs_dir."/slim.swf ".$v_web_dir."/slim.swf"); + } function v_install_phase_1() { - //conf_mount_rw(); - //config_lock(); + conf_mount_rw(); + config_lock(); v_settings(); @@ -3358,9 +3360,10 @@ function v_install_phase_1() //set script execution time limit to 24 hours set_time_limit (86400); ini_set(max_execution_time,86400); + //hide errors - //ini_set('display_errors', '0'); + ini_set('display_errors', '0'); clearstatcache(); //clear file status cache @@ -3384,7 +3387,7 @@ function v_install_phase_1() //download and install the packages - $pkg_download_path = $v_download_path."freebsd7.2/1_0_4/"; + $pkg_download_path = $v_download_path."/freebsd7.2/1_0_4"; //if the package is not installed then install it if(stristr(exec('pkg_info | grep freeswitch'), 'freeswitch') === FALSE) { @@ -3929,8 +3932,8 @@ function v_install_phase_1() // sync_package_v_ivr(); //} - //conf_mount_ro(); - //config_unlock(); + conf_mount_ro(); + config_unlock(); } @@ -3938,8 +3941,8 @@ function v_install_phase_1() function v_deinstall_command() { - //conf_mount_rw(); - //config_lock(); + conf_mount_rw(); + config_lock(); global $config; $v_settings_array = $config['installedpackages']['freeswitchsettings']['config'][0]; @@ -3987,8 +3990,8 @@ function v_deinstall_command() //unlink_if_exists($tmp_dir."/".$v_name.".tar.gz"); unlink_if_exists($tmp_dir."/pkg_mgr_".$v_label.".log"); - //conf_mount_ro(); - //config_unlock(); + conf_mount_ro(); + config_unlock(); } diff --git a/pkg_config.7.xml b/pkg_config.7.xml index f436109a..c45b4b98 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -98,7 +98,7 @@ <descr>Adds pfSense dashboard that will be included with 2.0. WARNING! Cannot be deinstalled.</descr> <category>System</category> <config_file>http://www.pfsense.com/packages/config/dashboard/dashboard.xml</config_file> - <version>0.8.4</version> + <version>0.8.3_1</version> <status>BETA</status> <required_version>1.2</required_version> <maximum_version>1.9</maximum_version> @@ -126,7 +126,7 @@ <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink> <config_file>http://www.pfsense.com/packages/config/freeswitch_dev/freeswitch.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.9.7.21</version> + <version>0.9.7.22</version> <status>Beta</status> <required_version>1.2.3</required_version> <maintainer>markjcrane@gmail.com</maintainer> @@ -240,7 +240,7 @@ <depends_on_package>mysql-client-5.1.34.tbz</depends_on_package> <depends_on_package>snort-2.8.4.1.tbz</depends_on_package> <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file> - <version>2.8.4.1_1</version> + <version>2.8.4.1</version> <required_version>1.2.2</required_version> <status>Stable</status> <configurationfile>snort.xml</configurationfile> @@ -283,7 +283,6 @@ <category>NET</category> <config_file>http://www.pfsense.com/packages/config/openbgpd/openbgpd.xml</config_file> <version>0.4</version> - <pkginfolink>http://doc.pfsense.org/index.php/OpenBGPD_package</pkginfolink> <status>STABLE</status> <required_version>1.3</required_version> <configurationfile>openbgpd.xml</configurationfile> @@ -389,7 +388,7 @@ <descr>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr> <website>https://portal.pfsense.org</website> <category>Services</category> - <version>1.17</version> + <version>1.15</version> <status>BETA</status> <required_version>1.2</required_version> <pkginfolink>http://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink> @@ -780,7 +779,7 @@ <depends_on_package>nrpe-2.12_1.tbz</depends_on_package> <depends_on_package>nagios-plugins-1.4.13,1.tbz</depends_on_package> <config_file>http://www.pfsense.com/packages/config/nrpe2/nrpe2.xml</config_file> - <version>2.11_1</version> + <version>2.11</version> <status>Beta</status> <required_version>1.2</required_version> <maintainer>erik@erikkristensen.com</maintainer> |