renamed certbot_from_git variable to certbot_install_from_source and fixed some wording

pull/19/head
exploide 8 years ago
parent 33724b0a93
commit afa993333f
  1. 4
      README.md
  2. 2
      defaults/main.yml
  3. 2
      tasks/install-from-source.yml
  4. 4
      tasks/install-with-package.yml
  5. 8
      tasks/main.yml

@ -10,12 +10,12 @@ Certbot requires Git to be installed if one wants to install Certbot from Git re
## Role Variables ## Role Variables
certbot_from_git: no certbot_install_from_source: no
certbot_repo: https://github.com/certbot/certbot.git certbot_repo: https://github.com/certbot/certbot.git
certbot_version: master certbot_version: master
certbot_keep_updated: yes 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 certbot_dir: /opt/certbot

@ -1,6 +1,6 @@
--- ---
# Where to get Certbot. # Where to get Certbot.
certbot_from_git: no certbot_install_from_source: no
certbot_repo: https://github.com/certbot/certbot.git certbot_repo: https://github.com/certbot/certbot.git
certbot_version: master certbot_version: master
certbot_keep_updated: yes certbot_keep_updated: yes

@ -7,7 +7,7 @@
update: "{{ certbot_keep_updated }}" update: "{{ certbot_keep_updated }}"
force: yes force: yes
- name: Set Certbot script variable - name: Set Certbot script variable.
set_fact: set_fact:
certbot_script: "{{ certbot_dir }}/certbot-auto" certbot_script: "{{ certbot_dir }}/certbot-auto"

@ -1,7 +1,7 @@
--- ---
- name: Install Certbot - name: Install Certbot.
package: name=certbot state=present package: name=certbot state=present
- name: Set Certbot script variable - name: Set Certbot script variable.
set_fact: set_fact:
certbot_script: certbot certbot_script: certbot

@ -1,9 +1,9 @@
--- ---
- include: install-from-package.yml - include: install-with-package.yml
when: not certbot_from_git when: not certbot_install_from_source
- include: install-from-git.yml - include: install-from-source.yml
when: certbot_from_git when: certbot_install_from_source
- include: renew-cron.yml - include: renew-cron.yml
when: certbot_auto_renew when: certbot_auto_renew

Loading…
Cancel
Save