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.

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

[IMP] doodba-copier-template: domains_prod and domains_test #475

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pipx ensurepath
Once you installed everything, you can now use Copier to copy this template:

```bash
copier copy gh:Tecnativa/doodba-copier-template ~/path/to/your/subproject
copier copy gh:Tecnativa/doodba-copier-template ~/path/to/your/subproject --trust
```

Copier will ask you a lot of questions. Answer them to properly generate the template.
Expand Down
15 changes: 8 additions & 7 deletions copier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,13 @@ gitlab_url:
domains_prod:
type: yaml
multiline: true
default: {}
default: null
placeholder: |
# Main domains, with TLS and cert resolved with "letsencrypt" resolver
- hosts:
Copy link
Member

Choose a reason for hiding this comment

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

I don't see the need of this, as there's already the same 3 lines below. Maybe we should add cert_resolver: letsencypt by default. cc @josep-tecnativa

Copy link
Author

Choose a reason for hiding this comment

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

I have removed duplicate lines.
The placeholder has the comment in the end, to show first the syntax of the value.

- www.main.com
- shop.main.com

# Main domains, with TLS and cert resolved with "letsencrypt" resolver
examples: |
# Alternate domains that redirect to main ones
- hosts:
- main.com
Expand Down Expand Up @@ -270,13 +270,13 @@ domains_prod:
domains_test:
type: yaml
multiline: true
default: {}
default: null
placeholder: |
# Main domains, with TLS and cert resolved with "letsencrypt" resolver
- hosts:
- demo1.main.com
- demo2.main.com

# Main domains, with TLS and cert resolved with "letsencrypt" resolver
examples: |
# Alternate domains that redirect to main ones
- hosts:
- www.demo1.main.com
Expand Down Expand Up @@ -349,7 +349,7 @@ cidr_whitelist:
⚠️ It must be a list. And this is only supported if you deploy with Traefik 2+.

postgres_version:
default: "15"
default: "16"
help: >-
Which PostgreSQL version do you want to deploy? (Recommended: for new instances
always use the latest version. Version 9.6 has no backup support.)
Expand All @@ -362,6 +362,7 @@ postgres_version:
"13": "13"
"14": "14"
"15": "15"
"16": "16"
validator: >-
{% if postgres_version|int > 0 %} {% if (odoo_version >= 16.0 and
postgres_version|int < 12) or (odoo_version >= 14.0 and postgres_version|int < 10)
Expand Down
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ This is needed for testing and production environments to be reachable.

Our supported proxy is Traefik. There must be one in each node.

To have it, use this `inverseproxy.yaml` file:
To have it, use this `inverseproxy/docker-compose.yaml` file:

<details>
<summary>Traefik v1 docker compose</summary>
Expand Down