Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stabilize example config #913

Merged
merged 2 commits into from
Nov 24, 2017
Merged

Stabilize example config #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf9aaaf
Stabilise example config and start writing the CHANGELOG
Pchelolo Nov 24, 2017
09c2d2c
Removed CHANGELOG nad version bump for now
Pchelolo Nov 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions config.example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ services:
retry_delay: 250
retry_limit: 10
show_sql: false
citoid:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this being removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the example.yaml config don't specify citoid or mathoid modules, so the setting is useless.

host: http://citoid-beta.wmflabs.org
mathoid:
host: http://mathoid-tester.wmflabs.org
mobileapps:
host: http://appservice.wmflabs.org
purged_cache_control: s-maxage=0, max-age=86400
Expand Down
25 changes: 18 additions & 7 deletions projects/example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,17 @@ paths:
x-modules:
- spec:
paths:
/table:
/table3: &sys_table_ng
x-modules:
- path: sys/table.js
options:
conf: '{{options.table}}'
/key_value: &sys_key_value
x-modules:
- path: sys/key_value.js
/key_value_old: &sys_key_value_old
x-modules:
- path: sys/key_value_old.js
/key_rev_value:
x-modules:
- path: sys/key_rev_value.js
/key_rev_value_old:
x-modules:
- path: sys/key_rev_value_old.js
/page_revisions:
x-modules:
- path: sys/page_revisions.js
Expand All @@ -62,5 +56,22 @@ paths:
options:
parsoidHost: '{{options.parsoid.host}}'
response_cache_control: '{{options.purged_cache_control}}'
grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
/parsoid_bucket:
x-modules:
- path: sys/multi_content_bucket.js
options:
time_to_live: '{{default(options.parsoid.time_to_live, 84600)}}'
renew_expiring: true
delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
table_name_prefix: parsoid_ng
main_content_type:
name: html
value_type: blob
dependent_content_types:
- name: data-parsoid
value_type: json
- name: section-offsets
value_type: json
options: '{{options}}'