Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Łukasz Nowak
slapos
Commits
d170acc7
Commit
d170acc7
authored
Sep 03, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
Remove wget
See merge request
nexedi/slapos!1633
parents
e3291616
9144e0ac
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1 addition
and
154 deletions
+1
-154
component/wget/buildout.cfg
component/wget/buildout.cfg
+0
-36
setup.py
setup.py
+0
-1
slapos/recipe/web_checker/__init__.py
slapos/recipe/web_checker/__init__.py
+0
-60
slapos/recipe/web_checker/template/web_checker.cfg.in
slapos/recipe/web_checker/template/web_checker.cfg.in
+0
-43
software/peertube/software.cfg
software/peertube/software.cfg
+1
-9
stack/erp5-zope2/buildout.cfg
stack/erp5-zope2/buildout.cfg
+0
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+0
-3
No files found.
component/wget/buildout.cfg
deleted
100644 → 0
View file @
e3291616
[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
setup.py
View file @
d170acc7
...
@@ -163,7 +163,6 @@ setup(name=name,
...
@@ -163,7 +163,6 @@ setup(name=name,
'urlparse = slapos.recipe._urlparse:Recipe'
,
'urlparse = slapos.recipe._urlparse:Recipe'
,
'uuid = slapos.recipe._uuid:Recipe'
,
'uuid = slapos.recipe._uuid:Recipe'
,
'userinfo = slapos.recipe.userinfo:Recipe'
,
'userinfo = slapos.recipe.userinfo:Recipe'
,
'webchecker = slapos.recipe.web_checker:Recipe'
,
'wrapper = slapos.recipe.wrapper:Recipe'
,
'wrapper = slapos.recipe.wrapper:Recipe'
,
'zabbixagent = slapos.recipe.zabbixagent:Recipe'
,
'zabbixagent = slapos.recipe.zabbixagent:Recipe'
,
'zeo = slapos.recipe.zeo:Recipe'
,
'zeo = slapos.recipe.zeo:Recipe'
,
...
...
slapos/recipe/web_checker/__init__.py
deleted
100644 → 0
View file @
e3291616
##############################################################################
#
# 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
slapos/recipe/web_checker/template/web_checker.cfg.in
deleted
100644 → 0
View file @
e3291616
[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
software/peertube/software.cfg
View file @
d170acc7
...
@@ -29,7 +29,6 @@ extends =
...
@@ -29,7 +29,6 @@ extends =
# redis-server
# redis-server
../../component/redis/buildout.cfg
../../component/redis/buildout.cfg
../../component/git/buildout.cfg
../../component/git/buildout.cfg
../../component/wget/buildout.cfg
# backup
# backup
../../component/rdiff-backup/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/rsync/buildout.cfg
../../component/rsync/buildout.cfg
...
@@ -39,15 +38,8 @@ parts =
...
@@ -39,15 +38,8 @@ parts =
# in 99,9% of Slapos Software Releases)
# in 99,9% of Slapos Software Releases)
slapos-cookbook
slapos-cookbook
dcron
dcron
unzip
curl
openssl
python3
nginx
ffmpeg
ffmpeg
postgresql
postgresql
redis
wget
# peetube sections
# peetube sections
peertube
peertube
peertube-build
peertube-build
...
@@ -65,7 +57,7 @@ md5sum = 1c9639748d66e8c49fc27e4705f87622
...
@@ -65,7 +57,7 @@ md5sum = 1c9639748d66e8c49fc27e4705f87622
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
path = ${peertube:location}
path = ${peertube:location}
environment =
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
CPPFLAGS=-I${openssl:location}/include
LDFLAGS=-L${curl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl
LDFLAGS=-L${curl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl
pre-configure =
pre-configure =
...
...
stack/erp5-zope2/buildout.cfg
View file @
d170acc7
...
@@ -46,7 +46,6 @@ extends =
...
@@ -46,7 +46,6 @@ extends =
../../component/grep/buildout.cfg
../../component/grep/buildout.cfg
../../component/dash/buildout.cfg
../../component/dash/buildout.cfg
../../component/bash/buildout.cfg
../../component/bash/buildout.cfg
../../component/wget/buildout.cfg
../../component/aspell/buildout.cfg
../../component/aspell/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/userhosts/buildout.cfg
../../component/userhosts/buildout.cfg
...
@@ -228,7 +227,6 @@ context =
...
@@ -228,7 +227,6 @@ context =
key template_fonts_conf template-fonts-conf:output
key template_fonts_conf template-fonts-conf:output
key userhosts_location userhosts:location
key userhosts_location userhosts:location
key unixodbc_location unixodbc:location
key unixodbc_location unixodbc:location
key wget_location wget:location
key extra_path_list eggs:extra-paths
key extra_path_list eggs:extra-paths
key python_executable_for_kernel erp5-python-interpreter-jupyter:exe
key python_executable_for_kernel erp5-python-interpreter-jupyter:exe
key erp5_kernel_location erp5-kernel:location
key erp5_kernel_location erp5-kernel:location
...
...
stack/erp5/buildout.cfg
View file @
d170acc7
...
@@ -50,7 +50,6 @@ extends =
...
@@ -50,7 +50,6 @@ extends =
../../component/grep/buildout.cfg
../../component/grep/buildout.cfg
../../component/dash/buildout.cfg
../../component/dash/buildout.cfg
../../component/bash/buildout.cfg
../../component/bash/buildout.cfg
../../component/wget/buildout.cfg
../../component/aspell/buildout.cfg
../../component/aspell/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/userhosts/buildout.cfg
../../component/userhosts/buildout.cfg
...
@@ -233,7 +232,6 @@ context =
...
@@ -233,7 +232,6 @@ context =
key template_fonts_conf template-fonts-conf:output
key template_fonts_conf template-fonts-conf:output
key userhosts_location userhosts:location
key userhosts_location userhosts:location
key unixodbc_location unixodbc:location
key unixodbc_location unixodbc:location
key wget_location wget:location
key extra_path_list eggs:extra-paths
key extra_path_list eggs:extra-paths
key python_executable_for_kernel erp5-python-interpreter-jupyter:exe
key python_executable_for_kernel erp5-python-interpreter-jupyter:exe
key erp5_kernel_location erp5-kernel:location
key erp5_kernel_location erp5-kernel:location
...
@@ -633,7 +631,6 @@ scripts =
...
@@ -633,7 +631,6 @@ scripts =
tidstoraged
tidstoraged
tidstorage_repozo
tidstorage_repozo
wcfs
wcfs
web_checker_utility
extra-paths =
extra-paths =
${erp5:location}
${erp5:location}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment