From f7be80008ac0f1f22ed534ede3ba1010b9e4f80a Mon Sep 17 00:00:00 2001 From: lhahn Date: Wed, 27 Nov 2024 22:34:45 +0100 Subject: [PATCH] Typos. --- tasks/letsencrypt.yml | 20 +++++++++---------- templates/etc/nginx/nginx.conf.j2 | 10 +++++----- .../etc/nginx/sites-available/website.j2 | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tasks/letsencrypt.yml b/tasks/letsencrypt.yml index 989fd1f..efbbaf2 100755 --- a/tasks/letsencrypt.yml +++ b/tasks/letsencrypt.yml @@ -10,12 +10,12 @@ register: certbot_nginx_installation - name: create letsencrypt account - command: + command: cmd: | certbot register - -m {{ letsencrypt_mail_address }} - --agree-tos - --noninteractive + -m {{ letsencrypt_mail_address }} + --agree-tos + --noninteractive --redirect when: certbot_nginx_installation.changed @@ -31,12 +31,12 @@ - name: create let's-encrypt certificates for web web_sites command: cmd: | - certbot - --nginx - -d {% if cert_domain is not string and cert_domain is iterable %}{{ cert_domain | join(',') }}{% else %}{{ cert_domain }}{% endif %} - -m {{ letsencrypt_mail_address }} - --agree-tos - --noninteractive + certbot + --nginx + -d {% if cert_domain is not string and cert_domain is iterable %}{{ cert_domain | join(',') }}{% else %}{{ cert_domain }}{% endif %} + -m {{ letsencrypt_mail_address }} + --agree-tos + --noninteractive --redirect creates: "/etc/letsencrypt/live/{% if cert_domain is not string and cert_domain is iterable %}{{ cert_domain[0] }}{% else %}{{ cert_domain }}{% endif %}" loop: "{{ web_sites | json_query('[?letsencrypt==`true`&&state==`present`].domain') }}" diff --git a/templates/etc/nginx/nginx.conf.j2 b/templates/etc/nginx/nginx.conf.j2 index 6399cec..6e31e93 100755 --- a/templates/etc/nginx/nginx.conf.j2 +++ b/templates/etc/nginx/nginx.conf.j2 @@ -64,22 +64,22 @@ http { ### Ansible included configs ### {% for http_conf in nginx_conf_http %} {{ http_conf | indent(width=4, first=False) }} -{% endfor %} +{% endfor %} } #mail { # # See sample authentication script at: # # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript -# +# # # auth_http localhost/auth.php; # # pop3_capabilities "TOP" "USER"; # # imap_capabilities "IMAP4rev1" "UIDPLUS"; -# +# # server { # listen localhost:110; # protocol pop3; # proxy on; # } -# +# # server { # listen localhost:143; # protocol imap; @@ -93,4 +93,4 @@ stream { {% for conf in nginx_conf %} {{ conf }} -{% endfor %} \ No newline at end of file +{% endfor %} \ No newline at end of file diff --git a/templates/etc/nginx/sites-available/website.j2 b/templates/etc/nginx/sites-available/website.j2 index 3e86be8..c326474 100755 --- a/templates/etc/nginx/sites-available/website.j2 +++ b/templates/etc/nginx/sites-available/website.j2 @@ -4,7 +4,7 @@ server { {% if website.domain is iterable and (website.domain is not mapping and website.domain is not string) %} server_name {{ website.domain | join(' ') }}; - + {% else %} server_name {{ website.domain }}; {% endif %}