paulbsd/paulbsd-salt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://git.paulbsd.com:2222/paulbsd/paulbsd-salt
All checks were successful
continuous-integration/drone Build is passing
Details

Browse Source
This commit is contained in:
Paul 2025-10-04 01:05:03 +02:00
commit ec0c1d6642
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
states/_modules/syncthing.py
View File

@ -27,7 +27,8 @@ def get_apikey(configfile="/root/.config/syncthing/config.xml"):
return None return None
def get_config(url="http://localhost:8384", verify=False, apikey=""):
def get_config(url="http://localhost:8384", verify=False, apikey=None):
try: try:
apikey = get_apikey() apikey = get_apikey()
except: except:
@ -47,7 +48,9 @@ def get_config(url="http://localhost:8384", verify=False, apikey=""):
return None 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" fullurl = f"{url}/rest/config/options"
req = Request(method="PUT", req = Request(method="PUT",
url=fullurl, url=fullurl,
@ -68,7 +71,9 @@ def set_config_options(url="http://localhost:8384", verify=False, apikey=get_api
return None 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" fullurl = f"{url}/rest/config/gui"
req = Request(method="PUT", req = Request(method="PUT",
url=fullurl, url=fullurl,
@ -92,7 +97,9 @@ def set_config_gui(url="http://localhost:8384", verify=False, apikey=get_apikey(
return None return None
## deprecated ## 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" fullurl = f"{url}/rest/config"
req = Request(method="POST", req = Request(method="POST",
url=fullurl, url=fullurl,
@ -113,7 +120,9 @@ def _set_config(url="http://localhost:8384", verify=False, apikey=get_apikey(),
return None 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" fullurl = f"{url}/rest/config/restart-required"
req = Request(method="GET", req = Request(method="GET",
url=fullurl) url=fullurl)
@ -128,7 +137,9 @@ def insync(url="http://localhost:8384", verify=False, apikey=get_apikey()):
return None 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" fullurl = f"{url}/rest/system/restart"
req = Request(method="POST", req = Request(method="POST",
url=fullurl) url=fullurl)

2
states/vector/config.sls
View File

@ -23,7 +23,7 @@ vector-config-dir:
- name: /etc/vector - name: /etc/vector
- user: {{ vector.user.name }} - user: {{ vector.user.name }}
- group: {{ vector.group.name }} - group: {{ vector.group.name }}
- mode: 700 - mode: 755
- watch_in: - watch_in:
- service: vector-service - service: vector-service