pki: Update install path.

This commit is contained in:
Gunnar Beutner 2013-10-17 15:35:42 +02:00
parent 3e56467ee5
commit deb84dcc2b
6 changed files with 29 additions and 7 deletions

View File

@ -200,6 +200,8 @@ lib/icinga/Makefile
lib/db_ido/Makefile lib/db_ido/Makefile
lib/python/Makefile lib/python/Makefile
pki/Makefile pki/Makefile
pki/icinga2-build-ca
pki/icinga2-build-key
test/Makefile test/Makefile
third-party/Makefile third-party/Makefile
third-party/cJSON/Makefile third-party/cJSON/Makefile

View File

@ -232,7 +232,6 @@ fi
%{_bindir}/icinga2-migrate-config %{_bindir}/icinga2-migrate-config
%{_bindir}/icinga2-build-ca %{_bindir}/icinga2-build-ca
%{_bindir}/icinga2-build-key %{_bindir}/icinga2-build-key
%{_bindir}/icinga2-pkifuncs
%{_sbindir}/i2enfeature %{_sbindir}/i2enfeature
%{_sbindir}/i2disfeature %{_sbindir}/i2disfeature
%exclude %{_libdir}/%{name}/libdb_ido_mysql* %exclude %{_libdir}/%{name}/libdb_ido_mysql*

View File

@ -1,6 +1,15 @@
bin_SCRIPTS = \ bin_SCRIPTS = \
icinga2-build-ca \ icinga2-build-ca \
icinga2-build-key \ icinga2-build-key
icinga2-pkifuncs
EXTRA_DIST = $(bin_SCRIPTS) icinga2pkidir = ${pkgdatadir}/pki
icinga2pki_DATA = \
pkifuncs \
openssl.cnf
CLEANFILES = $(bin_SCRIPTS)
EXTRA_DIST = \
icinga2-build-ca.in \
icinga2-build-key.in \
$(icinga2pki_DATA)

8
pki/icinga2-build-ca → pki/icinga2-build-ca.in Executable file → Normal file
View File

@ -1,5 +1,11 @@
#!/bin/bash #!/bin/bash
source $(dirname -- $0)/icinga2-pkifuncs prefix=@prefix@
datarootdir=@datarootdir@
datadir=@datadir@
ICINGA2PKIDIR=$datadir/icinga2/pki
source $ICINGA2PKIDIR/pkifuncs
check_pki_dir check_pki_dir

10
pki/icinga2-build-key → pki/icinga2-build-key.in Executable file → Normal file
View File

@ -1,4 +1,12 @@
#!/bin/sh #!/bin/sh
prefix=@prefix@
datarootdir=@datarootdir@
datadir=@datadir@
ICINGA2PKIDIR=$datadir/icinga2/pki
source $ICINGA2PKIDIR/pkifuncs
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Syntax: $0 <name>" >&2 echo "Syntax: $0 <name>" >&2
exit 1 exit 1
@ -6,8 +14,6 @@ fi
name=$1 name=$1
source $(dirname -- $0)/icinga2-pkifuncs
check_pki_dir check_pki_dir
if [ ! -f $ICINGA_CA/ca.crt -o ! -f $ICINGA_CA/ca.key ]; then if [ ! -f $ICINGA_CA/ca.crt -o ! -f $ICINGA_CA/ca.key ]; then