Commit 188f8833 authored by Alain Takoudjou's avatar Alain Takoudjou

Restart apache to take boinc config in consideration

parent 4b05a7da
...@@ -28,6 +28,7 @@ from slapos.recipe.librecipe import GenericBaseRecipe ...@@ -28,6 +28,7 @@ from slapos.recipe.librecipe import GenericBaseRecipe
import os import os
import subprocess import subprocess
import pwd import pwd
import signal
class Recipe(GenericBaseRecipe): class Recipe(GenericBaseRecipe):
"""Deploy a fully operational boinc architecture.""" """Deploy a fully operational boinc architecture."""
...@@ -66,12 +67,12 @@ class Recipe(GenericBaseRecipe): ...@@ -66,12 +67,12 @@ class Recipe(GenericBaseRecipe):
self.pythonbin = options['python-binary'].strip() self.pythonbin = options['python-binary'].strip()
#Apache php informations #Apache php informations
self.wwwdata = options['www-data'].strip()
self.ipv6 = options['ip'].strip() self.ipv6 = options['ip'].strip()
self.port = options['port'].strip() self.port = options['port'].strip()
self.httpd_conf = options['httpd-conf'].strip() self.httpd_conf = options['httpd-conf'].strip()
self.apachewrapper = options['apache-wrapper'].strip() self.apachewrapper = options['apache-wrapper'].strip()
self.htpasswd = options['htpasswd'].strip() self.htpasswd = options['htpasswd'].strip()
self.apachepid = options['pid-file'].strip()
self.apachebin = options['apache-bin'].strip() self.apachebin = options['apache-bin'].strip()
self.phpini = options['php-ini'].strip() self.phpini = options['php-ini'].strip()
self.phpbin = options['php-bin'].strip() self.phpbin = options['php-bin'].strip()
...@@ -231,6 +232,15 @@ class Recipe(GenericBaseRecipe): ...@@ -231,6 +232,15 @@ class Recipe(GenericBaseRecipe):
) )
path_list.append(start_wrapper) path_list.append(start_wrapper)
if os.path.exists(self.apachepid):
#Reload apache configuration for boinc allias.
with open(self.options['pid-file']) as pid_file:
pid = int(pid_file.read().strip(), 10)
try:
os.kill(pid, signal.SIGUSR1) # Graceful restart
except OSError:
pass
return path_list return path_list
update = install update = install
...@@ -306,8 +316,6 @@ class App(GenericBaseRecipe): ...@@ -306,8 +316,6 @@ class App(GenericBaseRecipe):
return path_list return path_list
update = install
class Client(GenericBaseRecipe): class Client(GenericBaseRecipe):
"""Deploy a fully fonctionnal boinc client connected to a boinc server instance""" """Deploy a fully fonctionnal boinc client connected to a boinc server instance"""
......
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