From 6b779c3178b6b0d2c1fa6d1c92f9517f3fd8264a Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Thu, 30 Sep 2021 02:42:03 -0500
Subject: [PATCH] Cleanup config.php.default (#13297)

Comment out all lines.  This allows setting in webui and lnms config:set
---
 config.php.default           | 12 ++++++------
 misc/config_definitions.json | 33 ++++++++-------------------------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/config.php.default b/config.php.default
index b8aacd52db..2d4c76ae0b 100644
--- a/config.php.default
+++ b/config.php.default
@@ -4,7 +4,7 @@
 
 // This is the user LibreNMS will run as
 //Please ensure this user is created and has the correct permissions to your install
-$config['user'] = 'librenms';
+#$config['user'] = 'librenms';
 
 ### This should *only* be set if you want to *force* a particular hostname/port
 ### It will prevent the web interface being usable form any other hostname
@@ -15,10 +15,10 @@ $config['user'] = 'librenms';
 #$config['rrdcached']    = "unix:/var/run/rrdcached.sock";
 
 ### Default community
-$config['snmp']['community'] = array('public');
+#$config['snmp']['community'] = array('public');
 
 ### Authentication Model
-$config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth
+#$config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth
 #$config['http_auth_guest'] = "guest"; # remember to configure this user if you use http-auth
 
 ### List of RFC1918 networks to allow scanning-based discovery
@@ -30,7 +30,7 @@ $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth
 #$config['update'] = 0;
 
 # Number in days of how long to keep old rrd files. 0 disables this feature
-$config['rrd_purge'] = 0;
+#$config['rrd_purge'] = 0;
 
 # Uncomment to submit callback stats via proxy
 #$config['callback_proxy'] = "hostname:port";
@@ -39,7 +39,7 @@ $config['rrd_purge'] = 0;
 #$config['default_port_association_mode'] = 'ifIndex';
 
 # Enable the in-built billing extension
-$config['enable_billing'] = 1;
+#$config['enable_billing'] = 1;
 
 # Enable the in-built services support (Nagios plugins)
-$config['show_services'] = 1;
+#$config['show_services'] = 1;
diff --git a/misc/config_definitions.json b/misc/config_definitions.json
index 901c06312b..c5b8a894b7 100644
--- a/misc/config_definitions.json
+++ b/misc/config_definitions.json
@@ -833,31 +833,6 @@
             "default": "H:i:s",
             "type": "text"
         },
-        "db_name": {
-            "default": "librenms",
-            "hidden": true,
-            "type": "boolean"
-        },
-        "db_pass": {
-            "default": null,
-            "hidden": true,
-            "type": "boolean"
-        },
-        "db_port": {
-            "default": 3306,
-            "hidden": true,
-            "type": "boolean"
-        },
-        "db_socket": {
-            "default": null,
-            "hidden": true,
-            "type": "boolean"
-        },
-        "db_user": {
-            "default": "librenms",
-            "hidden": true,
-            "type": "boolean"
-        },
         "debug.run_trace": {
             "default": false,
             "type": "boolean"
@@ -3442,6 +3417,10 @@
                 "other": "Other"
             }
         },
+        "group": {
+            "type": "text",
+            "default": "librenms"
+        },
         "gui.network-map.style": {
             "default": "new",
             "type": "select",
@@ -5397,6 +5376,10 @@
                 "value": "integer|min:0"
             }
         },
+        "user": {
+            "type": "text",
+            "default": "librenms"
+        },
         "vertical_summary": {
             "default": 0,
             "type": "integer"