From 5e1711d87064d09a39423b4530a53e61e36d6781 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Fri, 1 Jun 2007 23:05:03 +0000 Subject: [PATCH] Yast module modifications to invoke the shell script that allows the ATS to leverage installed certificates and keys for the server. --- .../server-java/Svc/linux/refresh_server_keystore.sh | 2 +- CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp | 3 +++ CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CASA-auth-token/server-java/Svc/linux/refresh_server_keystore.sh b/CASA-auth-token/server-java/Svc/linux/refresh_server_keystore.sh index 6a95928d..d8355058 100755 --- a/CASA-auth-token/server-java/Svc/linux/refresh_server_keystore.sh +++ b/CASA-auth-token/server-java/Svc/linux/refresh_server_keystore.sh @@ -47,7 +47,7 @@ if [ -f /etc/ssl/servercerts/serverkey.pem ]; then # Check if we must create PKCS12 keystore if [ ! -f $PKCS12_KEYSTORE_PATH ]; then # Create PKCS12 keystore - openssl pkcs12 -export -in $SERVER_CERT_PATH -inkey $SERVER_KEY_PATH -name tomcat -out PKCS12_KEYSTORE_PATH -password pass:password + openssl pkcs12 -export -in $SERVER_CERT_PATH -inkey $SERVER_KEY_PATH -name tomcat -out $PKCS12_KEYSTORE_PATH -password pass:password # Make sure that the PKCS12 keystore is only accessible by the service chown casaatsd:casaauth $PKCS12_KEYSTORE_PATH diff --git a/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp b/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp index 0918d0f0..f10dc0c9 100644 --- a/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp +++ b/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp @@ -658,6 +658,9 @@ global boolean Write() { } }); + // Refresh the server Keystore + SCR::Execute(.target.bash, "/usr/share/java/CASA/authtoken/bin/refresh_server_keystore.sh"); + // Adjust firewall as needed if (Abort()) return false; Progress::NextStage(); diff --git a/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in b/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in index 4ea84b95..a1351025 100644 --- a/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in +++ b/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Requires: yast2 CASA_auth_token_svc curl -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite CASA_auth_token_svc curl yast2-theme-NLD java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel +Requires: yast2 CASA_auth_token_svc curl openssl +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite CASA_auth_token_svc curl openssl yast2-theme-NLD java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel BuildArchitectures: noarch