diff --git a/plist b/plist index f06ef22cd..66f2d8b85 100644 --- a/plist +++ b/plist @@ -308,6 +308,7 @@ /usr/local/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php /usr/local/opnsense/contrib/simplepie/phpunit.xml.dist /usr/local/opnsense/contrib/tzdata/iso3166.tab +/usr/local/opnsense/firmware-product /usr/local/opnsense/mvc/app/cache/README /usr/local/opnsense/mvc/app/config/config.php /usr/local/opnsense/mvc/app/config/loader.php diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 20dd0cd6d..528a679d0 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -29,23 +29,12 @@ POSSIBILITY OF SUCH DAMAGE. */ -openlog('opnsense', LOG_ODELAY, LOG_USER); -register_shutdown_function('closelog'); - global $g; /* XXX make this a getter function for traceability */ -$g = array( - 'factory_shipped_username' => 'root', - 'factory_shipped_password' => 'opnsense', - 'dhcpd_chroot_path' => '/var/dhcpd', - 'unbound_chroot_path' => '/var/unbound', - 'product_name' => 'OPNsense', - 'product_website' => 'https://opnsense.org/', - 'product_email' => 'project@opnsense.org', - 'product_copyright_owner' => 'Deciso B.V.', - 'product_copyright_years' => '2014-2017', - 'product_copyright_url' => 'https://www.deciso.com/', -); +$g = json_decode(file_get_contents('/usr/local/opnsense/firmware-product'), true); + +openlog($g['product_id'], LOG_ODELAY, LOG_USER); +register_shutdown_function('closelog'); require_once("xmlparse.inc"); require_once("crypt.inc"); diff --git a/src/opnsense/firmware-product b/src/opnsense/firmware-product new file mode 100644 index 000000000..fe634395f --- /dev/null +++ b/src/opnsense/firmware-product @@ -0,0 +1,13 @@ +{ + "dhcpd_chroot_path": "/var/dhcpd", + "factory_shipped_password": "opnsense", + "factory_shipped_username": "root", + "product_copyright_owner": "Deciso B.V.", + "product_copyright_url": "https://www.deciso.com/", + "product_copyright_years": "2014-2017", + "product_email": "project@opnsense.org", + "product_id": "opnsense", + "product_name": "OPNsense", + "product_website": "https://opnsense.org/", + "unbound_chroot_path": "/var/unbound" +}