From 2e5fbd02f5383bb5e6c68a3a2d82964255824772 Mon Sep 17 00:00:00 2001
From: Adi Priyanto <adipriyanto.bpn@gmail.com>
Date: Thu, 6 Jul 2017 21:37:44 +0700
Subject: [PATCH] Install extra packages which are listed on
 certbot_package_extras variable

---
 .gitignore                     |  1 +
 defaults/main.yml              |  3 +++
 meta/.galaxy_install_info      |  1 -
 tasks/install-with-package.yml | 10 +++++++++-
 vars/Ubuntu-16.04.yml          |  3 +--
 vars/default.yml               |  5 +----
 6 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 meta/.galaxy_install_info

diff --git a/.gitignore b/.gitignore
index c9b2377..be086dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.retry
 tests/test.sh
+meta/.galaxy_install_info
\ No newline at end of file
diff --git a/defaults/main.yml b/defaults/main.yml
index 7f6f0d3..50291fd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,7 @@
 ---
+# Additional packages/plugins for Certbot
+certbot_package_extras: []
+
 # Certbot auto-renew cron job configuration (for certificate renewals).
 certbot_auto_renew: true
 certbot_auto_renew_user: "{{ ansible_user }}"
diff --git a/meta/.galaxy_install_info b/meta/.galaxy_install_info
deleted file mode 100644
index 5ab1bab..0000000
--- a/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Tue Jul  4 10:56:19 2017', version: 2.0.0}
diff --git a/tasks/install-with-package.yml b/tasks/install-with-package.yml
index bae8d09..d4fca03 100644
--- a/tasks/install-with-package.yml
+++ b/tasks/install-with-package.yml
@@ -1,7 +1,15 @@
 ---
+- name: Define certbot_packages.
+  set_fact:
+    certbot_packages: "{{ [ certbot_package ] }}"
+
+- name: Define extra certbot_packages.
+  set_fact:
+    certbot_packages: "{{ certbot_packages | list + certbot_package_extras | list }}"
+
 - name: Install Certbot.
   package: "name={{ item }} state=present"
-  with_items: "{{ certbot_package }}"
+  with_items: "{{ certbot_packages }}"
 
 - name: Set Certbot script variable.
   set_fact:
diff --git a/vars/Ubuntu-16.04.yml b/vars/Ubuntu-16.04.yml
index c6db23a..90e9138 100644
--- a/vars/Ubuntu-16.04.yml
+++ b/vars/Ubuntu-16.04.yml
@@ -1,2 +1 @@
-certbot_package:
-  - letsencrypt
+certbot_package: letsencrypt
diff --git a/vars/default.yml b/vars/default.yml
index 135e69e..d88f2dc 100644
--- a/vars/default.yml
+++ b/vars/default.yml
@@ -1,5 +1,2 @@
 ---
-certbot_package:
-  - certbot
-  - certbot-apache
-  - certbot-nginx
+certbot_package: certbot