Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D1DC817CB1 for ; Tue, 12 May 2015 15:25:16 +0000 (UTC) Received: (qmail 97635 invoked by uid 500); 12 May 2015 15:25:16 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 97614 invoked by uid 500); 12 May 2015 15:25:16 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 97605 invoked by uid 99); 12 May 2015 15:25:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 15:25:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84CFFE03C7; Tue, 12 May 2015 15:25:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tbeerbower@apache.org To: commits@ambari.apache.org Message-Id: <21f0afa3defd4a75a0d615ef9fa6d465@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-11058 - Check oozie.https properties to generate oozie war -secure (tbeerbower) Date: Tue, 12 May 2015 15:25:16 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk ce407e621 -> bb9963c78 AMBARI-11058 - Check oozie.https properties to generate oozie war -secure (tbeerbower) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb9963c7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb9963c7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb9963c7 Branch: refs/heads/trunk Commit: bb9963c7833b5441c83bbae544edea028377a2fd Parents: ce407e6 Author: tbeerbower Authored: Tue May 12 11:23:34 2015 -0400 Committer: tbeerbower Committed: Tue May 12 11:23:49 2015 -0400 ---------------------------------------------------------------------- .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 2 +- .../src/test/python/stacks/2.0.6/configs/secured.json | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bb9963c7/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py index 59d0097..bc168c6 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py @@ -139,7 +139,7 @@ oozie_log_dir = config['configurations']['oozie-env']['oozie_log_dir'] oozie_data_dir = config['configurations']['oozie-env']['oozie_data_dir'] oozie_server_port = get_port_from_url(config['configurations']['oozie-site']['oozie.base.url']) oozie_server_admin_port = config['configurations']['oozie-env']['oozie_admin_port'] -if config['configurations']['oozie-site']['oozie.base.url'].startswith('https'): +if 'oozie.https.port' in config['configurations']['oozie-site'] or 'oozie.https.keystore.file' in config['configurations']['oozie-site'] or 'oozie.https.keystore.pass' in config['configurations']['oozie-site']: oozie_secure = '-secure' else: oozie_secure = '' http://git-wip-us.apache.org/repos/asf/ambari/blob/bb9963c7/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json index 0b54d8c..8616f3d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json @@ -97,7 +97,7 @@ "oozie.service.ActionService.executor.ext.classes": "\n org.apache.oozie.action.email.EmailActionExecutor,\n org.apache.oozie.action.hadoop.HiveActionExecutor,\n org.apache.oozie.action.hadoop.ShellActionExecutor,\n org.apache.oozie.action.hadoop.SqoopActionExecutor,\n org.apache.oozie.action.hadoop.DistcpActionExecutor", "oozie.service.HadoopAccessorService.kerberos.principal": "oozie/c6402.ambari.apache.org@EXAMPLE.COM", "oozie.service.AuthorizationService.authorization.enabled": "true", - "oozie.base.url": "https://c6402.ambari.apache.org:11000/oozie", + "oozie.base.url": "http://c6402.ambari.apache.org:11000/oozie", "oozie.service.JPAService.jdbc.password": "asd", "oozie.service.coord.normal.default.timeout": "120", "oozie.service.AuthorizationService.security.enabled": "true", @@ -117,7 +117,10 @@ "oozie.service.URIHandlerService.uri.handlers": "org.apache.oozie.dependency.FSURIHandler,org.apache.oozie.dependency.HCatURIHandler", "oozie.authentication.type": "kerberos", "oozie.authentication.kerberos.principal": "HTTP/c6402.ambari.apache.org@EXAMPLE.COM", - "oozie.system.id": "oozie-${user.name}" + "oozie.system.id": "oozie-${user.name}", + "oozie.https.port": "11443", + "oozie.https.keystore.file": "/home/oozie/oozie.keystore", + "oozie.https.keystore.pass": "password" }, "storm-site": { "topology.tuple.serializer": "backtype.storm.serialization.types.ListDelegateSerializer",