Juan Hernandez has uploaded a new change for review.
Change subject: packaging: Rename APACHE_KEYSTORE to WEB_KEYSTORE
......................................................................
packaging: Rename APACHE_KEYSTORE to WEB_KEYSTORE
This constant contains the name of the file that stores the key pair
used by the web server, be it Apache, JBoss Web or whatever, so its name
is not accurate.
Change-Id: I5174bc2cf9014152ec3c2cb96b8843618899f5d7
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/engine-cleanup.py
M packaging/fedora/setup/engine-setup.py
M packaging/fedora/setup/engine-upgrade.py
4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/10862/1
diff --git a/packaging/fedora/setup/basedefs.py
b/packaging/fedora/setup/basedefs.py
index d4fe310..c42a722 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_APACHE_KEYSTORE="%s/keys/apache.p12"%(DIR_OVIRT_PKI)
+FILE_WEB_KEYSTORE="%s/keys/apache.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"
diff --git a/packaging/fedora/setup/engine-cleanup.py
b/packaging/fedora/setup/engine-cleanup.py
index cfe24a0..6aca4ab 100755
--- a/packaging/fedora/setup/engine-cleanup.py
+++ b/packaging/fedora/setup/engine-cleanup.py
@@ -248,7 +248,7 @@
basedefs.FILE_APACHE_CA_CRT_SRC,
basedefs.FILE_TRUSTSTORE,
basedefs.FILE_ENGINE_KEYSTORE,
- basedefs.FILE_APACHE_KEYSTORE,
+ basedefs.FILE_WEB_KEYSTORE,
basedefs.FILE_APACHE_PRIVATE_KEY,
basedefs.FILE_SSH_PRIVATE_KEY
):
diff --git a/packaging/fedora/setup/engine-setup.py
b/packaging/fedora/setup/engine-setup.py
index ea24f43..bf03480 100755
--- a/packaging/fedora/setup/engine-setup.py
+++ b/packaging/fedora/setup/engine-setup.py
@@ -794,7 +794,7 @@
cmd = [
basedefs.EXEC_OPENSSL,
"pkcs12",
- "-in", basedefs.FILE_APACHE_KEYSTORE,
+ "-in", basedefs.FILE_WEB_KEYSTORE,
"-passin", "pass:" + basedefs.CONST_KEY_PASS,
"-nodes",
"-nocerts",
@@ -858,7 +858,7 @@
changeList = [os.path.join(basedefs.DIR_OVIRT_PKI, "private"),
basedefs.FILE_CA_CRT_SRC,
basedefs.FILE_ENGINE_KEYSTORE,
- basedefs.FILE_APACHE_KEYSTORE,
+ basedefs.FILE_WEB_KEYSTORE,
os.path.join(basedefs.DIR_OVIRT_PKI, "private", "ca.pem"),
os.path.join(basedefs.DIR_OVIRT_PKI, ".truststore")]
for item in changeList:
diff --git a/packaging/fedora/setup/engine-upgrade.py
b/packaging/fedora/setup/engine-upgrade.py
index a618873..0c13d3f 100755
--- a/packaging/fedora/setup/engine-upgrade.py
+++ b/packaging/fedora/setup/engine-upgrade.py
@@ -491,10 +491,10 @@
shutil.copyfile(
basedefs.FILE_ENGINE_KEYSTORE,
- basedefs.FILE_APACHE_KEYSTORE
+ basedefs.FILE_WEB_KEYSTORE
)
- utils.chownToEngine(basedefs.FILE_APACHE_KEYSTORE)
- os.chmod(basedefs.FILE_APACHE_KEYSTORE, 0640)
+ utils.chownToEngine(basedefs.FILE_WEB_KEYSTORE)
+ os.chmod(basedefs.FILE_WEB_KEYSTORE, 0640)
for src, dst in (
(basedefs.FILE_ENGINE_CERT, basedefs.FILE_APACHE_CERT),
@@ -558,7 +558,7 @@
for f in (
self.TMPAPACHECONF,
basedefs.FILE_ENGINE_KEYSTORE,
- basedefs.FILE_APACHE_KEYSTORE,
+ basedefs.FILE_WEB_KEYSTORE,
basedefs.FILE_APACHE_CA_CRT_SRC,
basedefs.FILE_APACHE_CERT,
basedefs.FILE_APACHE_PRIVATE_KEY
--
To view, visit http://gerrit.ovirt.org/10862
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5174bc2cf9014152ec3c2cb96b8843618899f5d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
