. "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
# Source completion code.
+ BASH_COMPLETION_COMPAT_DIR=/usr/share/bash-completion/completions
. /usr/share/bash-completion/bash_completion
fi
fi
+++ /dev/null
-../../usr/share/bash-completion/ack
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/base
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/bash-builtins
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/bind-utils
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/bzip2
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/coreutils
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/cpio
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/crontab
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/dd
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/e2fsprogs
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/eix
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/eselect
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/figlet
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/findutils
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/fuse
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/genlop
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/gentoo
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/getent
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/git
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/git-prompt
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/gpg
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/gpg2
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/gzip
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/iconv
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/imagemagick
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/info
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/iproute2
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/iptables
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/ipv6calc
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/lftp
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/links
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/lsof
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/lvm
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/lzma
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/make
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/man
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/mdadm
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/ncftp
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/net-tools
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/nmap
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/openssl
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/perl
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/postgresql
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/procps
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/python
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/rcs
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/rrdtool
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/rsync
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/screen
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/sh
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/shadow
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/smartctl
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/sqlite3
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/ssh
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/sshfs
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/strace
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/subversion
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/tar
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/tcpdump
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/tree
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/unrar
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/util-linux
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/vim
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/xxd
\ No newline at end of file
+++ /dev/null
-../../usr/share/bash-completion/xz
\ No newline at end of file
--- /dev/null
+# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+
+# see man pages for salt-minion or run `salt-master --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $
#
# To populate all changes in this file you need to regenerate your
# grub configuration file afterwards:
# 'grub2-mkconfig -o /boot/grub/grub.cfg'
#
# See the grub info page for documentation on possible variables and
-# their associated values.
+# their associated values.
GRUB_DISTRIBUTOR="Samara (Gentoo)"
-GRUB_DEFAULT=0
-GRUB_HIDDEN_TIMEOUT=5
-GRUB_HIDDEN_TIMEOUT_QUIET=true
+# Default menu entry
+#GRUB_DEFAULT=0
+
+# Boot the default entry this many seconds after the menu is displayed
+#GRUB_TIMEOUT=5
GRUB_TIMEOUT=10
+#GRUB_TIMEOUT_STYLE=menu
# Append parameters to the linux kernel command line
-#GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
+#GRUB_CMDLINE_LINUX=""
+#
+# Examples:
+#
+# Boot with network interface renaming disabled
+# GRUB_CMDLINE_LINUX="net.ifnames=0"
+#
+# Boot with systemd instead of sysvinit (openrc)
+# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
# Append parameters to the linux kernel command line for non-recovery entries
#GRUB_CMDLINE_LINUX_DEFAULT=""
# The resolution used on graphical terminal.
# Note that you can use only modes which your graphic card supports via VBE.
# You can see them in real GRUB with the command `vbeinfo'.
+#GRUB_GFXMODE=640x480
GRUB_GFXMODE=800x600
+# Set to 'text' to force the Linux kernel to boot in normal text
+# mode, 'keep' to preserve the graphics mode set using
+# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
+# graphics mode, or a sequence of these separated by commas or
+# semicolons to try several modes in sequence.
+#GRUB_GFXPAYLOAD_LINUX=
+
# Path to theme spec txt file.
# The starfield is by default provided with use truetype.
# NOTE: when enabling custom theme, ensure you have required font/etc.
--- /dev/null
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+# 'grub2-mkconfig -o /boot/grub/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values.
+
+GRUB_DISTRIBUTOR="Samara (Gentoo)"
+
+GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=5
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=10
+
+# Append parameters to the linux kernel command line
+#GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
+
+# Append parameters to the linux kernel command line for non-recovery entries
+#GRUB_CMDLINE_LINUX_DEFAULT=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+GRUB_GFXMODE=800x600
+
+# Path to theme spec txt file.
+# The starfield is by default provided with use truetype.
+# NOTE: when enabling custom theme, ensure you have required font/etc.
+#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+#GRUB_BACKGROUND="/boot/grub/mybackground.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $
#
# To populate all changes in this file you need to regenerate your
# grub configuration file afterwards:
# Uncomment to disable generation of recovery mode menu entries
#GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $
#
# To populate all changes in this file you need to regenerate your
# grub configuration file afterwards:
# Uncomment to disable generation of recovery mode menu entries
#GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"
<dir name="desktop">
<dir name="ibus">
<dir name="panel">
- <entry name="auto-hide-timeout" mtime="1416941141" type="schema" stype="int" owner="ibus">
+ <entry name="auto-hide-timeout" mtime="1435047393" type="schema" stype="int" owner="ibus">
<local_schema locale="C" short_desc="The milliseconds to show property panel">
<default type="int" value="10000"/>
<longdesc>The milliseconds to show property panel after focus-in or
properties are changed.</longdesc>
</local_schema>
</entry>
- <entry name="custom_font" mtime="1416941141" type="schema" stype="string" owner="ibus">
+ <entry name="custom_font" mtime="1435047393" type="schema" stype="string" owner="ibus">
<local_schema locale="C" short_desc="Custom font">
<default type="string">
<stringvalue>Sans 10</stringvalue>
<longdesc>Custom font name for language panel</longdesc>
</local_schema>
</entry>
- <entry name="use_custom_font" mtime="1416941141" type="schema" stype="bool" owner="ibus">
+ <entry name="use_custom_font" mtime="1435047393" type="schema" stype="bool" owner="ibus">
<local_schema locale="C" short_desc="Use custom font">
<default type="bool" value="false"/>
<longdesc>Use custom font name for language panel</longdesc>
</local_schema>
</entry>
- <entry name="show_im_name" mtime="1416941141" type="schema" stype="bool" owner="ibus">
+ <entry name="show_im_name" mtime="1435047393" type="schema" stype="bool" owner="ibus">
<local_schema locale="C" short_desc="Show input method name">
<default type="bool" value="false"/>
<longdesc>Show input method name on language bar</longdesc>
</local_schema>
</entry>
- <entry name="show_icon_on_systray" mtime="1416941141" type="schema" stype="bool" owner="ibus">
+ <entry name="show_icon_on_systray" mtime="1435047393" type="schema" stype="bool" owner="ibus">
<local_schema locale="C" short_desc="Show icon on system tray">
<default type="bool" value="true"/>
<longdesc>Show icon on system tray</longdesc>
</local_schema>
</entry>
- <entry name="lookup_table_orientation" mtime="1416941141" type="schema" stype="int" owner="ibus">
+ <entry name="lookup_table_orientation" mtime="1435047393" type="schema" stype="int" owner="ibus">
<local_schema locale="C" short_desc="Orientation of lookup table">
<default type="int" value="1"/>
<longdesc>Orientation of lookup table. 0 = Horizontal, 1 = Vertical</longdesc>
</local_schema>
</entry>
- <entry name="y" mtime="1416941141" type="schema" stype="int" owner="ibus">
+ <entry name="y" mtime="1435047393" type="schema" stype="int" owner="ibus">
<local_schema locale="C" short_desc="Language panel position">
<default type="int" value="-1"/>
</local_schema>
</entry>
- <entry name="x" mtime="1416941141" type="schema" stype="int" owner="ibus">
+ <entry name="x" mtime="1435047393" type="schema" stype="int" owner="ibus">
<local_schema locale="C" short_desc="Language panel position">
<default type="int" value="-1"/>
</local_schema>
</entry>
- <entry name="show" mtime="1416941141" type="schema" stype="int" owner="ibus">
+ <entry name="show" mtime="1435047393" type="schema" stype="int" owner="ibus">
<local_schema locale="C" short_desc="Auto hide">
<default type="int" value="1"/>
<longdesc>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</longdesc>
</entry>
</dir>
<dir name="general">
- <entry name="version" mtime="1416941141" type="schema" stype="string" owner="ibus">
+ <entry name="version" mtime="1435047393" type="schema" stype="string" owner="ibus">
<local_schema locale="C" short_desc="Saved version number">
<default type="string">
<stringvalue></stringvalue>
</longdesc>
</local_schema>
</entry>
- <entry name="dconf_preserve_name_prefixes" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="dconf_preserve_name_prefixes" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="DConf preserve name prefixes">
<default type="list" ltype="string">
<li type="string">
<longdesc>Prefixes of DConf keys to stop name conversion</longdesc>
</local_schema>
</entry>
- <entry name="enable_by_default" mtime="1416941141" type="schema" stype="bool" owner="ibus">
+ <entry name="enable_by_default" mtime="1435047393" type="schema" stype="bool" owner="ibus">
<local_schema locale="C" short_desc="Enable input method by default">
<default type="bool" value="false"/>
<longdesc>Enable input method by default when the application gets input
focus</longdesc>
</local_schema>
</entry>
- <entry name="use_global_engine" mtime="1416941141" type="schema" stype="bool" owner="ibus">
+ <entry name="use_global_engine" mtime="1435047393" type="schema" stype="bool" owner="ibus">
<local_schema locale="C" short_desc="Use global input method">
<default type="bool" value="true"/>
<longdesc>Share the same input method among all applications</longdesc>
</local_schema>
</entry>
- <entry name="embed_preedit_text" mtime="1416941141" type="schema" stype="bool" owner="ibus">
+ <entry name="embed_preedit_text" mtime="1435047393" type="schema" stype="bool" owner="ibus">
<local_schema locale="C" short_desc="Embed Preedit Text">
<default type="bool" value="true"/>
<longdesc>Embed Preedit Text in Application Window</longdesc>
</local_schema>
</entry>
- <entry name="use_system_keyboard_layout" mtime="1416941141" type="schema" stype="bool" owner="ibus">
+ <entry name="use_system_keyboard_layout" mtime="1435047393" type="schema" stype="bool" owner="ibus">
<local_schema locale="C" short_desc="Use system keyboard layout">
<default type="bool" value="false"/>
<longdesc>Use system keyboard (XKB) layout</longdesc>
</local_schema>
</entry>
- <entry name="switcher-delay-time" mtime="1416941141" type="schema" stype="int" owner="ibus">
+ <entry name="switcher-delay-time" mtime="1435047393" type="schema" stype="int" owner="ibus">
<local_schema locale="C" short_desc="Popup delay milliseconds for IME switcher window">
<default type="int" value="400"/>
<longdesc>Set popup delay milliseconds to show IME switcher window.
</longdesc>
</local_schema>
</entry>
- <entry name="engines_order" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="engines_order" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Engines order">
<default type="list" ltype="string">
</default>
<longdesc>Saved engines order in input method list</longdesc>
</local_schema>
</entry>
- <entry name="preload_engines" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="preload_engines" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Preload engines">
<default type="list" ltype="string">
</default>
</local_schema>
</entry>
<dir name="hotkey">
- <entry name="previous_engine" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="previous_engine" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Prev engine shortcut keys">
<default type="list" ltype="string">
</default>
<longdesc>The shortcut keys for switching to the previous input method</longdesc>
</local_schema>
</entry>
- <entry name="prev_engine" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="prev_engine" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Prev engine shortcut keys">
<default type="list" ltype="string">
</default>
<longdesc>The shortcut keys for switching to the previous input method</longdesc>
</local_schema>
</entry>
- <entry name="next_engine_in_menu" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="next_engine_in_menu" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Next engine shortcut keys">
<default type="list" ltype="string">
<li type="string">
<longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
</local_schema>
</entry>
- <entry name="next_engine" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="next_engine" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Next engine shortcut keys">
<default type="list" ltype="string">
<li type="string">
<longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
</local_schema>
</entry>
- <entry name="disable_unconditional" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="disable_unconditional" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Disable shortcut keys">
<default type="list" ltype="string">
</default>
<longdesc>The shortcut keys for turning input method off</longdesc>
</local_schema>
</entry>
- <entry name="enable_unconditional" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="enable_unconditional" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Enable shortcut keys">
<default type="list" ltype="string">
</default>
<longdesc>The shortcut keys for turning input method on</longdesc>
</local_schema>
</entry>
- <entry name="triggers" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="triggers" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Trigger shortcut keys for gtk_accelerator_parse">
<default type="list" ltype="string">
<li type="string">
<longdesc>The shortcut keys for turning input method on or off</longdesc>
</local_schema>
</entry>
- <entry name="trigger" mtime="1416941141" type="schema" stype="list" owner="ibus" list_type="string">
+ <entry name="trigger" mtime="1435047393" type="schema" stype="list" owner="ibus" list_type="string">
<local_schema locale="C" short_desc="Trigger shortcut keys">
<default type="list" ltype="string">
<li type="string">
<dir name="desktop">
<dir name="ibus">
<dir name="panel">
- <entry name="auto-hide-timeout" mtime="1416941141" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
- <entry name="custom_font" mtime="1416941141" schema="/schemas/desktop/ibus/panel/custom_font"/>
- <entry name="use_custom_font" mtime="1416941141" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
- <entry name="show_im_name" mtime="1416941141" schema="/schemas/desktop/ibus/panel/show_im_name"/>
- <entry name="show_icon_on_systray" mtime="1416941141" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
- <entry name="lookup_table_orientation" mtime="1416941141" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
- <entry name="y" mtime="1416941141" schema="/schemas/desktop/ibus/panel/y"/>
- <entry name="x" mtime="1416941141" schema="/schemas/desktop/ibus/panel/x"/>
- <entry name="show" mtime="1416941141" schema="/schemas/desktop/ibus/panel/show"/>
+ <entry name="auto-hide-timeout" mtime="1435047393" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
+ <entry name="custom_font" mtime="1435047393" schema="/schemas/desktop/ibus/panel/custom_font"/>
+ <entry name="use_custom_font" mtime="1435047393" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
+ <entry name="show_im_name" mtime="1435047393" schema="/schemas/desktop/ibus/panel/show_im_name"/>
+ <entry name="show_icon_on_systray" mtime="1435047393" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
+ <entry name="lookup_table_orientation" mtime="1435047393" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
+ <entry name="y" mtime="1435047393" schema="/schemas/desktop/ibus/panel/y"/>
+ <entry name="x" mtime="1435047393" schema="/schemas/desktop/ibus/panel/x"/>
+ <entry name="show" mtime="1435047393" schema="/schemas/desktop/ibus/panel/show"/>
</dir>
<dir name="general">
- <entry name="version" mtime="1416941141" schema="/schemas/desktop/ibus/general/version"/>
- <entry name="dconf_preserve_name_prefixes" mtime="1416941141" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
- <entry name="enable_by_default" mtime="1416941141" schema="/schemas/desktop/ibus/general/enable_by_default"/>
- <entry name="use_global_engine" mtime="1416941141" schema="/schemas/desktop/ibus/general/use_global_engine"/>
- <entry name="embed_preedit_text" mtime="1416941141" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
- <entry name="use_system_keyboard_layout" mtime="1416941141" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
- <entry name="switcher-delay-time" mtime="1416941141" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
- <entry name="engines_order" mtime="1416941141" schema="/schemas/desktop/ibus/general/engines_order"/>
- <entry name="preload_engines" mtime="1416941141" schema="/schemas/desktop/ibus/general/preload_engines"/>
+ <entry name="version" mtime="1435047393" schema="/schemas/desktop/ibus/general/version"/>
+ <entry name="dconf_preserve_name_prefixes" mtime="1435047393" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
+ <entry name="enable_by_default" mtime="1435047393" schema="/schemas/desktop/ibus/general/enable_by_default"/>
+ <entry name="use_global_engine" mtime="1435047393" schema="/schemas/desktop/ibus/general/use_global_engine"/>
+ <entry name="embed_preedit_text" mtime="1435047393" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
+ <entry name="use_system_keyboard_layout" mtime="1435047393" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
+ <entry name="switcher-delay-time" mtime="1435047393" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
+ <entry name="engines_order" mtime="1435047393" schema="/schemas/desktop/ibus/general/engines_order"/>
+ <entry name="preload_engines" mtime="1435047393" schema="/schemas/desktop/ibus/general/preload_engines"/>
<dir name="hotkey">
- <entry name="previous_engine" mtime="1416941141" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
- <entry name="prev_engine" mtime="1416941141" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
- <entry name="next_engine_in_menu" mtime="1416941141" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
- <entry name="next_engine" mtime="1416941141" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
- <entry name="disable_unconditional" mtime="1416941141" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
- <entry name="enable_unconditional" mtime="1416941141" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
- <entry name="triggers" mtime="1416941141" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
- <entry name="trigger" mtime="1416941141" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
+ <entry name="previous_engine" mtime="1435047393" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
+ <entry name="prev_engine" mtime="1435047393" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
+ <entry name="next_engine_in_menu" mtime="1435047393" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
+ <entry name="next_engine" mtime="1435047393" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
+ <entry name="disable_unconditional" mtime="1435047393" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
+ <entry name="enable_unconditional" mtime="1435047393" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
+ <entry name="triggers" mtime="1435047393" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
+ <entry name="trigger" mtime="1435047393" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
</dir>
</dir>
</dir>
--- /dev/null
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/api-initd-4,v 1.1 2015/05/06 22:27:59 chutzpah Exp $
+
+command="/usr/bin/salt-api"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-api.pid"
+name="SALT API daemon"
+retry="20"
+
+depend() {
+ use net logger
+}
#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/master-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/master-initd-4,v 1.1 2015/05/06 22:27:59 chutzpah Exp $
command="/usr/bin/salt-master"
command_args="${SALT_OPTS}"
command_background="1"
pidfile="/var/run/salt-master.pid"
name="SALT master daemon"
+retry="20"
depend() {
use net logger
#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/minion-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/minion-initd-4,v 1.1 2015/05/06 22:27:59 chutzpah Exp $
command="/usr/bin/salt-minion"
command_args="${SALT_OPTS}"
command_background="1"
pidfile="/var/run/salt-minion.pid"
name="SALT minion daemon"
+retry="20"
depend() {
need net
#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/syndic-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/syndic-initd-4,v 1.1 2015/05/06 22:27:59 chutzpah Exp $
command="/usr/bin/salt-syndic"
command_args="${SALT_OPTS}"
command_background="1"
pidfile="/var/run/salt-syndic.pid"
name="SALT syndic daemon"
+retry="20"
depend() {
use net logger
# All Parameters must be like "paramter=value" without blanks.
# version of Config File
-version=1.76
+version=1.77
# Selection of the ripping Title, look with "lsdvd".
# With "titel=0" lxdvdrip selects automatically the longest Title.
# Device for DVD-Burner.
# growisofs: normally "/dev/sr0".
-# cdrecord: normally "0,0,0", test with "cdrecord -scanbus".
+# wodim: normally "0,0,0", test with "wodim -scanbus".
# On the Commandline: "-db=".
dvdbrenner=/dev/sr0
file=0
# Burning Program.
-# "1": growisofs, "2": cdrecord, "3": cdrecord on the fly,
-# "4": create ISO-Image "/tmp/dvdrip.img" with mkisofs.
-# "5": create ISO-Image with Name "Volume-ID.img" (=Name of DVD) with mkisofs.
+# "1": growisofs, "2": wodim, "3": wodim on the fly,
+# "4": create ISO-Image "/tmp/dvdrip.img" with genisoimage.
+# "5": create ISO-Image with Name "Volume-ID.img" (=Name of DVD) with genisoimage.
# "0": no Burning.
# On the Commandline: "-bp=".
brennprogramm=1
# On the Commandline: "-free="
free=1
-# Burning Speed for growisofs and cdrecord.
+# Burning Speed for growisofs and wodim.
# speed=0: Start without "-speed="
speed=4
# For a Description see "man growisofs".
dvdcompat=1
-# Extra-Parameter(s) for mkisofs.
+# Extra-Parameter(s) for genisoimage.
# Parameter must be marked with apostrophes "xxx", i. E.:
-# mkisofs_param="-input-charset iso8859-1"
-# Parameter would be set by calling mkisofs or growisofs.
-mkisofs_param=""
+# genisoimage_param="-input-charset iso8859-1"
+# Parameter would be set by calling genisoimage or growisofs.
+genisoimage_param=""
-# Extra-Parameter(s) for cdrecord/growisofs.
+# Extra-Parameter(s) for wodim/growisofs.
# Parameter must be marked with apostrophes "xxx", i. E.:
# burn_param="-tao"
-# Parameter would be set by calling cdrecord or growisofs.
+# Parameter would be set by calling wodim or growisofs.
burn_param=""
# Eject DVD after Ripping
# Optional the full Path could be set, i. E.
# "play_cell_name=/usr/local/bin/play_cell".
dvdauthor_name=dvdauthor
-buffer_name=buffer_lxdvdrip
+#buffer_name=buffer
#buffer_name=bfr
-#buffer_name=mbuffer
+buffer_name=mbuffer_lxdvdrip
tccat_name=tccat
tcextract_name=tcextract
requant_name=requant_lxdvdrip
spuunmux_name=spuunmux
dvdbackup_name=dvdbackup_lxdvdrip
# Alternative: dvdbackup_name=vobcopy
-mkisofs_name=mkisofs
-cdrecord_name=cdrecord
+genisoimage_name=genisoimage
+wodim_name=wodim
growisofs_name=growisofs
dvd+rw-format=dvd+rw-format
dvdunauthor_name=dvdunauthor
# Nice-Level for Programgroups
# nice_rip for ripping (tccat, mplayer, spuunmux, vamps_play_cell)
-# nice_burn for burning (growisofs, cdrecord)
+# nice_burn for burning (growisofs, wodim)
# Possible values from "-20" (high) to "19" (low), "off" without nice
nice_rip=off
nice_burn=off
~app-admin/collectd-5.4.1
~app-admin/salt-2014.1.10
+~app-admin/salt-2015.5.2
#~app-admin/ulogd-1.24
#~app-emulation/emul-linux-x86-baselibs-20120520
~dev-python/pyparted-3.10.2
#~dev-python/python-debian-0.1.21
~dev-python/python-debian-0.1.21_p2
+~dev-python/python-debian-0.1.27
~dev-python/python-ldap-2.4.15
#~dev-python/setuptools-1.1.6
#~dev-python/sphinx-1.1.3
#~dev-python/virtualenvwrapper-3.2
#~dev-python/virtualenvwrapper-3.7
~dev-python/virtualenvwrapper-4.2
+~dev-python/virtualenvwrapper-4.5.1
#~dev-ruby/dnsruby-1.53
#~dev-ruby/zonecheck-3.0.4
# ~media-video/libav-11.2
~media-video/lxdvdrip-1.76
+~media-video/lxdvdrip-1.77
~media-video/streamdvd-0.4
#~net-im/skype-2.2.0.35
#script: bootstrap-salt
-
##########################################
##### Logging Settings #####
##########################################
##### Misc Defaults #####
##########################################
-# Whether or not to remove the accompnaying SSH key from the known_hosts file
+# Whether or not to remove the accompanying SSH key from the known_hosts file
# when an instance is destroyed.
#
# Default: 'False'
base_ec2:
provider: my-ec2-config
image: ami-e565ba8c
- size: Micro Instance
+ size: t1.micro
script: python-bootstrap
minion:
cheese: edam
# password: xyzzy
# url: https://api.cloud.xmission.com:4465/paci/v1.0/
+#my-proxmox-config:
+# provider: proxmox
+# user: saltcloud@pve
+# password: xyzzy
+# url: your.proxmox.host
+
#my-openstack-rackspace-config:
# provider: openstack
# identity_url: 'https://identity.api.rackspacecloud.com/v2.0/tokens'
##### Primary configuration settings #####
##########################################
-# This configuration file is used to manage the behavior of the Salt Master
-# Values that are commented out but have no space after the comment are
-# defaults that need not be set in the config. If there is a space after the
-# comment that the value is presented as an example and is not the default.
+# This configuration file is used to manage the behavior of the Salt Master.
+# Values that are commented out but have an empty line after the comment are
+# defaults that do not need to be set in the config. If there is no blank line
+# after the comment then the value is presented as an example and is not the
+# default.
# Per default, the master will automatically include all config files
# from master.d/*.conf (master.d is a directory in the same directory
-# as the main master config file)
+# as the main master config file).
#default_include: master.d/*.conf
-# The address of the interface to bind to
+# The address of the interface to bind to:
#interface: 0.0.0.0
# Whether the master should listen for IPv6 connections. If this is set to True,
-# the interface option must be adjusted too (for example: "interface: '::'")
+# the interface option must be adjusted, too. (For example: "interface: '::'")
#ipv6: False
-# The tcp port used by the publisher
+# The tcp port used by the publisher:
#publish_port: 4505
# The user under which the salt master will run. Salt will update all
# permissions to allow the specified user to run the master. The exception is
-# the job cache, which must be deleted if this user is changed. If the
-# modified files cause conflicts set verify_env to False.
+# the job cache, which must be deleted if this user is changed. If the
+# modified files cause conflicts, set verify_env to False.
#user: root
# Max open files
+#
# Each minion connecting to the master uses AT LEAST one file descriptor, the
# master subscription connection. If enough minions connect you might start
-# seeing on the console(and then salt-master crashes):
+# seeing on the console (and then salt-master crashes):
# Too many open files (tcp_listener.cpp:335)
# Aborted (core dumped)
#
# If you wish to set a different value than the default one, uncomment and
# configure this setting. Remember that this value CANNOT be higher than the
# hard limit. Raising the hard limit depends on your OS and/or distribution,
-# a good way to find the limit is to search the internet for(for example):
+# a good way to find the limit is to search the internet. For example:
# raise max open files hard limit debian
#
#max_open_files: 100000
-# The number of worker threads to start, these threads are used to manage
-# return calls made from minions to the master, if the master seems to be
-# running slowly, increase the number of threads
+# The number of worker threads to start. These threads are used to manage
+# return calls made from minions to the master. If the master seems to be
+# running slowly, increase the number of threads.
#worker_threads: 5
# The port used by the communication interface. The ret (return) port is the
-# interface used for the file server, authentication, job returnes, etc.
+# interface used for the file server, authentication, job returns, etc.
#ret_port: 4506
-# Specify the location of the daemon process ID file
+# Specify the location of the daemon process ID file:
#pidfile: /var/run/salt-master.pid
# The root directory prepended to these options: pki_dir, cachedir,
# sock_dir, log_file, autosign_file, autoreject_file, extension_modules,
-# key_logfile, pidfile.
+# key_logfile, pidfile:
#root_dir: /
-# Directory used to store public key data
+# Directory used to store public key data:
#pki_dir: /etc/salt/pki/master
-# Directory to store job and cache data
+# Directory to store job and cache data:
#cachedir: /var/cache/salt/master
-# Verify and set permissions on configuration directories at startup
+# Directory for custom modules. This directory can contain subdirectories for
+# each of Salt's module types such as "runners", "output", "wheel", "modules",
+# "states", "returners", etc.
+#extension_modules: <no default>
+
+# Directory for custom modules. This directory can contain subdirectories for
+# each of Salt's module types such as "runners", "output", "wheel", "modules",
+# "states", "returners", etc.
+# Like 'extension_modules' but can take an array of paths
+#module_dirs: <no default>
+# - /var/cache/salt/minion/extmods
+
+# Verify and set permissions on configuration directories at startup:
#verify_env: True
-# Set the number of hours to keep old job information in the job cache
+# Set the number of hours to keep old job information in the job cache:
#keep_jobs: 24
-# Set the default timeout for the salt command and api, the default is 5
-# seconds
+# Set the default timeout for the salt command and api. The default is 5
+# seconds.
#timeout: 5
-# The loop_interval option controls the seconds for the master's maintinance
+# The loop_interval option controls the seconds for the master's maintenance
# process check cycle. This process updates file server backends, cleans the
# job cache and executes the scheduler.
#loop_interval: 60
-# Set the default outputter used by the salt command. The default is "nested"
+# Set the default outputter used by the salt command. The default is "nested".
#output: nested
-# By default output is colored, to disable colored output set the color value
-# to False
+# Return minions that timeout when running commands like test.ping
+#show_timeout: True
+
+# By default, output is colored. To disable colored output, set the color value
+# to False.
#color: True
-# Set the directory used to hold unix sockets
+# Do not strip off the colored output from nested results and state outputs
+# (true by default).
+# strip_colors: False
+
+# Set the directory used to hold unix sockets:
#sock_dir: /var/run/salt/master
# The master can take a while to start up when lspci and/or dmidecode is used
# to populate the grains for the master. Enable if you want to see GPU hardware
# data for your master.
-#
# enable_gpu_grains: False
-# The master maintains a job cache, while this is a great addition it can be
+# The master maintains a job cache. While this is a great addition, it can be
# a burden on the master for larger deployments (over 5000 minions).
# Disabling the job cache will make previously executed jobs unavailable to
# the jobs system and is not generally recommended.
-#
#job_cache: True
# Cache minion grains and pillar data in the cachedir.
#minion_data_cache: True
+# Store all returns in the given returner.
+# Setting this option requires that any returner-specific configuration also
+# be set. See various returners in salt/returners for details on required
+# configuration values. (See also, event_return_queue below.)
+#
+#event_return: mysql
+
+# On busy systems, enabling event_returns can cause a considerable load on
+# the storage system for returners. Events can be queued on the master and
+# stored in a batched fashion using a single transaction for multiple events.
+# By default, events are not queued.
+#event_return_queue: 0
+
+# Only events returns matching tags in a whitelist
+# event_return_whitelist:
+# - salt/master/a_tag
+# - salt/master/another_tag
+
+# Store all event returns _except_ the tags in a blacklist
+# event_return_blacklist:
+# - salt/master/not_this_tag
+# - salt/master/or_this_one
+
+# Passing very large events can cause the minion to consume large amounts of
+# memory. This value tunes the maximum size of a message allowed onto the
+# master event bus. The value is expressed in bytes.
+#max_event_size: 1048576
+
+# By default, the master AES key rotates every 24 hours. The next command
+# following a key rotation will trigger a key refresh from the minion which may
+# result in minions which do not respond to the first command after a key refresh.
+#
+# To tell the master to ping all minions immediately after an AES key refresh, set
+# ping_on_rotate to True. This should mitigate the issue where a minion does not
+# appear to initially respond after a key is rotated.
+#
+# Note that ping_on_rotate may cause high load on the master immediately after
+# the key rotation event as minions reconnect. Consider this carefully if this
+# salt master is managing a large number of minions.
+#
+# If disabled, it is recommended to handle this event by listening for the
+# 'aes_key_rotate' event with the 'key' tag and acting appropriately.
+# ping_on_rotate: False
+
+# By default, the master deletes its cache of minion data when the key for that
+# minion is removed. To preserve the cache after key deletion, set
+# 'preserve_minion_cache' to True.
+#
+# WARNING: This may have security implications if compromised minions auth with
+# a previous deleted minion ID.
+#preserve_minion_cache: False
+
+# If max_minions is used in large installations, the master might experience
+# high-load situations because of having to check the number of connected
+# minions for every authentication. This cache provides the minion-ids of
+# all connected minions to all MWorker-processes and greatly improves the
+# performance of max_minions.
+# con_cache: False
+
# The master can include configuration from other files. To enable this,
# pass a list of paths to this option. The paths can be either relative or
# absolute; if relative, they are considered to be relative to the directory
# the main master configuration file lives in (this file). Paths can make use
# of shell-style globbing. If no files are matched by a path passed to this
-# option then the master will log a warning message.
-#
+# option, then the master will log a warning message.
#
# Include a config file from some other path:
-#include: /etc/salt/extra_config
+# include: /etc/salt/extra_config
#
# Include config from several files and directories:
-#include:
-# - /etc/salt/extra_config
+# include:
+# - /etc/salt/extra_config
##### Security settings #####
# public keys from the minions. Note that this is insecure.
#auto_accept: False
+# Time in minutes that a incoming public key with a matching name found in
+# pki_dir/minion_autosign/keyid is automatically accepted. Expired autosign keys
+# are removed when the master checks the minion_autosign directory.
+# 0 equals no timeout
+# autosign_timeout: 120
+
# If the autosign_file is specified, incoming keys specified in the
# autosign_file will be automatically accepted. This is insecure. Regular
# expressions as well as globing lines are supported.
# the autosign_file and the auto_accept setting.
#autoreject_file: /etc/salt/autoreject.conf
-# Enable permissive access to the salt keys. This allows you to run the
+# Enable permissive access to the salt keys. This allows you to run the
# master or minion as root, but have a non-root group be given access to
-# your pki_dir. To make the access explicit, root must belong to the group
-# you've given access to. This is potentially quite insecure.
-# If an autosign_file is specified, enabling permissive_pki_access will allow group access
-# to that specific file.
+# your pki_dir. To make the access explicit, root must belong to the group
+# you've given access to. This is potentially quite insecure. If an autosign_file
+# is specified, enabling permissive_pki_access will allow group access to that
+# specific file.
#permissive_pki_access: False
# Allow users on the master access to execute specific commands on minions.
# This setting should be treated with care since it opens up execution
# capabilities to non root users. By default this capability is completely
# disabled.
-#
#client_acl:
# larry:
# - test.ping
# - network.*
#
-
# Blacklist any of the following users or modules
#
# This example would blacklist all non sudo users, including root from
# running any commands. It would also blacklist any use of the "cmd"
-# module.
-# This is completely disabled by default.
+# module. This is completely disabled by default.
#
#client_acl_blacklist:
# users:
# modules:
# - cmd
+# Enforce client_acl & client_acl_blacklist when users have sudo
+# access to the salt command.
+#
+#sudo_acl: False
+
# The external auth system uses the Salt auth modules to authenticate and
# validate users to access areas of the Salt system.
-#
#external_auth:
# pam:
# fred:
# - test.*
#
-
# Time (in seconds) for a newly generated token to live. Default: 12 hours
#token_expire: 43200
#file_recv: False
# Set a hard-limit on the size of the files that can be pushed to the master.
-# It will be interpreted as megabytes.
-# Default: 100
+# It will be interpreted as megabytes. Default: 100
#file_recv_max_size: 100
# Signature verification on messages published from the master.
# no signature, it will still be accepted, and a warning message will be logged.
# Conversely, if sign_pub_messages is False, but a minion receives a signed
# message it will be accepted, the signature will not be checked, and a warning message
-# will be logged. This behavior will go away in Salt 0.17.6 (or Hydrogen RC1, whichever
-# comes first) and these two situations will cause minion to throw an exception and
-# drop the message.
-#
+# will be logged. This behavior went away in Salt 2014.1.0 and these two situations
+# will cause minion to throw an exception and drop the message.
# sign_pub_messages: False
+##### Salt-SSH Configuration #####
+##########################################
+
+# Pass in an alternative location for the salt-ssh roster file
+#roster_file: /etc/salt/roster
+
+# Pass in minion option overrides that will be inserted into the SHIM for
+# salt-ssh calls. The local minion config is not used for salt-ssh. Can be
+# overridden on a per-minion basis in the roster (`minion_opts`)
+#ssh_minion_opts:
+# gpg_keydir: /root/gpg
+
##### Master Module Management #####
##########################################
-# Manage how master side modules are loaded
+# Manage how master side modules are loaded.
-# Add any additional locations to look for master runners
+# Add any additional locations to look for master runners:
#runner_dirs: []
-# Enable Cython for master side modules
+# Enable Cython for master side modules:
#cython_enable: False
# The master_tops option replaces the external_nodes option by creating
# a plugable system for the generation of external top data. The external_nodes
# option is deprecated by the master_tops option.
+#
# To gain the capabilities of the classic external_nodes system, use the
# following configuration:
# master_tops:
# output for each changed state if set to 'full', but if set to 'terse'
# the output will be shortened to a single line. If set to 'mixed', the output
# will be terse unless a state failed, in which case that output will be full.
+# If set to 'changes', the output will be full unless the state didn't change.
#state_output: full
+# Automatically aggregate all states that have support for mod_aggregate by
+# setting to True. Or pass a list of state module names to automatically
+# aggregate just those types.
+#
+# state_aggregate:
+# - pkg
+#
+#state_aggregate: False
##### File Server settings #####
##########################################
# prod:
# - /srv/salt/prod/services
# - /srv/salt/prod/states
-
+#
#file_roots:
# base:
# - /srv/salt
# The hash_type is the hash to use when discovering the hash of a file on
# the master server. The default is md5, but sha1, sha224, sha256, sha384
# and sha512 are also supported.
+#
+# Prior to changing this value, the master should be stopped and all Salt
+# caches should be cleared.
#hash_type: md5
# The buffer size in the file server can be adjusted here:
# For example, if you manage your custom modules and states in subversion
# and don't want all the '.svn' folders and content synced to your minions,
# you could set this to '/\.svn($|/)'. By default nothing is ignored.
-#
#file_ignore_regex:
# - '/\.svn($|/)'
# - '/\.git($|/)'
# path before syncing the modules and states to the minions. This is similar
# to file_ignore_regex above, but works on globs instead of regex. By default
# nothing is ignored.
-#
# file_ignore_glob:
# - '*.pyc'
# - '*/somefolder/*.bak'
# - '*.swp'
# File Server Backend
+#
# Salt supports a modular fileserver backend system, this system allows
# the salt master to link directly to third party systems to gather and
# manage the files available to minions. Multiple backends can be
# configured and will be searched for the requested file in the order in which
# they are defined here. The default setting only enables the standard backend
# "roots" which uses the "file_roots" option.
-#
#fileserver_backend:
# - roots
#
# To use multiple backends list them in the order they are searched:
-#
#fileserver_backend:
# - git
# - roots
# symlinks when walking the filesystem tree. This is set to True
# by default. Currently this only applies to the default roots
# fileserver_backend.
-#
#fileserver_followsymlinks: False
#
# Uncomment the line below if you do not want symlinks to be
# treated as the files they are pointing to. By default this is set to
# False. By uncommenting the line below, any detected symlink while listing
# files on the Master will not be returned to the Minion.
-#
#fileserver_ignoresymlinks: True
#
# By default, the Salt fileserver recurses fully into all defined environments
# traverses directories with SLS files and special Salt directories like _modules,
# enable the option below. This might be useful for installations where a file root
# has a very large number of files and performance is impacted. Default is False.
-#
# fileserver_limit_traversal: False
#
# The fileserver can fire events off every time the fileserver is updated,
# these are disabled by default, but can be easily turned on by setting this
# flag to True
#fileserver_events: False
+
+# Git File Server Backend Configuration
+#
+# Gitfs can be provided by one of two python modules: GitPython or pygit2. If
+# using pygit2, both libgit2 and git must also be installed.
+#gitfs_provider: gitpython
#
-# Git fileserver backend configuration
# When using the git fileserver backend at least one git remote needs to be
# defined. The user running the salt master will need read access to the repo.
#
+# The repos will be searched in order to find the file requested by a client
+# and the first repo to have the file will return it.
+# When using the git backend branches and tags are translated into salt
+# environments.
+# Note: file:// repos will be treated as a remote, so refs you want used must
+# exist in that repo as *local* refs.
#gitfs_remotes:
# - git://github.com/saltstack/salt-states.git
# - file:///var/git/saltmaster
# is a security concern, you may want to try using the ssh transport.
#gitfs_ssl_verify: True
#
-# The repos will be searched in order to find the file requested by a client
-# and the first repo to have the file will return it.
-# When using the git backend branches and tags are translated into salt
-# environments.
-# Note: file:// repos will be treated as a remote, so refs you want used must
-# exist in that repo as *local* refs.
-#
# The gitfs_root option gives the ability to serve files from a subdirectory
# within the repository. The path is defined relative to the root of the
# repository and defaults to the repository root.
#gitfs_root: somefolder/otherfolder
-
-
+#
+#
##### Pillar settings #####
##########################################
# Salt Pillars allow for the building of global data that can be made selectively
# Pillar is laid out in the same fashion as the file server, with environments,
# a top file and sls files. However, pillar data does not need to be in the
# highstate format, and is generally just key/value pairs.
-
#pillar_roots:
# base:
# - /srv/pillar
-
+#
#ext_pillar:
# - hiera: /etc/hiera.yaml
# - cmd_yaml: cat /etc/salt/yaml
+# The ext_pillar_first option allows for external pillar sources to populate
+# before file system pillar. This allows for targeting file system pillar from
+# ext_pillar.
+#ext_pillar_first: False
+
# The pillar_gitfs_ssl_verify option specifies whether to ignore ssl certificate
# errors when contacting the pillar gitfs backend. You might want to set this to
# false if you're using a git backend that uses a self-signed certificate but
# The pillar_opts option adds the master configuration file data to a dict in
# the pillar called "master". This is used to set simple configurations in the
# master config file that can then be used on minions.
-#pillar_opts: True
+#pillar_opts: False
+
+# The pillar_safe_render_error option prevents the master from passing piller
+# render errors to the minion. This is set on by default because the error could
+# contain templating data which would give that minion information it shouldn't
+# have, like a password! When set true the error message will only show:
+# Rendering SLS 'my.sls' failed. Please see master log for details.
+#pillar_safe_render_error: True
+
+# The pillar_source_merging_strategy option allows you to configure merging strategy
+# between different sources. It accepts four values: recurse, aggregate, overwrite,
+# or smart. Recurse will merge recursively mapping of data. Aggregate instructs
+# aggregation of elements between sources that use the #!yamlex renderer. Overwrite
+# will verwrite elements according the order in which they are processed. This is
+# behavior of the 2014.1 branch and earlier. Smart guesses the best strategy based
+# on the "renderer" setting and is the default value.
+#pillar_source_merging_strategy: smart
##### Syndic settings #####
# this master where to receive commands from.
#syndic_master: masterofmaster
-# This is the 'ret_port' of the MasterOfMaster
+# This is the 'ret_port' of the MasterOfMaster:
#syndic_master_port: 4506
-# PID file of the syndic daemon
+# PID file of the syndic daemon:
#syndic_pidfile: /var/run/salt-syndic.pid
-# LOG file of the syndic daemon
+# LOG file of the syndic daemon:
#syndic_log_file: syndic.log
+
##### Peer Publish settings #####
##########################################
# Salt minions can send commands to other minions, but only if the minion is
# of regular expressions to match functions. The following will allow the
# minion authenticated as foo.example.com to execute functions from the test
# and pkg modules.
-#
#peer:
# foo.example.com:
# - test.*
# - pkg.*
#
# This will allow all minions to execute all commands:
-#
#peer:
# .*:
# - .*
#
# All peer runner support is turned off by default and must be enabled before
# using. This will enable all peer runners for all minions:
-#
#peer_run:
# .*:
# - .*
#
# To enable just the manage.up runner for the minion foo.example.com:
-#
#peer_run:
# foo.example.com:
# - manage.up
-
+#
+#
##### Mine settings #####
##########################################
# Restrict mine.get access from minions. By default any minion has a full access
# to get all mine data from master cache. In acl definion below, only pcre matches
# are allowed.
-#
# mine_get:
# .*:
# - .*
#
-# Example below enables minion foo.example.com to get 'network.interfaces' mine data only
-# , minions web* to get all network.* and disk.* mine data and all other minions won't get
-# any mine data.
-#
+# The example below enables minion foo.example.com to get 'network.interfaces' mine
+# data only, minions web* to get all network.* and disk.* mine data and all other
+# minions won't get any mine data.
# mine_get:
# foo.example.com:
-# - network.inetrfaces
+# - network.interfaces
# web.*:
# - network.*
# - disk.*
+
##### Logging settings #####
##########################################
# The location of the master log file
# The level of messages to send to the log file.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
+# If using 'log_granular_levels' this must be set to the highest desired level.
#log_level_logfile: warning
# The date and time format used in log messages. Allowed date/time formating
# example sets the main salt library at the 'warning' level, but sets
# 'salt.modules' to log at the 'debug' level:
# log_granular_levels:
-# 'salt': 'warning',
+# 'salt': 'warning'
# 'salt.modules': 'debug'
#
#log_granular_levels: {}
##### Node Groups #####
##########################################
-# Node groups allow for logical groupings of minion nodes.
-# A group consists of a group name and a compound target.
-#
+# Node groups allow for logical groupings of minion nodes. A group consists of a group
+# name and a compound target.
#nodegroups:
# group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com'
# group2: 'G@os:Debian and foo.domain.com'
##### Range Cluster settings #####
##########################################
# The range server (and optional port) that serves your cluster information
-# https://github.com/grierj/range/wiki/Introduction-to-Range-with-YAML-files
+# https://github.com/ytoolshed/range/wiki/%22yamlfile%22-module-file-spec
#
#range_server: range:80
##### Windows Software Repo settings #####
##############################################
-# Location of the repo on the master
+# Location of the repo on the master:
#win_repo: '/srv/salt/win/repo'
-
-# Location of the master's repo cache file
+#
+# Location of the master's repo cache file:
#win_repo_mastercachefile: '/srv/salt/win/repo/winrepo.p'
-
-# List of git repositories to include with the local repo
+#
+# List of git repositories to include with the local repo:
#win_gitrepos:
# - 'https://github.com/saltstack/salt-winrepo.git'
+
+##### Returner settings ######
+############################################
+# Which returner(s) will be used for minion's result:
+#return: mysql
##### Primary configuration settings #####
-##########################################
+##########################################
+# This configuration file is used to manage the behavior of the Salt Minion.
+# With the exception of the location of the Salt Master Server, values that are
+# commented out but have an empty line after the comment are defaults that need
+# not be set in the config. If there is no blank line after the comment, the
+# value is presented as an example and is not the default.
# Per default the minion will automatically include all config files
# from minion.d/*.conf (minion.d is a directory in the same directory
# as the main minion config file).
#default_include: minion.d/*.conf
-# Set the location of the salt master server, if the master server cannot be
+# Set the location of the salt master server. If the master server cannot be
# resolved, then the minion will fail to start.
#master: salt
-# Set whether the minion should connect to the master via IPv6
+# If multiple masters are specified in the 'master' setting, the default behavior
+# is to always try to connect to them in the order they are listed. If random_master is
+# set to True, the order will be randomized instead. This can be helpful in distributing
+# the load of many minions executing salt-call requests, for example, from a cron job.
+# If only one master is listed, this setting is ignored and a warning will be logged.
+#random_master: False
+
+# Set whether the minion should connect to the master via IPv6:
#ipv6: False
# Set the number of seconds to wait before attempting to resolve
# Set to zero if the minion should shutdown and not retry.
# retry_dns: 30
-# Set the port used by the master reply and authentication server
+# Set the port used by the master reply and authentication server.
#master_port: 4506
-# The user to run salt
+# The user to run salt.
#user: root
-# Specify the location of the daemon process ID file
+# Specify the location of the daemon process ID file.
#pidfile: /var/run/salt-minion.pid
# The root directory prepended to these options: pki_dir, cachedir, log_file,
# Custom static grains for this minion can be specified here and used in SLS
# files just like all other grains. This example sets 4 custom grains, with
-# the 'roles' grain having two values that can be matched against:
+# the 'roles' grain having two values that can be matched against.
#grains:
# roles:
# - webserver
# deployment: datacenter4
# cabinet: 13
# cab_u: 14-15
-
-# Where cache data goes
+#
+# Where cache data goes.
#cachedir: /var/cache/salt/minion
-# Verify and set permissions on configuration directories at startup
+# Verify and set permissions on configuration directories at startup.
#verify_env: True
# The minion can locally cache the return data from jobs sent to it, this
# can be a good way to keep track of jobs the minion has executed
-# (on the minion side). By default this feature is disabled, to enable
-# set cache_jobs to True
+# (on the minion side). By default this feature is disabled, to enable, set
+# cache_jobs to True.
#cache_jobs: False
-# set the directory used to hold unix sockets
+# Set the directory used to hold unix sockets.
#sock_dir: /var/run/salt/minion
# Set the default outputter used by the salt-call command. The default is
-# "nested"
+# "nested".
#output: nested
#
-# By default output is colored, to disable colored output set the color value
-# to False
+# By default output is colored. To disable colored output, set the color value
+# to False.
#color: True
+# Do not strip off the colored output from nested results and state outputs
+# (true by default).
+# strip_colors: False
+
# Backup files that are replaced by file.managed and file.recurse under
# 'cachedir'/file_backups relative to their original location and appended
# with a timestamp. The only valid setting is "minion". Disabled by default.
#
# Alternatively this can be specified for each file in state files:
-#
# /etc/ssh/sshd_config:
# file.managed:
# - source: salt://ssh/sshd_config
# set to zero, the time between reconnection attempts will stay constant.
#acceptance_wait_time_max: 0
-# If the master rejects the minion's public key, retry instead exiting. Rejected keys
-# # will be handled the same as waiting on acceptance.
+# If the master rejects the minion's public key, retry instead of exiting.
+# Rejected keys will be handled the same as waiting on acceptance.
#rejected_retry: False
# When the master key changes, the minion will try to re-auth itself to receive
# the new master key. In larger environments this can cause a SYN flood on the
# master because all minions try to re-auth immediately. To prevent this and
# have a minion wait for a random amount of time, use this optional parameter.
-# The wait-time will be a random number of seconds between
-# 0 and the defined value.
+# The wait-time will be a random number of seconds between 0 and the defined value.
#random_reauth_delay: 60
# When waiting for a master to accept the minion's public key, salt will
# continuously attempt to reconnect until successful. This is the timeout value,
# in seconds, for each individual attempt. After this timeout expires, the minion
-# will wait for acceptance_wait_time seconds before trying again.
-# Unless your master is under unusually heavy load, this should be left at the default.
-#auth_timeout: 3
+# will wait for acceptance_wait_time seconds before trying again. Unless your master
+# is under unusually heavy load, this should be left at the default.
+#auth_timeout: 60
+
+# Number of consecutive SaltReqTimeoutError that are acceptable when trying to
+# authenticate.
+#auth_tries: 7
+
+# If authentication fails due to SaltReqTimeoutError during a ping_interval,
+# cause sub minion process to restart.
+#auth_safemode: False
+# Ping Master to ensure connection is alive (minutes).
+#ping_interval: 0
+
+# To auto recover minions if master changes IP address (DDNS)
+# auth_tries: 10
+# auth_safemode: False
+# ping_interval: 90
+#
+# Minions won't know master is missing until a ping fails. After the ping fail,
+# the minion will attempt authentication and likely fails out and cause a restart.
+# When the minion restarts it will resolve the masters IP and attempt to reconnect.
-# If you don't have any problems with syn-floods, dont bother with the
+# If you don't have any problems with syn-floods, don't bother with the
# three recon_* settings described below, just leave the defaults!
#
# The ZeroMQ pull-socket that binds to the masters publishing interface tries
# minions reconnect immediately which might flood the master (the ZeroMQ-default
# is usually a 100ms delay). To prevent this, these three recon_* settings
# can be used.
-#
# recon_default: the interval in milliseconds that the socket should wait before
-# trying to reconnect to the master (100ms = 1 second)
+# trying to reconnect to the master (1000ms = 1 second)
#
# recon_max: the maximum time a socket should wait. each interval the time to wait
# is calculated by doubling the previous time. if recon_max is reached,
# and recon_max value kind of defeats the purpose of being able to
# change these settings. If all minions have the same values and your
# setup is quite large (several thousand minions), they will still
-# flood the master. The desired behaviour is to have timeframe within
+# flood the master. The desired behavior is to have timeframe within
# all minions try to reconnect.
-
-# Example on how to use these settings:
-# The goal: have all minions reconnect within a 60 second timeframe on a disconnect
#
-# The settings:
-#recon_default: 1000
-#recon_max: 59000
-#recon_randomize: True
+# Example on how to use these settings. The goal: have all minions reconnect within a
+# 60 second timeframe on a disconnect.
+# recon_default: 1000
+# recon_max: 59000
+# recon_randomize: True
#
# Each minion will have a randomized reconnect value between 'recon_default'
# and 'recon_default + recon_max', which in this example means between 1000ms
# 60000ms (or between 1 and 60 seconds). The generated random-value will be
# doubled after each attempt to reconnect. Lets say the generated random
# value is 11 seconds (or 11000ms).
-#
# reconnect 1: wait 11 seconds
# reconnect 2: wait 22 seconds
# reconnect 3: wait 33 seconds
#
# In a setup with ~6000 thousand hosts these settings would average the reconnects
# to about 100 per second and all hosts would be reconnected within 60 seconds.
-#recon_default: 100
-#recon_max: 5000
-#recon_randomize: False
-
+# recon_default: 100
+# recon_max: 5000
+# recon_randomize: False
+#
+#
# The loop_interval sets how long in seconds the minion will wait between
# evaluating the scheduler and running cleanup tasks. This defaults to a
# sane 60 seconds, but if the minion scheduler needs to be evaluated more
# A value of 10 minutes is a reasonable default.
#
# If the value is set to zero, this check is disabled.
-#grains_refresh_every = 1
+#grains_refresh_every: 1
# Cache grains on the minion. Default is False.
-# grains_cache: False
+#grains_cache: False
# Grains cache expiration, in seconds. If the cache file is older than this
# number of seconds then the grains cache will be dumped and fully re-populated
# is not enabled.
# grains_cache_expiration: 300
-
-# When healing, a dns_check is run. This is to make sure that the originally
-# resolved dns has not changed. If this is something that does not happen in
-# your environment, set this value to False.
-#dns_check: True
-
# Windows platforms lack posix IPC and must rely on slower TCP based inter-
# process communications. Set ipc_mode to 'tcp' on such systems
#ipc_mode: ipc
-#
+
# Overwrite the default tcp ports used by the minion when in tcp mode
#tcp_pub_port: 4510
#tcp_pull_port: 4511
+# Passing very large events can cause the minion to consume large amounts of
+# memory. This value tunes the maximum size of a message allowed onto the
+# minion event bus. The value is expressed in bytes.
+#max_event_size: 1048576
+
+# To detect failed master(s) and fire events on connect/disconnect, set
+# master_alive_interval to the number of seconds to poll the masters for
+# connection events.
+#
+#master_alive_interval: 30
+
# The minion can include configuration from other files. To enable this,
# pass a list of paths to this option. The paths can be either relative or
# absolute; if relative, they are considered to be relative to the directory
# of shell-style globbing. If no files are matched by a path passed to this
# option then the minion will log a warning message.
#
-#
# Include a config file from some other path:
# include: /etc/salt/extra_config
#
#include:
# - /etc/salt/extra_config
# - /etc/roles/webserver
-
+#
+#
+#
##### Minion module management #####
##########################################
# Disable specific modules. This allows the admin to limit the level of
-# access the master has to the minion
+# access the master has to the minion.
#disable_modules: [cmd,test]
#disable_returners: []
#
#returner_dirs: []
#states_dirs: []
#render_dirs: []
+#utils_dirs: []
#
# A module provider can be statically overwritten or extended for the minion
# via the providers option, in this case the default module will be
# overwritten by the specified module. In this example the pkg module will
# be provided by the yumpkg5 module instead of the system default.
-#
#providers:
# pkg: yumpkg5
#
# Enable Cython modules searching and loading. (Default: False)
#cython_enable: False
#
-#
-#
-# Specify a max size (in bytes) for modules on import
-# this feature is currently only supported on *nix OSs and requires psutil
+# Specify a max size (in bytes) for modules on import. This feature is currently
+# only supported on *nix operating systems and requires psutil.
# modules_max_memory: -1
-
##### State Management Settings #####
###########################################
# The state management system executes all of the state templates on the minion
#renderer: yaml_jinja
#
# The failhard option tells the minions to stop immediately after the first
-# failure detected in the state execution, defaults to False
+# failure detected in the state execution. Defaults to False.
#failhard: False
#
-# autoload_dynamic_modules Turns on automatic loading of modules found in the
-# environments on the master. This is turned on by default, to turn of
-# autoloading modules when states run set this value to False
+# autoload_dynamic_modules turns on automatic loading of modules found in the
+# environments on the master. This is turned on by default. To turn of
+# autoloading modules when states run, set this value to False.
#autoload_dynamic_modules: True
#
# clean_dynamic_modules keeps the dynamic modules on the minion in sync with
# the dynamic modules on the master, this means that if a dynamic module is
-# not on the master it will be deleted from the minion. By default this is
-# enabled and can be disabled by changing this value to False
+# not on the master it will be deleted from the minion. By default, this is
+# enabled and can be disabled by changing this value to False.
#clean_dynamic_modules: True
#
-# Normally the minion is not isolated to any single environment on the master
+# Normally, the minion is not isolated to any single environment on the master
# when running states, but the environment can be isolated on the minion side
# by statically setting it. Remember that the recommended way to manage
# environments is to isolate via the top file.
# 'top' -- Read top_file option and execute based on that file on the Master
#startup_states: ''
#
-# list of states to run when the minion starts up if startup_states is 'sls'
+# List of states to run when the minion starts up if startup_states is 'sls':
#sls_list:
# - edit.vim
# - hyper
#
-# top file to execute if startup_states is 'top'
+# Top file to execute if startup_states is 'top':
#top_file: ''
+# Automatically aggregate all states that have support for mod_aggregate by
+# setting to True. Or pass a list of state module names to automatically
+# aggregate just those types.
+#
+# state_aggregate:
+# - pkg
+#
+#state_aggregate: False
+
##### File Directory Settings #####
##########################################
# The Salt Minion can redirect all file server operations to a local directory,
# to attempt to find files. To limit this behavior so that the fileserver only
# traverses directories with SLS files and special Salt directories like _modules,
# enable the option below. This might be useful for installations where a file root
-# has a very large number of files and performance is negatively impacted.
-#
-# Default is False.
-#
-# fileserver_limit_traversal: False
+# has a very large number of files and performance is negatively impacted. Default
+# is False.
+#fileserver_limit_traversal: False
# The hash_type is the hash to use when discovering the hash of a file in
# the local fileserver. The default is md5, but sha1, sha224, sha256, sha384
# and sha512 are also supported.
+#
+# Warning: Prior to changing this value, the minion should be stopped and all
+# Salt caches should be cleared.
#hash_type: md5
# The Salt pillar is searched for locally if file_client is set to local. If
#pillar_roots:
# base:
# - /srv/pillar
-
+#
+#
###### Security settings #####
###########################################
# Enable "open mode", this mode still maintains encryption, but turns off
# The state_verbose setting can be set to True or False, when set to False
# all data that has a result of True and no changes will be suppressed.
#state_verbose: True
-#
+
# The state_output setting changes if the output is the full multi line
# output for each changed state if set to 'full', but if set to 'terse'
# the output will be shortened to a single line.
#state_output: full
-#
+
+# The state_output_diff setting changes whether or not the output from
+# successful states is returned. Useful when even the terse output of these
+# states is cluttering the logs. Set it to True to ignore them.
+#state_output_diff: False
+
+# The state_output_profile setting changes whether profile information
+# will be shown for each state run.
+#state_output_profile: True
+
# Fingerprint of the master public key to double verify the master is valid,
# the master fingerprint can be found by running "salt-key -F master" on the
# salt master.
#master_finger: ''
+
###### Thread settings #####
###########################################
# Disable multiprocessing support, by default when a minion receives a
# publication a new process is spawned and the command is executed therein.
#multiprocessing: True
+
##### Logging settings #####
##########################################
# The location of the minion log file
#
#log_file: /var/log/salt/minion
#key_logfile: /var/log/salt/key
-#
+
# The level of messages to send to the console.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
# Default: 'warning'
#log_level: warning
-#
+
# The level of messages to send to the log file.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
+# If using 'log_granular_levels' this must be set to the highest desired level.
# Default: 'warning'
#log_level_logfile:
# can be seen here: http://docs.python.org/library/time.html#time.strftime
#log_datefmt: '%H:%M:%S'
#log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'
-#
+
# The format of the console logging messages. Allowed formatting options can
# be seen here: http://docs.python.org/library/logging.html#logrecord-attributes
#log_fmt_console: '[%(levelname)-8s] %(message)s'
#log_fmt_logfile: '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'
-#
+
# This can be used to control logging levels more specificically. This
# example sets the main salt library at the 'warning' level, but sets
# 'salt.modules' to log at the 'debug' level:
# log_granular_levels:
-# 'salt': 'warning',
+# 'salt': 'warning'
# 'salt.modules': 'debug'
#
#log_granular_levels: {}
+# To diagnose issues with minions disconnecting or missing returns, ZeroMQ
+# supports the use of monitor sockets # to log connection events. This
+# feature requires ZeroMQ 4.0 or higher.
+#
+# To enable ZeroMQ monitor sockets, set 'zmq_monitor' to 'True' and log at a
+# debug level or higher.
+#
+# A sample log event is as follows:
+#
+# [DEBUG ] ZeroMQ event: {'endpoint': 'tcp://127.0.0.1:4505', 'event': 512,
+# 'value': 27, 'description': 'EVENT_DISCONNECTED'}
+#
+# All events logged will include the string 'ZeroMQ event'. A connection event
+# should be logged on the as the minion starts up and initially connects to the
+# master. If not, check for debug log level and that the necessary version of
+# ZeroMQ is installed.
+#
+#zmq_monitor: False
+
###### Module configuration #####
###########################################
# Salt allows for modules to be passed arbitrary configuration data, any data
#
# A dict for the test module:
#test.baz: {spam: sausage, cheese: bread}
-
-
+#
+#
###### Update settings ######
###########################################
# Using the features in Esky, a salt minion can both run as a frozen app and
# the risk that it could tear down the connection the master and minion
# without informing either party that their connection has been taken away.
# Enabling TCP Keepalives prevents this from happening.
-#
+
# Overall state of TCP Keepalives, enable (1 or True), disable (0 or False)
# or leave to the OS defaults (-1), on Linux, typically disabled. Default True, enabled.
#tcp_keepalive: True
-#
+
# How long before the first keepalive should be sent in seconds. Default 300
# to send the first keepalive after 5 minutes, OS default (-1) is typically 7200 seconds
# on Linux see /proc/sys/net/ipv4/tcp_keepalive_time.
#tcp_keepalive_idle: 300
-#
+
# How many lost probes are needed to consider the connection lost. Default -1
# to use OS defaults, typically 9 on Linux, see /proc/sys/net/ipv4/tcp_keepalive_probes.
#tcp_keepalive_cnt: -1
-#
+
# How often, in seconds, to send keepalives after the first one. Default -1 to
# use OS defaults, typically 75 seconds on Linux, see
# /proc/sys/net/ipv4/tcp_keepalive_intvl.
###### Windows Software settings ######
############################################
-# Location of the repository cache file on the master
+# Location of the repository cache file on the master:
#win_repo_cachefile: 'salt://win/repo/winrepo.p'
+
+
+###### Returner settings ######
+############################################
+# Which returner(s) will be used for minion's result:
+#return: mysql
projects / config / samara / etc.git / commitdiff