Skip to content

Commit

Permalink
Merge pull request #47 from systemli/enh/debian12
Browse files Browse the repository at this point in the history
Add debian12 support, remove debian10
  • Loading branch information
doobry-systemli authored Aug 4, 2023
2 parents 8d40c3a + 8cd4264 commit c38778a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
uses: systemli/github-ansible-workflow/.github/workflows/[email protected]
with:
disable-apparmor-mysql: true
distros: '[ "debian11", "debian10" ]'
distros: '[ "debian12", "debian11" ]'
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ galaxy_info:
- name: Debian
versions:
- stretch
- buster
- bullseye
- bookworm
6 changes: 4 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ driver:
name: virtualbox

platforms:
- name: bullseye64
box: debian/bullseye64
- name: bookworm64
box: debian/bookworm64

lint: |
set -e
Expand All @@ -15,4 +15,6 @@ lint: |
provisioner:
name: ansible
ansible_args:
- --diff
become: true
14 changes: 2 additions & 12 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
---
- name: Set Ansible Python interpreter
ansible.builtin.set_fact:
ansible_python_interpreter: /usr/bin/python3
when: ansible_distribution_major_version | int == 10

- name: Install MariaDB client + server
ansible.builtin.apt:
pkg: "{{ mariadb_packages }}"
state: present
update_cache: true
notify: Remove MariaDB test database

- name: Install python-pymysql
ansible.builtin.apt:
pkg: python-pymysql
when: ansible_distribution_major_version | int <= 9

- name: Optionally install automysqlbackup
ansible.builtin.apt:
pkg: "automysqlbackup"
Expand All @@ -26,7 +16,7 @@
ansible.builtin.apt:
pkg: "mariadb-backup"
state: present
when: mariadb_backup and ansible_distribution_major_version | int >= 10
when: mariadb_backup

- name: Start MariaDB
ansible.builtin.service:
Expand All @@ -53,7 +43,7 @@
mode: "0644"
tags:
- role:mariadb:config
when: mariadb_backup and ansible_distribution_major_version | int >= 10
when: mariadb_backup

- name: Ensure databases are present
community.mysql.mysql_db:
Expand Down
1 change: 0 additions & 1 deletion tasks/munin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
ansible.builtin.apt:
name: munin-plugins-core
state: present
default_release: "{{ 'stretch-backports' if ansible_distribution_release == 'stretch' else omit }}"

- name: Ensure munin perl packages are installed
ansible.builtin.apt:
Expand Down

0 comments on commit c38778a

Please sign in to comment.