From e9e7d50186e881340e02d4ad92fb3d7b05c495d2 Mon Sep 17 00:00:00 2001 From: Matthew Grooms Date: Tue, 2 Sep 2008 16:46:13 +0000 Subject: Modify all the default configuration files to ensure the versions match. While in globals.inc, remove the easyrsa path and do some whitespace cleanup. --- cf/conf/config.xml | 2 +- conf.default/config.xml | 2 +- etc/inc/globals.inc | 71 ++++++++++++++++++++++++------------------------- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/cf/conf/config.xml b/cf/conf/config.xml index 85a38d6..719f16f 100644 --- a/cf/conf/config.xml +++ b/cf/conf/config.xml @@ -1,7 +1,7 @@ - 5.1 + 5.2 nervecenter diff --git a/conf.default/config.xml b/conf.default/config.xml index 73bb73c..f4e372b 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -1,7 +1,7 @@ - 5.0 + 5.2 nervecenter diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 66128e0..9e0d1f0 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -33,52 +33,51 @@ $g = array( "upload_path" => "/root", - "dhcpd_chroot_path" => "/var/dhcpd", - "varrun_path" => "/var/run", - "varetc_path" => "/var/etc", - "vardb_path" => "/var/db", - "varlog_path" => "/var/log", - "etc_path" => "/etc", - "tmp_path" => "/tmp", - "conf_path" => "/conf", - "ftmp_path" => "/ftmp", - "conf_default_path" => "/conf.default", - "cf_path" => "/cf", - "cf_conf_path" => "/cf/conf", - "www_path" => "/usr/local/www", - "xml_rootobj" => "pfsense", - "admin_group" => "admins", - "easyrsapath" => "/usr/local/share/openvpn/certificates", + "dhcpd_chroot_path" => "/var/dhcpd", + "varrun_path" => "/var/run", + "varetc_path" => "/var/etc", + "vardb_path" => "/var/db", + "varlog_path" => "/var/log", + "etc_path" => "/etc", + "tmp_path" => "/tmp", + "conf_path" => "/conf", + "ftmp_path" => "/ftmp", + "conf_default_path" => "/conf.default", + "cf_path" => "/cf", + "cf_conf_path" => "/cf/conf", + "www_path" => "/usr/local/www", + "xml_rootobj" => "pfsense", + "admin_group" => "admins", "product_name" => "pfSense", "product_copyright" => "BSD Perimeter LLC", "product_copyright_years" => "2005, 2006, 2007, 2008", - "product_website" => "www.pfsense.com", - "product_email" => "coreteam@pfsense.com", - "pppoe_interface" => "ng0", - "n_pptp_units" => 16, /* this value can be overriden in pptp->n_pptp_units */ - "pptp_subnet" => 28, /* this value can be overriden in pptp->pptp_subnet */ - "n_pppoe_units" => 16, /* this value can be overriden in pppoe->n_pppoe_units */ - "pppoe_subnet" => 28, /* this value can be overriden in pppoe->pppoe_subnet */ - "debug" => false, - "latest_config" => "5.2", - "nopkg_platforms" => array("cdrom"), + "product_website" => "www.pfsense.com", + "product_email" => "coreteam@pfsense.com", + "pppoe_interface" => "ng0", + "n_pptp_units" => 16, /* this value can be overriden in pptp->n_pptp_units */ + "pptp_subnet" => 28, /* this value can be overriden in pptp->pptp_subnet */ + "n_pppoe_units" => 16, /* this value can be overriden in pppoe->n_pppoe_units */ + "pppoe_subnet" => 28, /* this value can be overriden in pppoe->pppoe_subnet */ + "debug" => false, + "latest_config" => "5.2", + "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "115", "minimum_ram_warning_text" => "128 megabytes", "minimum_nic_count" => "1", "minimum_nic_count_text" => "*AT LEAST* 1", "wan_interface_name" => "wan", - "nopccard_platforms" => array("wrap", "net48xx"), - "xmlrpcbaseurl" => "www.pfsense.com", - "captiveportal_path" => "/usr/local/captiveportal", - "captiveportal_element_path" => "/var/db/cpelements", - "captiveportal_element_sizelimit" => 262144, - "xmlrpcpath" => "/pfSense/xmlrpc.php", - "embeddedbootupslice" => "/dev/ad0a", + "nopccard_platforms" => array("wrap", "net48xx"), + "xmlrpcbaseurl" => "www.pfsense.com", + "captiveportal_path" => "/usr/local/captiveportal", + "captiveportal_element_path" => "/var/db/cpelements", + "captiveportal_element_sizelimit" => 262144, + "xmlrpcpath" => "/pfSense/xmlrpc.php", + "embeddedbootupslice" => "/dev/ad0a", "update_url" => "http://updates.pfSense.com/_updaters", "update_manifest" => "http://updates.pfSense.com/manifest", - "wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|wai|iwi|awi|wlan|rum)/", - "vlan_native_supp" => array("bce", "bge", "bfe", "cxgb", "dc", "em", "fxp", "gem", "hme", "ixgb", "msk", "nge", "re", "rl", "sis", "ste", "stge", "ti", "tl", "tx", "txp", "vge", "vr", "xl"), - "vlan_long_frame" => array("vge", "bfe", "bge", "dc", "em", "fxp", "gem", "hme", "ixgb", "le", "nge", "re", "rl", "sis", "sk", "ste", "ti", "tl", "tx", "txp", "vr", "xl") + "wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|wai|iwi|awi|wlan|rum)/", + "vlan_native_supp" => array("bce", "bge", "bfe", "cxgb", "dc", "em", "fxp", "gem", "hme", "ixgb", "msk", "nge", "re", "rl", "sis", "ste", "stge", "ti", "tl", "tx", "txp", "vge", "vr", "xl"), + "vlan_long_frame" => array("vge", "bfe", "bge", "dc", "em", "fxp", "gem", "hme", "ixgb", "le", "nge", "re", "rl", "sis", "sk", "ste", "ti", "tl", "tx", "txp", "vr", "xl") ); /* IP TOS flags */ -- cgit v1.1