add certbot-nginx support, remove ubuntu 16.04

defaults/main.yml

@@ -5,11 +5,11 @@ certbot_auto_renew_user: "{{ ansible_user | default(lookup('env', 'USER')) }}"
 certbot_auto_renew_hour: "3"
 certbot_auto_renew_minute: "30"
 certbot_auto_renew_options: "--quiet"
+certbot_package: certbot
 
 certbot_testmode: false
 certbot_hsts: false
 
-
 # Parameters used when creating new Certbot certs.
 certbot_create_if_missing: false
 certbot_create_method: standalone

tasks/include-vars.yml

@@ -1,8 +0,0 @@
----
-- name: Load a variable file based on the OS type, or a default if not found.
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
-    - "{{ ansible_distribution }}.yml"
-    - "{{ ansible_os_family }}.yml"
-    - "default.yml"

tasks/install-with-package.yml

@@ -4,4 +4,4 @@
 
 - name: Set Certbot script variable.
   set_fact:
-    certbot_script: "{{ certbot_package }}"
+    certbot_script: "certbot"

tasks/main.yml

@@ -1,6 +1,4 @@
 ---
-- import_tasks: include-vars.yml
-
 - import_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 

vars/Ubuntu-16.04.yml

@@ -1,2 +0,0 @@
----
-certbot_package: letsencrypt

vars/default.yml

@@ -1,2 +0,0 @@
----
-certbot_package: certbot