Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: services: ovirt-engine: opt-in defaults
......................................................................
packaging: services: ovirt-engine: opt-in defaults
by now all developers should use the new development environment, there
is no need to keep opt-out defaults.
Change-Id: I954491b1e5f557dba38b2a6d6b3c47266c750fe9
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/services/ovirt-engine/ovirt-engine.conf.in
M packaging/setup/plugins/ovirt-engine-setup/config/protocols.py
2 files changed, 12 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/17337/1
diff --git a/packaging/services/ovirt-engine/ovirt-engine.conf.in
b/packaging/services/ovirt-engine/ovirt-engine.conf.in
index 4b1496d..4d1f2b6 100644
--- a/packaging/services/ovirt-engine/ovirt-engine.conf.in
+++ b/packaging/services/ovirt-engine/ovirt-engine.conf.in
@@ -15,7 +15,7 @@
#
# The location of the Java virtual machine used by the engine:
#
-JAVA_HOME=/usr/lib/jvm/jre-1.7.0-openjdk.x86_64
+JAVA_HOME=/bin/false
#
# The location of the application server used by the engine:
@@ -115,25 +115,17 @@
# Flags to enable or disable the web server (the proxy) and the
# connectors of the application server:
#
-ENGINE_PROXY_ENABLED=true
ENGINE_HTTP_ENABLED=false
ENGINE_HTTPS_ENABLED=false
-ENGINE_AJP_ENABLED=true
-
-#
-# Engine host fully qualified domain name:
-#
-ENGINE_FQDN=localhost.localdomain
-
-#
-# Ports used by the web server (the proxy) and by the connectors
-# of the application server:
-#
-ENGINE_PROXY_HTTP_PORT=80
-ENGINE_PROXY_HTTPS_PORT=443
ENGINE_HTTP_PORT=8700
ENGINE_HTTPS_PORT=8701
+
+ENGINE_AJP_ENABLED=false
ENGINE_AJP_PORT=8702
+
+ENGINE_PROXY_ENABLED=false
+ENGINE_PROXY_HTTP_PORT=80
+ENGINE_PROXY_HTTPS_PORT=443
#
# A comma separated list of the SSL protocols supported by the engine
@@ -148,6 +140,11 @@
ENGINE_HTTPS_PROTOCOLS=SSLv3,TLSv1,TLSv1.1,TLSv1.2
#
+# Engine host fully qualified domain name:
+#
+ENGINE_FQDN=localhost.localdomain
+
+#
# Database connection details (note that the password is
# encrypted):
#
diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/protocols.py
b/packaging/setup/plugins/ovirt-engine-setup/config/protocols.py
index 4a9444c..b07690d 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/config/protocols.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/config/protocols.py
@@ -88,19 +88,13 @@
stage=plugin.Stages.STAGE_MISC,
)
def _misc(self):
- #
- # TODO
- # Defaults of engine should be HTTP[s]_ENABLED=false
- #
if self.environment[osetupcons.CoreEnv.DEVELOPER_MODE]:
content = (
'ENGINE_FQDN={fqdn}\n'
- 'ENGINE_PROXY_ENABLED=false\n'
'ENGINE_HTTP_ENABLED=true\n'
'ENGINE_HTTPS_ENABLED=true\n'
'ENGINE_HTTP_PORT={httpPort}\n'
'ENGINE_HTTPS_PORT={httpsPort}\n'
- 'ENGINE_AJP_ENABLED=false\n'
'ENGINE_DEBUG_ADDRESS={debugAddress}\n'
).format(
fqdn=self.environment[osetupcons.ConfigEnv.FQDN],
@@ -120,8 +114,6 @@
'ENGINE_PROXY_ENABLED=true\n'
'ENGINE_PROXY_HTTP_PORT={httpPort}\n'
'ENGINE_PROXY_HTTPS_PORT={httpsPort}\n'
- 'ENGINE_HTTP_ENABLED=false\n'
- 'ENGINE_HTTPS_ENABLED=false\n'
'ENGINE_AJP_ENABLED=true\n'
'ENGINE_AJP_PORT={ajpPort}\n'
).format(
--
To view, visit http://gerrit.ovirt.org/17337
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I954491b1e5f557dba38b2a6d6b3c47266c750fe9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
