summaryrefslogtreecommitdiffstats
path: root/mcp/patches/0008-Handle-file_recv-option.patch
blob: b0c497ae12e580d56d9f542f4c7d6ac83b2a3596 (plain)
1
2
3
4
5
6
7
8

@media only all and (prefers-color-scheme: dark) {
.highlight .hll { background-color: #49483e }
.highlight .c { color: #75715e } /* Comment */
.highlight .err { color: #960050; background-color: #1e0010 } /* Error */
.highlight .k { color: #66d9ef } /* Keyword */
.highlight .l { color: #ae81ff } /* Literal */
.highlight .n { color: #f8f8f2 } /* Name */
.highlight .o { color: #f92672 } /* Operator */
.highlight .p { color: #f8f8f2 } /* Punctuation */
.highlight .ch { color: #75715e } /* Comment.Hashbang */
.highlight .cm { color: #75715e } /* Comment.Multiline */
.highlight .
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Mon, 28 Aug 2017 16:17:43 +0400
Subject: [PATCH] Handle file_recv option


diff --git a/salt/files/master.conf b/salt/files/master.conf
index 329ae0d..a9d9656 100644
--- a/salt/files/master.conf
+++ b/salt/files/master.conf
@@ -95,6 +95,8 @@ logstash_zmq_handler:
 order_masters: True
 {%- endif %}

+file_recv: {{ master.get('file_recv', False) }}
+
 {#-
 vim: syntax=jinja
 -#}