diff --git a/src/extra/manual/beta/_sources/cdist-best-practice.rst.txt b/src/extra/manual/beta/_sources/cdist-best-practice.rst.txt index 39ec453e..f7677276 100644 --- a/src/extra/manual/beta/_sources/cdist-best-practice.rst.txt +++ b/src/extra/manual/beta/_sources/cdist-best-practice.rst.txt @@ -200,15 +200,15 @@ of cdist: .. code-block:: sh # Singleton type without parameter - echo __ungleich_munin_server | cdist --initial-manifest - munin.panter.ch + echo __ungleich_munin_server | cdist config --initial-manifest - munin.panter.ch # Singleton type with parameter echo __ungleich_munin_node --allow 1.2.3.4 | \ - cdist --initial-manifest - rails-19.panter.ch + cdist config --initial-manifest - rails-19.panter.ch # Normal type echo __file /tmp/stdintest --mode 0644 | \ - cdist --initial-manifest - cdist-dev-01.ungleich.ch + cdist config --initial-manifest - cdist-dev-01.ungleich.ch Other content in cdist repository diff --git a/src/extra/manual/beta/_sources/cdist-install.rst.txt b/src/extra/manual/beta/_sources/cdist-install.rst.txt index 6f4f14d7..18863145 100644 --- a/src/extra/manual/beta/_sources/cdist-install.rst.txt +++ b/src/extra/manual/beta/_sources/cdist-install.rst.txt @@ -49,7 +49,7 @@ create version.py: .. code-block:: sh - ./bin/build-helper version + ./bin/cdist-build-helper version Then you install it with: @@ -70,7 +70,7 @@ Or directly with distutils: python setup.py install -Note that `bin/build-helper` script is intended for cdist maintainers. +Note that `bin/cdist-build-helper` script is intended for cdist maintainers. Available versions in git diff --git a/src/extra/manual/beta/_sources/cdist-reference.rst.txt b/src/extra/manual/beta/_sources/cdist-reference.rst.txt index 2220b8c1..e71da50c 100644 --- a/src/extra/manual/beta/_sources/cdist-reference.rst.txt +++ b/src/extra/manual/beta/_sources/cdist-reference.rst.txt @@ -196,6 +196,7 @@ The following types are available: - __group (`cdist-type__group(7) `_) - __hostname (`cdist-type__hostname(7) `_) - __hosts (`cdist-type__hosts(7) `_) +- __hwclock (`cdist-type__hwclock(7) `_) - __install_bootloader_grub (`cdist-type__install_bootloader_grub(7) `_) - __install_chroot_mount (`cdist-type__install_chroot_mount(7) `_) - __install_chroot_umount (`cdist-type__install_chroot_umount(7) `_) @@ -226,6 +227,7 @@ The following types are available: - __link (`cdist-type__link(7) `_) - __locale (`cdist-type__locale(7) `_) - __locale_system (`cdist-type__locale_system(7) `_) +- __localedef (`cdist-type__localedef(7) `_) - __motd (`cdist-type__motd(7) `_) - __mount (`cdist-type__mount(7) `_) - __mysql_database (`cdist-type__mysql_database(7) `_) @@ -280,6 +282,7 @@ The following types are available: - __ssh_authorized_key (`cdist-type__ssh_authorized_key(7) `_) - __ssh_authorized_keys (`cdist-type__ssh_authorized_keys(7) `_) - __ssh_dot_ssh (`cdist-type__ssh_dot_ssh(7) `_) +- __sshd_config (`cdist-type__sshd_config(7) `_) - __staged_file (`cdist-type__staged_file(7) `_) - __start_on_boot (`cdist-type__start_on_boot(7) `_) - __sysctl (`cdist-type__sysctl(7) `_) diff --git a/src/extra/manual/beta/_sources/cdist-types.rst.txt b/src/extra/manual/beta/_sources/cdist-types.rst.txt index f86b4899..ad55e5b0 100644 --- a/src/extra/manual/beta/_sources/cdist-types.rst.txt +++ b/src/extra/manual/beta/_sources/cdist-types.rst.txt @@ -64,6 +64,7 @@ cdist types __group __hostname __hosts + __hwclock __install_bootloader_grub __install_chroot_mount __install_chroot_umount @@ -94,6 +95,7 @@ cdist types __link __locale __locale_system + __localedef __motd __mount __mysql_database @@ -148,6 +150,7 @@ cdist types __ssh_authorized_key __ssh_authorized_keys __ssh_dot_ssh + __sshd_config __staged_file __start_on_boot __sysctl diff --git a/src/extra/manual/beta/_sources/man7/cdist-type__hwclock.rst.txt b/src/extra/manual/beta/_sources/man7/cdist-type__hwclock.rst.txt new file mode 100644 index 00000000..65eb648f --- /dev/null +++ b/src/extra/manual/beta/_sources/man7/cdist-type__hwclock.rst.txt @@ -0,0 +1,63 @@ +cdist-type__hwclock(7) +====================== + +NAME +---- +cdist-type__hwclock - Manage the hardware real time clock. + + +DESCRIPTION +----------- +This type can be used to control how the hardware clock is used by the operating +system. + + +REQUIRED PARAMETERS +------------------- +mode + What mode the hardware clock is in. + + Acceptable values: + + localtime + The hardware clock is set to local time (common for systems also running + Windows.) + UTC + The hardware clock is set to UTC (common on UNIX systems.) + + +OPTIONAL PARAMETERS +------------------- +None. + + +BOOLEAN PARAMETERS +------------------ +None. + + +EXAMPLES +-------- + +.. code-block:: sh + + # Make the operating system treat the time read from the hwclock as UTC. + __hwclock --mode UTC + + +SEE ALSO +-------- +:strong:`hwclock`\ (8) + + +AUTHORS +------- +Dennis Camera + + +COPYING +------- +Copyright \(C) 2020 Dennis Camera. You can redistribute it +and/or modify it under the terms of the GNU General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. diff --git a/src/extra/manual/beta/_sources/man7/cdist-type__localedef.rst.txt b/src/extra/manual/beta/_sources/man7/cdist-type__localedef.rst.txt new file mode 100644 index 00000000..454ce9d1 --- /dev/null +++ b/src/extra/manual/beta/_sources/man7/cdist-type__localedef.rst.txt @@ -0,0 +1,60 @@ +cdist-type__localedef(7) +======================== + +NAME +---- +cdist-type__localedef - Define and remove system locales + + +DESCRIPTION +----------- +This cdist type allows you to define locales on the system using +:strong:`localedef`\ (1) or remove them. +On systems that don't support definition of new locales, the type will raise an +error. + +**NB:** This type respects the glibc ``locale.alias`` file, +i.e. it defines alias locales or deletes aliases of a locale when it is removed. +It is not possible, however, to use alias names to define locales or only remove +certain aliases of a locale. + + +OPTIONAL PARAMETERS +------------------- +state + ``present`` or ``absent``. Defaults to ``present``. + + +EXAMPLES +-------- + +.. code-block:: sh + + # Add locale de_CH.UTF-8 + __localedef de_CH.UTF-8 + + # Same as above, but more explicit + __localedef de_CH.UTF-8 --state present + + # Remove colourful British English + __localedef en_GB.UTF-8 --state absent + + +SEE ALSO +-------- +:strong:`locale`\ (1), +:strong:`localedef`\ (1), +:strong:`cdist-type__locale_system`\ (7) + + +AUTHORS +------- +| Dennis Camera +| Nico Schottelius + + +COPYING +------- +Copyright \(C) 2013-2019 Nico Schottelius, 2020 Dennis Camera. Free use of this +software is granted under the terms of the GNU General Public License version 3 +or later (GPLv3+). diff --git a/src/extra/manual/beta/_sources/man7/cdist-type__sshd_config.rst.txt b/src/extra/manual/beta/_sources/man7/cdist-type__sshd_config.rst.txt new file mode 100644 index 00000000..8b0069ac --- /dev/null +++ b/src/extra/manual/beta/_sources/man7/cdist-type__sshd_config.rst.txt @@ -0,0 +1,94 @@ +cdist-type__sshd_config(7) +========================== + +NAME +---- +cdist-type__sshd_config - Manage options in sshd_config + + +DESCRIPTION +----------- +This space intentionally left blank. + + +REQUIRED PARAMETERS +------------------- +None. + + +OPTIONAL PARAMETERS +------------------- +file + The path to the sshd_config file to edit. + Defaults to ``/etc/ssh/sshd_config``. +match + Restrict this option to apply only for certain connections. + Allowed values are what would be allowed to be written after a ``Match`` + keyword in ``sshd_config``, e.g. ``--match 'User anoncvs'``. + + Can be used multiple times. All of the values are ANDed together. +option + The name of the option to manipulate. Defaults to ``__object_id``. +state + Can be: + + - ``present``: ensure a matching config line is present (or the default + value). + - ``absent``: ensure no matching config line is present. +value + The option's value to be assigned to the option (if ``--state present``) or + removed (if ``--state absent``). + + This option is required if ``--state present``. If not specified and + ``--state absent``, all values for the given option are removed. + + +BOOLEAN PARAMETERS +------------------ +None. + + +EXAMPLES +-------- + +.. code-block:: sh + + # Disallow root logins with password + __sshd_config PermitRootLogin --value without-password + + # Disallow password-based authentication + __sshd_config PasswordAuthentication --value no + + # Accept the EDITOR environment variable + __sshd_config AcceptEnv:EDITOR --option AcceptEnv --value EDITOR + + # Force command for connections as git user + __sshd_config git@ForceCommand --match 'User git' --option ForceCommand \ + --value 'cd ~git && exec git-shell ${SSH_ORIGINAL_COMMAND:+-c "${SSH_ORIGINAL_COMMAND}"}' + + +SEE ALSO +-------- +:strong:`sshd_config`\ (5) + + +BUGS +---- +- This type assumes a nicely formatted config file, + i.e. no config options spanning multiple lines. +- ``Include`` directives are ignored. +- Config options are not added/removed to/from the config file if their value is + the default value. + + +AUTHORS +------- +Dennis Camera + + +COPYING +------- +Copyright \(C) 2020 Dennis Camera. You can redistribute it +and/or modify it under the terms of the GNU General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. diff --git a/src/extra/manual/beta/_static/documentation_options.js b/src/extra/manual/beta/_static/documentation_options.js index 42d00267..029530d4 100644 --- a/src/extra/manual/beta/_static/documentation_options.js +++ b/src/extra/manual/beta/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '6.9.1', + VERSION: '6.9.2', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/src/extra/manual/beta/cdist-best-practice.html b/src/extra/manual/beta/cdist-best-practice.html index 7f633d7d..65f692a1 100644 --- a/src/extra/manual/beta/cdist-best-practice.html +++ b/src/extra/manual/beta/cdist-best-practice.html @@ -8,7 +8,7 @@ - 25. Best practice — cdist 6.9.1 documentation + 25. Best practice — cdist 6.9.2 documentation @@ -63,7 +63,7 @@
- 6.9.1 + 6.9.2
@@ -394,15 +394,15 @@ object of this type: Use the '--initial-manifest' parameter with - (stdin) as argument and feed object into stdin of cdist:

