Compare commits

..

6 Commits

Author SHA1 Message Date
Jeff Geerling
1011113914 Attempt to fix ansible_facts deprecation warnings. 2025-11-27 22:11:54 -06:00
Jeff Geerling
95afe409cc Attempt to fix ansible_facts deprecation warnings. 2025-11-27 21:55:16 -06:00
Jeff Geerling
f8e02e1e83 Require Python 3.13 until Ansible 13 is released. 2025-11-10 14:29:32 -06:00
Jeff Geerling
d35de757e0
Merge pull request #239 from C0rn3j/patch-1
Fix broken conditionals in create-cert-standalone.yml
2025-08-19 00:52:32 -04:00
Martin
ef85f3e63d
Fix broken conditionals in create-cert-standalone.yml 2025-07-28 10:01:44 +02:00
Jeff Geerling
3b3cc546d1 Syntax adjust. 2025-05-04 20:02:06 -05:00
13 changed files with 41 additions and 29 deletions

View File

@ -26,7 +26,7 @@ jobs:
- name: Set up Python 3.
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.13' # Can't go to 3.14+ until Ansible 13.x
- name: Install test dependencies.
run: pip3 install yamllint
@ -50,6 +50,16 @@ jobs:
- distro: debian12
playbook: converge.yml
experimental: false
<<<<<<< Updated upstream
=======
- distro: debian10
playbook: converge.yml
experimental: false
# Source install started failing recently.
# - distro: centos7
# playbook: playbook-source-install.yml
# experimental: false
>>>>>>> Stashed changes
- distro: rockylinux9
playbook: playbook-snap-install.yml
@ -64,7 +74,7 @@ jobs:
- name: Set up Python 3.
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.13' # Can't go to 3.14+ until Ansible 13.x
- name: Install test dependencies.
run: pip3 install ansible molecule molecule-plugins[docker] docker

View File

@ -29,7 +29,7 @@ jobs:
- name: Set up Python 3.
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.13' # Can't go to 3.14+ until Ansible 13.x
- name: Install Ansible.
run: pip3 install ansible-core

View File

@ -9,7 +9,7 @@
pre_tasks:
- name: Update apt cache.
apt: update_cache=yes cache_valid_time=600
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'
changed_when: false
- name: Install dependencies (RedHat).
@ -18,11 +18,11 @@
- cronie
- epel-release
state: present
when: ansible_os_family == 'RedHat'
when: ansible_facts.os_family == 'RedHat'
- name: Install cron (Debian).
apt: name=cron state=present
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'
roles:
- geerlingguy.certbot

View File

@ -10,16 +10,16 @@
pre_tasks:
- name: Update apt cache.
apt: update_cache=yes cache_valid_time=600
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'
changed_when: false
- name: Install cron (RedHat).
yum: name=cronie state=present
when: ansible_os_family == 'RedHat'
when: ansible_facts.os_family == 'RedHat'
- name: Install cron (Debian).
apt: name=cron state=present
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'
roles:
- geerlingguy.git

View File

@ -10,16 +10,16 @@
pre_tasks:
- name: Update apt cache.
apt: update_cache=yes cache_valid_time=600
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'
changed_when: false
- name: Install cron (RedHat).
yum: name=cronie state=present
when: ansible_os_family == 'RedHat'
when: ansible_facts.os_family == 'RedHat'
- name: Install cron (Debian).
apt: name=cron state=present
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'
roles:
- geerlingguy.git

View File

@ -111,19 +111,19 @@
pre_tasks:
- name: Update apt cache.
apt: update_cache=true cache_valid_time=600
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'
changed_when: false
- name: Install dependencies (RedHat).
yum: name={{ item }} state=present
when: ansible_os_family == 'RedHat'
when: ansible_facts.os_family == 'RedHat'
with_items:
- cronie
- epel-release
- name: Install cron (Debian).
apt: name=cron state=present
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'
roles:
- geerlingguy.certbot

View File

@ -28,7 +28,7 @@
mode: 0750
when:
- certbot_create_standalone_stop_services is defined
- certbot_create_standalone_stop_services
- certbot_create_standalone_stop_services is truthy
- name: Create post hook to start services.
template:
@ -39,7 +39,7 @@
mode: 0750
when:
- certbot_create_standalone_stop_services is defined
- certbot_create_standalone_stop_services
- certbot_create_standalone_stop_services is truthy
- name: Check if domains have changed
block:

View File

@ -2,7 +2,7 @@
- name: Load a variable file based on the OS type, or a default if not found.
include_vars: "{{ item }}"
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"
- "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_version }}.yml"
- "{{ ansible_facts.distribution }}.yml"
- "{{ ansible_facts.os_family }}.yml"
- "default.yml"

View File

@ -1,6 +1,8 @@
---
- name: Install Certbot.
package: "name={{ certbot_package }} state=present"
package:
name: "{{ certbot_package }}"
state: present
- name: Set Certbot script variable.
set_fact:

View File

@ -16,7 +16,7 @@
src: /var/lib/snapd/snap
dest: /snap
state: link
when: ansible_os_family != "Debian"
when: ansible_facts.os_family != "Debian"
- name: Update snap after install.
shell: snap install core; snap refresh core

View File

@ -2,7 +2,7 @@
- import_tasks: include-vars.yml
- import_tasks: setup-RedHat.yml
when: ansible_os_family == 'RedHat'
when: ansible_facts.os_family == 'RedHat'
- import_tasks: install-with-package.yml
when: certbot_install_method == 'package'

View File

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

View File

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