Browse Source

modules: set: really remove persistent keepalive

master
Maximilian Eschenbacher 6 years ago
parent
commit
6c465b38f7
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      _modules/wireguard.py
  2. +2
    -2
      _states/wireguard.py

+ 1
- 1
_modules/wireguard.py View File

if not peer: if not peer:
return 'If endpoint is given, peer must also be given' return 'If endpoint is given, peer must also be given'
s = '%s endpoint %s' % (s, endpoint) s = '%s endpoint %s' % (s, endpoint)
if persistent_keepalive:
if persistent_keepalive is not None:
if not peer: if not peer:
return 'If persistent_keepalive is given, peer must also be given' return 'If persistent_keepalive is given, peer must also be given'
s = '%s persistent-keepalive %s' % (s, persistent_keepalive) s = '%s persistent-keepalive %s' % (s, persistent_keepalive)

+ 2
- 2
_states/wireguard.py View File



show = __salt__['wg.show'](name, hide_keys=False) show = __salt__['wg.show'](name, hide_keys=False)


if int(show.get('listening port', 0)) != int(listen_port):
if listen_port and int(show.get('listening port', 0)) != int(listen_port):
__salt__['wg.set'](name, listen_port=listen_port) __salt__['wg.set'](name, listen_port=listen_port)
ret['changes']['listening port'] = dict( ret['changes']['listening port'] = dict(
old=show.get('listening port', 0), old=show.get('listening port', 0),
ret['changes']['endpoint'] = dict( ret['changes']['endpoint'] = dict(
old=show.get('endpoint'), new=endpoint) old=show.get('endpoint'), new=endpoint)


if persistent_keepalive and show.get('persistent keepalive', '').startswith('every %s second' % (persistent_keepalive,)):
if persistent_keepalive and not show.get('persistent keepalive', '').startswith('every %s second' % (persistent_keepalive,)):
__salt__['wg.set'](interface, peer=name, __salt__['wg.set'](interface, peer=name,
persistent_keepalive=persistent_keepalive) persistent_keepalive=persistent_keepalive)
ret['changes']['persistent keepalive'] = 'persistent keepalive changed.' ret['changes']['persistent keepalive'] = 'persistent keepalive changed.'

Loading…
Cancel
Save