From c86a78bef7b1b7ada7b9cd025e3e8508a5fde6ad Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 2 Oct 2024 16:48:48 +0200 Subject: [PATCH] [man] add manpage for global configuration --- client/SDL/SDL2/man/CMakeLists.txt | 11 +-- client/SDL/SDL2/man/sdl2-freerdp.1.xml.in | 3 + client/SDL/SDL3/man/CMakeLists.txt | 11 +-- client/SDL/SDL3/man/sdl3-freerdp.1.xml.in | 3 + client/X11/man/CMakeLists.txt | 11 +-- client/X11/man/xfreerdp.1.xml.in | 3 + .../common/man/freerdp-global-config.1.xml.in | 76 +++++++++++++++++++ 7 files changed, 103 insertions(+), 15 deletions(-) create mode 100644 client/common/man/freerdp-global-config.1.xml.in diff --git a/client/SDL/SDL2/man/CMakeLists.txt b/client/SDL/SDL2/man/CMakeLists.txt index 522448893..d4087f361 100644 --- a/client/SDL/SDL2/man/CMakeLists.txt +++ b/client/SDL/SDL2/man/CMakeLists.txt @@ -1,8 +1,9 @@ set(DEPS - ../../common/man/sdl-freerdp-channels.1.xml - ../../common/man/sdl-freerdp-config.1.xml - ../../common/man/sdl-freerdp-examples.1.xml - ../../common/man/sdl-freerdp-envvar.1.xml - ) + ../../common/man/sdl-freerdp-channels.1.xml + ../../common/man/sdl-freerdp-config.1.xml + ../../common/man/sdl-freerdp-examples.1.xml + ../../common/man/sdl-freerdp-envvar.1.xml + ../../../common/man/freerdp-global-config.1.xml +) generate_and_install_freerdp_man_from_xml(${MODULE_NAME} "1" "${DEPS}") diff --git a/client/SDL/SDL2/man/sdl2-freerdp.1.xml.in b/client/SDL/SDL2/man/sdl2-freerdp.1.xml.in index ba5b6cbf8..2573855d4 100644 --- a/client/SDL/SDL2/man/sdl2-freerdp.1.xml.in +++ b/client/SDL/SDL2/man/sdl2-freerdp.1.xml.in @@ -5,6 +5,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + ] > @@ -53,6 +54,8 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" &envvar; + &configuration; + &examples; diff --git a/client/SDL/SDL3/man/CMakeLists.txt b/client/SDL/SDL3/man/CMakeLists.txt index 522448893..d4087f361 100644 --- a/client/SDL/SDL3/man/CMakeLists.txt +++ b/client/SDL/SDL3/man/CMakeLists.txt @@ -1,8 +1,9 @@ set(DEPS - ../../common/man/sdl-freerdp-channels.1.xml - ../../common/man/sdl-freerdp-config.1.xml - ../../common/man/sdl-freerdp-examples.1.xml - ../../common/man/sdl-freerdp-envvar.1.xml - ) + ../../common/man/sdl-freerdp-channels.1.xml + ../../common/man/sdl-freerdp-config.1.xml + ../../common/man/sdl-freerdp-examples.1.xml + ../../common/man/sdl-freerdp-envvar.1.xml + ../../../common/man/freerdp-global-config.1.xml +) generate_and_install_freerdp_man_from_xml(${MODULE_NAME} "1" "${DEPS}") diff --git a/client/SDL/SDL3/man/sdl3-freerdp.1.xml.in b/client/SDL/SDL3/man/sdl3-freerdp.1.xml.in index ba5b6cbf8..2573855d4 100644 --- a/client/SDL/SDL3/man/sdl3-freerdp.1.xml.in +++ b/client/SDL/SDL3/man/sdl3-freerdp.1.xml.in @@ -5,6 +5,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + ] > @@ -53,6 +54,8 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" &envvar; + &configuration; + &examples; diff --git a/client/X11/man/CMakeLists.txt b/client/X11/man/CMakeLists.txt index 01d66464f..21c8a76a4 100644 --- a/client/X11/man/CMakeLists.txt +++ b/client/X11/man/CMakeLists.txt @@ -1,8 +1,9 @@ set(DEPS - xfreerdp-channels.1.xml - xfreerdp-examples.1.xml - xfreerdp-shortcuts.1.xml - xfreerdp-envvar.1.xml - ) + xfreerdp-channels.1.xml + xfreerdp-examples.1.xml + xfreerdp-shortcuts.1.xml + xfreerdp-envvar.1.xml + ../../common/man/freerdp-global-config.1.xml +) generate_and_install_freerdp_man_from_xml(${MODULE_NAME} "1" "${DEPS}") diff --git a/client/X11/man/xfreerdp.1.xml.in b/client/X11/man/xfreerdp.1.xml.in index 7e7c782f7..40f342e08 100644 --- a/client/X11/man/xfreerdp.1.xml.in +++ b/client/X11/man/xfreerdp.1.xml.in @@ -6,6 +6,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + ] > @@ -56,6 +57,8 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" &envvar; + &configuration; + &examples; diff --git a/client/common/man/freerdp-global-config.1.xml.in b/client/common/man/freerdp-global-config.1.xml.in new file mode 100644 index 000000000..21de1880b --- /dev/null +++ b/client/common/man/freerdp-global-config.1.xml.in @@ -0,0 +1,76 @@ + + Global Configuration + + + + Format and Location: + + The configuration file is stored in global system configuration. + The location is @CMAKE_INSTALL_FULL_SYSCONFDIR@/@VENDOR@/@PRODUCT@/certificates.json + File format is JSON + + + + Supported options: + + + deny + + + + JSON boolean + Deny the certificate if the check against system SSL store was not successful + + + + + + ignore + + + + JSON boolean + Ignore certificate failures, just ignore the certificate + + + + + + deny-userconfig + + + + JSON boolean + If the checks in the global configuration do not accept the certificate do not ask the user + + + + + + certificate-db + + + JSON array + An array of JSON objects with: + + type + + JSON string + a string identifying the hash algorithm used, e.g. sha256 + + + + hash + + JSON string + a string of hex integer values representing the certificate hash, e.g. 0123456789abcdef + + + + + + + + + +