From 42f884f7caccb6c50b97d5f345d6554cbcce4177 Mon Sep 17 00:00:00 2001
From: Thedro Neely <thedroneely@gmail.com>
Date: Wed, 1 Apr 2020 13:14:00 -0400
Subject: roles/nginx: Copy certbot cron

---
 roles/nginx/files/certbot |  2 ++
 roles/nginx/main.yml      | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 roles/nginx/files/certbot

diff --git a/roles/nginx/files/certbot b/roles/nginx/files/certbot
new file mode 100644
index 0000000..6e95f3e
--- /dev/null
+++ b/roles/nginx/files/certbot
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/certbot renew --agree-tos
diff --git a/roles/nginx/main.yml b/roles/nginx/main.yml
index a55912a..a4aeb03 100644
--- a/roles/nginx/main.yml
+++ b/roles/nginx/main.yml
@@ -1,5 +1,4 @@
 ---
-# Target: alpine3.11
 - name: Install Nginx and Certbot
   hosts: nginx
 
@@ -240,30 +239,35 @@
         group: "{{ item.group }}"
         mode: "{{ item.mode }}"
       with_items:
+
         -
           src: default.conf
           dest: /etc/nginx/default.d/default.conf
           owner: "{{ user }}"
           group: "{{ user }}"
           mode: '0644'
+
         -
           src: nginx.init.d
           dest: /etc/init.d/nginx
           owner: root
           group: root
           mode: '0755'
+
         -
           src: nginx.logrotate
           dest: /etc/logrotate.d/nginx
           owner: root
           group: root
           mode: '0644'
+
         -
           src: nginx.conf
           dest: /etc/nginx/nginx.conf
           owner: "{{ user }}"
           group: "{{ user }}"
           mode: '0644'
+
         -
           src: mime.types
           dest: /etc/nginx/mime.types
@@ -271,6 +275,13 @@
           group: "{{ user }}"
           mode: '0644'
 
+        -
+          src: certbot
+          dest: /etc/periodic/daily/certbot
+          owner: root
+          group: root
+          mode: '0755'
+
     - name: Enabling services
       service:
         name: "{{ item }}"
@@ -278,16 +289,3 @@
         enabled: yes
       with_items:
         - nginx
-
-    - name: Setting up certbot automatic renewal
-      blockinfile:
-        path: /etc/periodic/daily/certbot
-        block: |
-          #!/bin/sh
-          /usr/bin/certbot renew --agree-tos
-        create: yes
-
-    - name: Making certbot executable
-      file:
-        path: /etc/periodic/daily/certbot
-        mode: '0755'
-- 
cgit v1.2.3