Merge 49bf3fd9cf2383b5f28470d023f71d7bdc1cf5e3 into d35de757e01902399e685c2b344823ebc09b3372

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Python 3.
         uses: actions/setup-python@v5
         with:
-          python-version: '3.13'  # Can't go to 3.14+ until Ansible 13.x
+          python-version: '3.x'
 
       - name: Install test dependencies.
         run: pip3 install yamllint
@@ -50,16 +50,6 @@ 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
@@ -74,7 +64,7 @@ jobs:
       - name: Set up Python 3.
         uses: actions/setup-python@v5
         with:
-          python-version: '3.13'  # Can't go to 3.14+ until Ansible 13.x
+          python-version: '3.x'
 
       - name: Install test dependencies.
         run: pip3 install ansible molecule molecule-plugins[docker] docker

.github/workflows/release.yml

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

templates/start_services.j2

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

templates/stop_services.j2

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