Merge pull request #730 from SunStroke74/patch-1

2 files changed, 55 insertions, 0 deletions

diff --git a/config/nut/nut.inc b/config/nut/nut.inc
index 5a61d41a..aa0bbe13 100644
--- a/config/nut/nut.inc
+++ b/config/nut/nut.inc
@@ -185,6 +185,7 @@
 		$remoteuser = nut_config('remoteuser');
 		$remotepass = nut_config('remotepass');
 		$shutdownflag  = (nut_config('powerdown') == 'on') ? '-p' : '-h';
+		$custom_upsmonconf = str_replace(";", "\n", nut_config('custom_upsmonconf'));
 
 		if(!($remotename && $remoteaddr && $remoteuser && $remotepass))
 			return false;
@@ -195,6 +196,7 @@ MONITOR {$remotename}@{$remoteaddr} 1 {$remoteuser} {$remotepass} slave
 MINSUPPLIES 1
 SHUTDOWNCMD "/sbin/shutdown {$shutdownflag} +0"
 POWERDOWNFLAG /etc/killpower
+{$custom_upsmonconf}
 EOD;
 	
 		$stop = <<<EOD
@@ -233,6 +235,10 @@ EOD;
 		$allowuser = nut_config('allowuser');
 		$allowpass = nut_config('allowpass');
 		$shutdownflag  = (nut_config('powerdown') == 'on') ? '-p' : '-h';
+		$custom_upsconf = str_replace(";", "\n", nut_config('custom_upsconf'));
+		$custom_upsdconf = str_replace(";", "\n", nut_config('custom_upsdconf'));
+		$custom_upsdusers = str_replace(";", "\n", nut_config('custom_upsdusers'));
+		$custom_upsmonconf = str_replace(";", "\n", nut_config('custom_upsmonconf'));
 
 
 		if(!($name && $driver && $port))
@@ -265,10 +271,12 @@ EOD;
 			$ups_conf .= "cable={$cable}\n";
 		if($upstype)
 			$ups_conf .= "upstype={$upstype}\n";
+		$ups_conf .= "{$custom_upsconf}";
 
 		/* upsd.conf */
 		$upsd_conf = "LISTEN 127.0.0.1\n";
 		$upsd_conf .= "LISTEN ::1\n";
+		$upsd_conf .= "{$custom_upsdconf}";
 
 		$password = uniqid("nut");
 		/* upsd.users */
@@ -280,6 +288,7 @@ EOD;
 			$upsd_users .= "password = $allowpass\n";
 			$upsd_users .= "upsmon master\n";
 		}
+		$upsd_users .= "{$custom_upsdusers}";
 
 		if ($pfs_version == "2.1")
 			$upsdrvctl = "/usr/local/libexec/nut/upsdrvctl";
@@ -292,6 +301,7 @@ MONITOR {$name}@localhost 1 monuser {$password} master
 MINSUPPLIES 1
 SHUTDOWNCMD "/sbin/shutdown {$shutdownflag} +0"
 POWERDOWNFLAG /etc/killpower
+{$custom_upsmonconf}
 EOD;
 
 		$stop = <<<EOD
@@ -366,6 +376,10 @@ EOD;
 		$snmpdisabletransfer = (nut_config('snmpdisabletransfer') == 'on');
 		$allowuser = nut_config('allowuser');
 		$allowpass = nut_config('allowpass');
+		$custom_upsconf = str_replace(";", "\n", nut_config('custom_upsconf'));
+		$custom_upsdconf = str_replace(";", "\n", nut_config('custom_upsdconf'));
+		$custom_upsdusers = str_replace(";", "\n", nut_config('custom_upsdusers'));
+		$custom_upsmonconf = str_replace(";", "\n", nut_config('custom_upsmonconf'));
 
 		if(!($name && $driver && $port))
 			return false;
@@ -386,10 +400,12 @@ EOD;
 			$ups_conf .= "pollfreq={$snmpfreq}\n";
 		if($snmpdisabletransfer)
 			$ups_conf .= "notransferoids=true\n";
+		$ups_conf .= "{$custom_upsconf}";
 
 		/* upsd.conf */
 		$upsd_conf = "LISTEN 127.0.0.1\n";
 		$upsd_conf .= "LISTEN ::1\n";
+		$upsd_conf .= "{$custom_upsdconf}";
 
 		$password = uniqid("nut");
 		/* upsd.users */
@@ -401,6 +417,7 @@ EOD;
 			$upsd_users .= "password = $allowpass\n";
 			$upsd_users .= "upsmon master\n";
 		}
+		$upsd_users .= "{$custom_upsdusers}";
 
 		if ($pfs_version == "2.1")
 			$upsdrvctl = "/usr/local/libexec/nut/upsdrvctl";
@@ -413,6 +430,7 @@ MONITOR {$name}@localhost 1 monuser {$password} master
 MINSUPPLIES 1
 SHUTDOWNCMD "/sbin/shutdown {$shutdownflag} +0"
 POWERDOWNFLAG /etc/killpower
+{$custom_upsmonconf}
 EOD;
 
 		$stop = <<<EOD
diff --git a/config/nut/nut.xml b/config/nut/nut.xml
index 210d7b82..d1496a16 100644
--- a/config/nut/nut.xml
+++ b/config/nut/nut.xml
@@ -84,6 +84,7 @@
 	    <chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/nut/status_nut.php</item>
 	</additional_files_needed>
+	<advanced_options>enabled</advanced_options>
 	<fields>
 		<field>
 			<name>General Settings</name>
@@ -119,6 +120,42 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>ups.conf options</fielddescr>
+			<fieldname>custom_upsconf</fieldname>
+			<description>Write there any custom options for ups.conf. All options must be separated by semi-colons (;).</description>
+			<type>textarea</type>
+			<cols>65</cols>
+			<rows>5</rows>
+			<advancedfield/>
+		</field>
+		<field>
+			<fielddescr>upsd.conf options</fielddescr>
+			<fieldname>custom_upsdconf</fieldname>
+			<description>Write there any custom options for upsd.conf. All options must be separated by semi-colons (;).</description>
+			<type>textarea</type>
+			<cols>65</cols>
+			<rows>5</rows>
+			<advancedfield/>
+		</field>
+		<field>
+			<fielddescr>upsd.users options</fielddescr>
+			<fieldname>custom_upsdusers</fieldname>
+			<description>Write there any custom options for upsd.users. All options must be separated by semi-colons (;).</description>
+			<type>textarea</type>
+			<cols>65</cols>
+			<rows>5</rows>
+			<advancedfield/>
+		</field>
+		<field>
+			<fielddescr>upsmon.conf options</fielddescr>
+			<fieldname>custom_upsmonconf</fieldname>
+			<description>Write there any custom options for upsmon.conf. All options must be separated by semi-colons (;).</description>
+			<type>textarea</type>
+			<cols>65</cols>
+			<rows>5</rows>
+			<advancedfield/>
+		</field>		
+		<field>
 			<name>Remote Access Settings - Used for Local and SNMP Types to allow access</name>
 			<type>listtopic</type>
 		</field>