diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | scripts/ca-master.cfg | 2 | ||||
| -rwxr-xr-x | scripts/ca-test.sh | 9 | ||||
| -rwxr-xr-x | scripts/cert-request-approve.sh | 2 | ||||
| -rwxr-xr-x | scripts/cert-request-review.sh | 2 | ||||
| -rwxr-xr-x | scripts/console-build.sh | 18 | ||||
| -rwxr-xr-x | scripts/console-install.sh | 9 | ||||
| -rwxr-xr-x | scripts/core-build.sh | 18 | ||||
| -rwxr-xr-x | scripts/core-install.sh | 22 | ||||
| -rwxr-xr-x | scripts/core-uninstall.sh | 2 | ||||
| -rwxr-xr-x | scripts/firefox-certs-list.sh (renamed from scripts/firefox-certs.sh) | 0 | ||||
| -rw-r--r-- | scripts/kra-master.cfg | 2 | ||||
| -rwxr-xr-x | scripts/theme-build.sh | 18 | ||||
| -rwxr-xr-x | scripts/theme-install.sh | 16 |
14 files changed, 61 insertions, 60 deletions
@@ -1 +1,2 @@ dogtag-9/build +scripts/build diff --git a/scripts/ca-master.cfg b/scripts/ca-master.cfg index b634c1d..04cef32 100644 --- a/scripts/ca-master.cfg +++ b/scripts/ca-master.cfg @@ -45,7 +45,7 @@ pki_audit_signing_signing_algorithm=SHA256withRSA pki_audit_signing_subject_dn= pki_audit_signing_token= pki_backup_keys=False -pki_client_database_dir=../../certs/ca-master +pki_client_database_dir=/var/lib/pki/ca-master/certs pki_client_database_purge=False pki_client_dir= pki_ds_base_dn=dc=ca-master,dc=example,dc=com diff --git a/scripts/ca-test.sh b/scripts/ca-test.sh index 31fc717..3ce6da9 100755 --- a/scripts/ca-test.sh +++ b/scripts/ca-test.sh @@ -1,10 +1,9 @@ #!/bin/sh -x SRC_DIR=`cd ../.. ; pwd` -CERTS=$SRC_DIR/certs INSTANCE_NAME=ca-master -CLIENT_CERT_DIR=$CERTS/$INSTANCE_NAME +CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/certs SERVER_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/alias CERT_NAME="caSigningCert cert-${INSTANCE_NAME}" @@ -12,11 +11,11 @@ CERT_NAME="caSigningCert cert-${INSTANCE_NAME}" pki -u caadmin -w Secret123 group-add-member "Registration Manager Agents" caadmin # export CA cert -certutil -L -d $SERVER_CERT_DIR -n "$CERT_NAME" -a > $CERTS/ca.pem -AtoB $CERTS/ca.pem $CERTS/ca.crt +certutil -L -d $SERVER_CERT_DIR -n "$CERT_NAME" -a > $CLIENT_CERT_DIR/ca.pem +AtoB $CLIENT_CERT_DIR/ca.pem $CLIENT_CERT_DIR/ca.crt # import CA cert -certutil -A -d $CLIENT_CERT_DIR -n "$CERT_NAME" -i $CERTS/ca.pem -t CT,c,c +certutil -A -d $CLIENT_CERT_DIR -n "$CERT_NAME" -i $CLIENT_CERT_DIR/ca.pem -t CT,c,c CLASSPATH=$SRC_DIR/pki/build/classes CLASSPATH=$CLASSPATH:/usr/lib64/java/jss4.jar diff --git a/scripts/cert-request-approve.sh b/scripts/cert-request-approve.sh index 1b59fc3..3bee8f7 100755 --- a/scripts/cert-request-approve.sh +++ b/scripts/cert-request-approve.sh @@ -4,7 +4,7 @@ INPUT=$1 SRC_DIR=`cd ../.. ; pwd` INSTANCE_NAME=ca-master -CLIENT_CERT_DIR=$SRC_DIR/certs/$INSTANCE_NAME +CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/certs export NSPR_LOG_MODULES=all export NSPR_LOG_FILE=nspr.log diff --git a/scripts/cert-request-review.sh b/scripts/cert-request-review.sh index cf7fcbe..759f2bd 100755 --- a/scripts/cert-request-review.sh +++ b/scripts/cert-request-review.sh @@ -4,7 +4,7 @@ REQUEST_ID=$1 SRC_DIR=`cd ../.. ; pwd` INSTANCE_NAME=ca-master -CLIENT_CERT_DIR=$SRC_DIR/certs/$INSTANCE_NAME +CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/certs export NSPR_LOG_MODULES=all export NSPR_LOG_FILE=nspr.log diff --git a/scripts/console-build.sh b/scripts/console-build.sh index a57b0c1..28d036f 100755 --- a/scripts/console-build.sh +++ b/scripts/console-build.sh @@ -1,17 +1,21 @@ #!/bin/sh -x -SRC_DIR=`cd ../.. ; pwd` +WORK_DIR=`pwd` +PROJECT_DIR=`cd ../.. ; pwd` +COMPONENT=console -cd $SRC_DIR +mkdir -p $WORK_DIR/build +rm -rf $WORK_DIR/build/$COMPONENT +cd $PROJECT_DIR rm -rf packages mkdir -p packages -pki/scripts/compose_pki_console_packages rpms | tee packages/build.log +pki/scripts/compose_pki_${COMPONENT}_packages rpms | tee packages/build.log + +mv packages $WORK_DIR/build/$COMPONENT +cd $WORK_DIR/build/$COMPONENT mkdir -p repo -mv `find packages/RPMS -name *.rpm` repo +mv `find RPMS -name *.rpm` repo createrepo repo - -rm -rf packages.console -mv packages packages.console diff --git a/scripts/console-install.sh b/scripts/console-install.sh index 003d097..40b768d 100755 --- a/scripts/console-install.sh +++ b/scripts/console-install.sh @@ -1,6 +1,9 @@ #!/bin/sh -x -SRC_DIR=`cd ../.. ; pwd` +WORK_DIR=`pwd` +PROJECT_DIR=`cd ../.. ; pwd` +COMPONENT=console -cd $SRC_DIR/repo -rpm -ivh pki-console-*.rpm +cd $WORK_DIR/build/$COMPONENT/repo + +yum install -y *.rpm diff --git a/scripts/core-build.sh b/scripts/core-build.sh index f67dc51..836e93e 100755 --- a/scripts/core-build.sh +++ b/scripts/core-build.sh @@ -1,17 +1,21 @@ #!/bin/sh -x -SRC_DIR=`cd ../.. ; pwd` +WORK_DIR=`pwd` +PROJECT_DIR=`cd ../.. ; pwd` +COMPONENT=core -cd $SRC_DIR +mkdir -p $WORK_DIR/build +rm -rf $WORK_DIR/build/$COMPONENT +cd $PROJECT_DIR rm -rf packages mkdir -p packages -pki/scripts/compose_pki_core_packages --without-javadoc hybrid_rpms 2>&1 | tee packages/build.log +pki/scripts/compose_pki_${COMPONENT}_packages --without-javadoc hybrid_rpms 2>&1 | tee packages/build.log + +mv packages $WORK_DIR/build/$COMPONENT +cd $WORK_DIR/build/$COMPONENT mkdir -p repo -mv `find packages/RPMS -name *.rpm` repo +mv `find RPMS -name *.rpm` repo createrepo repo - -rm -rf packages.core -mv packages packages.core diff --git a/scripts/core-install.sh b/scripts/core-install.sh index 3c7b265..f12fea2 100755 --- a/scripts/core-install.sh +++ b/scripts/core-install.sh @@ -1,19 +1,9 @@ #!/bin/sh -x -SRC_DIR=`cd ../.. ; pwd` +WORK_DIR=`pwd` +PROJECT_DIR=`cd ../.. ; pwd` +COMPONENT=core -cd $SRC_DIR/repo -yum install -y\ - pki-deploy-*.rpm\ - pki-selinux-*.rpm\ - pki-tks-*.rpm\ - pki-kra-*.rpm\ - pki-common-*.rpm\ - pki-native-tools-*.rpm\ - pki-silent-*.rpm\ - pki-util-*.rpm\ - pki-setup-*.rpm\ - pki-ocsp-*.rpm\ - pki-ca-*.rpm\ - pki-java-tools-*.rpm\ - pki-symkey-*.rpm +cd $WORK_DIR/build/$COMPONENT/repo + +yum install -y *.rpm diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh index 91296c2..f38c520 100755 --- a/scripts/core-uninstall.sh +++ b/scripts/core-uninstall.sh @@ -17,4 +17,4 @@ yum erase -y\ pki-ca\ pki-java-tools\ pki-symkey\ - pki-deploy\ + pki-deploy diff --git a/scripts/firefox-certs.sh b/scripts/firefox-certs-list.sh index 4691a0c..4691a0c 100755 --- a/scripts/firefox-certs.sh +++ b/scripts/firefox-certs-list.sh diff --git a/scripts/kra-master.cfg b/scripts/kra-master.cfg index 8fcfb38..1500354 100644 --- a/scripts/kra-master.cfg +++ b/scripts/kra-master.cfg @@ -45,7 +45,7 @@ pki_audit_signing_signing_algorithm=SHA256withRSA pki_audit_signing_subject_dn= pki_audit_signing_token= pki_backup_keys=False -pki_client_database_dir=../../certs/kra-master +pki_client_database_dir=/var/lib/pki/kra-master/certs pki_client_database_purge=False pki_client_dir= pki_ds_base_dn=dc=kra-master,dc=example,dc=com diff --git a/scripts/theme-build.sh b/scripts/theme-build.sh index f48a431..71c4110 100755 --- a/scripts/theme-build.sh +++ b/scripts/theme-build.sh @@ -1,17 +1,21 @@ #!/bin/sh -x -SRC_DIR=`cd ../.. ; pwd` +WORK_DIR=`pwd` +PROJECT_DIR=`cd ../.. ; pwd` +COMPONENT=theme -cd $SRC_DIR +mkdir -p $WORK_DIR/build +rm -rf $WORK_DIR/build/$COMPONENT +cd $PROJECT_DIR rm -rf packages mkdir -p packages -pki/scripts/compose_dogtag_pki_theme_packages rpms | tee packages/build.log +pki/scripts/compose_dogtag_pki_${COMPONENT}_packages rpms | tee packages/build.log + +mv packages $WORK_DIR/build/$COMPONENT +cd $WORK_DIR/build/$COMPONENT mkdir -p repo -mv `find packages/RPMS -name *.rpm` repo +mv `find RPMS -name *.rpm` repo createrepo repo - -rm -rf packages.theme -mv packages packages.theme diff --git a/scripts/theme-install.sh b/scripts/theme-install.sh index 8956b0f..b353fbe 100755 --- a/scripts/theme-install.sh +++ b/scripts/theme-install.sh @@ -1,13 +1,9 @@ #!/bin/sh -x -SRC_DIR=`cd ../.. ; pwd` +WORK_DIR=`pwd` +PROJECT_DIR=`cd ../.. ; pwd` +COMPONENT=theme -cd $SRC_DIR/repo -rpm -ivh dogtag-pki-ca-theme-*.rpm\ - dogtag-pki-kra-theme-*.rpm\ - dogtag-pki-tps-theme-*.rpm\ - dogtag-pki-tks-theme-*.rpm\ - dogtag-pki-console-theme-*.rpm\ - dogtag-pki-ra-theme-*.rpm\ - dogtag-pki-common-theme-*.rpm\ - dogtag-pki-ocsp-theme-*.rpm +cd $WORK_DIR/build/$COMPONENT/repo + +yum install -y *.rpm |