Compare commits
No commits in common. "main" and "0.4.1" have entirely different histories.
8 changed files with 58 additions and 231 deletions
|
|
@ -1,12 +1,3 @@
|
||||||
# 0.4.3
|
|
||||||
|
|
||||||
* Add support for AddressFamily and ConnectTimeout in the .ssh/config when using `--remote-ssh-config`.
|
|
||||||
* Update dependencies
|
|
||||||
|
|
||||||
# 0.4.2
|
|
||||||
|
|
||||||
* Support `--remote-ssh-config [path-to-ssh-config]` as an argument in case extra params are required beyond `--remote-port` or `--remote-user`. Note: `--remote-host` must still be set, but it can be an 'alias' represented by the 'Host' value in the ssh config.
|
|
||||||
|
|
||||||
# 0.4.1
|
# 0.4.1
|
||||||
|
|
||||||
* Add interactive output when 'enroll diff --enforce' is invoking Ansible.
|
* Add interactive output when 'enroll diff --enforce' is invoking Ansible.
|
||||||
|
|
|
||||||
10
README.md
10
README.md
|
|
@ -74,7 +74,7 @@ Harvest state about a host and write a harvest bundle.
|
||||||
|
|
||||||
**Common flags**
|
**Common flags**
|
||||||
- Remote harvesting:
|
- Remote harvesting:
|
||||||
- `--remote-host`, `--remote-user`, `--remote-port`, `--remote-ssh-config`
|
- `--remote-host`, `--remote-user`, `--remote-port`
|
||||||
- `--no-sudo` (if you don't want/need sudo)
|
- `--no-sudo` (if you don't want/need sudo)
|
||||||
- Sensitive-data behaviour:
|
- Sensitive-data behaviour:
|
||||||
- default: tries to avoid likely secrets
|
- default: tries to avoid likely secrets
|
||||||
|
|
@ -355,14 +355,6 @@ enroll harvest --out /tmp/enroll-harvest
|
||||||
enroll harvest --remote-host myhost.example.com --remote-user myuser --out /tmp/enroll-harvest
|
enroll harvest --remote-host myhost.example.com --remote-user myuser --out /tmp/enroll-harvest
|
||||||
```
|
```
|
||||||
|
|
||||||
### Remote harvest over SSH, where the SSH configuration is in ~/.ssh/config (e.g a different SSH key)
|
|
||||||
|
|
||||||
Note: you must still pass `--remote-host`, but in this case, its value can be the 'Host' alias of an entry in your `~/.ssh/config`.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
enroll harvest --remote-host myhostalias --remote-ssh-config ~/.ssh/config --out /tmp/enroll-harvest
|
|
||||||
```
|
|
||||||
|
|
||||||
### Include paths (`--include-path`)
|
### Include paths (`--include-path`)
|
||||||
```bash
|
```bash
|
||||||
# Add a few dotfiles from /home (still secret-safe unless --dangerous)
|
# Add a few dotfiles from /home (still secret-safe unless --dangerous)
|
||||||
|
|
|
||||||
12
debian/changelog
vendored
12
debian/changelog
vendored
|
|
@ -1,15 +1,3 @@
|
||||||
enroll (0.4.3) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Add support for AddressFamily and ConnectTimeout in the .ssh/config when using `--remote-ssh-config`.
|
|
||||||
|
|
||||||
-- Miguel Jacq <mig@mig5.net> Fri, 16 Jan 2026 11:00 +1100
|
|
||||||
|
|
||||||
enroll (0.4.2) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Support `--remote-ssh-config [path-to-ssh-config]` as an argument in case extra params are required beyond `--remote-port` or `--remote-user`. Note: `--remote-host` must still be set, but it can be an 'alias' represented by the 'Host' value in the ssh config.
|
|
||||||
|
|
||||||
-- Miguel Jacq <mig@mig5.net> Tue, 13 Jan 2026 21:55:00 +1100
|
|
||||||
|
|
||||||
enroll (0.4.1) unstable; urgency=medium
|
enroll (0.4.1) unstable; urgency=medium
|
||||||
* Add interactive output when 'enroll diff --enforce' is invoking Ansible.
|
* Add interactive output when 'enroll diff --enforce' is invoking Ansible.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -350,33 +350,16 @@ def _add_remote_args(p: argparse.ArgumentParser) -> None:
|
||||||
"--remote-host",
|
"--remote-host",
|
||||||
help="SSH host to run harvesting on (if set, harvest runs remotely and is pulled locally).",
|
help="SSH host to run harvesting on (if set, harvest runs remotely and is pulled locally).",
|
||||||
)
|
)
|
||||||
p.add_argument(
|
|
||||||
"--remote-ssh-config",
|
|
||||||
nargs="?",
|
|
||||||
const=str(Path.home() / ".ssh" / "config"),
|
|
||||||
default=None,
|
|
||||||
help=(
|
|
||||||
"Use OpenSSH-style ssh_config settings for --remote-host. "
|
|
||||||
"If provided without a value, defaults to ~/.ssh/config. "
|
|
||||||
"(Applies HostName/User/Port/IdentityFile/ProxyCommand/HostKeyAlias when supported.)"
|
|
||||||
),
|
|
||||||
)
|
|
||||||
p.add_argument(
|
p.add_argument(
|
||||||
"--remote-port",
|
"--remote-port",
|
||||||
type=int,
|
type=int,
|
||||||
default=None,
|
default=22,
|
||||||
help=(
|
help="SSH port for --remote-host (default: 22).",
|
||||||
"SSH port for --remote-host. If omitted, defaults to 22, or a value from ssh_config when "
|
|
||||||
"--remote-ssh-config is set."
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
p.add_argument(
|
p.add_argument(
|
||||||
"--remote-user",
|
"--remote-user",
|
||||||
default=None,
|
default=os.environ.get("USER") or None,
|
||||||
help=(
|
help="SSH username for --remote-host (default: local $USER).",
|
||||||
"SSH username for --remote-host. If omitted, defaults to local $USER, or a value from ssh_config when "
|
|
||||||
"--remote-ssh-config is set."
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Align terminology with Ansible: "become" == sudo.
|
# Align terminology with Ansible: "become" == sudo.
|
||||||
|
|
@ -745,17 +728,6 @@ def main() -> None:
|
||||||
)
|
)
|
||||||
args = ap.parse_args(argv)
|
args = ap.parse_args(argv)
|
||||||
|
|
||||||
# Preserve historical defaults for remote harvesting unless ssh_config lookup is enabled.
|
|
||||||
# This lets ssh_config values take effect when the user did not explicitly set
|
|
||||||
# --remote-user / --remote-port.
|
|
||||||
if hasattr(args, "remote_host"):
|
|
||||||
rsc = getattr(args, "remote_ssh_config", None)
|
|
||||||
if not rsc:
|
|
||||||
if getattr(args, "remote_port", None) is None:
|
|
||||||
setattr(args, "remote_port", 22)
|
|
||||||
if getattr(args, "remote_user", None) is None:
|
|
||||||
setattr(args, "remote_user", os.environ.get("USER") or None)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if args.cmd == "harvest":
|
if args.cmd == "harvest":
|
||||||
sops_fps = getattr(args, "sops", None)
|
sops_fps = getattr(args, "sops", None)
|
||||||
|
|
@ -773,9 +745,8 @@ def main() -> None:
|
||||||
ask_become_pass=args.ask_become_pass,
|
ask_become_pass=args.ask_become_pass,
|
||||||
local_out_dir=tmp_bundle,
|
local_out_dir=tmp_bundle,
|
||||||
remote_host=args.remote_host,
|
remote_host=args.remote_host,
|
||||||
remote_port=args.remote_port,
|
remote_port=int(args.remote_port),
|
||||||
remote_user=args.remote_user,
|
remote_user=args.remote_user,
|
||||||
remote_ssh_config=args.remote_ssh_config,
|
|
||||||
dangerous=bool(args.dangerous),
|
dangerous=bool(args.dangerous),
|
||||||
no_sudo=bool(args.no_sudo),
|
no_sudo=bool(args.no_sudo),
|
||||||
include_paths=list(getattr(args, "include_path", []) or []),
|
include_paths=list(getattr(args, "include_path", []) or []),
|
||||||
|
|
@ -795,9 +766,8 @@ def main() -> None:
|
||||||
ask_become_pass=args.ask_become_pass,
|
ask_become_pass=args.ask_become_pass,
|
||||||
local_out_dir=out_dir,
|
local_out_dir=out_dir,
|
||||||
remote_host=args.remote_host,
|
remote_host=args.remote_host,
|
||||||
remote_port=args.remote_port,
|
remote_port=int(args.remote_port),
|
||||||
remote_user=args.remote_user,
|
remote_user=args.remote_user,
|
||||||
remote_ssh_config=args.remote_ssh_config,
|
|
||||||
dangerous=bool(args.dangerous),
|
dangerous=bool(args.dangerous),
|
||||||
no_sudo=bool(args.no_sudo),
|
no_sudo=bool(args.no_sudo),
|
||||||
include_paths=list(getattr(args, "include_path", []) or []),
|
include_paths=list(getattr(args, "include_path", []) or []),
|
||||||
|
|
@ -998,9 +968,8 @@ def main() -> None:
|
||||||
ask_become_pass=args.ask_become_pass,
|
ask_become_pass=args.ask_become_pass,
|
||||||
local_out_dir=tmp_bundle,
|
local_out_dir=tmp_bundle,
|
||||||
remote_host=args.remote_host,
|
remote_host=args.remote_host,
|
||||||
remote_port=args.remote_port,
|
remote_port=int(args.remote_port),
|
||||||
remote_user=args.remote_user,
|
remote_user=args.remote_user,
|
||||||
remote_ssh_config=args.remote_ssh_config,
|
|
||||||
dangerous=bool(args.dangerous),
|
dangerous=bool(args.dangerous),
|
||||||
no_sudo=bool(args.no_sudo),
|
no_sudo=bool(args.no_sudo),
|
||||||
include_paths=list(getattr(args, "include_path", []) or []),
|
include_paths=list(getattr(args, "include_path", []) or []),
|
||||||
|
|
@ -1029,9 +998,8 @@ def main() -> None:
|
||||||
ask_become_pass=args.ask_become_pass,
|
ask_become_pass=args.ask_become_pass,
|
||||||
local_out_dir=harvest_dir,
|
local_out_dir=harvest_dir,
|
||||||
remote_host=args.remote_host,
|
remote_host=args.remote_host,
|
||||||
remote_port=args.remote_port,
|
remote_port=int(args.remote_port),
|
||||||
remote_user=args.remote_user,
|
remote_user=args.remote_user,
|
||||||
remote_ssh_config=args.remote_ssh_config,
|
|
||||||
dangerous=bool(args.dangerous),
|
dangerous=bool(args.dangerous),
|
||||||
no_sudo=bool(args.no_sudo),
|
no_sudo=bool(args.no_sudo),
|
||||||
include_paths=list(getattr(args, "include_path", []) or []),
|
include_paths=list(getattr(args, "include_path", []) or []),
|
||||||
|
|
|
||||||
110
enroll/remote.py
110
enroll/remote.py
|
|
@ -330,9 +330,8 @@ def _remote_harvest(
|
||||||
*,
|
*,
|
||||||
local_out_dir: Path,
|
local_out_dir: Path,
|
||||||
remote_host: str,
|
remote_host: str,
|
||||||
remote_port: Optional[int] = None,
|
remote_port: int = 22,
|
||||||
remote_user: Optional[str] = None,
|
remote_user: Optional[str] = None,
|
||||||
remote_ssh_config: Optional[str] = None,
|
|
||||||
remote_python: str = "python3",
|
remote_python: str = "python3",
|
||||||
dangerous: bool = False,
|
dangerous: bool = False,
|
||||||
no_sudo: bool = False,
|
no_sudo: bool = False,
|
||||||
|
|
@ -371,113 +370,12 @@ def _remote_harvest(
|
||||||
# Users should add the key to known_hosts.
|
# Users should add the key to known_hosts.
|
||||||
ssh.set_missing_host_key_policy(paramiko.RejectPolicy())
|
ssh.set_missing_host_key_policy(paramiko.RejectPolicy())
|
||||||
|
|
||||||
# Resolve SSH connection parameters.
|
|
||||||
connect_host = remote_host
|
|
||||||
connect_port = int(remote_port) if remote_port is not None else 22
|
|
||||||
connect_user = remote_user
|
|
||||||
key_filename = None
|
|
||||||
sock = None
|
|
||||||
hostkey_name = connect_host
|
|
||||||
|
|
||||||
# Timeouts derived from ssh_config if set (ConnectTimeout).
|
|
||||||
# Used both for socket connect (when we create one) and Paramiko handshake/auth.
|
|
||||||
connect_timeout: Optional[float] = None
|
|
||||||
|
|
||||||
if remote_ssh_config:
|
|
||||||
from paramiko.config import SSHConfig # type: ignore
|
|
||||||
from paramiko.proxy import ProxyCommand # type: ignore
|
|
||||||
import socket as _socket
|
|
||||||
|
|
||||||
cfg_path = Path(str(remote_ssh_config)).expanduser()
|
|
||||||
if not cfg_path.exists():
|
|
||||||
raise RuntimeError(f"SSH config file not found: {cfg_path}")
|
|
||||||
|
|
||||||
cfg = SSHConfig()
|
|
||||||
with cfg_path.open("r", encoding="utf-8") as _fp:
|
|
||||||
cfg.parse(_fp)
|
|
||||||
hcfg = cfg.lookup(remote_host)
|
|
||||||
|
|
||||||
connect_host = str(hcfg.get("hostname") or remote_host)
|
|
||||||
hostkey_name = str(hcfg.get("hostkeyalias") or connect_host)
|
|
||||||
|
|
||||||
if remote_port is None and hcfg.get("port"):
|
|
||||||
try:
|
|
||||||
connect_port = int(str(hcfg.get("port")))
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
if connect_user is None and hcfg.get("user"):
|
|
||||||
connect_user = str(hcfg.get("user"))
|
|
||||||
|
|
||||||
ident = hcfg.get("identityfile")
|
|
||||||
if ident:
|
|
||||||
if isinstance(ident, (list, tuple)):
|
|
||||||
key_filename = [str(Path(p).expanduser()) for p in ident]
|
|
||||||
else:
|
|
||||||
key_filename = str(Path(str(ident)).expanduser())
|
|
||||||
|
|
||||||
# Honour OpenSSH ConnectTimeout (seconds) if present.
|
|
||||||
if hcfg.get("connecttimeout"):
|
|
||||||
try:
|
|
||||||
connect_timeout = float(str(hcfg.get("connecttimeout")))
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
connect_timeout = None
|
|
||||||
|
|
||||||
proxycmd = hcfg.get("proxycommand")
|
|
||||||
|
|
||||||
# AddressFamily support: inet (IPv4 only), inet6 (IPv6 only), any (default).
|
|
||||||
addrfam = str(hcfg.get("addressfamily") or "any").strip().lower()
|
|
||||||
family: Optional[int] = None
|
|
||||||
if addrfam == "inet":
|
|
||||||
family = _socket.AF_INET
|
|
||||||
elif addrfam == "inet6":
|
|
||||||
family = _socket.AF_INET6
|
|
||||||
|
|
||||||
if proxycmd:
|
|
||||||
# ProxyCommand provides the transport; AddressFamily doesn't apply here.
|
|
||||||
sock = ProxyCommand(str(proxycmd))
|
|
||||||
elif family is not None:
|
|
||||||
# Enforce the requested address family by pre-connecting the socket and
|
|
||||||
# passing it into Paramiko via sock=.
|
|
||||||
last_err: Optional[OSError] = None
|
|
||||||
infos = _socket.getaddrinfo(
|
|
||||||
connect_host, connect_port, family, _socket.SOCK_STREAM
|
|
||||||
)
|
|
||||||
for af, socktype, proto, _, sa in infos:
|
|
||||||
s = _socket.socket(af, socktype, proto)
|
|
||||||
if connect_timeout is not None:
|
|
||||||
s.settimeout(connect_timeout)
|
|
||||||
try:
|
|
||||||
s.connect(sa)
|
|
||||||
sock = s
|
|
||||||
break
|
|
||||||
except OSError as e:
|
|
||||||
last_err = e
|
|
||||||
try:
|
|
||||||
s.close()
|
|
||||||
except Exception:
|
|
||||||
pass # nosec
|
|
||||||
if sock is None and last_err is not None:
|
|
||||||
raise last_err
|
|
||||||
elif hostkey_name != connect_host:
|
|
||||||
# If HostKeyAlias is used, connect to HostName via a socket but
|
|
||||||
# use HostKeyAlias for known_hosts lookups.
|
|
||||||
sock = _socket.create_connection(
|
|
||||||
(connect_host, connect_port), timeout=connect_timeout
|
|
||||||
)
|
|
||||||
|
|
||||||
# If we created a socket (sock!=None), pass hostkey_name as hostname so
|
|
||||||
# known_hosts lookup uses HostKeyAlias (or whatever hostkey_name resolved to).
|
|
||||||
ssh.connect(
|
ssh.connect(
|
||||||
hostname=hostkey_name if sock is not None else connect_host,
|
hostname=remote_host,
|
||||||
port=connect_port,
|
port=int(remote_port),
|
||||||
username=connect_user,
|
username=remote_user,
|
||||||
key_filename=key_filename,
|
|
||||||
sock=sock,
|
|
||||||
allow_agent=True,
|
allow_agent=True,
|
||||||
look_for_keys=True,
|
look_for_keys=True,
|
||||||
timeout=connect_timeout,
|
|
||||||
banner_timeout=connect_timeout,
|
|
||||||
auth_timeout=connect_timeout,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# If no username was explicitly provided, SSH may have selected a default.
|
# If no username was explicitly provided, SSH may have selected a default.
|
||||||
|
|
|
||||||
91
poetry.lock
generated
91
poetry.lock
generated
|
|
@ -1027,58 +1027,53 @@ files = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tomli"
|
name = "tomli"
|
||||||
version = "2.4.0"
|
version = "2.3.0"
|
||||||
description = "A lil' TOML parser"
|
description = "A lil' TOML parser"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.8"
|
python-versions = ">=3.8"
|
||||||
files = [
|
files = [
|
||||||
{file = "tomli-2.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b5ef256a3fd497d4973c11bf142e9ed78b150d36f5773f1ca6088c230ffc5867"},
|
{file = "tomli-2.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:88bd15eb972f3664f5ed4b57c1634a97153b4bac4479dcb6a495f41921eb7f45"},
|
||||||
{file = "tomli-2.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5572e41282d5268eb09a697c89a7bee84fae66511f87533a6f88bd2f7b652da9"},
|
{file = "tomli-2.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:883b1c0d6398a6a9d29b508c331fa56adbcdff647f6ace4dfca0f50e90dfd0ba"},
|
||||||
{file = "tomli-2.4.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:551e321c6ba03b55676970b47cb1b73f14a0a4dce6a3e1a9458fd6d921d72e95"},
|
{file = "tomli-2.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d1381caf13ab9f300e30dd8feadb3de072aeb86f1d34a8569453ff32a7dea4bf"},
|
||||||
{file = "tomli-2.4.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5e3f639a7a8f10069d0e15408c0b96a2a828cfdec6fca05296ebcdcc28ca7c76"},
|
{file = "tomli-2.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a0e285d2649b78c0d9027570d4da3425bdb49830a6156121360b3f8511ea3441"},
|
||||||
{file = "tomli-2.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1b168f2731796b045128c45982d3a4874057626da0e2ef1fdd722848b741361d"},
|
{file = "tomli-2.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0a154a9ae14bfcf5d8917a59b51ffd5a3ac1fd149b71b47a3a104ca4edcfa845"},
|
||||||
{file = "tomli-2.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:133e93646ec4300d651839d382d63edff11d8978be23da4cc106f5a18b7d0576"},
|
{file = "tomli-2.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:74bf8464ff93e413514fefd2be591c3b0b23231a77f901db1eb30d6f712fc42c"},
|
||||||
{file = "tomli-2.4.0-cp311-cp311-win32.whl", hash = "sha256:b6c78bdf37764092d369722d9946cb65b8767bfa4110f902a1b2542d8d173c8a"},
|
{file = "tomli-2.3.0-cp311-cp311-win32.whl", hash = "sha256:00b5f5d95bbfc7d12f91ad8c593a1659b6387b43f054104cda404be6bda62456"},
|
||||||
{file = "tomli-2.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:d3d1654e11d724760cdb37a3d7691f0be9db5fbdaef59c9f532aabf87006dbaa"},
|
{file = "tomli-2.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:4dc4ce8483a5d429ab602f111a93a6ab1ed425eae3122032db7e9acf449451be"},
|
||||||
{file = "tomli-2.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:cae9c19ed12d4e8f3ebf46d1a75090e4c0dc16271c5bce1c833ac168f08fb614"},
|
{file = "tomli-2.3.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d7d86942e56ded512a594786a5ba0a5e521d02529b3826e7761a05138341a2ac"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:920b1de295e72887bafa3ad9f7a792f811847d57ea6b1215154030cf131f16b1"},
|
{file = "tomli-2.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:73ee0b47d4dad1c5e996e3cd33b8a76a50167ae5f96a2607cbe8cc773506ab22"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7d6d9a4aee98fac3eab4952ad1d73aee87359452d1c086b5ceb43ed02ddb16b8"},
|
{file = "tomli-2.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:792262b94d5d0a466afb5bc63c7daa9d75520110971ee269152083270998316f"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:36b9d05b51e65b254ea6c2585b59d2c4cb91c8a3d91d0ed0f17591a29aaea54a"},
|
{file = "tomli-2.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4f195fe57ecceac95a66a75ac24d9d5fbc98ef0962e09b2eddec5d39375aae52"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1c8a885b370751837c029ef9bc014f27d80840e48bac415f3412e6593bbc18c1"},
|
{file = "tomli-2.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e31d432427dcbf4d86958c184b9bfd1e96b5b71f8eb17e6d02531f434fd335b8"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8768715ffc41f0008abe25d808c20c3d990f42b6e2e58305d5da280ae7d1fa3b"},
|
{file = "tomli-2.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7b0882799624980785240ab732537fcfc372601015c00f7fc367c55308c186f6"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7b438885858efd5be02a9a133caf5812b8776ee0c969fea02c45e8e3f296ba51"},
|
{file = "tomli-2.3.0-cp312-cp312-win32.whl", hash = "sha256:ff72b71b5d10d22ecb084d345fc26f42b5143c5533db5e2eaba7d2d335358876"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-win32.whl", hash = "sha256:0408e3de5ec77cc7f81960c362543cbbd91ef883e3138e81b729fc3eea5b9729"},
|
{file = "tomli-2.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:1cb4ed918939151a03f33d4242ccd0aa5f11b3547d0cf30f7c74a408a5b99878"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:685306e2cc7da35be4ee914fd34ab801a6acacb061b6a7abca922aaf9ad368da"},
|
{file = "tomli-2.3.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5192f562738228945d7b13d4930baffda67b69425a7f0da96d360b0a3888136b"},
|
||||||
{file = "tomli-2.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:5aa48d7c2356055feef06a43611fc401a07337d5b006be13a30f6c58f869e3c3"},
|
{file = "tomli-2.3.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:be71c93a63d738597996be9528f4abe628d1adf5e6eb11607bc8fe1a510b5dae"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:84d081fbc252d1b6a982e1870660e7330fb8f90f676f6e78b052ad4e64714bf0"},
|
{file = "tomli-2.3.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c4665508bcbac83a31ff8ab08f424b665200c0e1e645d2bd9ab3d3e557b6185b"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:9a08144fa4cba33db5255f9b74f0b89888622109bd2776148f2597447f92a94e"},
|
{file = "tomli-2.3.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4021923f97266babc6ccab9f5068642a0095faa0a51a246a6a02fccbb3514eaf"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c73add4bb52a206fd0c0723432db123c0c75c280cbd67174dd9d2db228ebb1b4"},
|
{file = "tomli-2.3.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4ea38c40145a357d513bffad0ed869f13c1773716cf71ccaa83b0fa0cc4e42f"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fb2945cbe303b1419e2706e711b7113da57b7db31ee378d08712d678a34e51e"},
|
{file = "tomli-2.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ad805ea85eda330dbad64c7ea7a4556259665bdf9d2672f5dccc740eb9d3ca05"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:bbb1b10aa643d973366dc2cb1ad94f99c1726a02343d43cbc011edbfac579e7c"},
|
{file = "tomli-2.3.0-cp313-cp313-win32.whl", hash = "sha256:97d5eec30149fd3294270e889b4234023f2c69747e555a27bd708828353ab606"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4cbcb367d44a1f0c2be408758b43e1ffb5308abe0ea222897d6bfc8e8281ef2f"},
|
{file = "tomli-2.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:0c95ca56fbe89e065c6ead5b593ee64b84a26fca063b5d71a1122bf26e533999"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-win32.whl", hash = "sha256:7d49c66a7d5e56ac959cb6fc583aff0651094ec071ba9ad43df785abc2320d86"},
|
{file = "tomli-2.3.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:cebc6fe843e0733ee827a282aca4999b596241195f43b4cc371d64fc6639da9e"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:3cf226acb51d8f1c394c1b310e0e0e61fecdd7adcb78d01e294ac297dd2e7f87"},
|
{file = "tomli-2.3.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:4c2ef0244c75aba9355561272009d934953817c49f47d768070c3c94355c2aa3"},
|
||||||
{file = "tomli-2.4.0-cp313-cp313-win_arm64.whl", hash = "sha256:d20b797a5c1ad80c516e41bc1fb0443ddb5006e9aaa7bda2d71978346aeb9132"},
|
{file = "tomli-2.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c22a8bf253bacc0cf11f35ad9808b6cb75ada2631c2d97c971122583b129afbc"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:26ab906a1eb794cd4e103691daa23d95c6919cc2fa9160000ac02370cc9dd3f6"},
|
{file = "tomli-2.3.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0eea8cc5c5e9f89c9b90c4896a8deefc74f518db5927d0e0e8d4a80953d774d0"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:20cedb4ee43278bc4f2fee6cb50daec836959aadaf948db5172e776dd3d993fc"},
|
{file = "tomli-2.3.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:b74a0e59ec5d15127acdabd75ea17726ac4c5178ae51b85bfe39c4f8a278e879"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:39b0b5d1b6dd03684b3fb276407ebed7090bbec989fa55838c98560c01113b66"},
|
{file = "tomli-2.3.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b5870b50c9db823c595983571d1296a6ff3e1b88f734a4c8f6fc6188397de005"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a26d7ff68dfdb9f87a016ecfd1e1c2bacbe3108f4e0f8bcd2228ef9a766c787d"},
|
{file = "tomli-2.3.0-cp314-cp314-win32.whl", hash = "sha256:feb0dacc61170ed7ab602d3d972a58f14ee3ee60494292d384649a3dc38ef463"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:20ffd184fb1df76a66e34bd1b36b4a4641bd2b82954befa32fe8163e79f1a702"},
|
{file = "tomli-2.3.0-cp314-cp314-win_amd64.whl", hash = "sha256:b273fcbd7fc64dc3600c098e39136522650c49bca95df2d11cf3b626422392c8"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:75c2f8bbddf170e8effc98f5e9084a8751f8174ea6ccf4fca5398436e0320bc8"},
|
{file = "tomli-2.3.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:940d56ee0410fa17ee1f12b817b37a4d4e4dc4d27340863cc67236c74f582e77"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-win32.whl", hash = "sha256:31d556d079d72db7c584c0627ff3a24c5d3fb4f730221d3444f3efb1b2514776"},
|
{file = "tomli-2.3.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:f85209946d1fe94416debbb88d00eb92ce9cd5266775424ff81bc959e001acaf"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-win_amd64.whl", hash = "sha256:43e685b9b2341681907759cf3a04e14d7104b3580f808cfde1dfdb60ada85475"},
|
{file = "tomli-2.3.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a56212bdcce682e56b0aaf79e869ba5d15a6163f88d5451cbde388d48b13f530"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314-win_arm64.whl", hash = "sha256:3d895d56bd3f82ddd6faaff993c275efc2ff38e52322ea264122d72729dca2b2"},
|
{file = "tomli-2.3.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c5f3ffd1e098dfc032d4d3af5c0ac64f6d286d98bc148698356847b80fa4de1b"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:5b5807f3999fb66776dbce568cc9a828544244a8eb84b84b9bafc080c99597b9"},
|
{file = "tomli-2.3.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:5e01decd096b1530d97d5d85cb4dff4af2d8347bd35686654a004f8dea20fc67"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c084ad935abe686bd9c898e62a02a19abfc9760b5a79bc29644463eaf2840cb0"},
|
{file = "tomli-2.3.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:8a35dd0e643bb2610f156cca8db95d213a90015c11fee76c946aa62b7ae7e02f"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0f2e3955efea4d1cfbcb87bc321e00dc08d2bcb737fd1d5e398af111d86db5df"},
|
{file = "tomli-2.3.0-cp314-cp314t-win32.whl", hash = "sha256:a1f7f282fe248311650081faafa5f4732bdbfef5d45fe3f2e702fbc6f2d496e0"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0e0fe8a0b8312acf3a88077a0802565cb09ee34107813bba1c7cd591fa6cfc8d"},
|
{file = "tomli-2.3.0-cp314-cp314t-win_amd64.whl", hash = "sha256:70a251f8d4ba2d9ac2542eecf008b3c8a9fc5c3f9f02c56a9d7952612be2fdba"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:413540dce94673591859c4c6f794dfeaa845e98bf35d72ed59636f869ef9f86f"},
|
{file = "tomli-2.3.0-py3-none-any.whl", hash = "sha256:e95b1af3c5b07d9e643909b5abbec77cd9f1217e6d0bca72b0234736b9fb1f1b"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:0dc56fef0e2c1c470aeac5b6ca8cc7b640bb93e92d9803ddaf9ea03e198f5b0b"},
|
{file = "tomli-2.3.0.tar.gz", hash = "sha256:64be704a875d2a59753d80ee8a533c3fe183e3f06807ff7dc2232938ccb01549"},
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-win32.whl", hash = "sha256:d878f2a6707cc9d53a1be1414bbb419e629c3d6e67f69230217bb663e76b5087"},
|
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-win_amd64.whl", hash = "sha256:2add28aacc7425117ff6364fe9e06a183bb0251b03f986df0e78e974047571fd"},
|
|
||||||
{file = "tomli-2.4.0-cp314-cp314t-win_arm64.whl", hash = "sha256:2b1e3b80e1d5e52e40e9b924ec43d81570f0e7d09d11081b797bc4692765a3d4"},
|
|
||||||
{file = "tomli-2.4.0-py3-none-any.whl", hash = "sha256:1f776e7d669ebceb01dee46484485f43a4048746235e683bcdffacdf1fb4785a"},
|
|
||||||
{file = "tomli-2.4.0.tar.gz", hash = "sha256:aa89c3f6c277dd275d8e243ad24f3b5e701491a860d5121f2cdd399fbb31fc9c"},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "enroll"
|
name = "enroll"
|
||||||
version = "0.4.3"
|
version = "0.4.1"
|
||||||
description = "Enroll a server's running state retrospectively into Ansible"
|
description = "Enroll a server's running state retrospectively into Ansible"
|
||||||
authors = ["Miguel Jacq <mig@mig5.net>"]
|
authors = ["Miguel Jacq <mig@mig5.net>"]
|
||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
%global upstream_version 0.4.3
|
%global upstream_version 0.4.1
|
||||||
|
|
||||||
Name: enroll
|
Name: enroll
|
||||||
Version: %{upstream_version}
|
Version: %{upstream_version}
|
||||||
|
|
@ -43,11 +43,6 @@ Enroll a server's running state retrospectively into Ansible.
|
||||||
%{_bindir}/enroll
|
%{_bindir}/enroll
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jan 16 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
|
|
||||||
- Add support for AddressFamily and ConnectTimeout in the .ssh/config when using `--remote-ssh-config`.
|
|
||||||
* Tue Jan 13 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
|
|
||||||
- Support `--remote-ssh-config [path-to-ssh-config]` as an argument in case extra params are required beyond `--remote-port` or `--remote-user`. Note: `--remote-host` must still be s
|
|
||||||
et, but it can be an 'alias' represented by the 'Host' value in the ssh config.
|
|
||||||
* Sun Jan 11 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
|
* Sun Jan 11 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
|
||||||
- Add interactive output when 'enroll diff --enforce' is invoking Ansible.
|
- Add interactive output when 'enroll diff --enforce' is invoking Ansible.
|
||||||
* Sat Jan 10 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
|
* Sat Jan 10 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue