Skip to content

Commit 4499a34

Browse files
committed
adjust some config
1 parent d93112d commit 4499a34

3 files changed

Lines changed: 62 additions & 7 deletions

File tree

cookieplone-config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
},
88
"templates": {
99
"project": {
10-
"title": "CUSTOM PROJECT AT CODESYNTAX",
11-
"description": "CUSTOM PROJECT DESCRIPTION",
10+
"title": "CodeSyntax's Plone projects",
11+
"description": "Plone projects with sane defaults for CodeSyntax",
1212
"path": "./templates/project"
1313
},
1414
"sub/project_settings": {

templates/project/cookieplone.json

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
{
22
"schema": {
33
"properties": {
4+
"description": {
5+
"type": "string",
6+
"title": "Description",
7+
"description": "A short description of your add-on.",
8+
"default": "A new Plone project for {{ cookiecutter.title }}",
9+
"validator": "",
10+
"format": "computed"
11+
},
412
"author": {
513
"title": "Author",
614
"default": "CodeSyntax",
@@ -13,6 +21,29 @@
1321
"type": "string",
1422
"format": "computed"
1523
},
24+
"hostname": {
25+
"type": "string",
26+
"title": "Hostname",
27+
"description": "Public URL of the server.",
28+
"default": "{{ cookiecutter.folder_name }}.korpoweb.com",
29+
"validator": "",
30+
"format": "computed"
31+
},
32+
"use_prerelease_versions": {
33+
"type": "string",
34+
"title": "Should we use prerelease versions?",
35+
"description": "Whether to include alpha, beta, and release candidate versions when resolving the Plone version.",
36+
"default": false,
37+
"validator": "",
38+
"format": "computed"
39+
},
40+
"plone_version": {
41+
"type": "string",
42+
"title": "Plone Version",
43+
"description": "Plone backend version to use. Automatically resolved to the latest available release.",
44+
"default": "{{ false | latest_plone }}",
45+
"validator": "cookieplone.validators.plone_version"
46+
},
1647
"github_organization": {
1748
"title": "GitHub Username or Organization",
1849
"default": "codesyntax",
@@ -78,13 +109,38 @@
78109
"thumbor": {
79110
"type": "boolean",
80111
"title": "Use Thumbor?",
81-
"default": false
112+
"default": false,
113+
"format": "computed"
82114
},
83115
"security_key": {
84116
"type": "string",
85117
"title": "Security Key",
86118
"default": "{{ random_ascii_string(32) }}",
87119
"format": "computed"
120+
},
121+
"volto_version": {
122+
"type": "string",
123+
"title": "Volto Version",
124+
"description": "Volto frontend version to use. Automatically resolved to the latest available release.",
125+
"default": "19.0.0",
126+
"validator": "cookieplone.validators.volto_version",
127+
"format": "computed"
128+
},
129+
"frontend_addon_name": {
130+
"type": "string",
131+
"title": "Volto Addon Name",
132+
"description": "Name of the Volto frontend add-on package (e.g. volto-myproject).",
133+
"default": "volto-{{ cookiecutter.python_package_name|replace('_', '-')|replace('.', '-') }}",
134+
"validator": "cookieplone.validators.npm_package_name",
135+
"format": "computed"
136+
},
137+
"language_code": {
138+
"type": "string",
139+
"title": "Language",
140+
"description": "Default language for the Plone site.",
141+
"default": "en",
142+
"validator": "cookieplone.validators.language_code",
143+
"format": "computed"
88144
}
89145
},
90146
"allOf": [

templates/project/{{ cookiecutter.__folder_name }}/database/docker-compose.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
services:
22

3-
{%- if cookiecutter.devops_storage == 'relstorage' %}
4-
postgres:
5-
# Default: postgres:17 (tsvector ranking, no extensions needed)
3+
{%- if cookiecutter.postgres %}
4+
postgres: postgres:17 (tsvector ranking, no extensions needed)
65
# For BM25: PG_IMAGE=tensorchord/vchord-suite:pg17-latest docker compose up -d
76
image: ${PG_IMAGE:-postgres:17}
87
environment:
@@ -27,7 +26,7 @@ services:
2726
postgres:
2827
condition: service_healthy
2928

30-
{%- if cookiecutter.devops_cache %}
29+
{%- if cookiecutter.thumbor %}
3130
thumbor:
3231
image: ghcr.io/bluedynamics/zodb-pgjsonb-thumborblobloader:0.4.2
3332
environment:

0 commit comments

Comments
 (0)