diff options
Diffstat (limited to 'src/etc/inc/globals.inc')
| -rw-r--r-- | src/etc/inc/globals.inc | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index cadb013..377fcd5 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -3,7 +3,7 @@ * globals.inc * * part of pfSense (https://www.pfsense.org) - * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC + * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate) * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -54,7 +54,7 @@ $g = array( "admin_group" => "admins", "product_name" => "pfSense", "product_version" => trim(file_get_contents("/etc/version"), " \n"), - "product_copyright" => "Electric Sheep Fencing LLC", + "product_copyright" => "Rubicon Communications, LLC (Netgate)", "product_copyright_url" => "https://pfsense.org/license", "product_copyright_years" => "2004 - ".date("Y"), "product_website" => "www.pfsense.org", @@ -101,27 +101,12 @@ if (is_numeric($g["product_version_patch"]) && $g["product_version_patch"] != "0 } if (file_exists("/etc/platform")) { - $arch = php_uname("m"); - - if (strstr($g['product_version'], "-RELEASE")) { - /* This is only necessary for RELEASE */ - $arch = ($arch == "i386") ? "" : '/' . $arch; - /* Full installs and NanoBSD use the same update directory and manifest in 2.x */ - $g['update_url']="https://updates.pfsense.org/_updaters{$arch}"; - $g['update_manifest']="https://updates.pfsense.org/manifest"; - } else { - /* Full installs and NanoBSD use the same update directory and manifest in 2.x */ - $g['update_url']="https://snapshots.pfsense.org/FreeBSD_releng/10.1/{$arch}/pfSense_HEAD/.updaters/"; - $g['update_manifest']="https://updates.pfSense.org/manifest"; - } - + $g['update_manifest']="https://updates.pfsense.org/manifest"; $g['platform'] = trim(file_get_contents("/etc/platform")); if ($g['platform'] == "nanobsd") { - $g['firmware_update_text']="pfSense-*.img.gz"; $g['hidebackupbeforeupgrade'] = true; $g['default_config_backup_count'] = 5; } else { - $g['firmware_update_text']="pfSense-*.tgz"; $g['default_config_backup_count'] = 30; } } else { |
