Migration of several settings to new format

1 files changed, 20 insertions, 22 deletions

diff --git a/default.prf b/default.prf
index 80b83667..2e80f8da 100644
--- a/default.prf
+++ b/default.prf
@@ -2,8 +2,10 @@
 #
 # Lynis - Scan Profile (default)
 #
-# This is the default profile and contains default values. You are encouraged to
-# copy this file and use it's base for custom audit profiles.
+# This is the default profile and contains default values.
+#
+# Do not change this file directly. Instead copy over the settings you need
+# to a new file (custom.prf) and keep it tidy.
 #
 # All empty lines or with the # prefix will be skipped
 #
@@ -12,16 +14,11 @@
 #
 #################################################################################
 
-[configuration]
 # Profile name, will be used as title/description
-config:profile_name:Default Audit Template:
+profile-name=Default Audit Template
 
 # Number of seconds to pause between every test (0 is no pause)
-config:pause_between_tests:0:
-
-# Show inline tips about the tool
-config:show_tool_tips:1:
-
+pause-between-tests=0
 
 #################################################################################
 #
@@ -35,22 +32,19 @@ config:show_tool_tips:1:
 # Description: How deep the audit should be
 # Values: light, normal or full (default)
 #
-# config:test_scan_mode:full:
-
+test-scan-mode=full
 
 # ** Skip one or more specific tests **
 # (always ignores scan mode and will make sure the test is skipped)
 #
 # config:test_skip_always:AAAA-1234 BBBB-5678 CCCC-9012:
 
-
 # ** Define machine role **
 #
 # Description: defines the role of the system
 # Values: desktop, server (default)
 #
-#config:machine_role:server:
-
+machine-role=server
 
 #################################################################################
 #
@@ -202,7 +196,7 @@ openldap:slapd.conf:owner:ldap-root:
 #################################################################################
 
 # Locations where to search for SSL certificates
-ssl:certificates:/etc/letsencrypt /etc/pki /etc/ssl /usr/local/share/ca-certificates /var/www /srv/www:
+ssl-certificate-paths=/etc/letsencrypt:/etc/pki:/etc/ssl:/usr/local/share/ca-certificates:/var/www:/srv/www
 
 
 #################################################################################
@@ -352,7 +346,7 @@ permdir:/root/.ssh:rwx------:root:-:WARN:
 #################################################################################
 
 # Add your Lynis Enterprise license key here
-#config:license_key:[Your license key]:
+license-key=
 
 # Compressed uploads (set to zero when errors with uploading occur)
 #config:upload_compressed:1:
@@ -379,23 +373,27 @@ permdir:/root/.ssh:rwx------:root:-:WARN:
 # Define which compliance standards are audited and reported on. Disable this if not required.
 config:compliance_standards:cis,hipaa,iso27001,pci-dss:
 
+
 #################################################################################
 #
 # Configuration (New Style)
 #
 #################################################################################
 
-# Show non-zero exit code when warnings are found (default: no)
-#error-on-warnings=yes
+# Show non-zero exit code when warnings are found
+error-on-warnings=no
 
 # Use Lynis in your own language (available languages: en fr nl)
-#language=es
+language=en
 
 # Enable quick mode (no waiting for keypresses, same as --quick option)
-#quick=yes
+quick=no
+
+# Show inline tips about the tool
+show-tool-tips=yes
 
-# Skip plugins (default: no)
-#skip-plugins=yes
+# Skip plugins
+skip-plugins=no
 
 # Skip a test (one per line)
 #skip-test=SSH-7408