From 558e3eb581d4af4ed13fae1b9635b75d86691640 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 15 Mar 2012 15:13:29 +0100 Subject: [PATCH] Fix econe configuration file_path (cherry picked from commit 6dc08dbfa6e86b10aea8e2a598bba4dda0d344d9) --- src/cloud/ec2/lib/econe-server.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb index 0d20b59cc4..01c18da86c 100644 --- a/src/cloud/ec2/lib/econe-server.rb +++ b/src/cloud/ec2/lib/econe-server.rb @@ -33,9 +33,9 @@ end EC2_AUTH = VAR_LOCATION + "/.one/ec2_auth" EC2_LOG = LOG_LOCATION + "/econe-server.log" -CONFIGURATION_FILE = ETC_LOCATION + "/occi-server.conf" +CONFIGURATION_FILE = ETC_LOCATION + "/econe.conf" -TEMPLATE_LOCATION = ETC_LOCATION + "/occi_templates" +TEMPLATE_LOCATION = ETC_LOCATION + "/econe_templates" VIEWS_LOCATION = RUBY_LIB_LOCATION + "/cloud/econe/views" $: << RUBY_LIB_LOCATION