diff --git a/states/_modules/syncthing.py b/states/_modules/syncthing.py index 414a8c0..373afee 100644 --- a/states/_modules/syncthing.py +++ b/states/_modules/syncthing.py @@ -27,9 +27,10 @@ def get_apikey(configfile="/root/.config/syncthing/config.xml"): return None -def get_config(url="http://localhost:8384", verify=False, apikey=""): + +def get_config(url="http://localhost:8384", verify=False, apikey=None): try: - apikey=get_apikey() + apikey = get_apikey() except: return None fullurl = f"{url}/rest/config" @@ -47,7 +48,9 @@ def get_config(url="http://localhost:8384", verify=False, apikey=""): return None -def set_config_options(url="http://localhost:8384", verify=False, apikey=get_apikey(), options={}): +def set_config_options(url="http://localhost:8384", verify=False, apikey=None, options={}): + if not apikey: + apikey = get_apikey() fullurl = f"{url}/rest/config/options" req = Request(method="PUT", url=fullurl, @@ -68,7 +71,9 @@ def set_config_options(url="http://localhost:8384", verify=False, apikey=get_api return None -def set_config_gui(url="http://localhost:8384", verify=False, apikey=get_apikey(), gui={}): +def set_config_gui(url="http://localhost:8384", verify=False, apikey=None, gui={}): + if not apikey: + apikey = get_apikey() fullurl = f"{url}/rest/config/gui" req = Request(method="PUT", url=fullurl, @@ -92,7 +97,9 @@ def set_config_gui(url="http://localhost:8384", verify=False, apikey=get_apikey( return None ## deprecated -def _set_config(url="http://localhost:8384", verify=False, apikey=get_apikey(), config={}): +def _set_config(url="http://localhost:8384", verify=False, apikey=None, config={}): + if not apikey: + apikey = get_apikey() fullurl = f"{url}/rest/config" req = Request(method="POST", url=fullurl, @@ -113,7 +120,9 @@ def _set_config(url="http://localhost:8384", verify=False, apikey=get_apikey(), return None -def insync(url="http://localhost:8384", verify=False, apikey=get_apikey()): +def insync(url="http://localhost:8384", verify=False, apikey=None): + if not apikey: + apikey = get_apikey() fullurl = f"{url}/rest/config/restart-required" req = Request(method="GET", url=fullurl) @@ -128,7 +137,9 @@ def insync(url="http://localhost:8384", verify=False, apikey=get_apikey()): return None -def restart(url="http://localhost:8384", verify=False, apikey=get_apikey()): +def restart(url="http://localhost:8384", verify=False, apikey=None): + if not apikey: + apikey = get_apikey() fullurl = f"{url}/rest/system/restart" req = Request(method="POST", url=fullurl) diff --git a/states/vector/config.sls b/states/vector/config.sls index e704bd0..faa2ab0 100644 --- a/states/vector/config.sls +++ b/states/vector/config.sls @@ -23,7 +23,7 @@ vector-config-dir: - name: /etc/vector - user: {{ vector.user.name }} - group: {{ vector.group.name }} - - mode: 700 + - mode: 755 - watch_in: - service: vector-service