diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b96ed2e..c04a50c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The **patch** part changes incrementally at each release. ### Changed * listupgrade: upstream release 21.06.3 +* mysql: use python3 with Debian 11 and later ### Fixed diff --git a/mysql-oracle/tasks/users.yml b/mysql-oracle/tasks/users.yml index da1ca05f..e5a7e3da 100644 --- a/mysql-oracle/tasks/users.yml +++ b/mysql-oracle/tasks/users.yml @@ -5,6 +5,16 @@ apt: name: python-mysqldb state: present + when: ansible_distribution_major_version is version('10', '<=') + tags: + - mysql + +# dependency for mysql_user and mysql_db +- name: python3-mysqldb is installed (Ansible dependency) + apt: + name: python3-mysqldb + state: present + when: ansible_distribution_major_version is version('10', '>') tags: - mysql diff --git a/mysql/tasks/users_jessie.yml b/mysql/tasks/users_jessie.yml index 99dd2d04..3a56a63d 100644 --- a/mysql/tasks/users_jessie.yml +++ b/mysql/tasks/users_jessie.yml @@ -6,13 +6,22 @@ when: mysql_variant == "mariadb" # dependency for mysql_user and mysql_db - - name: python-mysqldb is installed (Ansible dependency) apt: name: python-mysqldb state: present + when: ansible_distribution_major_version is version('10', '<=') tags: - - mysql + - mysql + +# dependency for mysql_user and mysql_db +- name: python3-mysqldb is installed (Ansible dependency) + apt: + name: python3-mysqldb + state: present + when: ansible_distribution_major_version is version('10', '>') + tags: + - mysql - name: create a password for mysqladmin command: "apg -n 1 -m 16 -M lcN" diff --git a/mysql/tasks/users_stretch.yml b/mysql/tasks/users_stretch.yml index 574399af..2b9bec6b 100644 --- a/mysql/tasks/users_stretch.yml +++ b/mysql/tasks/users_stretch.yml @@ -1,13 +1,22 @@ --- # dependency for mysql_user and mysql_db - - name: python-mysqldb is installed (Ansible dependency) apt: name: python-mysqldb state: present + when: ansible_distribution_major_version is version('10', '<=') tags: - - mysql + - mysql + +# dependency for mysql_user and mysql_db +- name: python3-mysqldb is installed (Ansible dependency) + apt: + name: python3-mysqldb + state: present + when: ansible_distribution_major_version is version('10', '>') + tags: + - mysql - name: create a password for mysqladmin command: "apg -n 1 -m 16 -M lcN" diff --git a/redmine/tasks/packages.yml b/redmine/tasks/packages.yml index b2be8faa..0c65df44 100644 --- a/redmine/tasks/packages.yml +++ b/redmine/tasks/packages.yml @@ -1,5 +1,5 @@ --- -- name: Install dependancy +- name: Install dependency apt: name: - libpam-systemd @@ -14,7 +14,24 @@ - libmagickwand-dev - libmagickcore-dev - libmariadbclient-dev - - python-mysqldb state: present tags: - redmine + +# dependency for mysql_user and mysql_db +- name: python-mysqldb is installed (Ansible dependency) + apt: + name: python-mysqldb + state: present + when: ansible_distribution_major_version is version('10', '<=') + tags: + - redmine + +# dependency for mysql_user and mysql_db +- name: python3-mysqldb is installed (Ansible dependency) + apt: + name: python3-mysqldb + state: present + when: ansible_distribution_major_version is version('10', '>') + tags: + - redmine \ No newline at end of file diff --git a/webapps/nextcloud/tasks/main.yml b/webapps/nextcloud/tasks/main.yml index 2c525114..c63291f1 100644 --- a/webapps/nextcloud/tasks/main.yml +++ b/webapps/nextcloud/tasks/main.yml @@ -16,7 +16,24 @@ - php-apcu - php-redis - php-bcmath - - python-mysqldb + tags: + - nextcloud + +# dependency for mysql_user and mysql_db +- name: python-mysqldb is installed (Ansible dependency) + apt: + name: python-mysqldb + state: present + when: ansible_distribution_major_version is version('10', '<=') + tags: + - nextcloud + +# dependency for mysql_user and mysql_db +- name: python3-mysqldb is installed (Ansible dependency) + apt: + name: python3-mysqldb + state: present + when: ansible_distribution_major_version is version('10', '>') tags: - nextcloud