diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-03 11:30:34 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-03 11:31:31 -0400 |
| commit | d9a273cf83ed999ac73f7df8bf21f8faec31989f (patch) | |
| tree | 9486d84e84b4c0a31ced540774343bb53d48905d /config | |
| parent | e87217276b6c92072b2070011159809a0a8cc224 (diff) | |
| download | pfsense-packages-d9a273cf83ed999ac73f7df8bf21f8faec31989f.tar.gz pfsense-packages-d9a273cf83ed999ac73f7df8bf21f8faec31989f.tar.bz2 pfsense-packages-d9a273cf83ed999ac73f7df8bf21f8faec31989f.zip | |
Reorganize the nut settings so it's more obvious that the "Remote access" settings can be used for both Local and SNMP UPS types.
Diffstat (limited to 'config')
| -rw-r--r-- | config/nut/nut.xml | 90 |
1 files changed, 47 insertions, 43 deletions
diff --git a/config/nut/nut.xml b/config/nut/nut.xml index 5be4ace6..b1fb705a 100644 --- a/config/nut/nut.xml +++ b/config/nut/nut.xml @@ -103,13 +103,13 @@ <value>local</value> </option> <option> - <name>Remote NUT UPS</name> - <value>remote</value> - </option> - <option> <name>Remote SNMP UPS</name> <value>snmp</value> </option> + <option> + <name>Remote NUT UPS</name> + <value>remote</value> + </option> </options> </field> <field> @@ -118,6 +118,25 @@ <type>checkbox</type> </field> <field> + <name>Remote Access Settings - Used for Local and SNMP Types to allow access</name> + <type>listtopic</type> + </field> + <field> + <fielddescr>Remote Access Address <br>(ex: 192.168.1.0/24)</fielddescr> + <fieldname>allowaddr</fieldname> + <type>input</type> + </field> + <field> + <fielddescr>Remote Access User</fielddescr> + <fieldname>allowuser</fieldname> + <type>input</type> + </field> + <field> + <fielddescr>Remote Acces Password</fielddescr> + <fieldname>allowpass</fieldname> + <type>password</type> + </field> + <field> <name>Local UPS Settings</name> <type>listtopic</type> </field> @@ -521,45 +540,6 @@ </options> </field> <field> - <fielddescr>Local Remote Access Address <br>(ex: 192.168.1.0/24)</fielddescr> - <fieldname>allowaddr</fieldname> - <type>input</type> - </field> - <field> - <fielddescr>Local Remote Access User</fielddescr> - <fieldname>allowuser</fieldname> - <type>input</type> - </field> - <field> - <fielddescr>Local Remote Acces Password</fielddescr> - <fieldname>allowpass</fieldname> - <type>password</type> - </field> - <field> - <name>Remote NUT UPS Settings</name> - <type>listtopic</type> - </field> - <field> - <fielddescr><strong>Remote UPS Name</strong></fielddescr> - <fieldname>remotename</fieldname> - <type>input</type> - </field> - <field> - <fielddescr><strong>Remote UPS Address</strong> <br>(ex: 192.168.1.10)</fielddescr> - <fieldname>remoteaddr</fieldname> - <type>input</type> - </field> - <field> - <fielddescr><strong>Remote UPS User</strong></fielddescr> - <fieldname>remoteuser</fieldname> - <type>input</type> - </field> - <field> - <fielddescr><strong>Remote UPS Password</strong></fielddescr> - <fieldname>remotepass</fieldname> - <type>password</type> - </field> - <field> <name>Remote SNMP UPS Settings</name> <type>listtopic</type> </field> @@ -630,6 +610,30 @@ <fieldname>snmpdisabletransfer</fieldname> <type>checkbox</type> </field> + <field> + <name>Remote NUT UPS Settings</name> + <type>listtopic</type> + </field> + <field> + <fielddescr><strong>Remote NUT UPS Name</strong></fielddescr> + <fieldname>remotename</fieldname> + <type>input</type> + </field> + <field> + <fielddescr><strong>Remote NUT UPS Address</strong> <br>(ex: 192.168.1.10)</fielddescr> + <fieldname>remoteaddr</fieldname> + <type>input</type> + </field> + <field> + <fielddescr><strong>Remote NUT UPS User</strong></fielddescr> + <fieldname>remoteuser</fieldname> + <type>input</type> + </field> + <field> + <fielddescr><strong>Remote NUT UPS Password</strong></fielddescr> + <fieldname>remotepass</fieldname> + <type>password</type> + </field> </fields> <custom_php_command_before_form> before_form_nut(&$pkg); |