Revision 553bd93f
| b/Makefile.am | ||
|---|---|---|
| 445 | 445 |
echo "VERSION_FULL = '$(VERSION_FULL)'"; \ |
| 446 | 446 |
echo "LOCALSTATEDIR = '$(localstatedir)'"; \ |
| 447 | 447 |
echo "SYSCONFDIR = '$(sysconfdir)'"; \ |
| 448 |
echo "SSH_CONFIG_DIR = '$(SSH_CONFIG_DIR)'"; \ |
|
| 448 | 449 |
echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \ |
| 449 | 450 |
echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \ |
| 450 | 451 |
echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \ |
| b/configure.ac | ||
|---|---|---|
| 39 | 39 |
[export_dir="/srv/ganeti/export"]) |
| 40 | 40 |
AC_SUBST(EXPORT_DIR, $export_dir) |
| 41 | 41 |
|
| 42 |
# --with-ssh-config-dir=... |
|
| 43 |
AC_ARG_WITH([ssh-config-dir], |
|
| 44 |
[AS_HELP_STRING([--with-ssh-config-dir=DIR], |
|
| 45 |
[ directory with ssh host keys ] |
|
| 46 |
[ (default is /etc/ssh)] |
|
| 47 |
)], |
|
| 48 |
[ssh_config_dir="$withval"], |
|
| 49 |
[ssh_config_dir="/etc/ssh"]) |
|
| 50 |
AC_SUBST(SSH_CONFIG_DIR, $ssh_config_dir) |
|
| 51 |
|
|
| 42 | 52 |
# --with-os-search-path=... |
| 43 | 53 |
# do a bit of black sed magic to for quoting of the strings in the list |
| 44 | 54 |
AC_ARG_WITH([os-search-path], |
| b/lib/constants.py | ||
|---|---|---|
| 367 | 367 |
OS_VARIANTS_FILE = 'variants.list' |
| 368 | 368 |
|
| 369 | 369 |
# ssh constants |
| 370 |
SSH_CONFIG_DIR = "/etc/ssh/"
|
|
| 371 |
SSH_HOST_DSA_PRIV = SSH_CONFIG_DIR + "ssh_host_dsa_key" |
|
| 370 |
SSH_CONFIG_DIR = _autoconf.SSH_CONFIG_DIR
|
|
| 371 |
SSH_HOST_DSA_PRIV = SSH_CONFIG_DIR + "/ssh_host_dsa_key"
|
|
| 372 | 372 |
SSH_HOST_DSA_PUB = SSH_HOST_DSA_PRIV + ".pub" |
| 373 |
SSH_HOST_RSA_PRIV = SSH_CONFIG_DIR + "ssh_host_rsa_key" |
|
| 373 |
SSH_HOST_RSA_PRIV = SSH_CONFIG_DIR + "/ssh_host_rsa_key"
|
|
| 374 | 374 |
SSH_HOST_RSA_PUB = SSH_HOST_RSA_PRIV + ".pub" |
| 375 | 375 |
SSH = "ssh" |
| 376 | 376 |
SCP = "scp" |
Also available in: Unified diff