diff options
| author | UnicronNL <kim.sidney@gmail.com> | 2018-07-10 19:04:12 +0200 |
|---|---|---|
| committer | UnicronNL <kim.sidney@gmail.com> | 2018-07-10 19:04:12 +0200 |
| commit | 5649059d271f0d19a7c312184f99af0909c359cf (patch) | |
| tree | a1b888ff3c2de33d4b5755b9da33cbddbd369dd7 | |
| parent | 49b7a8774370e40fb076ab7c2e37bc14b351ef34 (diff) | |
| download | vyos-salt-minion-5649059d271f0d19a7c312184f99af0909c359cf.tar.gz vyos-salt-minion-5649059d271f0d19a7c312184f99af0909c359cf.zip | |
fix bugs
| -rwxr-xr-x | src/conf_mode/salt-minion.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py index dc75dd7..1ee0659 100755 --- a/src/conf_mode/salt-minion.py +++ b/src/conf_mode/salt-minion.py @@ -31,7 +31,6 @@ config_file = r'/etc/salt/minion' # Please be careful if you edit the template. config_tmpl = """ - ### Autogenerated by salt-minion.py ### ##### Primary configuration settings ##### @@ -140,7 +139,7 @@ def get_config(): salt['master-key'] = None if conf.exists('master-key'): - salt['master-key'] = conf.return_value('mine_interval') + salt['master-key'] = conf.return_value('master-key') salt['verify_master_pubkey_sign'] = 'true' return salt @@ -175,7 +174,7 @@ def generate(salt): with open('/opt/vyatta/etc/config/salt/pki/minion/master_sign.pub', 'wb') as out: while True: - data = r.read(chunk_size) + data = r.read(1024) if not data: break out.write(data) |