diff --git a/component/wget/buildout.cfg b/component/wget/buildout.cfg
deleted file mode 100644
index 88fb043ccf8a4760461bacb3c5660840c21ce5da..0000000000000000000000000000000000000000
--- a/component/wget/buildout.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-[buildout]
-extends =
- ../gettext/buildout.cfg
- ../lunzip/buildout.cfg
- ../openssl/buildout.cfg
- ../patch/buildout.cfg
- ../pcre/buildout.cfg
- ../perl/buildout.cfg
- ../pkgconfig/buildout.cfg
- ../zlib/buildout.cfg
-parts =
- wget
-
-[wget]
-recipe = slapos.recipe.cmmi
-shared = true
-url = http://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.lz
-md5sum = 3bc242eb69165247b1793dd0b794ff52
-configure-options =
- --enable-ipv6
- --enable-opie
- --disable-iri
- --disable-pcre2
- --with-ssl=openssl
- --with-libssl-prefix=${openssl:location}
- --with-zlib-lib=${zlib:location}
-
-environment =
-# Python 3 is used for things we don't need. This is an optional dependency,
-# unless PYTHON is set (previously set by [python]): wget complains (rightly)
-# if it points to Python 2.7 (which we may still use).
- PYTHON=
- PATH=${gettext:location}/bin:${lunzip:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
- PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
- LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${openssl:location}/lib
- CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include
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
diff --git a/software/peertube/software.cfg b/software/peertube/software.cfg
index 7605a8ee8a1b3ceecc023a4b086dfff67e4b2a1c..729a12de34c33fff6a4fb4e04d78d7a94122361f 100644
--- a/software/peertube/software.cfg
+++ b/software/peertube/software.cfg
@@ -29,7 +29,6 @@ extends =
# redis-server
../../component/redis/buildout.cfg
../../component/git/buildout.cfg
- ../../component/wget/buildout.cfg
# backup
../../component/rdiff-backup/buildout.cfg
../../component/rsync/buildout.cfg
@@ -39,15 +38,8 @@ parts =
# in 99,9% of Slapos Software Releases)
slapos-cookbook
dcron
- unzip
- curl
- openssl
- python3
- nginx
ffmpeg
postgresql
- redis
- wget
# peetube sections
peertube
peertube-build
@@ -65,7 +57,7 @@ md5sum = 1c9639748d66e8c49fc27e4705f87622
recipe = slapos.recipe.cmmi
path = ${peertube:location}
environment =
- PATH=${unzip:location}/bin:${vim:location}/bin:${nodejs:location}/bin:${yarn:location}/bin:${python3:location}/bin:${nginx:location}/sbin:${postgresql10:location}/bin:${redis:location}/bin:${git:location}/bin:${wget:location}/bin:%(PATH)s
+ PATH=${unzip:location}/bin:${vim:location}/bin:${nodejs:location}/bin:${yarn:location}/bin:${python3:location}/bin:${nginx:location}/sbin:${postgresql10:location}/bin:${redis:location}/bin:${git:location}/bin:%(PATH)s
CPPFLAGS=-I${openssl:location}/include
LDFLAGS=-L${curl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl
pre-configure =
diff --git a/stack/erp5-zope2/buildout.cfg b/stack/erp5-zope2/buildout.cfg
index 11faef4c916e1edf11bf49dae233bcc252836f37..eb9d90ea035e345dd131221355f9df4035c3fc08 100644
--- a/stack/erp5-zope2/buildout.cfg
+++ b/stack/erp5-zope2/buildout.cfg
@@ -46,7 +46,6 @@ extends =
../../component/grep/buildout.cfg
../../component/dash/buildout.cfg
../../component/bash/buildout.cfg
- ../../component/wget/buildout.cfg
../../component/aspell/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/userhosts/buildout.cfg
@@ -228,7 +227,6 @@ context =
key template_fonts_conf template-fonts-conf:output
key userhosts_location userhosts:location
key unixodbc_location unixodbc:location
- key wget_location wget:location
key extra_path_list eggs:extra-paths
key python_executable_for_kernel erp5-python-interpreter-jupyter:exe
key erp5_kernel_location erp5-kernel:location
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 16cdeebe2e4e9eae37d709316a5f42e152e902ad..2ff1b798eb56aaea792ded652e34e42c538a8aad 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -50,7 +50,6 @@ extends =
../../component/grep/buildout.cfg
../../component/dash/buildout.cfg
../../component/bash/buildout.cfg
- ../../component/wget/buildout.cfg
../../component/aspell/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/userhosts/buildout.cfg
@@ -233,7 +232,6 @@ context =
key template_fonts_conf template-fonts-conf:output
key userhosts_location userhosts:location
key unixodbc_location unixodbc:location
- key wget_location wget:location
key extra_path_list eggs:extra-paths
key python_executable_for_kernel erp5-python-interpreter-jupyter:exe
key erp5_kernel_location erp5-kernel:location
@@ -633,7 +631,6 @@ scripts =
tidstoraged
tidstorage_repozo
wcfs
- web_checker_utility
extra-paths =
${erp5:location}