mirror of
https://github.com/Mailu/Mailu.git
synced 2025-01-18 03:21:36 +02:00
Completely remove step 5 where you can set the replica count for docker-stack.
Add additional warning to ´experimental' notice in setup for stack. Add a notice the shipped PostgreSQL is deprecated. Make the external PostgreSQL database the default option. Make 1.7 the default version (stable_version': '1.7', in docs\conf.py) Update mergify.yml with 1.8 version
This commit is contained in:
parent
78890a97ff
commit
17cea83301
@ -35,18 +35,18 @@ pull_request_rules:
|
|||||||
comment:
|
comment:
|
||||||
message: bors r+
|
message: bors r+
|
||||||
|
|
||||||
- name: Backport to 1.7 branch
|
- name: Backport to 1.8 branch
|
||||||
conditions:
|
conditions:
|
||||||
- base=master
|
- base=master
|
||||||
- label=type/backport
|
- label=type/backport
|
||||||
actions:
|
actions:
|
||||||
backport:
|
backport:
|
||||||
branches:
|
branches:
|
||||||
- '1.7'
|
- '1.8'
|
||||||
|
|
||||||
- name: remove outdated reviews
|
- name: remove outdated reviews
|
||||||
conditions:
|
conditions:
|
||||||
- base~=^(master|1.7)$
|
- base~=^(master|1.8)$
|
||||||
actions:
|
actions:
|
||||||
dismiss_reviews:
|
dismiss_reviews:
|
||||||
approved: True
|
approved: True
|
||||||
|
@ -36,7 +36,7 @@ html_context = {
|
|||||||
'github_user': 'mailu',
|
'github_user': 'mailu',
|
||||||
'github_repo': 'mailu',
|
'github_repo': 'mailu',
|
||||||
'github_version': version,
|
'github_version': version,
|
||||||
'stable_version': '1.8',
|
'stable_version': '1.7',
|
||||||
'versions': [
|
'versions': [
|
||||||
('1.5', '/1.5/'),
|
('1.5', '/1.5/'),
|
||||||
('1.6', '/1.6/'),
|
('1.6', '/1.6/'),
|
||||||
|
@ -29,7 +29,7 @@ services:
|
|||||||
- "{{ root }}/certs:/certs"
|
- "{{ root }}/certs:/certs"
|
||||||
- "{{ root }}/overrides/nginx:/overrides:ro"
|
- "{{ root }}/overrides/nginx:/overrides:ro"
|
||||||
deploy:
|
deploy:
|
||||||
replicas: {{ front_replicas }}
|
replicas: 1
|
||||||
|
|
||||||
admin:
|
admin:
|
||||||
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}}
|
image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}}
|
||||||
@ -42,7 +42,7 @@ services:
|
|||||||
- "{{ root }}/data:/data"
|
- "{{ root }}/data:/data"
|
||||||
- "{{ root }}/dkim:/dkim"
|
- "{{ root }}/dkim:/dkim"
|
||||||
deploy:
|
deploy:
|
||||||
replicas: {{ admin_replicas }}
|
replicas: 1
|
||||||
healthcheck:
|
healthcheck:
|
||||||
disable: true
|
disable: true
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ services:
|
|||||||
- "{{ root }}/mail:/mail"
|
- "{{ root }}/mail:/mail"
|
||||||
- "{{ root }}/overrides/dovecot:/overrides:ro"
|
- "{{ root }}/overrides/dovecot:/overrides:ro"
|
||||||
deploy:
|
deploy:
|
||||||
replicas: {{ imap_replicas }}
|
replicas: 1
|
||||||
healthcheck:
|
healthcheck:
|
||||||
disable: true
|
disable: true
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ services:
|
|||||||
- "{{ root }}/mailqueue:/queue"
|
- "{{ root }}/mailqueue:/queue"
|
||||||
- "{{ root }}/overrides/postfix:/overrides:ro"
|
- "{{ root }}/overrides/postfix:/overrides:ro"
|
||||||
deploy:
|
deploy:
|
||||||
replicas: {{ smtp_replicas }}
|
replicas: 1
|
||||||
healthcheck:
|
healthcheck:
|
||||||
disable: true
|
disable: true
|
||||||
|
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
{% if flavor == "stack" %}
|
{% if flavor == "stack" %}
|
||||||
{% call macros.panel("danger", "Docker stack / swarm is experimental") %}
|
{% call macros.panel("danger", "Docker stack / swarm is experimental") %}
|
||||||
Setup is capable of generating a somewhat decent docker-compose.yml,
|
Setup is capable of generating a somewhat decent docker-compose.yml,
|
||||||
for the docker stack flavor. However its usage is for advanced users an is experimental.
|
for the docker stack flavor. However its usage is for advanced users only and is experimental.
|
||||||
Expect many challenges is shared mail storage and fail-over scenarios! Some user experiences
|
Expect many challenges such as shared mail storage and fail-over scenarios! Some user experiences
|
||||||
have been <a href="https://github.com/Mailu/Mailu/blob/master/docs/swarm/master/README.md">shared on GitHub.</a>
|
have been <a href="https://github.com/Mailu/Mailu/blob/master/docs/swarm/master/README.md">shared on GitHub.</a>
|
||||||
|
For this reason also think very hard about using a replica count higher than 1. This cannot be used with the default config.
|
||||||
|
Manual post-configuration is required for using a replica count higher than 1.
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -11,13 +11,16 @@
|
|||||||
<p></p>
|
<p></p>
|
||||||
<div id="postgres_db" style="display: none">
|
<div id="postgres_db" style="display: none">
|
||||||
<div class="form-check">
|
<div class="form-check">
|
||||||
<input class="form-check-input" type="radio" name="postgresql" id="internal_psql" value="internal" checked>
|
<input class="form-check-input" type="radio" name="postgresql" id="internal_psql" value="internal">
|
||||||
<label class="form-check-label" for="internal_psql">
|
<label class="form-check-label" for="internal_psql">
|
||||||
Use the Postgresql from Mailu
|
Use the PostgreSQL image from Mailu. Warning, this image is deprecated.
|
||||||
|
It will be removed from Mailu 1.9. Existing users can still upgrade to Mailu 1.8 using this image.
|
||||||
|
With the release of Mailu 1.9,
|
||||||
|
we will offer a mechanism for migrating your data to another database management system.
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check">
|
<div class="form-check">
|
||||||
<input class="form-check-input" type="radio" name="postgresql" value="external" id="external_psql" >
|
<input class="form-check-input" type="radio" name="postgresql" value="external" id="external_psql" checked>
|
||||||
<label class="form-check-label" for="external_psql">
|
<label class="form-check-label" for="external_psql">
|
||||||
I want to connect to an external database
|
I want to connect to an external database
|
||||||
</label>
|
</label>
|
||||||
@ -37,4 +40,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
|
@ -1,28 +0,0 @@
|
|||||||
{% call macros.panel("info", "Step 5 - Number of replicas for containers") %}
|
|
||||||
<p>Select number of replicas for containers</p>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<input class="form-control" type="number" name="front_replicas" min="1" required value="1"
|
|
||||||
style="width: 6%; display: inline;">
|
|
||||||
<label>Front</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<input class="form-control" type="number" name="admin_replicas" min="1" required value="1"
|
|
||||||
style="width: 6%; display: inline;">
|
|
||||||
<label>Admin</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<input class="form-control" type="number" name="imap_replicas" min="1" required value="1"
|
|
||||||
style="width: 6%; display: inline;">
|
|
||||||
<label>IMAP</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<input class="form-control" type="number" name=smtp_replicas min="1" required value="1"
|
|
||||||
style="width: 6%; display: inline;">
|
|
||||||
<label>SMTP</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endcall %}
|
|
Loading…
Reference in New Issue
Block a user