You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/29 09:42:24 UTC
[1/3] git commit: updated refs/heads/4.6 to a44e0b7
Repository: cloudstack
Updated Branches:
refs/heads/4.6 2733c3835 -> a44e0b730
CLOUDSTACK-9076: Changed ownership of directory /var/lib/cloudstack to cloud.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e73f667
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e73f667
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e73f667
Branch: refs/heads/4.6
Commit: 1e73f667c93fe7bc7a765f205e1eb62fb778f99c
Parents: 3f7a86d
Author: Boris Schrijver <bo...@pcextreme.nl>
Authored: Mon Nov 23 00:05:53 2015 +0100
Committer: Boris Schrijver <bo...@pcextreme.nl>
Committed: Mon Nov 23 00:25:14 2015 +0100
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfigServer.py | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e73f667/python/lib/cloudutils/serviceConfigServer.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index bedd885..ea7e125 100644
--- a/python/lib/cloudutils/serviceConfigServer.py
+++ b/python/lib/cloudutils/serviceConfigServer.py
@@ -121,6 +121,7 @@ class cloudManagementConfig(serviceCfgBase):
#distro like sl 6.1 needs this folder, or tomcat6 failed to start
checkHostName()
bash("mkdir /var/log/cloudstack-management/")
+ bash("chown cloud:cloud -R /var/lib/cloudstack")
#set max process per account is unlimited
if os.path.exists("/etc/security/limits.conf"):
cfo = configFileOps("/etc/security/limits.conf")
[3/3] git commit: updated refs/heads/4.6 to a44e0b7
Posted by re...@apache.org.
Merge pull request #1105 from borisroman/packagingIssues
Debian/Ubuntu packaging issuesSee individual issues. I've installed the management server with and without the fix. See difference bellow.
Before:
```
root@acs46:~# ls -la /var/lib/cloudstack
total 16
drwxr-xr-x 4 root root 4096 Nov 23 00:20 .
drwxr-xr-x 46 root root 4096 Nov 23 00:21 ..
drwxrwx--- 2 root cloud 4096 Nov 17 01:15 management
drwxr-xr-x 2 root root 4096 Nov 17 01:15 mnt
```
```
root@acs46:~# ls -la /usr/share/cloudstack-management/webapps/client/WEB-INF/classes/scripts/storage/secondary/
total 152
drwxr-xr-x 2 root root 4096 Nov 23 00:20 .
drwxr-xr-x 4 root root 4096 Nov 23 00:20 ..
-rw-r--r-- 1 root root 10092 Nov 17 01:15 cloud-install-sys-tmplt
-rw-r--r-- 1 root root 10591 Nov 17 01:15 cloud-install-sys-tmplt.py
-rw-r--r-- 1 root root 11254 Nov 23 00:20 cloud-install-sys-tmplt.pyc
-rw-r--r-- 1 root root 2362 Nov 17 01:15 create_privatetemplate_from_snapshot_xen.sh
-rw-r--r-- 1 root root 5446 Nov 17 01:15 createtmplt.sh
-rw-r--r-- 1 root root 5388 Nov 17 01:15 createvolume.sh
-rw-r--r-- 1 root root 2532 Nov 17 01:15 installIso.sh
-rw-r--r-- 1 root root 1622 Nov 17 01:15 listvmtmplt.sh
-rw-r--r-- 1 root root 1621 Nov 17 01:15 listvolume.sh
-rw-r--r-- 1 root root 75712 Nov 17 01:15 swift
```
After:
```
root@acs46:~# ls -la /var/lib/cloudstack
total 16
drwxr-xr-x 4 cloud cloud 4096 Nov 23 00:51 .
drwxr-xr-x 46 root root 4096 Nov 23 00:53 ..
drwxrwx--- 2 cloud cloud 4096 Nov 23 00:33 management
drwxr-xr-x 2 cloud cloud 4096 Nov 23 00:33 mnt
```
```
root@acs46:~# ls -la /usr/share/cloudstack-management/webapps/client/WEB-INF/classes/scripts/storage/secondary/
total 152
drwxr-xr-x 2 root root 4096 Nov 23 00:53 .
drwxr-xr-x 4 root root 4096 Nov 23 00:53 ..
-rwxr-xr-x 1 root root 10092 Nov 23 00:33 cloud-install-sys-tmplt
-rwxr-xr-x 1 root root 10591 Nov 23 00:33 cloud-install-sys-tmplt.py
-rwxr-xr-x 1 root root 11254 Nov 23 00:53 cloud-install-sys-tmplt.pyc
-rwxr-xr-x 1 root root 2362 Nov 23 00:33 create_privatetemplate_from_snapshot_xen.sh
-rwxr-xr-x 1 root root 5446 Nov 23 00:33 createtmplt.sh
-rwxr-xr-x 1 root root 5388 Nov 23 00:33 createvolume.sh
-rwxr-xr-x 1 root root 2532 Nov 23 00:33 installIso.sh
-rwxr-xr-x 1 root root 1622 Nov 23 00:33 listvmtmplt.sh
-rwxr-xr-x 1 root root 1621 Nov 23 00:33 listvolume.sh
-rwxr-xr-x 1 root root 75712 Nov 23 00:33 swift
```
* pr/1105:
CLOUDSTACK-9078: Gave scripts executable permissions.
CLOUDSTACK-9076: Changed ownership of directory /var/lib/cloudstack to cloud.
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a44e0b73
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a44e0b73
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a44e0b73
Branch: refs/heads/4.6
Commit: a44e0b7309e6b65a8d50c016337ced1da5e8990b
Parents: 2733c38 e2fc270
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Nov 29 09:41:35 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Nov 29 09:41:36 2015 +0100
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfigServer.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/4.6 to a44e0b7
Posted by re...@apache.org.
CLOUDSTACK-9078: Gave scripts executable permissions.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e2fc2704
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e2fc2704
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e2fc2704
Branch: refs/heads/4.6
Commit: e2fc270480916901b2bfd4f4bab376a6008f9f57
Parents: 1e73f66
Author: Boris Schrijver <bo...@pcextreme.nl>
Authored: Mon Nov 23 00:07:29 2015 +0100
Committer: Boris Schrijver <bo...@pcextreme.nl>
Committed: Mon Nov 23 00:25:24 2015 +0100
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfigServer.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2fc2704/python/lib/cloudutils/serviceConfigServer.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index ea7e125..4d45b13 100644
--- a/python/lib/cloudutils/serviceConfigServer.py
+++ b/python/lib/cloudutils/serviceConfigServer.py
@@ -121,7 +121,8 @@ class cloudManagementConfig(serviceCfgBase):
#distro like sl 6.1 needs this folder, or tomcat6 failed to start
checkHostName()
bash("mkdir /var/log/cloudstack-management/")
- bash("chown cloud:cloud -R /var/lib/cloudstack")
+ bash("chown cloud:cloud -R /var/lib/cloudstack/")
+ bash("chmod +x -R /usr/share/cloudstack-management/webapps/client/WEB-INF/classes/scripts/")
#set max process per account is unlimited
if os.path.exists("/etc/security/limits.conf"):
cfo = configFileOps("/etc/security/limits.conf")