Fix typo of variable "letsencrypt_challenge_root" (#383)

Fueled · Dec 5, 2019 · 00f2a25 · 00f2a25
1 parent 647a49c
commit 00f2a25
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/{{cookiecutter.github_repository}}/provisioner/roles/nginx/tasks/letsencrypt.yml b/{{cookiecutter.github_repository}}/provisioner/roles/nginx/tasks/letsencrypt.yml
@@ -16,7 +16,7 @@
 
 - name: create certbot folder
   become: yes
-  file: path={{ letsencrypt_challange_root }} state=directory owner={{ user }} group={{ nginx_user }} mode="u=rwx,g=rwxs,o=r"
+  file: path={{ letsencrypt_challenge_root }} state=directory owner={{ user }} group={{ nginx_user }} mode="u=rwx,g=rwxs,o=r"
 
 - name: reload nginx
   service: name=nginx state=reloaded
@@ -33,7 +33,7 @@
   service: name=nginx state=stopped
 
 - name: request cert
-  shell: certbot certonly --standalone -w {{ letsencrypt_challange_root }} -d {{ domain_name }} --email {{ letsencrypt_email }} --agree-tos --non-interactive
+  shell: certbot certonly --standalone -w {{ letsencrypt_challenge_root }} -d {{ domain_name }} --email {{ letsencrypt_email }} --agree-tos --non-interactive
   args:
     creates: '{{ letsencrypt_ssl_cert_dir }}'
 
@@ -45,4 +45,13 @@
 
 - name: symblink certificates
   file: src={{ letsencrypt_ssl_cert_dir }} dest={{ ssl_cert_dir }}/{{ domain_name }} owner={{ user }} group=www-data state=link
+
+# running cron job each monday
+- name: add letsencrypt renew cron
+  cron:
+   name: "Renew all certificates"
+   minute: "0"
+   hour: "2"
+   weekday: "1"
+   job: "certbot renew --non-interactive --webroot --webroot-path {{ letsencrypt_challenge_root }} --renew-hook 'service nginx reload' >> /var/log/certbot.log"
 {%endraw%}
diff --git a/{{cookiecutter.github_repository}}/provisioner/roles/nginx/tasks/main.yml b/{{cookiecutter.github_repository}}/provisioner/roles/nginx/tasks/main.yml
@@ -19,16 +19,6 @@
 - import_tasks: letsencrypt.yml
   when: vm == 0 and use_letsencrypt and letsencrypt_dir.stat.exists == false
 
-# running cron job each monday
-- name: add letsencrypt renew cron
-  cron:
-   name: "Renew all certificates"
-   minute: "0"
-   hour: "2"
-   weekday: "1"
-   job: 'certbot renew --non-interactive --webroot -w {{ letsencrypt_challange_root }} --renew-hook "service nginx reload"'
-  when: vm == 0 and use_letsencrypt
-
 - name: check ssl/nginx.crt exists
   stat: path={{ ssl_certificate }}
   register: nginx_cert

diff --git a/{{cookiecutter.github_repository}}/provisioner/roles/nginx/templates/site.443.conf.j2 b/{{cookiecutter.github_repository}}/provisioner/roles/nginx/templates/site.443.conf.j2
@@ -36,7 +36,7 @@ server {
 
     {% if use_letsencrypt %}
     location /.well-known/acme-challenge {
-            root {{ letsencrypt_challange_root }};
+            root {{ letsencrypt_challenge_root }};
             try_files $uri =404;
     }
     {% endif %}

diff --git a/{{cookiecutter.github_repository}}/provisioner/roles/nginx/templates/site.80.conf.j2 b/{{cookiecutter.github_repository}}/provisioner/roles/nginx/templates/site.80.conf.j2
@@ -6,7 +6,7 @@ server {
 
     {% if use_letsencrypt %}
         location /.well-known/acme-challenge/ {
-            root {{ letsencrypt_challange_root }};
+            root {{ letsencrypt_challenge_root }};
             try_files $uri =404;
         }
     {% endif %}