fix: Ensure rrdtool web settings aren't overwrote by defaults (#6698)

* fix for web settings

* revert db config

* revert description

* ensure rrdtool path is set

html/pages/settings/external.inc.php

@@ -61,7 +61,6 @@ $rrdtool_conf = array(
     ),
     array('name'               => 'rrd.heartbeat',
         'descr'                => 'Change the rrd heartbeat value (default 600)',
-
         'type'                 => 'text',
     ),
 );

includes/defaults.inc.php

@@ -42,8 +42,6 @@ $config['db_socket']             = null;
 $config['own_hostname'] = 'localhost';
 
 // Location of executables
-$config['rrdtool']                  = '/usr/bin/rrdtool';
-$config['rrdtool_version']          = 1.4; // Doesn't need to contain minor numbers.
 $config['fping']                    = '/usr/bin/fping';
 $config['fping6']                   = 'fping6';
 $config['fping_options']['retries'] = 3;

includes/process_config.inc.php

@@ -26,3 +26,11 @@
 if (empty($config['email_from'])) {
     $config['email_from'] = '"' . $config['project_name'] . '" <' . $config['email_user'] . '@' . php_uname('n') . '>';
 }
+
+// We need rrdtool so ensure it's set
+if (empty($config['rrdtool'])) {
+    $config['rrdtool'] = '/usr/bin/rrdtool';
+}
+if (empty($config['rrdtool_verion'])) {
+    $config['rrdtool_version'] = 1.4;
+}