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
Léo-Paul Géneau
slapos
Commits
0f81fd88
Commit
0f81fd88
authored
Dec 02, 2021
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop using collective.recipe.environment & collective.recipe.grp
parent
ef0055d2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
17 deletions
+9
-17
component/proftpd/buildout.cfg
component/proftpd/buildout.cfg
+9
-11
software/kvm/software.cfg
software/kvm/software.cfg
+0
-2
software/proftpd/software.cfg
software/proftpd/software.cfg
+0
-2
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+0
-1
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+0
-1
No files found.
component/proftpd/buildout.cfg
View file @
0f81fd88
# http://www.proftpd.org/ - Highly configurable GPL-licensed FTP server software
#
# Because it uses collective.recipe.environment this components needs slapos.core >= 1.4.7
# ( grid: do not hide `$USER` when running buildout )
#
[buildout]
extends =
../openssl/buildout.cfg
...
...
@@ -15,11 +12,12 @@ extends =
../zstd/buildout.cfg
# proftpd server
[proftpd-environment]
recipe = collective.recipe.environment
[proftpd-grp]
recipe = collective.recipe.grp
[proftpd-info]
recipe = slapos.recipe.build
init =
import grp, os, pwd
options['USER'] = pwd.getpwuid(os.getuid())[0]
options['GROUP'] = grp.getgrgid(os.getgid())[0]
[proftpd]
recipe = slapos.recipe.cmmi
...
...
@@ -36,8 +34,8 @@ environment =
CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\"
CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
install_user=${proftpd-
environment
:USER}
install_group=${proftpd-
grp
:GROUP}
install_user=${proftpd-
info
:USER}
install_group=${proftpd-
info
:GROUP}
patch-binary = ${patch:location}/bin/patch
patch-options = -p1
patches =
...
...
software/kvm/software.cfg
View file @
0f81fd88
...
...
@@ -171,8 +171,6 @@ mode = 640
[versions]
websockify = 0.9.0
collective.recipe.environment = 0.2.0
gitdb = 0.6.4
pycurl = 7.43.0
smmap = 0.9.0
software/proftpd/software.cfg
View file @
0f81fd88
...
...
@@ -44,6 +44,4 @@ context =
raw template_monitor ${monitor2-template:rendered}
[versions]
collective.recipe.environment = 1.1.0
collective.recipe.grp = 1.1.0
plone.recipe.command = 1.1
software/slaprunner/software.cfg
View file @
0f81fd88
...
...
@@ -175,5 +175,4 @@ gitdb = 0.6.4
gunicorn = 19.10.0
prettytable = 0.7.2
pycurl = 7.43.0
collective.recipe.environment = 0.2.0
smmap = 0.9.0
stack/resilient/buildout.cfg
View file @
0f81fd88
...
...
@@ -26,7 +26,6 @@ parts =
recipe = zc.recipe.egg
eggs =
collective.recipe.template
collective.recipe.environment
#----------------
#--
...
...
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