From c37a4b10134f6d97c364e63a793cf2922c92a0e4 Mon Sep 17 00:00:00 2001 From: mcrane Date: Fri, 11 Sep 2009 15:53:38 -0600 Subject: FreeSWITCH minor changes to tabbing and spacing, other minor changes and deny hosts add rm /usr/local/etc/denyhosts* to package uninstall. --- config/denyhosts/denyhosts.inc | 5 +- config/freeswitch_dev/dialplan.default.xml | 53 +-- config/freeswitch_dev/freeswitch.xml | 2 +- config/freeswitch_dev/v_config.inc | 4 +- config/freeswitch_dev/v_extensions.tmp | 18 +- config/freeswitch_dev/v_gateways_edit.tmp | 668 ++++++++++++++--------------- 6 files changed, 379 insertions(+), 371 deletions(-) (limited to 'config') diff --git a/config/denyhosts/denyhosts.inc b/config/denyhosts/denyhosts.inc index e1bcf877..e19365de 100644 --- a/config/denyhosts/denyhosts.inc +++ b/config/denyhosts/denyhosts.inc @@ -184,7 +184,10 @@ function deinstall_command() exec ("rm /etc/hosts.allow"); exec ("cp /etc/hosts.allow.bak /etc/hosts.allow"); } - + + //remove the configuration + exec ("rm /usr/local/etc/denyhosts*"); + //create a new hosts.allow file //$hosts_allow = "#\n"; //$hosts_allow .= "# hosts.allow access control file for \"tcp wrapped\" applications.\n"; diff --git a/config/freeswitch_dev/dialplan.default.xml b/config/freeswitch_dev/dialplan.default.xml index 3a564ec8..5fe1d4a4 100644 --- a/config/freeswitch_dev/dialplan.default.xml +++ b/config/freeswitch_dev/dialplan.default.xml @@ -1,4 +1,3 @@ - + + @@ -32,7 +33,7 @@ - + @@ -40,7 +41,7 @@ - + @@ -48,14 +49,14 @@ - + - + @@ -64,6 +65,10 @@ + + + + @@ -81,11 +86,10 @@ - - - - + + + @@ -121,7 +125,7 @@ - + @@ -137,7 +141,7 @@ - + @@ -200,11 +204,11 @@ - - + + - + @@ -328,14 +332,6 @@ - - @@ -633,6 +629,14 @@ + + + + + + + + - + + + diff --git a/config/freeswitch_dev/freeswitch.xml b/config/freeswitch_dev/freeswitch.xml index 322ebf0b..783b08cc 100644 --- a/config/freeswitch_dev/freeswitch.xml +++ b/config/freeswitch_dev/freeswitch.xml @@ -44,7 +44,7 @@ Describe your package requirements here Currently there are no FAQ items provided. Settings - 0.9.7.24 + 0.9.7.25 Settings /usr/local/pkg/v_config.inc diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc index a2c81cde..3208f09a 100644 --- a/config/freeswitch_dev/v_config.inc +++ b/config/freeswitch_dev/v_config.inc @@ -49,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.24"; + $config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = "0.9.7.25"; $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/ @@ -3425,7 +3425,7 @@ function v_install_phase_1() pkg_add($pkg_download_path, "libgpg-error-1.7.tbz"); pkg_add($pkg_download_path, "libgcrypt-1.4.4.tbz"); pkg_add($pkg_download_path, "gnutls-2.6.5.tbz"); - pkg_add($pkg_download_path, "freeswitch-1.0.4.tbz"); + pkg_add($pkg_download_path, "freeswitch-1.0.4.tbz"); //pkg_add($pkg_download_path, "p5-gettext-1.05_2.tbz"); //requirement for perl //pkg_add($pkg_download_path, "perl-5.8.9_3.tbz"); fwrite($handle, 'packages have been installed'); diff --git a/config/freeswitch_dev/v_extensions.tmp b/config/freeswitch_dev/v_extensions.tmp index 0eb61d95..2eb5a554 100644 --- a/config/freeswitch_dev/v_extensions.tmp +++ b/config/freeswitch_dev/v_extensions.tmp @@ -92,15 +92,15 @@ if ($config_change == 1) { //endif; ?> - - - - -

Extensions
-
- Use this to configure your SIP extensions. -

-
+ + + + +

Extensions
+
+ Use this to configure your SIP extensions. +

