Alon Bar-Lev has uploaded a new change for review. Change subject: tools: manage-domains: have it respect runtime and buildtime configuration ......................................................................
tools: manage-domains: have it respect runtime and buildtime configuration Change-Id: I21c5ecb6ceffa9cf0f6292bd5c63dedc3bcf94a3 Signed-off-by: Alon Bar-Lev <[email protected]> --- M .gitignore M Makefile M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java D packaging/etc/engine-manage-domains/engine-manage-domains.conf A packaging/etc/engine-manage-domains/engine-manage-domains.conf.in 5 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/14766/1 diff --git a/.gitignore b/.gitignore index b1e18b9..2a15836 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ packaging/conf/notifier.conf.defaults packaging/etc/engine-config/log4j.xml packaging/etc/engine-manage-domains/log4j.xml +packaging/etc/engine-manage-domains/engine-manage-domains.conf packaging/etc/notifier/log4j.xml packaging/services/config.py packaging/services/*.systemd diff --git a/Makefile b/Makefile index 05a8418..1d592eb 100644 --- a/Makefile +++ b/Makefile @@ -153,6 +153,7 @@ packaging/conf/notifier.conf.defaults \ packaging/etc/engine-config/log4j.xml \ packaging/etc/engine-manage-domains/log4j.xml \ + packaging/etc/engine-manage-domains/engine-manage-domains.conf \ packaging/etc/notifier/log4j.xml \ packaging/services/config.py \ packaging/services/ovirt-engine.systemd \ diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java index 75080f2..aec01cd 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java @@ -34,6 +34,7 @@ import org.ovirt.engine.core.ldap.LdapProviderType; import org.ovirt.engine.core.ldap.LdapSRVLocator; import org.ovirt.engine.core.utils.CLIParser; +import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.dns.DnsSRVLocator; import org.ovirt.engine.core.utils.dns.DnsSRVLocator.DnsSRVResult; import org.ovirt.engine.core.utils.ipa.ReturnStatus; @@ -44,7 +45,7 @@ public class ManageDomains { - public static final String CONF_FILE_PATH = "/etc/ovirt-engine/engine-manage-domains/engine-manage-domains.conf"; + public static final String CONF_FILE_PATH = new File(EngineLocalConfig.getInstance().getEtcDir(), "engine-manage-domains/engine-manage-domains.conf").getAbsolutePath(); private final String WARNING_ABOUT_TO_DELETE_LAST_DOMAIN = "WARNING: Domain %1$s is the last domain in the configuration. After deleting it you will have to either add another domain, or to use the internal admin user in order to login."; private final String INFO_ABOUT_NOT_ADDING_PERMISSIONS = diff --git a/packaging/etc/engine-manage-domains/engine-manage-domains.conf b/packaging/etc/engine-manage-domains/engine-manage-domains.conf deleted file mode 100644 index d23af65..0000000 --- a/packaging/etc/engine-manage-domains/engine-manage-domains.conf +++ /dev/null @@ -1,6 +0,0 @@ -jaasFile=/usr/share/ovirt-engine/conf/jaas.conf -krb5confFile=/etc/ovirt-engine/krb5.conf -engineConfigExecutable=/usr/bin/engine-config -localHostEntry=localhost -engineLibPath=/usr/share/ovirt-engine/engine.ear/lib -useDnsLookup=true diff --git a/packaging/etc/engine-manage-domains/engine-manage-domains.conf.in b/packaging/etc/engine-manage-domains/engine-manage-domains.conf.in new file mode 100644 index 0000000..33d0a60 --- /dev/null +++ b/packaging/etc/engine-manage-domains/engine-manage-domains.conf.in @@ -0,0 +1,5 @@ +jaasFile=@ENGINE_USR@/conf/jaas.conf +krb5confFile=@ENGINE_ETC@/krb5.conf +engineConfigExecutable=@ENGINE_USR@/bin/engine-config.sh +localHostEntry=localhost +useDnsLookup=true -- To view, visit http://gerrit.ovirt.org/14766 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21c5ecb6ceffa9cf0f6292bd5c63dedc3bcf94a3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
