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
Steven Gueguen
slapos
Commits
e0a99704
Commit
e0a99704
authored
Mar 12, 2020
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/seleniumserver: switch to new $FONTCONFIG_FILE
parent
0ea3c003
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
9 deletions
+26
-9
software/seleniumserver/buildout.hash.cfg
software/seleniumserver/buildout.hash.cfg
+1
-1
software/seleniumserver/instance-selenium.cfg.in
software/seleniumserver/instance-selenium.cfg.in
+23
-8
software/seleniumserver/software.cfg
software/seleniumserver/software.cfg
+2
-0
No files found.
software/seleniumserver/buildout.hash.cfg
View file @
e0a99704
...
@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
...
@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
[template-selenium]
[template-selenium]
filename = instance-selenium.cfg.in
filename = instance-selenium.cfg.in
md5sum =
1f0b67d2a542e94380c35afc9cd1946b
md5sum =
269ac5ce96695ede3ee917c6ce17ae2d
software/seleniumserver/instance-selenium.cfg.in
View file @
e0a99704
...
@@ -9,12 +9,25 @@ eggs-directory = ${buildout:eggs-directory}
...
@@ -9,12 +9,25 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
offline = true
[fontconfig-instance]
[fontconfig-conf]
recipe = slapos.cookbook:fontconfig
recipe = slapos.recipe.template:jinja2
conf-path = $${directory:etc}/font.conf
template = ${template-fonts-conf:output}
font-system-folder = ${fonts:location}
rendered = $${directory:etc}/fonts.conf
font-folder = $${directory:fonts}
context =
service-folder = $${directory:services}
key cachedir directory:fontconfig-cache
key fonts :fonts
key includes :includes
fonts =
${android-fonts:location}
${dejavu-fonts:location}
${ipa-fonts:location}
${ipaex-fonts:location}
${liberation-fonts:location}
${ocrb-fonts:location}
$${directory:fonts}
# XXX we don't include conf.d for now, to keep compatibility with current font selection problems.
includes =
# ${fontconfig:location}/etc/fonts/conf.d
[xvfb-instance]
[xvfb-instance]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
...
@@ -79,7 +92,7 @@ environment =
...
@@ -79,7 +92,7 @@ environment =
PATH=${buildout:bin-directory}
PATH=${buildout:bin-directory}
XORG_LOCK_DIR=$${directory:tmp}
XORG_LOCK_DIR=$${directory:tmp}
DISPLAY=$${xvfb-instance:display}
DISPLAY=$${xvfb-instance:display}
FONTCONFIG_FILE=$${fontconfig-
instance:conf-path
}
FONTCONFIG_FILE=$${fontconfig-
conf:rendered
}
hostname = $${instance-parameter:ipv4-random}
hostname = $${instance-parameter:ipv4-random}
...
@@ -331,5 +344,7 @@ tmp = $${buildout:directory}/tmp
...
@@ -331,5 +344,7 @@ tmp = $${buildout:directory}/tmp
services = $${:etc}/service
services = $${:etc}/service
framebuffer = $${:srv}/framebuffer
framebuffer = $${:srv}/framebuffer
fonts = $${:srv}/fonts/
fonts = $${:srv}/fonts/
fontconfig-cache = $${buildout:directory}/.fontconfig
ssh = $${:etc}/ssh
ssh = $${:etc}/ssh
run = $${:var}/run
run = $${:var}/run
\ No newline at end of file
software/seleniumserver/software.cfg
View file @
e0a99704
...
@@ -12,6 +12,8 @@ extends =
...
@@ -12,6 +12,8 @@ extends =
../../component/java/buildout.cfg
../../component/java/buildout.cfg
../../component/caddy/buildout.cfg
../../component/caddy/buildout.cfg
../../component/openssh/buildout.cfg
../../component/openssh/buildout.cfg
../../component/fonts/buildout.cfg
../../component/fontconfig/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
./buildout.hash.cfg
./buildout.hash.cfg
../../stack/monitor/buildout.cfg
../../stack/monitor/buildout.cfg
...
...
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