From: Frank Brehm Date: Wed, 26 Oct 2016 00:58:32 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c114308b27569179765c02af5728675e48223d40;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/libvirt/libvirtd.conf b/libvirt/libvirtd.conf index 1c1fa7fe..84666161 100644 --- a/libvirt/libvirtd.conf +++ b/libvirt/libvirtd.conf @@ -242,7 +242,7 @@ #tls_allowed_dn_list = ["DN1", "DN2"] -# A whitelist of allowed SASL usernames. The format for usernames +# A whitelist of allowed SASL usernames. The format for username # depends on the SASL authentication mechanism. Kerberos usernames # look like username@REALM # @@ -259,6 +259,13 @@ #sasl_allowed_username_list = ["joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ] +# Override the compile time default TLS priority string. The +# default is usually "NORMAL" unless overridden at build time. +# Only set this is it is desired for libvirt to deviate from +# the global default settings. +# +#tls_priority="NORMAL" + ################################################################# # @@ -276,8 +283,8 @@ #max_queued_clients = 1000 # The maximum length of queue of accepted but not yet -# authenticated clients. The default value is zero, meaning -# the feature is disabled. +# authenticated clients. The default value is 20. Set this to +# zero to turn this feature off. #max_anonymous_clients = 20 # The minimum limit sets the number of workers to start up diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf index 4fa5e8ad..79642736 100644 --- a/libvirt/qemu.conf +++ b/libvirt/qemu.conf @@ -15,9 +15,9 @@ # unix socket. This prevents unprivileged access from users on the # host machine, though most VNC clients do not support it. # -# This will only be enabled for VNC configurations that do not have -# a hardcoded 'listen' or 'socket' value. This setting takes preference -# over vnc_listen. +# This will only be enabled for VNC configurations that have listen +# type=address but without any address specified. This setting takes +# preference over vnc_listen. # #vnc_auto_unix_socket = 1 @@ -130,6 +130,17 @@ #spice_tls_x509_cert_dir = "/etc/pki/libvirt-spice" +# Enable this option to have SPICE served over an automatically created +# unix socket. This prevents unprivileged access from users on the +# host machine. +# +# This will only be enabled for SPICE configurations that have listen +# type=address but without any address specified. This setting takes +# preference over spice_listen. +# +#spice_auto_unix_socket = 1 + + # The default SPICE password. This parameter is only used if the # per-domain XML config does not already provide a password. To # allow access without passwords, leave this commented out. An diff --git a/libvirt/virt-login-shell.conf b/libvirt/virt-login-shell.conf index 835fd3fe..4a504b37 100644 --- a/libvirt/virt-login-shell.conf +++ b/libvirt/virt-login-shell.conf @@ -5,10 +5,32 @@ # By default, virt-login-shell will connect you to a container running # with the /bin/sh program. Modify the shell variable if you want your # users to run a different shell or a setup container when joining a -# container. Shell commands must be a list of commands/options separated by -# comma and delimited by square brackets. Defaults to: /bin/sh -l. -# Modify and uncomment the following to modify the login shell. -# shell = [ "/bin/sh", "-l" ] +# container. +# +# This can either be just the path to a shell binary: +# +# shell = "/bin/bash" +# +# Or can be the path and extra arguments +# +# shell = [ "/bin/bash", "--posix" ] +# +# Note there is no need to pass a '--login' / '-l' argument since +# virt-login-shell will always request a login shell + +# Normally virt-login-shell will always use the shell identified +# by the 'shell' configuration setting above. If the container +# is running a full OS, it might be desirable to allow the choice +# of shell to be delegated to the owner of the shell, by querying +# the /etc/passwd file inside the container +# +# To allow for that, uncomment the following: +# auto_shell = 1 +# +# NB, this should /not/ be used if any container is sharing the +# host filesystem /etc, as this would cause virt-login-shell to +# look at the host's /etc/passwd finding itself as the listed +# shell. Hilarious recursion would then ensue. # allowed_users specifies the user names of all users that are allowed to # execute virt-login-shell. You can specify the users as a comma diff --git a/libvirt/virtlogd.conf b/libvirt/virtlogd.conf index abb36332..7ef1ac32 100644 --- a/libvirt/virtlogd.conf +++ b/libvirt/virtlogd.conf @@ -57,3 +57,11 @@ # The maximum number of concurrent client connections to allow # over all sockets combined. #max_clients = 1024 + + +# Maximum file size before rolling over. Defaults to 2 MB +#max_size = 2097152 + +# Maximum number of backup files to keep. Defaults to 3, +# not including the primary active file +#max_backups = 3