Compare commits
3 Commits
bd49636f27
...
8adee3cdbe
| Author | SHA1 | Date | |
|---|---|---|---|
|
8adee3cdbe
|
|||
|
b7bf638475
|
|||
|
4c4783953e
|
@@ -3,5 +3,5 @@ kind: ExtensionServiceConfig
|
|||||||
name: tailscale
|
name: tailscale
|
||||||
environment:
|
environment:
|
||||||
- TS_AUTHKEY={{ config.tailscale.authKey }}
|
- TS_AUTHKEY={{ config.tailscale.authKey }}
|
||||||
- TS_EXTRA_ARGS=--login-server https://headscale.huizinga.dev
|
- TS_EXTRA_ARGS=--login-server {{ config.tailscale.loginServer }}
|
||||||
- TS_ROUTES={{ helper.tailscale_subnet(node.gateway, node.netmask) }}
|
- TS_ROUTES={{ helper.tailscale_subnet(node.gateway, node.netmask) }}
|
||||||
|
|||||||
@@ -2,4 +2,5 @@ PyYAML==6.0.3
|
|||||||
requests==2.32.5
|
requests==2.32.5
|
||||||
Jinja2==3.1.6
|
Jinja2==3.1.6
|
||||||
GitPython==3.1.45
|
GitPython==3.1.45
|
||||||
|
mergedeep==1.3.4
|
||||||
netaddr==1.3.0
|
netaddr==1.3.0
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import git
|
|||||||
import requests
|
import requests
|
||||||
import yaml
|
import yaml
|
||||||
from jinja2 import Environment, FileSystemLoader, StrictUndefined, Template
|
from jinja2 import Environment, FileSystemLoader, StrictUndefined, Template
|
||||||
|
from mergedeep import merge
|
||||||
from netaddr import IPAddress
|
from netaddr import IPAddress
|
||||||
|
|
||||||
REPO = git.Repo(sys.path[0], search_parent_directories=True)
|
REPO = git.Repo(sys.path[0], search_parent_directories=True)
|
||||||
@@ -141,7 +142,9 @@ def main():
|
|||||||
config = yaml.safe_load(fyaml)
|
config = yaml.safe_load(fyaml)
|
||||||
|
|
||||||
with open(ROOT.joinpath("secrets.yaml")) as fyaml:
|
with open(ROOT.joinpath("secrets.yaml")) as fyaml:
|
||||||
config |= yaml.safe_load(fyaml)
|
merge(config, yaml.safe_load(fyaml))
|
||||||
|
|
||||||
|
print(config)
|
||||||
|
|
||||||
template_args = {
|
template_args = {
|
||||||
"config": config,
|
"config": config,
|
||||||
|
|||||||
Reference in New Issue
Block a user