+
diff --git a/config/freeswitch_dev/v_gateways_edit.tmp b/config/freeswitch_dev/v_gateways_edit.tmp index 07953673..5444d7e8 100644 --- a/config/freeswitch_dev/v_gateways_edit.tmp +++ b/config/freeswitch_dev/v_gateways_edit.tmp @@ -339,358 +339,358 @@ if ($input_errors) print_input_errors($input_errors);
- - + +
+
- - - - + } + echo " \n"; + ?> + Choose whether to register-transport. + + + + + + + + + + + + + + + + + + +

Gateway Setup
-
+ + + - -

Gateway Setup
+
\n"; echo "http://wiki.freeswitch.org/wiki/SIP_Provider_Examples\n"; - } + } ?>

-
- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
Gateway - -
Enter the gateway name here.
-
Username - -
Enter the username here.
-
Password - -
Enter the password here.
-
From-user - -
Enter the from-user here.
-
From-domain - -
Enter the from-domain here.
-
Proxy - -
Enter the proxy here.
-
Realm - -
Enter the realm here.
-
Expire-seconds - -
Enter the expire-seconds here. Example: 600
-
Register - \n"; - echo " \n"; - switch (htmlspecialchars($pconfig['register'])) { - case "true": - echo " \n"; - echo " \n"; - break; - case "false": - echo " \n"; - echo " \n"; - - break; - default: - echo " \n"; - echo " \n"; - } - echo " \n"; - ?> - Choose whether to register. -
Retry-seconds - -
Enter the retry_seconds here. Example: 30
-
Effective Caller ID Name - -
Enter the effective caller ID name here.
-
Effective Caller ID Number - -
Enter the effective caller ID number here.
-
Outbound Caller ID Name - -
Enter the outbound caller ID name here.
-
Outbound Caller ID Number - -
Enter the outbound caller ID number here.
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - -
Gateway + +
Enter the gateway name here.
+
Username + +
Enter the username here.
+
Password + +
Enter the password here.
+
From-user + +
Enter the from-user here.
+
From-domain + +
Enter the from-domain here.
+
Proxy + +
Enter the proxy here.
+
Realm + +
Enter the realm here.
+
Expire-seconds + +
Enter the expire-seconds here. Example: 600
+
Register + \n"; + echo " \n"; + switch (htmlspecialchars($pconfig['register'])) { + case "true": + echo " \n"; + echo " \n"; + break; + case "false": + echo " \n"; + echo " \n"; + + break; + default: + echo " \n"; + echo " \n"; + } + echo " \n"; + ?> + Choose whether to register. +
Retry-seconds + +
Enter the retry_seconds here. Example: 30
+
Effective Caller ID Name + +
Enter the effective caller ID name here.
+
Effective Caller ID Number + +
Enter the effective caller ID number here.
+
Outbound Caller ID Name + +
Enter the outbound caller ID name here.
+
Outbound Caller ID Number + +
Enter the outbound caller ID number here.
+
Context - -
Enter the context here. Example: public
-
-
- - - - - -
Show Advanced - -
-
-
Extension + +
Enter the extension here.
+
Ping + +
Enter the ping interval here in seconds.
+
Caller-id-in-from + \n"; + echo " \n"; + switch (htmlspecialchars($pconfig['caller-id-in-from'])) { + case "true": + echo " \n"; + echo " \n"; + break; + case "false": + echo " \n"; + echo " \n"; + + break; + default: + echo " \n"; + echo " \n"; + } + echo " \n"; + ?> +
Supress-cng + \n"; + echo " \n"; + switch (htmlspecialchars($pconfig['supress-cng'])) { + case "true": + echo " \n"; + echo " \n"; + break; + case "false": + echo " \n"; + echo " \n"; + + break; + default: + echo " \n"; + echo " \n"; + } + echo " \n"; + ?> +
+ + + + + + + + + + + + + + + + + + + + + + +
Enabled + \n"; + echo " \n"; + switch (htmlspecialchars($pconfig['enabled'])) { + case "true": + echo " \n"; + echo " \n"; + break; + case "false": + echo " \n"; + echo " \n"; + + break; + default: + echo " \n"; + echo " \n"; + } + echo " \n"; + ?> +
Dialplan Expression + \n"; + ?> +
+ + +
+ Shortcut to create the outbound dialplan entries for this Gateway. The entries are saved to and edited from the 'Dialplan' tab. +
Gateway Description + +
Enter the description of the gateway here.
  + + + + + +
+ + +
+
+
+
+
+
+ +
-- cgit v1.2.3