# Singleton type without parameter
-echo __ungleich_munin_server | cdist --initial-manifest - munin.panter.ch
+echo __ungleich_munin_server | cdist config --initial-manifest - munin.panter.ch
 
 # Singleton type with parameter
 echo __ungleich_munin_node --allow 1.2.3.4 | \
-    cdist --initial-manifest - rails-19.panter.ch
+    cdist config --initial-manifest - rails-19.panter.ch
 
 # Normal type
 echo __file /tmp/stdintest --mode 0644 | \
-    cdist --initial-manifest - cdist-dev-01.ungleich.ch
+    cdist config --initial-manifest - cdist-dev-01.ungleich.ch
diff --git a/src/extra/manual/beta/cdist-bootstrap.html b/src/extra/manual/beta/cdist-bootstrap.html index 0adea5a1..c2f48a3b 100644 --- a/src/extra/manual/beta/cdist-bootstrap.html +++ b/src/extra/manual/beta/cdist-bootstrap.html @@ -8,7 +8,7 @@ - 12. Bootstrap — cdist 6.9.1 documentation + 12. Bootstrap — cdist 6.9.2 documentation @@ -63,7 +63,7 @@
- 6.9.1 + 6.9.2
diff --git a/src/extra/manual/beta/cdist-cache.html b/src/extra/manual/beta/cdist-cache.html index 28994952..87f24353 100644 --- a/src/extra/manual/beta/cdist-cache.html +++ b/src/extra/manual/beta/cdist-cache.html @@ -8,7 +8,7 @@ - 27. Local cache overview — cdist 6.9.1 documentation + 27. Local cache overview — cdist 6.9.2 documentation @@ -63,7 +63,7 @@
- 6.9.1 + 6.9.2
diff --git a/src/extra/manual/beta/cdist-configuration.html b/src/extra/manual/beta/cdist-configuration.html index 68bdcd0d..e152a819 100644 --- a/src/extra/manual/beta/cdist-configuration.html +++ b/src/extra/manual/beta/cdist-configuration.html @@ -8,7 +8,7 @@ - 13. Configuration — cdist 6.9.1 documentation + 13. Configuration — cdist 6.9.2 documentation @@ -63,7 +63,7 @@
- 6.9.1 + 6.9.2
diff --git a/src/extra/manual/beta/cdist-explorer.html b/src/extra/manual/beta/cdist-explorer.html index 54dc51bd..ad7c6d2f 100644 --- a/src/extra/manual/beta/cdist-explorer.html +++ b/src/extra/manual/beta/cdist-explorer.html @@ -8,7 +8,7 @@ - 17. Explorer — cdist 6.9.1 documentation + 17. Explorer — cdist 6.9.2 documentation @@ -36,7 +36,7 @@ - + @@ -63,7 +63,7 @@
- 6.9.1 + 6.9.2
@@ -245,7 +245,7 @@ dpkg -s "$name