mirror of
https://github.com/geerlingguy/ansible-role-certbot.git
synced 2025-09-13 17:41:10 +02:00
Merge 49bf3fd9cf2383b5f28470d023f71d7bdc1cf5e3 into d35de757e01902399e685c2b344823ebc09b3372
This commit is contained in:
commit
b6c53c3a6e
@ -9,7 +9,7 @@
|
|||||||
pre_tasks:
|
pre_tasks:
|
||||||
- name: Update apt cache.
|
- name: Update apt cache.
|
||||||
apt: update_cache=yes cache_valid_time=600
|
apt: update_cache=yes cache_valid_time=600
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_facts.os_family == 'Debian'
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
|
||||||
- name: Install dependencies (RedHat).
|
- name: Install dependencies (RedHat).
|
||||||
@ -18,11 +18,11 @@
|
|||||||
- cronie
|
- cronie
|
||||||
- epel-release
|
- epel-release
|
||||||
state: present
|
state: present
|
||||||
when: ansible_os_family == 'RedHat'
|
when: ansible_facts.os_family == 'RedHat'
|
||||||
|
|
||||||
- name: Install cron (Debian).
|
- name: Install cron (Debian).
|
||||||
apt: name=cron state=present
|
apt: name=cron state=present
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_facts.os_family == 'Debian'
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- geerlingguy.certbot
|
- geerlingguy.certbot
|
||||||
|
@ -10,16 +10,16 @@
|
|||||||
pre_tasks:
|
pre_tasks:
|
||||||
- name: Update apt cache.
|
- name: Update apt cache.
|
||||||
apt: update_cache=yes cache_valid_time=600
|
apt: update_cache=yes cache_valid_time=600
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_facts.os_family == 'Debian'
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
|
||||||
- name: Install cron (RedHat).
|
- name: Install cron (RedHat).
|
||||||
yum: name=cronie state=present
|
yum: name=cronie state=present
|
||||||
when: ansible_os_family == 'RedHat'
|
when: ansible_facts.os_family == 'RedHat'
|
||||||
|
|
||||||
- name: Install cron (Debian).
|
- name: Install cron (Debian).
|
||||||
apt: name=cron state=present
|
apt: name=cron state=present
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_facts.os_family == 'Debian'
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- geerlingguy.git
|
- geerlingguy.git
|
||||||
|
@ -10,16 +10,16 @@
|
|||||||
pre_tasks:
|
pre_tasks:
|
||||||
- name: Update apt cache.
|
- name: Update apt cache.
|
||||||
apt: update_cache=yes cache_valid_time=600
|
apt: update_cache=yes cache_valid_time=600
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_facts.os_family == 'Debian'
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
|
||||||
- name: Install cron (RedHat).
|
- name: Install cron (RedHat).
|
||||||
yum: name=cronie state=present
|
yum: name=cronie state=present
|
||||||
when: ansible_os_family == 'RedHat'
|
when: ansible_facts.os_family == 'RedHat'
|
||||||
|
|
||||||
- name: Install cron (Debian).
|
- name: Install cron (Debian).
|
||||||
apt: name=cron state=present
|
apt: name=cron state=present
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_facts.os_family == 'Debian'
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- geerlingguy.git
|
- geerlingguy.git
|
||||||
|
@ -111,19 +111,19 @@
|
|||||||
pre_tasks:
|
pre_tasks:
|
||||||
- name: Update apt cache.
|
- name: Update apt cache.
|
||||||
apt: update_cache=true cache_valid_time=600
|
apt: update_cache=true cache_valid_time=600
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_facts.os_family == 'Debian'
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
|
||||||
- name: Install dependencies (RedHat).
|
- name: Install dependencies (RedHat).
|
||||||
yum: name={{ item }} state=present
|
yum: name={{ item }} state=present
|
||||||
when: ansible_os_family == 'RedHat'
|
when: ansible_facts.os_family == 'RedHat'
|
||||||
with_items:
|
with_items:
|
||||||
- cronie
|
- cronie
|
||||||
- epel-release
|
- epel-release
|
||||||
|
|
||||||
- name: Install cron (Debian).
|
- name: Install cron (Debian).
|
||||||
apt: name=cron state=present
|
apt: name=cron state=present
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_facts.os_family == 'Debian'
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- geerlingguy.certbot
|
- geerlingguy.certbot
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
- name: Load a variable file based on the OS type, or a default if not found.
|
- name: Load a variable file based on the OS type, or a default if not found.
|
||||||
include_vars: "{{ item }}"
|
include_vars: "{{ item }}"
|
||||||
with_first_found:
|
with_first_found:
|
||||||
- "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
|
- "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_version }}.yml"
|
||||||
- "{{ ansible_distribution }}.yml"
|
- "{{ ansible_facts.distribution }}.yml"
|
||||||
- "{{ ansible_os_family }}.yml"
|
- "{{ ansible_facts.os_family }}.yml"
|
||||||
- "default.yml"
|
- "default.yml"
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
src: /var/lib/snapd/snap
|
src: /var/lib/snapd/snap
|
||||||
dest: /snap
|
dest: /snap
|
||||||
state: link
|
state: link
|
||||||
when: ansible_os_family != "Debian"
|
when: ansible_facts.os_family != "Debian"
|
||||||
|
|
||||||
- name: Update snap after install.
|
- name: Update snap after install.
|
||||||
shell: snap install core; snap refresh core
|
shell: snap install core; snap refresh core
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
- import_tasks: include-vars.yml
|
- import_tasks: include-vars.yml
|
||||||
|
|
||||||
- import_tasks: setup-RedHat.yml
|
- import_tasks: setup-RedHat.yml
|
||||||
when: ansible_os_family == 'RedHat'
|
when: ansible_facts.os_family == 'RedHat'
|
||||||
|
|
||||||
- import_tasks: install-with-package.yml
|
- import_tasks: install-with-package.yml
|
||||||
when: certbot_install_method == 'package'
|
when: certbot_install_method == 'package'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user