Skip to content
Merged
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
12 changes: 6 additions & 6 deletions getting-started/configure-webserver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ directory and make sure to replace ``server_name localhost;`` (Nginx) or
You either already know what you're doing, you're developing or like the
danger. ⚔️

.. tab:: letsencrypt
.. tab:: Let's Encrypt

letsencrypt is an easy and free way to retrieve valid ssl certificates.
Let's Encrypt is an easy and free way to retrieve valid ssl certificates.
These certificates are valid for 90 days and can be renewed automatically.

The two most common tools are
Expand Down Expand Up @@ -87,14 +87,14 @@ directory and make sure to replace ``server_name localhost;`` (Nginx) or

.. hint:: **Not exactly what you're looking for?**

The `cerbot documentation`_
The `Certbot documentation`_
has a lot more use cases than we cover here.

.. tab:: acme.sh

.. note::

acme.sh by default no longer uses letsencrypt.
acme.sh by default no longer uses Let's Encrypt.
For this reason you'll have to change the default CA.

.. code-block:: console
Expand Down Expand Up @@ -150,7 +150,7 @@ directory and make sure to replace ``server_name localhost;`` (Nginx) or
.. tab:: public, paid CA

If you prefer to use certificates from other official CAs than
letsencrypt, you can do so as well. Just get your certificate bundle from
Let's Encrypt, you can do so as well. Just get your certificate bundle from
the source you prefer and continue with
`Adjusting the webserver configuration`_.

Expand Down Expand Up @@ -202,7 +202,7 @@ directory and make sure to replace ``server_name localhost;`` (Nginx) or
If above command is not good enough for you, the
`openSSL documentation`_ is a good place to learn more.

.. _cerbot documentation: https://certbot.eff.org/docs/using.html#certbot-commands
.. _Certbot documentation: https://certbot.eff.org/docs/using.html#certbot-commands
.. _acme.sh documentation: https://github.com/acmesh-official/acme.sh/wiki/How-to-issue-a-cert
.. _Sectigo (formerly Comodo): https://sectigo.com/ssl-certificates-tls
.. _Secorio: https://secorio.com/en/productfinder/
Expand Down
2 changes: 1 addition & 1 deletion install/docker-compose.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ To publish a Zammad stack on the internet, it needs be secured via the HTTPS
protocol. To achieve that without modifying the Zammad stack, you can:

- Use a reverse proxy like Nginx Proxy Manager (NPM). It has a GUI that provides
an easy `Letsencrypt <https://letsencrypt.org/>`_ integration.
an easy `Let's Encrypt <https://letsencrypt.org/>`_ integration.
- Use a cloudflare tunnel, which provides SSL termination.

Both scenarios are covered in the
Expand Down