Migrate to new options, including skip-plugins

1 files changed, 59 insertions, 61 deletions

diff --git a/default.prf b/default.prf
index 2e80f8da..ddd9eafd 100644
--- a/default.prf
+++ b/default.prf
@@ -1,11 +1,24 @@
 #################################################################################
 #
+#
 # Lynis - Scan Profile (default)
 #
 # 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.
+#
+#################################################################################
+#
+#
+# SUGGESTION
+# ----------
+#
+# Do NOT make changes to this file, instead copy your preferred settings to
+# custom.prf and put it in the same directory as default.prf
+#
+# To discover where your profiles are located: lynis show profiles
+#
+#
+#################################################################################
 #
 # All empty lines or with the # prefix will be skipped
 #
@@ -14,37 +27,53 @@
 #
 #################################################################################
 
+
+# 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=en
+
+# Defines the role of the system (desktop, server)
+machine-role=server
+
 # Profile name, will be used as title/description
 profile-name=Default Audit Template
 
 # Number of seconds to pause between every test (0 is no pause)
 pause-between-tests=0
 
-#################################################################################
-#
-# Testing options
-# ---------------
-#
-#################################################################################
+# Enable quick mode (no waiting for keypresses, same as --quick option)
+quick=no
 
-# ** Scan type **
-#
-# Description: How deep the audit should be
-# Values: light, normal or full (default)
-#
+# Show inline tips about the tool
+show-tool-tips=yes
+
+# Skip plugins
+skip-plugins=no
+
+# Skip a test (one per line)
+#skip-test=SSH-7408
+
+# Skip a particular option within a test (when applicable)
+#skip-test=SSH-7408:loglevel
+#skip-test=SSH-7408:permitrootlogin
+
+# Scan type - how deep the audit should be (light, normal or 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)
+# SUGGESTION
+# ----------
 #
-machine-role=server
+# Do NOT make changes to this file, instead copy your preferred settings to
+# custom.prf and put it in the same directory as default.prf
+#
+# To discover where your profiles are located:  lynis show profiles
+#
+#################################################################################
 
 #################################################################################
 #
@@ -85,6 +114,15 @@ plugin=systemd
 plugin=users
 
 
+
+
+#################################################################################
+#
+# Configuration (Old Style) - will be replaced in phases
+#
+#################################################################################
+
+
 #################################################################################
 #
 # Kernel options
@@ -374,45 +412,5 @@ license-key=
 config:compliance_standards:cis,hipaa,iso27001,pci-dss:
 
 
-#################################################################################
-#
-# Configuration (New Style)
-#
-#################################################################################
-
-# 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=en
-
-# Enable quick mode (no waiting for keypresses, same as --quick option)
-quick=no
-
-# Show inline tips about the tool
-show-tool-tips=yes
-
-# Skip plugins
-skip-plugins=no
-
-# Skip a test (one per line)
-#skip-test=SSH-7408
-
-# Skip a particular option within a test (when applicable)
-#skip-test=SSH-7408:loglevel
-#skip-test=SSH-7408:permitrootlogin
-
-
-#################################################################################
-#
-# SUGGESTION
-# ----------
-#
-# Do NOT make changes to this file, instead copy your preferred settings to
-# custom.prf and put it in the same directory as default.prf
-#
-# To discover where your profiles are located:  lynis show profiles
-#
-#################################################################################
 
 #EOF