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
Vincent Bechu
slapos
Commits
b41f2565
Commit
b41f2565
authored
Jul 01, 2016
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: remove font-url-list parameter from cloudooo
parent
a1ca3b01
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
13 deletions
+1
-13
software/erp5/instance-cloudooo-schema.json
software/erp5/instance-cloudooo-schema.json
+0
-8
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-2
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+0
-3
No files found.
software/erp5/instance-cloudooo-schema.json
View file @
b41f2565
...
...
@@ -8,14 +8,6 @@
},
{
"description"
:
"Start allocating ports at this value, going upward"
}]
},
"font-url-list"
:
{
"description"
:
"List of URLs from which fonts are to be downloaded"
,
"default"
:
[],
"items"
:
{
"type"
:
"string"
},
"type"
:
"array"
}
}
}
stack/erp5/buildout.cfg
View file @
b41f2565
...
...
@@ -177,7 +177,7 @@ md5sum = 763db0c4a94649296e74fe1f53c03940
[template-cloudooo]
<= download-base
filename = instance-cloudoo.cfg.in
md5sum = 1
b515056c5892a86d4ece252ad114a97
md5sum = 1
eedc7ee93ac7c95e1c7d50a36ef2b01
[template-zope-conf]
<= download-base
...
...
@@ -616,7 +616,6 @@ eggs +=
scripts +=
is-local-tcp-port-opened
is-process-older-than-dependency-set
onetimedownload
zodbpack
[versions]
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
b41f2565
...
...
@@ -50,10 +50,7 @@ recipe = slapos.cookbook:fontconfig
conf-path = ${directory:etc}/font.conf
font-system-folder = {{ parameter_dict['fonts'] }}
font-folder = ${directory:font}
{# XXX: violates "instanciation happens offline" rule -#}
url-list = {{ dumps(slapparameter_dict.get('font-url-list', []) | join(' ')) }}
service-folder = ${directory:service}
onetimedownload_path = {{ bin_directory }}/onetimedownload
[resiliency-exclude-file]
# Generate rdiff exclude file in case of resiliency
...
...
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