You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/06/22 11:19:58 UTC
[1/2] ambari git commit: AMBARI-12062. Ambari-server fails to start
as non-root user(umask 0027) when /var/log/ambari-server is a symlink
(aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 b2c75b8be -> a68ebc800
refs/heads/trunk 161eec9fe -> d9a315e04
AMBARI-12062. Ambari-server fails to start as non-root user(umask 0027) when /var/log/ambari-server is a symlink (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9a315e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9a315e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9a315e0
Branch: refs/heads/trunk
Commit: d9a315e0486a9a4f161517128a49a19659116bd0
Parents: 161eec9
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Jun 22 12:19:47 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Jun 22 12:19:47 2015 +0300
----------------------------------------------------------------------
.../python/ambari_server/serverConfiguration.py | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9a315e0/ambari-server/src/main/python/ambari_server/serverConfiguration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index c41a27d..2f6e3e5 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -287,26 +287,26 @@ class ServerConfigDefaultsLinux(ServerConfigDefaults):
# Rules are executed in the same order as they are listed
# {0} in user/group will be replaced by customized ambari-server username
self.NR_ADJUST_OWNERSHIP_LIST = [
- ("/var/log/ambari-server", "644", "{0}", True),
- ("/var/log/ambari-server", "755", "{0}", False),
- ("/var/run/ambari-server", "644", "{0}", True),
- ("/var/run/ambari-server", "755", "{0}", False),
+ ("/var/log/ambari-server/", "644", "{0}", True),
+ ("/var/log/ambari-server/", "755", "{0}", False),
+ ("/var/run/ambari-server/", "644", "{0}", True),
+ ("/var/run/ambari-server/", "755", "{0}", False),
("/var/run/ambari-server/bootstrap", "755", "{0}", False),
("/var/lib/ambari-server/ambari-env.sh", "700", "{0}", False),
- ("/var/lib/ambari-server/keys", "600", "{0}", True),
- ("/var/lib/ambari-server/keys", "700", "{0}", False),
- ("/var/lib/ambari-server/keys/db", "700", "{0}", False),
- ("/var/lib/ambari-server/keys/db/newcerts", "700", "{0}", False),
+ ("/var/lib/ambari-server/keys/", "600", "{0}", True),
+ ("/var/lib/ambari-server/keys/", "700", "{0}", False),
+ ("/var/lib/ambari-server/keys/db/", "700", "{0}", False),
+ ("/var/lib/ambari-server/keys/db/newcerts/", "700", "{0}", False),
("/var/lib/ambari-server/keys/.ssh", "700", "{0}", False),
("/var/lib/ambari-server/resources/common-services/", "755", "{0}", True),
("/var/lib/ambari-server/resources/stacks/", "755", "{0}", True),
("/var/lib/ambari-server/resources/custom_actions/", "755", "{0}", True),
("/var/lib/ambari-server/resources/host_scripts/", "755", "{0}", True),
- ("/var/lib/ambari-server/resources/views", "644", "{0}", True),
- ("/var/lib/ambari-server/resources/views", "755", "{0}", False),
- ("/var/lib/ambari-server/resources/views/work", "755", "{0}", True),
- ("/etc/ambari-server/conf", "644", "{0}", True),
- ("/etc/ambari-server/conf", "755", "{0}", False),
+ ("/var/lib/ambari-server/resources/views/", "644", "{0}", True),
+ ("/var/lib/ambari-server/resources/views/", "755", "{0}", False),
+ ("/var/lib/ambari-server/resources/views/work/", "755", "{0}", True),
+ ("/etc/ambari-server/conf/", "644", "{0}", True),
+ ("/etc/ambari-server/conf/", "755", "{0}", False),
("/etc/ambari-server/conf/password.dat", "640", "{0}", False),
("/var/lib/ambari-server/keys/pass.txt", "600", "{0}", False),
("/etc/ambari-server/conf/ldap-password.dat", "640", "{0}", False),
[2/2] ambari git commit: AMBARI-12062. Ambari-server fails to start
as non-root user(umask 0027) when /var/log/ambari-server is a symlink
(aonishuk)
Posted by ao...@apache.org.
AMBARI-12062. Ambari-server fails to start as non-root user(umask 0027) when /var/log/ambari-server is a symlink (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a68ebc80
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a68ebc80
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a68ebc80
Branch: refs/heads/branch-2.1
Commit: a68ebc80069adede0ed4bfb67f87423489f4b48e
Parents: b2c75b8
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Jun 22 12:19:49 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Jun 22 12:19:49 2015 +0300
----------------------------------------------------------------------
.../python/ambari_server/serverConfiguration.py | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a68ebc80/ambari-server/src/main/python/ambari_server/serverConfiguration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index c41a27d..2f6e3e5 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -287,26 +287,26 @@ class ServerConfigDefaultsLinux(ServerConfigDefaults):
# Rules are executed in the same order as they are listed
# {0} in user/group will be replaced by customized ambari-server username
self.NR_ADJUST_OWNERSHIP_LIST = [
- ("/var/log/ambari-server", "644", "{0}", True),
- ("/var/log/ambari-server", "755", "{0}", False),
- ("/var/run/ambari-server", "644", "{0}", True),
- ("/var/run/ambari-server", "755", "{0}", False),
+ ("/var/log/ambari-server/", "644", "{0}", True),
+ ("/var/log/ambari-server/", "755", "{0}", False),
+ ("/var/run/ambari-server/", "644", "{0}", True),
+ ("/var/run/ambari-server/", "755", "{0}", False),
("/var/run/ambari-server/bootstrap", "755", "{0}", False),
("/var/lib/ambari-server/ambari-env.sh", "700", "{0}", False),
- ("/var/lib/ambari-server/keys", "600", "{0}", True),
- ("/var/lib/ambari-server/keys", "700", "{0}", False),
- ("/var/lib/ambari-server/keys/db", "700", "{0}", False),
- ("/var/lib/ambari-server/keys/db/newcerts", "700", "{0}", False),
+ ("/var/lib/ambari-server/keys/", "600", "{0}", True),
+ ("/var/lib/ambari-server/keys/", "700", "{0}", False),
+ ("/var/lib/ambari-server/keys/db/", "700", "{0}", False),
+ ("/var/lib/ambari-server/keys/db/newcerts/", "700", "{0}", False),
("/var/lib/ambari-server/keys/.ssh", "700", "{0}", False),
("/var/lib/ambari-server/resources/common-services/", "755", "{0}", True),
("/var/lib/ambari-server/resources/stacks/", "755", "{0}", True),
("/var/lib/ambari-server/resources/custom_actions/", "755", "{0}", True),
("/var/lib/ambari-server/resources/host_scripts/", "755", "{0}", True),
- ("/var/lib/ambari-server/resources/views", "644", "{0}", True),
- ("/var/lib/ambari-server/resources/views", "755", "{0}", False),
- ("/var/lib/ambari-server/resources/views/work", "755", "{0}", True),
- ("/etc/ambari-server/conf", "644", "{0}", True),
- ("/etc/ambari-server/conf", "755", "{0}", False),
+ ("/var/lib/ambari-server/resources/views/", "644", "{0}", True),
+ ("/var/lib/ambari-server/resources/views/", "755", "{0}", False),
+ ("/var/lib/ambari-server/resources/views/work/", "755", "{0}", True),
+ ("/etc/ambari-server/conf/", "644", "{0}", True),
+ ("/etc/ambari-server/conf/", "755", "{0}", False),
("/etc/ambari-server/conf/password.dat", "640", "{0}", False),
("/var/lib/ambari-server/keys/pass.txt", "600", "{0}", False),
("/etc/ambari-server/conf/ldap-password.dat", "640", "{0}", False),