Skip to content

Commit

Permalink
Deploying to gh-pages from @ f5b26c7 🚀
Browse files Browse the repository at this point in the history
  • Loading branch information
@milkmaker
milkmaker committed Sep 30, 2024
1 parent 54df759 commit d1442e4
Show file tree
Hide file tree
Showing 13 changed files with 521 additions and 498 deletions.
42 changes: 21 additions & 21 deletions de/manual-guides/Dovecot/u_e-dovecot-vmail-volume/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3839,35 +3839,35 @@ <h3 id="verschieben-eines-bestehenden-vmail-ordners">Verschieben eines bestehend
<ul>
<li>Finden Sie den aktuellen vmail-Ordner anhand seines "Mountpoint"-Attributs: <code>docker volume inspect mailcowdockerized_vmail-vol-1</code></li>
</ul>
<p><code>hl_lines="10"
[
<div class="highlight"><pre><span></span><code>[
{
"CreatedAt": "2019-06-16T22:08:34+02:00",
"Driver": "local",
"Labels": {
"com.docker.compose.project": "mailcowdockerized",
"com.docker.compose.version": "1.23.2",
"com.docker.compose.volume": "vmail-vol-1"
&quot;CreatedAt&quot;: &quot;2019-06-16T22:08:34+02:00&quot;,
&quot;Driver&quot;: &quot;local&quot;,
&quot;Labels&quot;: {
&quot;com.docker.compose.project&quot;: &quot;mailcowdockerized&quot;,
&quot;com.docker.compose.version&quot;: &quot;1.23.2&quot;,
&quot;com.docker.compose.volume&quot;: &quot;vmail-vol-1&quot;
},
"Mountpoint": "/var/lib/docker/volumes/mailcowdockerized_vmail-vol-1/_data",
"Name": "mailcowdockerized_vmail-vol-1",
"Options": null,
"Scope": "local"
<span class="hll"> &quot;Mountpoint&quot;: &quot;/var/lib/docker/volumes/mailcowdockerized_vmail-vol-1/_data&quot;,
</span> &quot;Name&quot;: &quot;mailcowdockerized_vmail-vol-1&quot;,
&quot;Options&quot;: null,
&quot;Scope&quot;: &quot;local&quot;
}
]</code></p>
]
</code></pre></div>
<ul>
<li>Kopieren Sie den Inhalt des <code>Mountpoint</code>-Ordners an den neuen Speicherort (z.B. <code>/data/mailcow/vmail</code>) mit <code>cp -a</code>, <code>rsync -a</code> oder einem ähnlichen, nicht strikten Kopierbefehl</li>
<li>Stoppen Sie mailcow durch Ausführen des kommenden Befehls aus Ihrem mailcow-Stammverzeichnis (z.B. <code>/opt/mailcow-dockerized</code>):</li>
</ul>
<div class="tabbed-set tabbed-alternate" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><input id="__tabbed_1_2" name="__tabbed_1" type="radio" /><div class="tabbed-labels"><label for="__tabbed_1_1">docker compose (Plugin)</label><label for="__tabbed_1_2">docker-compose (Standalone)</label></div>
<div class="tabbed-content">
<div class="tabbed-block">
<p><code>bash
docker compose down</code></p>
<div class="highlight"><pre><span></span><code>docker<span class="w"> </span>compose<span class="w"> </span>down
</code></pre></div>
</div>
<div class="tabbed-block">
<p><code>bash
docker-compose down</code></p>
<div class="highlight"><pre><span></span><code>docker-compose<span class="w"> </span>down<span class="w"> </span>
</code></pre></div>
</div>
</div>
</div>
Expand All @@ -3879,12 +3879,12 @@ <h3 id="verschieben-eines-bestehenden-vmail-ordners">Verschieben eines bestehend
<div class="tabbed-set tabbed-alternate" data-tabs="2:2"><input checked="checked" id="__tabbed_2_1" name="__tabbed_2" type="radio" /><input id="__tabbed_2_2" name="__tabbed_2" type="radio" /><div class="tabbed-labels"><label for="__tabbed_2_1">docker compose (Plugin)</label><label for="__tabbed_2_2">docker-compose (Standalone)</label></div>
<div class="tabbed-content">
<div class="tabbed-block">
<p><code>bash
docker compose up -d</code></p>
<div class="highlight"><pre><span></span><code>docker<span class="w"> </span>compose<span class="w"> </span>up<span class="w"> </span>-d
</code></pre></div>
</div>
<div class="tabbed-block">
<p><code>bash
docker-compose up -d</code></p>
<div class="highlight"><pre><span></span><code>docker-compose<span class="w"> </span>up<span class="w"> </span>-d
</code></pre></div>
</div>
</div>
</div>
Expand Down
57 changes: 38 additions & 19 deletions de/manual-guides/Nginx/u_e-nginx_custom/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2706,6 +2706,15 @@
</span>
</a>

</li>

<li class="md-nav__item">
<a href="#neue-website-mit-proxy-zu-einem-entfernten-location" class="md-nav__link">
<span class="md-ellipsis">
Neue Website mit Proxy zu einem entfernten Location
</span>
</a>

</li>

<li class="md-nav__item">
Expand Down Expand Up @@ -3772,6 +3781,15 @@
</span>
</a>

</li>

<li class="md-nav__item">
<a href="#neue-website-mit-proxy-zu-einem-entfernten-location" class="md-nav__link">
<span class="md-ellipsis">
Neue Website mit Proxy zu einem entfernten Location
</span>
</a>

</li>

<li class="md-nav__item">
Expand Down Expand Up @@ -3811,8 +3829,7 @@ <h2 id="neue-website">Neue Website<a class="headerlink" href="#neue-website" tit
<p>Eine gute Vorlage, um damit zu beginnen:</p>
<div class="highlight"><pre><span></span><code>nano data/conf/nginx/my_custom_site.conf
</code></pre></div>
<p>``` hl_lines="16"
server {
<div class="highlight"><pre><span></span><code>server {
ssl_certificate /etc/ssl/mail/cert.pem;
ssl_certificate_key /etc/ssl/mail/key.pem;
ssl_protocols TLSv1.2 TLSv1.3;
Expand All @@ -3827,27 +3844,29 @@ <h2 id="neue-website">Neue Website<a class="headerlink" href="#neue-website" tit
# Location: data/web
root /web;
# Location: data/web/mysite.com
#root /web/mysite.com
include /etc/nginx/conf.d/listen_plain.active;
<span class="hll"> #root /web/mysite.com
</span> include /etc/nginx/conf.d/listen_plain.active;
include /etc/nginx/conf.d/listen_ssl.active;
server_name mysite.example.org;
server_tokens off;</p>
<p># This allows acme to be validated even with a different web root
server_tokens off;

# This allows acme to be validated even with a different web root
location ^~ /.well-known/acme-challenge/ {
default_type "text/plain";
default_type &quot;text/plain&quot;;
rewrite /.well-known/acme-challenge/(.*) /$1 break;
root /web/.well-known/acme-challenge/;
}</p>
<p>if ($scheme = http) {
}

if ($scheme = http) {
return 301 https://$server_name$request_uri;
}
}
<div class="highlight"><pre><span></span><code>## Neue Website mit Proxy zu einem entfernten Location
Ein weiteres Beispiel mit einer Reverse-Proxy-Konfiguration:
</code></pre></div>
nano data/conf/nginx/my_custom_site.conf
<div class="highlight"><pre><span></span><code>``` hl_lines=&quot;16 28&quot;
server {
<h2 id="neue-website-mit-proxy-zu-einem-entfernten-location">Neue Website mit Proxy zu einem entfernten Location<a class="headerlink" href="#neue-website-mit-proxy-zu-einem-entfernten-location" title="Permanent link">&para;</a></h2>
<p>Ein weiteres Beispiel mit einer Reverse-Proxy-Konfiguration:</p>
<div class="highlight"><pre><span></span><code>nano data/conf/nginx/my_custom_site.conf
</code></pre></div>
<div class="highlight"><pre><span></span><code>server {
ssl_certificate /etc/ssl/mail/cert.pem;
ssl_certificate_key /etc/ssl/mail/key.pem;
ssl_protocols TLSv1.2 TLSv1.3;
Expand All @@ -3862,8 +3881,8 @@ <h2 id="neue-website">Neue Website<a class="headerlink" href="#neue-website" tit
root /web;
include /etc/nginx/conf.d/listen_plain.active;
include /etc/nginx/conf.d/listen_ssl.active;
server_name example.domain.tld;
server_tokens off;
<span class="hll"> server_name example.domain.tld;
</span> server_tokens off;

location ^~ /.well-known/acme-challenge/ {
allow all;
Expand All @@ -3874,16 +3893,16 @@ <h2 id="neue-website">Neue Website<a class="headerlink" href="#neue-website" tit
return 301 https://$host$request_uri;
}

location / {
proxy_pass http://service:3000/;
<span class="hll"> location / {
</span> proxy_pass http://service:3000/;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
client_max_body_size 0;
}
}
</code></pre></div></p>
</code></pre></div>
<h2 id="konfig-erweiterung-in-mailcows-nginx">Konfig-Erweiterung in mailcows Nginx<a class="headerlink" href="#konfig-erweiterung-in-mailcows-nginx" title="Permanent link">&para;</a></h2>
<p>Der Dateiname, der für eine neue Site verwendet wird, ist nicht wichtig, solange der Dateiname eine .conf-Erweiterung trägt.</p>
<p>Es ist auch möglich, die Konfiguration der Standarddatei <code>site.conf</code> Datei zu erweitern:</p>
Expand Down
61 changes: 30 additions & 31 deletions de/manual-guides/Nginx/u_e-nginx_webmail-site/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3711,54 +3711,53 @@ <h1>Subdomäne webmail.example.org erstellen</h1>
<p><strong>WICHTIG</strong>: Diese Anleitung gilt nur für Konfigurationen, bei denen SNI nicht aktiviert ist. Wenn SNI aktiviert ist, muss der Zertifikatspfad angepasst werden. Etwas wie <code>ssl_certificate,key /etc/ssl/mail/webmail.example.org/cert.pem,key.pem;</code> wird genügen. <strong>Aber</strong>: Das Zertifikat sollte <strong>zuerst</strong> bezogen werden und erst wenn das Zertifikat existiert, sollte eine Site Config erstellt werden. Nginx wird nicht starten, wenn es das Zertifikat und den Schlüssel nicht finden kann.</p>
<p>Um eine Subdomain <code>webmail.example.org</code> zu erstellen und sie auf SOGo umzuleiten, müssen Sie eine <strong>neue</strong> Nginx-Site erstellen. Achten Sie dabei auf "CHANGE_TO_MAILCOW_HOSTNAME"!</p>
<p><strong>nano data/conf/nginx/webmail.conf</strong></p>
<p>``` hl_lines="9 17"
server {
<div class="highlight"><pre><span></span><code>server {
ssl_certificate /etc/ssl/mail/cert.pem;
ssl_certificate_key /etc/ssl/mail/key.pem;
index index.php index.html;
client_max_body_size 0;
root /web;
include /etc/nginx/conf.d/listen_plain.active;
include /etc/nginx/conf.d/listen_ssl.active;
server_name webmail.example.org;
server_tokens off;
<span class="hll"> server_name webmail.example.org;
</span> server_tokens off;
location ^~ /.well-known/acme-challenge/ {
allow all;
default_type "text/plain";
}</p>
<p>location / {
return 301 <a href="https://CHANGE_TO_MAILCOW_HOSTNAME/SOGo">https://CHANGE_TO_MAILCOW_HOSTNAME/SOGo</a>;
default_type &quot;text/plain&quot;;
}
}
<div class="highlight"><pre><span></span><code>Speichern Sie und starten Sie Nginx neu:

=== &quot;docker compose (Plugin)&quot;

``` bash
docker compose restart nginx-mailcow
```

=== &quot;docker-compose (Standalone)&quot;

``` bash
docker-compose restart nginx-mailcow
```

Öffnen Sie nun `mailcow.conf` und suchen Sie `ADDITIONAL_SAN`.
Fügen Sie `webmail.example.org` zu diesem Array hinzu, verwenden Sie keine Anführungszeichen!
location / {
<span class="hll"> return 301 https://CHANGE_TO_MAILCOW_HOSTNAME/SOGo;
</span> }
}
</code></pre></div>
ADDITIONAL_SAN=webmail.example.org
```</p>
<p>Führen Sie den Befehl aus:</p>
<p>Speichern Sie und starten Sie Nginx neu: </p>
<div class="tabbed-set tabbed-alternate" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><input id="__tabbed_1_2" name="__tabbed_1" type="radio" /><div class="tabbed-labels"><label for="__tabbed_1_1">docker compose (Plugin)</label><label for="__tabbed_1_2">docker-compose (Standalone)</label></div>
<div class="tabbed-content">
<div class="tabbed-block">
<p><code>bash
docker compose up -d</code></p>
<div class="highlight"><pre><span></span><code>docker<span class="w"> </span>compose<span class="w"> </span>restart<span class="w"> </span>nginx-mailcow
</code></pre></div>
</div>
<div class="tabbed-block">
<div class="highlight"><pre><span></span><code>docker-compose<span class="w"> </span>restart<span class="w"> </span>nginx-mailcow
</code></pre></div>
</div>
</div>
</div>
<p>Öffnen Sie nun <code>mailcow.conf</code> und suchen Sie <code>ADDITIONAL_SAN</code>.
Fügen Sie <code>webmail.example.org</code> zu diesem Array hinzu, verwenden Sie keine Anführungszeichen!</p>
<div class="highlight"><pre><span></span><code>ADDITIONAL_SAN=webmail.example.org
</code></pre></div>
<p>Führen Sie den Befehl aus:</p>
<div class="tabbed-set tabbed-alternate" data-tabs="2:2"><input checked="checked" id="__tabbed_2_1" name="__tabbed_2" type="radio" /><input id="__tabbed_2_2" name="__tabbed_2" type="radio" /><div class="tabbed-labels"><label for="__tabbed_2_1">docker compose (Plugin)</label><label for="__tabbed_2_2">docker-compose (Standalone)</label></div>
<div class="tabbed-content">
<div class="tabbed-block">
<div class="highlight"><pre><span></span><code>docker<span class="w"> </span>compose<span class="w"> </span>up<span class="w"> </span>-d
</code></pre></div>
</div>
<div class="tabbed-block">
<p><code>bash
docker-compose up -d</code></p>
<div class="highlight"><pre><span></span><code>docker-compose<span class="w"> </span>up<span class="w"> </span>-d
</code></pre></div>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit d1442e4

Please sign in to comment.