Juan Hernandez has uploaded a new change for review. Change subject: packaging: Rename apache.p12 to web.p12 ......................................................................
packaging: Rename apache.p12 to web.p12 This file contains the key pair of the web server, be it Apache, JBoss Web or whatever, so its name is not accurate. Change-Id: Iae6219eb5165d8f54b6f589bcca3b658c5eabd68 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/conf/ca/installCA.sh M packaging/fedora/engine-service.xml.in M packaging/fedora/setup/basedefs.py 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/10863/1 diff --git a/backend/manager/conf/ca/installCA.sh b/backend/manager/conf/ca/installCA.sh index ff8dd6e..3a8d61c 100755 --- a/backend/manager/conf/ca/installCA.sh +++ b/backend/manager/conf/ca/installCA.sh @@ -76,7 +76,7 @@ echo " " echo "} Creating client certificates for oVirt..." enroll_certificate engine "$PASS" "/C=${COUNTRY}/O=${ORG}/CN=${SUBJECT}" -enroll_certificate apache "$PASS" "/C=${COUNTRY}/O=${ORG}/CN=${SUBJECT}" +enroll_certificate web "$PASS" "/C=${COUNTRY}/O=${ORG}/CN=${SUBJECT}" exit 0 diff --git a/packaging/fedora/engine-service.xml.in b/packaging/fedora/engine-service.xml.in index 1551605..3991ec6 100644 --- a/packaging/fedora/engine-service.xml.in +++ b/packaging/fedora/engine-service.xml.in @@ -246,7 +246,7 @@ #end if #if $getBoolean('ENGINE_HTTPS_ENABLED') <connector name="https" protocol="HTTP/1.1" scheme="https" socket-binding="https" secure="true"> - <ssl name="ssl" password="mypass" certificate-key-file="$getString('ENGINE_PKI')/keys/apache.p12" keystore-type="PKCS12" key-alias="1" protocol="TLSv1" verify-client="false"/> + <ssl name="ssl" password="mypass" certificate-key-file="$getString('ENGINE_PKI')/keys/web.p12" keystore-type="PKCS12" key-alias="1" protocol="TLSv1" verify-client="false"/> </connector> #end if #if $getBoolean('ENGINE_AJP_ENABLED') diff --git a/packaging/fedora/setup/basedefs.py b/packaging/fedora/setup/basedefs.py index c42a722..2943d8f 100644 --- a/packaging/fedora/setup/basedefs.py +++ b/packaging/fedora/setup/basedefs.py @@ -90,7 +90,7 @@ FILE_ETC_EXPORTS="/etc/exports" FILE_TRUSTSTORE="%s/.truststore"%(DIR_OVIRT_PKI) FILE_ENGINE_KEYSTORE="%s/keys/engine.p12"%(DIR_OVIRT_PKI) -FILE_WEB_KEYSTORE="%s/keys/apache.p12"%(DIR_OVIRT_PKI) +FILE_WEB_KEYSTORE="%s/keys/web.p12"%(DIR_OVIRT_PKI) FILE_APACHE_PRIVATE_KEY="%s/keys/apache.key.nopass"%(DIR_OVIRT_PKI) FILE_SSH_PRIVATE_KEY="%s/keys/engine_id_rsa"%(DIR_OVIRT_PKI) FILE_YUM_VERSION_LOCK="/etc/yum/pluginconf.d/versionlock.list" -- To view, visit http://gerrit.ovirt.org/10863 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae6219eb5165d8f54b6f589bcca3b658c5eabd68 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
