Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/CISOfy/lynis.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Boelen <michael.boelen@cisofy.com>2019-07-15 19:55:33 +0300
committerGitHub <noreply@github.com>2019-07-15 19:55:33 +0300
commitc31a1318e20e77793068972c45a54617fbd473f4 (patch)
tree8698846213c70166b6a2368400796bf97de8aeae
parent5cc5ecf534371b7eea6f7666b7b6e798d5d10de2 (diff)
parent7728213ac40ab3beb72c1e05c955ce021217c1e8 (diff)
Merge pull request #728 from Marzal/docu
Improve help info with missing data
-rw-r--r--CHANGELOG.md2
-rw-r--r--include/helper_show14
-rw-r--r--lynis.84
3 files changed, 16 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95664374..47215980 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,7 +56,7 @@ measures to further tighten any possible misuse.
- SSH-7402 - detect other SSH daemons like dropbear
- SSH-7406 - strip OpenSSH patch version and remove characters (carriage return)
- SSH-7408 - changed text in suggestion and report
-- Whow changelog works again for newer versions
+- Show changelog works again for newer versions
- systemd service file adjusted
- bash completion script extended
diff --git a/include/helper_show b/include/helper_show
index 94d839be..d1086378 100644
--- a/include/helper_show
+++ b/include/helper_show
@@ -108,11 +108,15 @@ GENERATE_HELP="
"
-UPDATE_ARGS="check info"
+UPDATE_ARGS="check | info"
UPDATE_HELP="
${CYAN}update info${NORMAL}
- Check version information
+ Check and show version information
+
+ ${CYAN}update check${NORMAL}
+
+ Just check if version is up-to-date
"
@@ -207,8 +211,11 @@ if [ $# -gt 0 ]; then
if [ $# -eq 1 ]; then
case $1 in
"audit") ${ECHOCMD} "${AUDIT_HELP}" ;;
+ "configure") ${ECHOCMD} "No help available yet" ;;
+ "generate") ${ECHOCMD} "${GENERATE_HELP}" ;;
"show") ${ECHOCMD} "${SHOW_HELP}" ;;
- "update") ${ECHOCMD} "No help available yet" ;;
+ "update") ${ECHOCMD} "${UPDATE_HELP}" ;;
+ "upload-only") ${ECHOCMD} "${UPLOAD_ONLY_HELP}" ;;
*) DisplayError "Unknown argument for 'commands'"
esac
else
@@ -288,6 +295,7 @@ if [ $# -gt 0 ]; then
shift
case $1 in
"audit") ${ECHOCMD} "${AUDIT_HELP}" ;;
+ "configure") ${ECHOCMD} "No help available yet" ;;
"generate") ${ECHOCMD} "${GENERATE_HELP}" ;;
"show") ${ECHOCMD} "${SHOW_HELP}" ;;
"update") ${ECHOCMD} "${UPDATE_HELP}" ;;
diff --git a/lynis.8 b/lynis.8
index f1c313eb..1c65a7b5 100644
--- a/lynis.8
+++ b/lynis.8
@@ -41,6 +41,10 @@ When running \fBLynis\fP for the first time, run: lynis audit system
.SH "COMMANDS"
.IP "audit \<type\>"
Perform an audit of the selected type
+.IP "configure \<parameters\>"
+Change or add settings to the config file
+.IP "generate \<parameter\>"
+Generate specific details such as host IDs
.IP "show \<parameter\>"
Show information, such as configuration and paths
.IP "update \<parameter\>"