diff --git a/sysutils/pfSense-pkg-nut/files/etc/inc/priv/nut.priv.inc b/sysutils/pfSense-pkg-nut/files/etc/inc/priv/nut.priv.inc old mode 100755 new mode 100644 index 5132dc7bc985..131586b5a037 --- a/sysutils/pfSense-pkg-nut/files/etc/inc/priv/nut.priv.inc +++ b/sysutils/pfSense-pkg-nut/files/etc/inc/priv/nut.priv.inc @@ -1,8 +1,10 @@ diff --git a/sysutils/pfSense-pkg-nut/files/pkg-deinstall.in b/sysutils/pfSense-pkg-nut/files/pkg-deinstall.in old mode 100755 new mode 100644 diff --git a/sysutils/pfSense-pkg-nut/files/pkg-install.in b/sysutils/pfSense-pkg-nut/files/pkg-install.in old mode 100755 new mode 100644 diff --git a/sysutils/pfSense-pkg-nut/files/usr/local/pkg/nut.xml b/sysutils/pfSense-pkg-nut/files/usr/local/pkg/nut.xml old mode 100755 new mode 100644 index b5fbe745e3f5..b515ff1c0f74 --- a/sysutils/pfSense-pkg-nut/files/usr/local/pkg/nut.xml +++ b/sysutils/pfSense-pkg-nut/files/usr/local/pkg/nut.xml @@ -11,6 +11,7 @@ part of pfSense (https://www.pfSense.org/) Copyright (C) 2009-2015 ESF, LLC Copyright (C) 2016 Sander Peterse + Copyright (C) 2016 Denny Page All rights reserved. */ /* ====================================================================================== */ @@ -27,7 +28,7 @@ documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, @@ -42,16 +43,15 @@ ]]> nut - 2.3.0 - Services: NUT + 2.7.4 + Services: UPS Change - /ups_status.php - /usr/local/pkg/nut.inc + /usr/local/pkg/nut/nut.inc - NUT - Set Network UPS Tools settings. + UPS + Network UPS Tools status
Services
- /ups_status.php + nut_status.php nut @@ -59,627 +59,10 @@ upsmon UPS monitoring daemon - - - UPS Status - /ups_status.php - - - NUT Settings - /pkg_edit.php?xml=nut.xml - - - - enabled - - - General Settings - listtopic - - - UPS Monitoring - monitor - select - - - - - - - - - Power Down Instead of Halt - powerdown - checkbox - - - ups.conf options - custom_upsconf - Write there any custom options for ups.conf. All options must be separated by semi-colons (;). - textarea - 65 - 5 - - - - upsd.conf options - custom_upsdconf - Write there any custom options for upsd.conf. All options must be separated by semi-colons (;). - textarea - 65 - 5 - - - - upsd.users options - custom_upsdusers - Write there any custom options for upsd.users. All options must be separated by semi-colons (;). - textarea - 65 - 5 - - - - upsmon.conf options - custom_upsmonconf - Write there any custom options for upsmon.conf. All options must be separated by semi-colons (;). - textarea - 65 - 5 - - - - Remote Access Settings - Used for Local and SNMP Types to allow access - listtopic - - - Remote Access Address - NOTE: Previous versions of NUT supported internal ACLs, these no longer work. The new default is to bind to localhost ONLY - you should add NAT rules for the NUT port (3493) to allow remote access. This field no longer has any effect, but was left intact for reference. - allowaddr - input - - - Remote Access User - allowuser - input - - - Remote Acces Password - allowpass - password - - - Local UPS Settings - listtopic - - - Local UPS Name - name - input - - - Local UPS Model - driver - If generic or cable specified in parenthesis you need to select the appropriate option below. - select - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Local UPS Port - port - select - - - - - - Local UPS Generic Type - upstype - select - - - - - - - - - - - - - Local UPS Cable Type - cable - select - - - - - - - - Remote SNMP UPS Settings - listtopic - - - SNMP UPS Name - snmpname - input - - - SNMP UPS Address - snmpaddr - input - - - SNMP UPS Community (Default: public) - snmpcommunity - input - - - SNMP UPS Version (Default: v2c) - snmpversion - select - - - - - - - SNMP UPS MIB (Default: IETF) - snmpmib - select - - - - - - - - - - - SNMP UPS Polling Freq (Default: 30) - snmpfreq - input - - - Disable transfer OIDs (use on APCC Symmetras) - snmpdisabletransfer - checkbox - - - Remote NUT UPS Settings - listtopic - - - Remote NUT UPS Name - remotename - input - - - Remote NUT UPS Address - remoteaddr - input - - - Remote NUT UPS User - remoteuser - input - - - Remote NUT UPS Password - remotepass - password - - - - before_form_nut($pkg); - - - validate_form_nut($_POST, $input_errors); - - sync_package_nut(); + nut_sync_config(); - deinstall_package_nut(); + nut_deinstall_command(); diff --git a/sysutils/pfSense-pkg-nut/files/usr/local/share/pfSense-pkg-nut/info.xml b/sysutils/pfSense-pkg-nut/files/usr/local/share/pfSense-pkg-nut/info.xml old mode 100755 new mode 100644 index 24cc29534b89..4eecd612c020 --- a/sysutils/pfSense-pkg-nut/files/usr/local/share/pfSense-pkg-nut/info.xml +++ b/sysutils/pfSense-pkg-nut/files/usr/local/share/pfSense-pkg-nut/info.xml @@ -5,6 +5,7 @@ https://forum.pfsense.org/index.php?topic=115349.0 http://networkupstools.org/ + https://forum.pfsense.org/index.php?topic=115349.0 %%PKGVERSION%% nut.xml diff --git a/sysutils/pfSense-pkg-nut/files/usr/local/www/shortcuts/pkg_nut.inc b/sysutils/pfSense-pkg-nut/files/usr/local/www/shortcuts/pkg_nut.inc old mode 100755 new mode 100644 index d0525f68f0ce..ee6375dbcc24 --- a/sysutils/pfSense-pkg-nut/files/usr/local/www/shortcuts/pkg_nut.inc +++ b/sysutils/pfSense-pkg-nut/files/usr/local/www/shortcuts/pkg_nut.inc @@ -1,36 +1,9 @@ \ No newline at end of file +?> diff --git a/sysutils/pfSense-pkg-nut/pkg-plist b/sysutils/pfSense-pkg-nut/pkg-plist index c25fca5d7f24..fa3a42a4ab9e 100755 --- a/sysutils/pfSense-pkg-nut/pkg-plist +++ b/sysutils/pfSense-pkg-nut/pkg-plist @@ -1,10 +1,11 @@ pkg/nut.xml -pkg/nut.inc +pkg/nut/nut.inc +pkg/nut/nut_email.php /etc/inc/priv/nut.priv.inc -www/ups_status.php +www/nut_settings.php +www/nut_status.php www/shortcuts/pkg_nut.inc -www/widgets/javascript/ups_status.js -www/widgets/widgets/ups_status.widget.php -www/widgets/include/ups_status.inc +www/widgets/include/nut_status.inc +www/widgets/widgets/nut_status.widget.php %%DATADIR%%/info.xml -@dir /etc/inc/priv \ No newline at end of file +@dir /etc/inc/priv