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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Matevz Golob
slapos
Commits
2ce94fa1
Commit
2ce94fa1
authored
Aug 28, 2014
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libuserhosts: Bump and rename to follow upstream renaming.
Update users.
parent
3974b084
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
component/userhosts/buildout.cfg
component/userhosts/buildout.cfg
+6
-6
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+6
-6
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+1
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+1
-1
stack/erp5/runzope_userhosts_preloaded.in
stack/erp5/runzope_userhosts_preloaded.in
+1
-1
No files found.
component/
lib
userhosts/buildout.cfg
→
component/userhosts/buildout.cfg
View file @
2ce94fa1
...
@@ -2,17 +2,17 @@
...
@@ -2,17 +2,17 @@
extends =
extends =
../git/buildout.cfg
../git/buildout.cfg
[
lib
userhosts]
[userhosts]
recipe = plone.recipe.command
recipe = plone.recipe.command
stop-on-error = true
stop-on-error = true
update-command = ${:command}
update-command = ${:command}
command = cd ${
lib
userhosts-get:location} && make
command = cd ${userhosts-get:location} && make
# For convenience (one section to build & know result path)
# For convenience (one section to build & know result path)
location = ${
libuserhosts-get:location}/lib
userhosts.so
location = ${
userhosts-get:location}/
userhosts.so
[
lib
userhosts-get]
[userhosts-get]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/userhosts.git
repository = http://git.erp5.org/repos/userhosts.git
revision =
1daeace39bbccc1b002f92d41e9dfbae5bf6b868
revision =
74b2ee92230ab142b99ab32d6b3265ba6aac7db4
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
location = ${buildout:parts-directory}/
lib
userhosts
location = ${buildout:parts-directory}/userhosts
stack/erp5/buildout.cfg
View file @
2ce94fa1
...
@@ -66,7 +66,7 @@ extends =
...
@@ -66,7 +66,7 @@ extends =
../../component/jsl/buildout.cfg
../../component/jsl/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/findutils/buildout.cfg
../../component/findutils/buildout.cfg
../../component/
lib
userhosts/buildout.cfg
../../component/userhosts/buildout.cfg
parts =
parts =
rdiff-backup
rdiff-backup
...
@@ -102,7 +102,7 @@ parts =
...
@@ -102,7 +102,7 @@ parts =
dcron
dcron
dash
dash
wget
wget
lib
userhosts
userhosts
# Buildoutish
# Buildoutish
patched-eggs
patched-eggs
...
@@ -210,7 +210,7 @@ md5sum = 8fe36c41ab784f547b968dc6edd0ca29
...
@@ -210,7 +210,7 @@ md5sum = 8fe36c41ab784f547b968dc6edd0ca29
[template-runzope-userhosts-preloaded]
[template-runzope-userhosts-preloaded]
< = download-base
< = download-base
filename = runzope_userhosts_preloaded.in
filename = runzope_userhosts_preloaded.in
md5sum =
479fc3a107ff965dfb6e7e1222d81f28
md5sum =
8801c37c04522a0f276bfe07c2709179
[template-my-cnf]
[template-my-cnf]
< = download-base
< = download-base
...
@@ -237,7 +237,7 @@ md5sum = e106cdd73c0a86a9b2c806062573ca8f
...
@@ -237,7 +237,7 @@ md5sum = e106cdd73c0a86a9b2c806062573ca8f
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
3900ab427f44e41668d9b36411e46149
md5sum =
8ccd836753a44aa26d68f5fff00c2eff
extra-context =
extra-context =
key mariadb_link_binary template-mariadb:link-binary
key mariadb_link_binary template-mariadb:link-binary
key zope_link_binary template-zope:link-binary
key zope_link_binary template-zope:link-binary
...
@@ -273,7 +273,6 @@ extra-context =
...
@@ -273,7 +273,6 @@ extra-context =
key libpng12_location libpng12:location
key libpng12_location libpng12:location
key libreoffice_bin_location libreoffice-bin:location
key libreoffice_bin_location libreoffice-bin:location
key librsvg_location librsvg:location
key librsvg_location librsvg:location
key libuserhosts_location libuserhosts:location
key libxcb_location libxcb:location
key libxcb_location libxcb:location
key local_bt5_repository local-bt5-repository:list
key local_bt5_repository local-bt5-repository:list
key logrotate_location logrotate:location
key logrotate_location logrotate:location
...
@@ -298,6 +297,7 @@ extra-context =
...
@@ -298,6 +297,7 @@ extra-context =
key template_zeo template-zeo:target
key template_zeo template-zeo:target
key template_zope template-zope:target
key template_zope template-zope:target
key template_zope_conf template-zope-conf:target
key template_zope_conf template-zope-conf:target
key userhosts_location userhosts:location
key wget_location wget:location
key wget_location wget:location
key zlib_location zlib:location
key zlib_location zlib:location
...
@@ -319,7 +319,7 @@ md5sum = 7bbb690cb2ea38cd2aa84c8a79c50399
...
@@ -319,7 +319,7 @@ md5sum = 7bbb690cb2ea38cd2aa84c8a79c50399
[template-zope]
[template-zope]
< = download-base
< = download-base
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
0db31172368f14eeeb2ae8e22af30d9e
md5sum =
e67bf593eb980761c61f126417c67b0c
link-binary =
link-binary =
${aspell:location}/bin/aspell
${aspell:location}/bin/aspell
${coreutils:location}/bin/basename
${coreutils:location}/bin/basename
...
...
stack/erp5/instance-zope.cfg.in
View file @
2ce94fa1
...
@@ -200,7 +200,7 @@ context = key host_dict hosts-parameter:host-dict
...
@@ -200,7 +200,7 @@ context = key host_dict hosts-parameter:host-dict
[preload-userhosts-runzope-parameter]
[preload-userhosts-runzope-parameter]
runzope-binary = {{ bin_directory }}/runzope
runzope-binary = {{ bin_directory }}/runzope
libuserhosts = {{ parameter_dict['lib
userhosts'] }}
userhosts = {{ parameter_dict['
userhosts'] }}
shell-path = {{ parameter_dict['dash'] }}/bin/dash
shell-path = {{ parameter_dict['dash'] }}/bin/dash
hosts = ${hosts:rendered}
hosts = ${hosts:rendered}
...
...
stack/erp5/instance.cfg.in
View file @
2ce94fa1
...
@@ -141,7 +141,7 @@ buildout-bin-directory = {{ buildout_bin_directory }}
...
@@ -141,7 +141,7 @@ buildout-bin-directory = {{ buildout_bin_directory }}
dash = {{ dash_location }}
dash = {{ dash_location }}
jsl = {{ jsl_location }}
jsl = {{ jsl_location }}
link-binary = {{ dumps(zope_link_binary) }}
link-binary = {{ dumps(zope_link_binary) }}
libuserhosts = {{ lib
userhosts_location }}
userhosts = {{
userhosts_location }}
runzope-userhosts-preloaded-template = {{ template_runzope_userhosts_preloaded }}
runzope-userhosts-preloaded-template = {{ template_runzope_userhosts_preloaded }}
[dynamic-template-zope]
[dynamic-template-zope]
...
...
stack/erp5/runzope_userhosts_preloaded.in
View file @
2ce94fa1
#!{{ parameter_dict['shell-path'] }}
#!{{ parameter_dict['shell-path'] }}
export HOSTS='{{ parameter_dict['hosts'] }}' LD_PRELOAD='{{ parameter_dict['
lib
userhosts'] }}'
export HOSTS='{{ parameter_dict['hosts'] }}' LD_PRELOAD='{{ parameter_dict['userhosts'] }}'
exec {{ parameter_dict['runzope-binary'] }} "$@"
exec {{ parameter_dict['runzope-binary'] }} "$@"
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