summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-26 11:11:32 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-26 11:12:02 +0200
commit52817fc97de3e5a5af4a43f2a2acfe05509f6258 (patch)
tree9734096ea77a727c1bfae069c06d32a0b513fd50 /src/conf_mode
parent529cf467098d1a31e07b4053722e2f9779b16142 (diff)
downloadvyos-1x-52817fc97de3e5a5af4a43f2a2acfe05509f6258.tar.gz
vyos-1x-52817fc97de3e5a5af4a43f2a2acfe05509f6258.zip
salt: T2384: always log to syslog
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/salt-minion.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py
index a460c95b3..d3412b7ef 100755
--- a/src/conf_mode/salt-minion.py
+++ b/src/conf_mode/salt-minion.py
@@ -31,7 +31,6 @@ master_keyfile = r'/opt/vyatta/etc/config/salt/pki/minion/master_sign.pub'
default_config_data = {
'hash_type': 'sha256',
- 'log_file': '/var/log/salt/minion',
'log_level': 'warning',
'master' : 'salt',
'user': 'nobody',
@@ -55,12 +54,6 @@ def get_config():
if conf.exists(['hash_type']):
salt['hash_type'] = conf.return_value(['hash_type'])
- if conf.exists(['log_file']):
- salt['log_file'] = conf.return_value(['log_file'])
-
- if conf.exists(['log_level']):
- salt['log_level'] = conf.return_value(['log_level'])
-
if conf.exists(['master']):
salt['master'] = conf.return_values(['master'])
@@ -90,6 +83,7 @@ def generate(salt):
dirname = os.path.dirname(file)
if not os.path.exists(dirname):
os.mkdir(dirname)
+ chown(dirname, salt['user'], salt['group'])
render(config_file, 'salt-minion/minion.tmpl', salt)
chown(config_file, salt['user'], salt['group'])