From 84ad6b7889de869adbcdaf44bbf6d91ce8f52524 Mon Sep 17 00:00:00 2001 From: "Jose A. Lopes" Date: Fri, 4 Oct 2013 17:10:00 +0200 Subject: [PATCH] Hs2Py constants: add SSH key files Add SSH key file constants to the Haskell to Python constant generation. Signed-off-by: Jose A. Lopes Reviewed-by: Thomas Thrainer --- lib/pathutils.py | 8 ++++---- src/Ganeti/HsConstants.hs | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lib/pathutils.py b/lib/pathutils.py index 3620ca6..756aec4 100644 --- a/lib/pathutils.py +++ b/lib/pathutils.py @@ -66,10 +66,10 @@ RUN_DIR = LOCALSTATEDIR + "/run/ganeti" #: Script to configure master IP address DEFAULT_MASTER_SETUP_SCRIPT = TOOLSDIR + "/master-ip-setup" -SSH_HOST_DSA_PRIV = SSH_CONFIG_DIR + "/ssh_host_dsa_key" -SSH_HOST_DSA_PUB = SSH_HOST_DSA_PRIV + ".pub" -SSH_HOST_RSA_PRIV = SSH_CONFIG_DIR + "/ssh_host_rsa_key" -SSH_HOST_RSA_PUB = SSH_HOST_RSA_PRIV + ".pub" +SSH_HOST_DSA_PRIV = _constants.SSH_HOST_DSA_PRIV +SSH_HOST_DSA_PUB = _constants.SSH_HOST_DSA_PUB +SSH_HOST_RSA_PRIV = _constants.SSH_HOST_RSA_PRIV +SSH_HOST_RSA_PUB = _constants.SSH_HOST_RSA_PUB BDEV_CACHE_DIR = RUN_DIR + "/bdev-cache" DISK_LINKS_DIR = RUN_DIR + "/instance-disks" diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs index bd8e066..8a100ea 100644 --- a/src/Ganeti/HsConstants.hs +++ b/src/Ganeti/HsConstants.hs @@ -1739,6 +1739,20 @@ qemuimgPath = AutoConf.qemuimgPath htools :: Bool htools = AutoConf.htools +-- * Key files for SSH daemon + +sshHostDsaPriv :: String +sshHostDsaPriv = sshConfigDir ++ "/ssh_host_dsa_key" + +sshHostDsaPub :: String +sshHostDsaPub = sshHostDsaPriv ++ ".pub" + +sshHostRsaPriv :: String +sshHostRsaPriv = sshConfigDir ++ "/ssh_host_rsa_key" + +sshHostRsaPub :: String +sshHostRsaPub = sshHostRsaPriv ++ ".pub" + -- | Path generating random UUID randomUuidFile :: String randomUuidFile = ConstantUtils.randomUuidFile -- 1.7.10.4