From afa993333fdb4b0d4023be7ec2dcd6717c657825 Mon Sep 17 00:00:00 2001 From: exploide Date: Sun, 19 Mar 2017 14:38:07 +0100 Subject: [PATCH] renamed certbot_from_git variable to certbot_install_from_source and fixed some wording --- README.md | 4 ++-- defaults/main.yml | 2 +- tasks/{install-from-git.yml => install-from-source.yml} | 2 +- ...{install-from-package.yml => install-with-package.yml} | 4 ++-- tasks/main.yml | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) rename tasks/{install-from-git.yml => install-from-source.yml} (91%) rename tasks/{install-from-package.yml => install-with-package.yml} (57%) diff --git a/README.md b/README.md index ba8cf6a..83bc68e 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,12 @@ Certbot requires Git to be installed if one wants to install Certbot from Git re ## Role Variables - certbot_from_git: no + certbot_install_from_source: no certbot_repo: https://github.com/certbot/certbot.git certbot_version: master certbot_keep_updated: yes -Certbot Git repository options. This role clones the agent from the configured repo, then makes the `certbot-auto` script executable if `certbot_from_git` is `yes`. Otherwise it will be installed from distribution's package management. +Certbot Git repository options. This role clones the agent from the configured repo, then makes the `certbot-auto` script executable if `certbot_install_from_source` is `yes`. Otherwise it will be installed from distribution's package management. certbot_dir: /opt/certbot diff --git a/defaults/main.yml b/defaults/main.yml index 53be380..cf4bb2b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- # Where to get Certbot. -certbot_from_git: no +certbot_install_from_source: no certbot_repo: https://github.com/certbot/certbot.git certbot_version: master certbot_keep_updated: yes diff --git a/tasks/install-from-git.yml b/tasks/install-from-source.yml similarity index 91% rename from tasks/install-from-git.yml rename to tasks/install-from-source.yml index 8ff2040..7d97f9b 100644 --- a/tasks/install-from-git.yml +++ b/tasks/install-from-source.yml @@ -7,7 +7,7 @@ update: "{{ certbot_keep_updated }}" force: yes -- name: Set Certbot script variable +- name: Set Certbot script variable. set_fact: certbot_script: "{{ certbot_dir }}/certbot-auto" diff --git a/tasks/install-from-package.yml b/tasks/install-with-package.yml similarity index 57% rename from tasks/install-from-package.yml rename to tasks/install-with-package.yml index 20f4a2f..0155963 100644 --- a/tasks/install-from-package.yml +++ b/tasks/install-with-package.yml @@ -1,7 +1,7 @@ --- -- name: Install Certbot +- name: Install Certbot. package: name=certbot state=present -- name: Set Certbot script variable +- name: Set Certbot script variable. set_fact: certbot_script: certbot diff --git a/tasks/main.yml b/tasks/main.yml index 0f1ac91..06d5512 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,9 +1,9 @@ --- -- include: install-from-package.yml - when: not certbot_from_git +- include: install-with-package.yml + when: not certbot_install_from_source -- include: install-from-git.yml - when: certbot_from_git +- include: install-from-source.yml + when: certbot_install_from_source - include: renew-cron.yml when: certbot_auto_renew