Compare commits

..

3 Commits

3 changed files with 2 additions and 6 deletions

View File

@@ -3,5 +3,5 @@ kind: ExtensionServiceConfig
name: tailscale
environment:
- TS_AUTHKEY={{ config.tailscale.authKey }}
- TS_EXTRA_ARGS=--login-server {{ config.tailscale.loginServer }}
- TS_EXTRA_ARGS=--login-server https://headscale.huizinga.dev
- TS_ROUTES={{ helper.tailscale_subnet(node.gateway, node.netmask) }}

View File

@@ -2,5 +2,4 @@ PyYAML==6.0.3
requests==2.32.5
Jinja2==3.1.6
GitPython==3.1.45
mergedeep==1.3.4
netaddr==1.3.0

View File

@@ -11,7 +11,6 @@ import git
import requests
import yaml
from jinja2 import Environment, FileSystemLoader, StrictUndefined, Template
from mergedeep import merge
from netaddr import IPAddress
REPO = git.Repo(sys.path[0], search_parent_directories=True)
@@ -142,9 +141,7 @@ def main():
config = yaml.safe_load(fyaml)
with open(ROOT.joinpath("secrets.yaml")) as fyaml:
merge(config, yaml.safe_load(fyaml))
print(config)
config |= yaml.safe_load(fyaml)
template_args = {
"config": config,