Revision 82ad3594
| b/Makefile.am | ||
|---|---|---|
| 449 | 449 |
echo "PKGLIBDIR = '$(pkglibdir)'"; \ |
| 450 | 450 |
echo "DRBD_BARRIERS = $(DRBD_BARRIERS)"; \ |
| 451 | 451 |
echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \ |
| 452 |
echo "OPENSSL_PATH = '$(OPENSSL)'"; \ |
|
| 452 | 453 |
} > $@ |
| 453 | 454 |
|
| 454 | 455 |
$(REPLACE_VARS_SED): Makefile |
| b/configure.ac | ||
|---|---|---|
| 201 | 201 |
AC_MSG_WARN([pylint not found, checking code will not be possible]) |
| 202 | 202 |
fi |
| 203 | 203 |
|
| 204 |
# Check for openssl |
|
| 205 |
AC_ARG_VAR(OPENSSL, [openssl path]) |
|
| 206 |
AC_PATH_PROG(OPENSSL, [openssl], []) |
|
| 207 |
if test -z "$OPENSSL" |
|
| 208 |
then |
|
| 209 |
AC_MSG_ERROR([openssl not found]) |
|
| 210 |
fi |
|
| 211 |
|
|
| 204 | 212 |
# Check for socat |
| 205 | 213 |
AC_ARG_VAR(SOCAT, [socat path]) |
| 206 | 214 |
AC_PATH_PROG(SOCAT, [socat], []) |
| b/lib/constants.py | ||
|---|---|---|
| 112 | 112 |
SYSCONFDIR = _autoconf.SYSCONFDIR |
| 113 | 113 |
TOOLSDIR = _autoconf.TOOLSDIR |
| 114 | 114 |
CONF_DIR = SYSCONFDIR + "/ganeti" |
| 115 |
OPENSSL_PATH = _autoconf.OPENSSL_PATH |
|
| 115 | 116 |
|
| 116 | 117 |
MASTER_SOCKET = SOCKET_DIR + "/ganeti-master" |
| 117 | 118 |
|
| b/lib/utils.py | ||
|---|---|---|
| 2273 | 2273 |
# Set permissions before writing key |
| 2274 | 2274 |
os.chmod(tmp_file_name, 0600) |
| 2275 | 2275 |
|
| 2276 |
result = RunCmd(["openssl", "req", "-new", "-newkey", "rsa:1024", |
|
| 2276 |
result = RunCmd([constants.OPENSSL_PATH, "req", |
|
| 2277 |
"-new", "-newkey", "rsa:1024", |
|
| 2277 | 2278 |
"-days", str(validity), "-nodes", "-x509", |
| 2278 | 2279 |
"-keyout", tmp_file_name, "-out", tmp_file_name, |
| 2279 | 2280 |
"-batch"]) |
Also available in: Unified diff