Skip to content

Commit

Permalink
[deps] Changed netjsonconfig branch
Browse files Browse the repository at this point in the history
- Removed redundant 'name' args from vpn.auto_client method
- Removed redundant zt method from connection/base/models.py
- Removed zt_identity_key cache key deletion from config/handlers.py
  • Loading branch information
Aryamanz29 committed Jul 31, 2023
1 parent 9d29798 commit b037b39
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion openwisp_controller/config/base/vpn.py
Expand Up @@ -600,7 +600,6 @@ def auto_client(self, auto_cert=True, template_backend_class=None):
# call auto_client and update the config
elif self._is_backend_type('zerotier') and template_backend_class:
auto = getattr(template_backend_class, 'zerotier_auto_client')(
name=self.name,
nwid=[self.network_id],
identity_secret=context_keys['zt_identity_secret'],
)
Expand Down
2 changes: 0 additions & 2 deletions openwisp_controller/config/handlers.py
Expand Up @@ -70,8 +70,6 @@ def devicegroup_delete_handler(instance, **kwargs):
def device_cache_invalidation_handler(instance, **kwargs):
view = DeviceChecksumView()
setattr(view, 'kwargs', {'pk': str(instance.pk)})
zt_identity_key = f'ow_controller_device_zt_identity_{instance.pk.hex}'
cache.delete(zt_identity_key)
view.get_device.invalidate(view)


Expand Down
4 changes: 0 additions & 4 deletions openwisp_controller/connection/base/models.py
Expand Up @@ -368,10 +368,6 @@ def update_config(self):
logger.exception(e)
else:
self.device.config.set_status_applied()
# After successfully applying the configuration
# to the device, run this check for ZeroTier member
# authentication and IP assignment
self.device.config._check_zt_vpn_client()
self.disconnect()

def save(self, *args, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,7 +1,7 @@
django-sortedm2m~=3.1.1
django-reversion~=5.0.4
django-taggit~=4.0.0
netjsonconfig @ https://github.com/openwisp/netjsonconfig/tarball/gsoc23
netjsonconfig @ https://github.com/openwisp/netjsonconfig/tarball/fix-zt-multiple-servers
django-x509 @ https://github.com/openwisp/django-x509/tarball/master
django-loci @ https://github.com/openwisp/django-loci/tarball/master
django-flat-json-widget @ https://github.com/openwisp/django-flat-json-widget/tarball/master
Expand Down

0 comments on commit b037b39

Please sign in to comment.