Commit a1e0d3c4 authored by Alain Takoudjou's avatar Alain Takoudjou

Don't use empty URL_BASE (BOINC)

parent 89d3c7a4
...@@ -101,6 +101,10 @@ class Recipe(GenericBaseRecipe): ...@@ -101,6 +101,10 @@ class Recipe(GenericBaseRecipe):
niceprojectname = self.project + "@Home" niceprojectname = self.project + "@Home"
slapuser = self.options['user'] slapuser = self.options['user']
#Check if given URL is not empty (case of URL request with frontend)
if not self.url_base:
raise Exception("URL_BASE is still empty. Can not use it")
#Define environment variable here #Define environment variable here
python = os.path.join(self.home, 'bin/python') python = os.path.join(self.home, 'bin/python')
python_path = self.boinc_egg python_path = self.boinc_egg
...@@ -306,7 +310,7 @@ class App(GenericBaseRecipe): ...@@ -306,7 +310,7 @@ class App(GenericBaseRecipe):
wrapperdir = self.options['wrapper-dir'].strip() wrapperdir = self.options['wrapper-dir'].strip()
project = self.options['project'].strip() project = self.options['project'].strip()
lockfile = os.path.join(self.options['home'].strip(), 'app_install.lock') lockfile = os.path.join(self.options['home'].strip(), 'app_install.lock')
fd = os.open(lockfile, os.O_RDWR|os.O_CREAT) fd = os.open(lockfile, os.O_RDWR|os.O_CREAT)
os.close( fd ) os.close( fd )
......
...@@ -101,6 +101,8 @@ class Recipe(GenericBaseRecipe): ...@@ -101,6 +101,8 @@ class Recipe(GenericBaseRecipe):
middleware=type))) middleware=type)))
os.chmod(config_info_file, 0744) os.chmod(config_info_file, 0744)
path_list.append(config_info) path_list.append(config_info)
update = install
class Client(GenericBaseRecipe): class Client(GenericBaseRecipe):
......
...@@ -34,7 +34,7 @@ eggs = ...@@ -34,7 +34,7 @@ eggs =
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg output = ${buildout:directory}/template-boinc.cfg
md5sum = 004691e9194eca2fa9cb1033094d3738 md5sum = 20e9e2276e3cbc6504bf065eabbe13a7
mode = 0644 mode = 0644
#Template for deploying MySQL Database Server #Template for deploying MySQL Database Server
......
...@@ -383,7 +383,7 @@ template-wu = ...@@ -383,7 +383,7 @@ template-wu =
wu-number = wu-number =
input-file = input-file =
# Default value if no domain is specified # Default value if no domain is specified
domain = domain =
# Default value if no ssh parameter is specified # Default value if no ssh parameter is specified
logbox-ip = logbox-ip =
logbox-port = logbox-port =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment