From: Frank Brehm Date: Thu, 3 Sep 2015 12:37:16 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=8e22b5520d06d02a4bcc45ac840ed505693dab5a;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/init.d/salt-api b/init.d/salt-api index e54a805..e69acdf 100755 --- a/init.d/salt-api +++ b/init.d/salt-api @@ -1,7 +1,7 @@ #!/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 $ +# $Id$ command="/usr/bin/salt-api" command_args="${SALT_OPTS}" diff --git a/init.d/salt-master b/init.d/salt-master index 93ed588..dc49628 100755 --- a/init.d/salt-master +++ b/init.d/salt-master @@ -1,7 +1,7 @@ #!/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/master-initd-4,v 1.1 2015/05/06 22:27:59 chutzpah Exp $ +# $Id$ command="/usr/bin/salt-master" command_args="${SALT_OPTS}" diff --git a/init.d/salt-minion b/init.d/salt-minion index 0880554..350703a 100755 --- a/init.d/salt-minion +++ b/init.d/salt-minion @@ -1,7 +1,7 @@ #!/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/minion-initd-4,v 1.1 2015/05/06 22:27:59 chutzpah Exp $ +# $Id$ command="/usr/bin/salt-minion" command_args="${SALT_OPTS}" diff --git a/init.d/salt-syndic b/init.d/salt-syndic index 3e1027f..65916b4 100755 --- a/init.d/salt-syndic +++ b/init.d/salt-syndic @@ -1,7 +1,7 @@ #!/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/syndic-initd-4,v 1.1 2015/05/06 22:27:59 chutzpah Exp $ +# $Id$ command="/usr/bin/salt-syndic" command_args="${SALT_OPTS}" diff --git a/portage/package.keywords/common b/portage/package.keywords/common index 94d9a22..18b7e5c 100644 --- a/portage/package.keywords/common +++ b/portage/package.keywords/common @@ -2,6 +2,7 @@ ~app-admin/collectd-5.4.1 ~app-admin/salt-2014.1.10 ~app-admin/salt-2015.5.2 +~app-admin/salt-2015.5.5 #~app-admin/ulogd-1.24 #~app-emulation/emul-linux-x86-baselibs-20120520 diff --git a/salt/master b/salt/master index 12f3b32..aaafb6f 100644 --- a/salt/master +++ b/salt/master @@ -48,7 +48,8 @@ # 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. +# running slowly, increase the number of threads. This setting can not be +# set lower than 3. #worker_threads: 5 # The port used by the communication interface. The ret (return) port is the @@ -353,12 +354,12 @@ # If this is set to True the first newline after a Jinja block is removed # (block, not variable tag!). Defaults to False, corresponds to the Jinja # environment init variable "trim_blocks". -# jinja_trim_blocks: False +#jinja_trim_blocks: False # # If this is set to True leading spaces and tabs are stripped from the start # of a line to a block. Defaults to False, corresponds to the Jinja # environment init variable "lstrip_blocks". -# jinja_lstrip_blocks: False +#jinja_lstrip_blocks: False # The failhard option tells the minions to stop immediately after the first # failure detected in the state execution, defaults to False @@ -378,7 +379,7 @@ #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 +# setting to 'True'. Or pass a list of state module names to automatically # aggregate just those types. # # state_aggregate: @@ -386,6 +387,11 @@ # #state_aggregate: False +# Send progress events as each function in a state run completes execution +# by setting to 'True'. Progress events are in the format +# 'salt/job//prog//'. +#state_events: False + ##### File Server settings ##### ########################################## # Salt runs a lightweight file server written in zeromq to deliver files to diff --git a/salt/minion b/salt/minion index 4c31839..23a1acb 100644 --- a/salt/minion +++ b/salt/minion @@ -22,6 +22,18 @@ # If only one master is listed, this setting is ignored and a warning will be logged. #random_master: False +# Minions can connect to multiple masters simultaneously (all masters +# are "hot"), or can be configured to failover if a master becomes +# unavailable. Multiple hot masters are configured by setting this +# value to "str". Failover masters can be requested by setting +# to "failover". MAKE SURE TO SET master_alive_interval if you are +# using failover. +# master_type: str + +# Poll interval in seconds for checking if the master is still there. Only +# respected if master_type above is "failover". +# master_alive_interval: 30 + # Set whether the minion should connect to the master via IPv6: #ipv6: False @@ -36,6 +48,12 @@ # The user to run salt. #user: root +# Setting sudo_user will cause salt to run all execution modules under an sudo +# to the user given in sudo_user. The user under which the salt minion process +# itself runs will still be that provided in the user config above, but all +# execution modules run by the minion will be rerouted through sudo. +#sudo_user: saltdev + # Specify the location of the daemon process ID file. #pidfile: /var/run/salt-minion.pid @@ -465,9 +483,9 @@ # 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. +# Fingerprint of the master public key to validate the identity of your Salt master +# before the initial key exchange. The master fingerprint can be found by running +# "salt-key -F master" on the Salt master. #master_finger: '' @@ -603,7 +621,7 @@ #tcp_keepalive_intvl: -1 -###### Windows Software settings ###### +###### Windows Software settings ###### ############################################ # Location of the repository cache file on the master: #win_repo_cachefile: 'salt://win/repo/winrepo.p'