summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-09-24 14:27:22 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-09-25 12:36:11 -0500
commit4ba74f71daa07abfd974546f6efae2fe518187c8 (patch)
treed4333c8e4c89b94c10247074807b8f6f80a5a171 /scripts
parent11e05d322df8ab09673cd9d4918ec39a8cb82999 (diff)
downloadpki-4ba74f71daa07abfd974546f6efae2fe518187c8.tar.gz
pki-4ba74f71daa07abfd974546f6efae2fe518187c8.tar.xz
pki-4ba74f71daa07abfd974546f6efae2fe518187c8.zip
Merged pki-setup into pki-server.
The scripts to create and remove PKI instances have been moved from pki-setup into pki-server package. Ticket #336
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build_dogtag_pki7
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/build_dogtag_pki b/scripts/build_dogtag_pki
index ce6c02236..5767f77b0 100755
--- a/scripts/build_dogtag_pki
+++ b/scripts/build_dogtag_pki
@@ -127,14 +127,11 @@ PKI_TPS_THEME=${PKI_FLAVOR}-pki-tps-theme${RPM_EXT}
PKI_CONSOLE_THEME=${PKI_FLAVOR}-pki-console-theme${RPM_EXT}
# Establish PKI core package names
-PKI_SETUP=pki-setup${RPM_EXT}
PKI_SYMKEY=pki-symkey${RPM_EXT}
PKI_BASE=pki-base${RPM_EXT}
-PKI_UTIL_JAVADOC=pki-util-javadoc${RPM_EXT}
+PKI_JAVADOC=pki-javadoc${RPM_EXT}
PKI_TOOLS=pki-tools${RPM_EXT}
-PKI_JAVA_TOOLS_JAVADOC=pki-java-tools-javadoc${RPM_EXT}
PKI_SERVER=pki-server${RPM_EXT}
-PKI_COMMON_JAVADOC=pki-common-javadoc${RPM_EXT}
PKI_SELINUX=pki-selinux${RPM_EXT}
PKI_CA=pki-ca${RPM_EXT}
PKI_KRA=pki-kra${RPM_EXT}
@@ -174,7 +171,7 @@ cd ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}
mkdir -p ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED}
cp -p ${NOARCH}/*.rpm ${PKI_ARCH}/*.rpm ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED}
cd ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SETUP} ${PKI_SYMKEY} ${PKI_BASE} ${PKI_UTIL_JAVADOC} ${PKI_TOOLS} ${PKI_JAVA_TOOLS_JAVADOC} ${PKI_SERVER} ${PKI_COMMON_JAVADOC} ${PKI_SELINUX} ${PKI_CA} ${PKI_KRA} ${PKI_OCSP} ${PKI_TKS} ${PKI_SILENT}
+${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SYMKEY} ${PKI_BASE} ${PKI_JAVADOC} ${PKI_TOOLS} ${PKI_SERVER} ${PKI_SELINUX} ${PKI_CA} ${PKI_KRA} ${PKI_OCSP} ${PKI_TKS} ${PKI_SILENT}
# Compose and install 'pki-ra' packages
cd ${PKI_PWD}