Compare commits
No commits in common. "27cdc9a06b6f820e4b647c826b0062bbe6b35d29" and "eb7f85d966ef7da11f41426b336ddc5702cec04f" have entirely different histories.
27cdc9a06b
...
eb7f85d966
7 changed files with 14 additions and 12 deletions
|
@ -4,9 +4,9 @@ import json
|
||||||
from json.decoder import JSONDecodeError
|
from json.decoder import JSONDecodeError
|
||||||
import logging
|
import logging
|
||||||
import socket
|
import socket
|
||||||
from typing import Union
|
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
import uuid
|
import uuid
|
||||||
|
from typing import Union
|
||||||
|
|
||||||
from Crypto.Hash import SHA, SHA256, SHA512
|
from Crypto.Hash import SHA, SHA256, SHA512
|
||||||
from Crypto.PublicKey import RSA
|
from Crypto.PublicKey import RSA
|
||||||
|
@ -16,8 +16,10 @@ from aiohttp.client_exceptions import (
|
||||||
ClientConnectorError,
|
ClientConnectorError,
|
||||||
ClientResponseError,
|
ClientResponseError,
|
||||||
)
|
)
|
||||||
|
from aiohttp.hdrs import METH_ALL as METHODS
|
||||||
from aiohttp.web import (
|
from aiohttp.web import (
|
||||||
Response as AiohttpResponse,
|
Response as AiohttpResponse,
|
||||||
|
View as AiohttpView,
|
||||||
)
|
)
|
||||||
from async_lru import alru_cache
|
from async_lru import alru_cache
|
||||||
from relay.http_debug import http_debug
|
from relay.http_debug import http_debug
|
||||||
|
@ -328,7 +330,7 @@ class DotDict(dict):
|
||||||
|
|
||||||
def jsonify(self):
|
def jsonify(self):
|
||||||
def _xform(v):
|
def _xform(v):
|
||||||
if hasattr(v, "jsonify"):
|
if hasattr(v, 'jsonify'):
|
||||||
return v.jsonify()
|
return v.jsonify()
|
||||||
else:
|
else:
|
||||||
return v
|
return v
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
from typing import Union, Optional
|
||||||
import datetime
|
import datetime
|
||||||
from typing import Optional, Union
|
|
||||||
|
|
||||||
from .key import KEY
|
from .key import KEY
|
||||||
from .lru import LRU
|
from .lru import LRU
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
from os import path
|
from os import path
|
||||||
|
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
|
|
||||||
|
|
||||||
here = path.abspath(path.dirname(__file__))
|
here = path.abspath(path.dirname(__file__))
|
||||||
|
|
||||||
with open(path.join(here, "README.md"), encoding="utf-8") as f:
|
with open(path.join(here, "README.md"), encoding="utf-8") as f:
|
||||||
|
@ -30,7 +28,7 @@ setup(
|
||||||
"proquint",
|
"proquint",
|
||||||
],
|
],
|
||||||
entry_points = {
|
entry_points = {
|
||||||
"console_scripts": ["proquint=proquint.__main__:main"],
|
'console_scripts': ['proquint=proquint.__main__:main'],
|
||||||
},
|
},
|
||||||
package_dir={"": "src/python"},
|
package_dir={"": "src/python"},
|
||||||
python_requires=">=3.9",
|
python_requires=">=3.9",
|
||||||
|
|
|
@ -8,9 +8,10 @@ from pprint import pprint
|
||||||
|
|
||||||
from gandi.client import GandiAPI
|
from gandi.client import GandiAPI
|
||||||
import meraki
|
import meraki
|
||||||
from updater import *
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
from updater import *
|
||||||
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(
|
parser = argparse.ArgumentParser(
|
||||||
description='"Dynamic" DNS updating for self-hosted services'
|
description='"Dynamic" DNS updating for self-hosted services'
|
||||||
|
|
|
@ -2,10 +2,9 @@
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from updater import (
|
import pytest
|
||||||
diff_zones,
|
|
||||||
RECORD_LINE_PATTERN,
|
from updater import RECORD_LINE_PATTERN, parse_zone_record, diff_zones
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def test_record_pattern():
|
def test_record_pattern():
|
||||||
|
|
|
@ -16,11 +16,13 @@ def inventory():
|
||||||
@inventory.command("config")
|
@inventory.command("config")
|
||||||
def inventory_config():
|
def inventory_config():
|
||||||
"""Show the configured inventory plugins."""
|
"""Show the configured inventory plugins."""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
@inventory.command("show")
|
@inventory.command("show")
|
||||||
def inventory_show():
|
def inventory_show():
|
||||||
"""Evaluate host inventory data & display that configuration."""
|
"""Evaluate host inventory data & display that configuration."""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
@cli.group("config")
|
@cli.group("config")
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
Hello {{ username }},
|
Hello {{ username }},
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
Your account on Tentacles has been approved! You may now <a href="{{ base_url }}user/login">log in</a> and start printing!
|
Your account on Tentacles has been approved! You may now <a href="{{ base_url }}login">log in</a> and start printing!
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue