diff --git a/setup.py b/setup.py index a53a31ccad96b792f1a749a338d491a3d163235c..76b051d91e1427d3b3f6f2c996f0e9ad075ed38d 100755 --- a/setup.py +++ b/setup.py @@ -163,7 +163,6 @@ setup(name=name, 'urlparse = slapos.recipe._urlparse:Recipe', 'uuid = slapos.recipe._uuid:Recipe', 'userinfo = slapos.recipe.userinfo:Recipe', - 'webchecker = slapos.recipe.web_checker:Recipe', 'wrapper = slapos.recipe.wrapper:Recipe', 'zabbixagent = slapos.recipe.zabbixagent:Recipe', 'zeo = slapos.recipe.zeo:Recipe', diff --git a/slapos/recipe/web_checker/__init__.py b/slapos/recipe/web_checker/__init__.py deleted file mode 100644 index c4dd309317c90b346f3ed6eb1c812f591e583879..0000000000000000000000000000000000000000 --- a/slapos/recipe/web_checker/__init__.py +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################## -# -# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved. -# -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsibility of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# guarantees and support are strongly adviced to contract a Free Software -# Service Company -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -############################################################################## -import os -import re -from slapos.recipe.librecipe import GenericSlapRecipe - -class Recipe(GenericSlapRecipe): - """ - Create web checker configuration. - """ - def _install(self): - path_list = [] - try: - web_checker_mail_address = self.options['mail-address'] - web_checker_smtp_host = self.options['smtp-host'] - web_checker_frontend_url = self.options['frontend-url'] - except KeyError: - # BBB - web_checker_mail_address = self.parameter_dict['web-checker-mail-address'] - web_checker_smtp_host = self.parameter_dict['web-checker-smtp-host'] - web_checker_frontend_url = self.parameter_dict['web-checker-frontend-url'] - web_checker_working_directory = \ - self.options['web-checker-working-directory'] - config = dict( - web_checker_mail_address = web_checker_mail_address, - web_checker_smtp_host = web_checker_smtp_host, - web_checker_working_directory = web_checker_working_directory, - frontend_url = web_checker_frontend_url, - wget_binary_path = self.options['wget-binary-path'], - varnishlog_binary_path = self.options['varnishlog-binary-path'], - web_checker_log = self.options['web-checker-log'], - ) - path_list.append(self.createFile(self.options['web-checker-config'], - self.substituteTemplate(self.getTemplateFilename('web_checker.cfg.in'), - config))) - return path_list diff --git a/slapos/recipe/web_checker/template/web_checker.cfg.in b/slapos/recipe/web_checker/template/web_checker.cfg.in deleted file mode 100644 index f0782ca6a76f088aa9e1e00acdfb7b6eb72d9fb2..0000000000000000000000000000000000000000 --- a/slapos/recipe/web_checker/template/web_checker.cfg.in +++ /dev/null @@ -1,43 +0,0 @@ -[web_checker] -url = %(frontend_url)s -working_directory = %(web_checker_working_directory)s -varnishlog_binary_path = %(varnishlog_binary_path)s -wget_binary_path = %(wget_binary_path)s -email_address = %(web_checker_mail_address)s -smtp_host = %(web_checker_smtp_host)s -debug_level = debug -file_log_path = %(web_checker_log)s - -[header_list] -Expires = True -Vary = Accept-Language, Cookie, Accept-Encoding - Accept-Language, Cookie - Accept-Language,Cookie,Accept-Encoding - Accept-Language,Cookie - Accept-Encoding -Cache-Control = max-age=300 - max-age=3600 - public,max-age=300 - public,max-age=3600 - -[header url=(.*_form)] -Vary = Accept-Encoding - -[header url=.*/favicon.ico] -Last-Modified = True - -[header content-type=(text/css|.*/javascript)] -Last-Modified = True -Cache-Control = public,max-age=300 - public,max-age=3600 - public - -[no_header content-type=(image/.*|application/font)] -Vary = None - -[erp5_extension_list] -prohibited_folder_name_list = web_page_module - document_module -prohibited_file_name_list = WebSection_viewAsWeb - Base_viewHistory - list