fix: some file names

Sponsored-by: author

1 files changed, 8 insertions, 7 deletions

diff --git a/cloud-init.py b/cloud-init.py
index 6e2a9a0..21d8ff9 100644
--- a/cloud-init.py
+++ b/cloud-init.py
@@ -2,14 +2,14 @@ import os
 import yaml
 
 HOST_ID_CONF = "host_id.conf"
-HOST_CA_CONF = "host_id.conf"
+USER_CA_CONF = "user_id.conf"
 USER_CA_KEYS = "user-ca-keys"
 AUTH_KEYS_CONF = "authorized_keys.conf"
 
 ETC = "/etc/ssh"
-CONFIG = "ssh_config"
-CONFIG_D = "ssh_config"
-LGGFILE = "/tmp/vmadm.script"
+CONFIG = "sshd_config"
+CONFIG_D = "sshd_config.d"
+LOGFILE = "/tmp/vmadm.script"
 USER_DATA = "/var/lib/cloud/instance/user-data.txt"
 
 
@@ -91,11 +91,12 @@ log(f"keys {keys}")
 log(f"certs {certs}")
 
 config_d = etc_join(CONFIG_D)
+log(f"config.d {CONFIG_D}")
 if not os.path.exists(config_d):
     log(f"mkdir {config_d}")
     os.mkdir(config_d)
 
-host_id_conf = etc.join(CONFIG_D, HOST_ID_CONF)
+host_id_conf = etc_join(CONFIG_D, HOST_ID_CONF)
 log(f"write {host_id_conf}")
 with open(host_id_conf, "w") as f:
     for filename in keys:
@@ -106,14 +107,14 @@ with open(host_id_conf, "w") as f:
         f.write(f"hostcertificate {filename}\n")
 
 if user_ca_pubkey:
-    user_ca_conf = etc.join(CONFIG_D, USER_CA_CONF)
+    user_ca_conf = etc_join(CONFIG_D, USER_CA_CONF)
     log(f"write {user_ca_conf}")
     with open(user_ca_conf, "w") as f:
         log(f"trustedusercakeys {user_ca_filename}")
         f.write(f"trustedusercakeys {user_ca_filename}\n")
 
 if not allow_authorized_keys:
-    authz_keys_conf = etc.join(CONFIG_D, AUTHZ_KEYS_CONF)
+    authz_keys_conf = etc_join(CONFIG_D, AUTHZ_KEYS_CONF)
     log(f"write {authz_keys_conf}")
     with open(auth_keys_conf, "w") as f:
         f.write("authorizedkeysfile none\n")