From c8c1e734e734f74e655741714dbfab7da825be5c Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Mon, 18 Jul 2011 16:17:38 +0200 Subject: [PATCH 1/3] Fix bug in sunstone plugins configuration file path. --- src/sunstone/sunstone-server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index 962912e901..cadc3eaad2 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -24,7 +24,7 @@ if !ONE_LOCATION VAR_LOCATION = "/var/lib/one" RUBY_LIB_LOCATION = "/usr/lib/one/ruby" CONFIGURATION_FILE = "/etc/one/sunstone-server.conf" - PLUGIN_CONFIGURATION_FILE = "/etc/sunstone-plugins.yaml" + PLUGIN_CONFIGURATION_FILE = "/etc/one/sunstone-plugins.yaml" else VAR_LOCATION = ONE_LOCATION+"/var" LOG_LOCATION = ONE_LOCATION+"/var" From 202545798709a6fdfcce851f433bcb0d76923625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 18 Jul 2011 16:27:01 +0200 Subject: [PATCH 2/3] Bug in accounting: src/acct/watch_helper.rb was not working in system-wide installations --- src/acct/watch_helper.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/acct/watch_helper.rb b/src/acct/watch_helper.rb index 5873211787..ce610feee5 100644 --- a/src/acct/watch_helper.rb +++ b/src/acct/watch_helper.rb @@ -5,13 +5,16 @@ module WatchHelper ONE_LOCATION=ENV["ONE_LOCATION"] if !ONE_LOCATION - ACCTD_CONF="/etc/one/acctd.conf" - ACCT_DB="/var/one/oneacct.db" + VAR_LOCATION = "/var/lib/one" + ETC_LOCATION = "/etc/one" else - ACCTD_CONF=ONE_LOCATION+"/etc/acctd.conf" - ACCT_DB=ONE_LOCATION+"/var/oneacct.db" + VAR_LOCATION = ONE_LOCATION + "/var" + ETC_LOCATION = ONE_LOCATION + "/etc" end + ACCTD_CONF = ETC_LOCATION + "/acctd.conf" + ACCT_DB = VAR_LOCATION + "/oneacct.db" + CONF = YAML.load_file(ACCTD_CONF) if CONF[:DB] From 5ebbff174aa2642e4515dcbf4565deb2b77371e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 18 Jul 2011 16:59:41 +0200 Subject: [PATCH 3/3] Bug in default ACL rules for new groups: missing POOL_INFO_MINE --- src/cli/etc/group.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/etc/group.default b/src/cli/etc/group.default index 98b60b3931..b8ad0a1e41 100644 --- a/src/cli/etc/group.default +++ b/src/cli/etc/group.default @@ -1,4 +1,4 @@ # This rule allows users in the new group to create common resources -VM+NET+IMAGE+TEMPLATE/* CREATE +VM+NET+IMAGE+TEMPLATE/* CREATE+INFO_POOL_MINE # This rule allows users in the group to deploy VMs in any host in the cloud HOST/* USE