diff --git a/alpine/config b/alpine/config index b24a9c1..2dc3aa1 100644 --- a/alpine/config +++ b/alpine/config @@ -1,8 +1,3 @@ -#Host dev -# Hostname dev -# User oliver -# Port 2222 - Host dev Hostname dev User 4server @@ -38,3 +33,8 @@ Host saopaulo Hostname 192.168.9.11 User 4server IdentityFile /app/host_vars/saopaulo/saopaulo + +Host sydney2 + Hostname 192.168.9.22 + User 4server + IdentityFile /app/host_vars/sydney2/sydney2 diff --git a/alpine/known_hosts b/alpine/known_hosts index 09e0e30..c1a92bd 100644 --- a/alpine/known_hosts +++ b/alpine/known_hosts @@ -15,3 +15,4 @@ 192.168.9.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDtexcutExMflSRPJOwGPuZx49c+ZUMoElNPNntXONOuVZ8jM+zzA/4s+HCj+RWdHMnarLcNJjwRZRq7JWruqmr1EN9eNmvu13cLCKZr6Ape1gt8VmMhvQ9nA7eMx3UdvnWgXjLCfJy+BKh2XVAneM5lOSPMcyQlcACrLQVkse9EKhxhV5nEjXKYxSNetIPK9PxglXznpC8IpuWlXnDH2R8vDhdvBmBFTKOjN5Wa+GrMfElWeQOjyCpNcMVYohvV87VN6FxHQTADFTm2CKy/W7pnM8rI55ZbBIMfvLyhpM+vtFh1sJlIZSFnn+ytMUImNEAgBDI3fCpwZ99zeLViGhQJlBkdCUI+JJK9XJjpcOMNydeWh142RGU6juPuSLOZPqKNc3BpZYgPY0vMDgDWgT9AcYup3rAJ/UnUnhsxiT2h/gx7+t/j9xg01BQF5S6mezaueuavHCh9MvAzXiJXR8zanhl/Hh9BKgIAFrZh71CzP/PYG33BKCe9DXA09aJrf8= 192.168.9.22 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMO5VhveQe76kEOdVqrdoTwW1fNzmgDzZNBznFEC4ohtXes0VMtJR02lhc+55XTIUX+EDxBtAh8U+kJpFeLetMU= 192.168.9.21 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGlzLZWNjSaDuDd4e66LoBizY5j+QCsifIIxkvX4CrzP/AqAgWDEEgT+pAXBFkNJlBR6TDFJ0bIdwZTbcq8/72E= +192.168.9.14 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMAQPput/v59v4cVaaXvyayCnrVzLQG/hbz+OMDJbdAt diff --git a/app/sbin/audit b/app/sbin/audit index d06110d..60d6453 100755 --- a/app/sbin/audit +++ b/app/sbin/audit @@ -36,9 +36,34 @@ def read_file(path): return None +def read_env_file(path, keys): + """Read KEY=VALUE lines from path and return the requested keys.""" + result = {key: None for key in keys} + try: + with open(path) as f: + for line in f: + line = line.strip() + if not line or line.startswith("#") or "=" not in line: + continue + if line.startswith("export "): + line = line[len("export "):].lstrip() + key, value = line.split("=", 1) + key = key.strip() + if key in result: + result[key] = value.strip().strip("\"'") + except (FileNotFoundError, PermissionError): + pass + return result + + def main(): audit = {} + # Contract info from /etc/4server + audit.update( + read_env_file("/etc/4server", ["PROVIDER", "COST", "CONTRACT_END"]) + ) + # Container identity audit["container_id"] = os.environ.get("HOSTNAME")