shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

Merge branch 'master' of git.opennebula.org:one

Browse Source
This commit is contained in:
Tino Vázquez 2011-07-18 17:17:41 +02:00
commit c19325112c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/acct/watch_helper.rb
View File

@ -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]

2
src/cli/etc/group.default
View File

@ -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

2
src/sunstone/sunstone-server.rb
View File

@ -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"