gregandev/ansible-role-certbot
gregandev/ansible-role-certbot
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-certbot.git synced 2025-12-02 11:21:08 +01:00
Code Issues Projects Releases Wiki Activity

Attempt to fix ansible_facts deprecation warnings.

Browse Source
This commit is contained in:
Jeff Geerling 2025-11-27 21:54:37 -06:00
parent f8e02e1e83
commit 95afe409cc
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
molecule/default/converge.yml
View File

@ -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

6
molecule/default/playbook-snap-install.yml
View File

@ -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

6
molecule/default/playbook-source-install.yml
View File

@ -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

6
molecule/default/playbook-standalone-nginx-aws.yml
View File

@ -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

6
tasks/include-vars.yml
View File

@ -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"

2
tasks/install-with-snap.yml
View File

@ -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
tasks/main.yml
View File

@ -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'

6
templates/start_services.j2
View File

@ -3,11 +3,11 @@
{% for item in certbot_create_standalone_stop_services %} {% for item in certbot_create_standalone_stop_services %}
echo "starting service {{ item }}" echo "starting service {{ item }}"
{% if ansible_service_mgr == 'systemd' %} {% if ansible_facts.service_mgr == 'systemd' %}
systemctl start {{ item }} systemctl start {{ item }}
{% elif ansible_service_mgr == 'upstart' %} {% elif ansible_facts.service_mgr == 'upstart' %}
initctl start {{ item }} initctl start {{ item }}
{% elif ansible_service_mgr == 'openrc' %} {% elif ansible_facts.service_mgr == 'openrc' %}
rc-service {{ item }} start rc-service {{ item }} start
{% else %} {% else %}
service {{ item }} start service {{ item }} start

6
templates/stop_services.j2
View File

@ -3,11 +3,11 @@
{% for item in certbot_create_standalone_stop_services %} {% for item in certbot_create_standalone_stop_services %}
echo "stopping service {{ item }}" echo "stopping service {{ item }}"
{% if ansible_service_mgr == 'systemd' %} {% if ansible_facts.service_mgr == 'systemd' %}
systemctl stop {{ item }} systemctl stop {{ item }}
{% elif ansible_service_mgr == 'upstart' %} {% elif ansible_facts.service_mgr == 'upstart' %}
initctl stop {{ item }} initctl stop {{ item }}
{% elif ansible_service_mgr == 'openrc' %} {% elif ansible_facts.service_mgr == 'openrc' %}
rc-service {{ item }} stop rc-service {{ item }} stop
{% else %} {% else %}
service {{ item }} stop service {{ item }} stop