From 314a33d37ce0d66f808a63cc61ac2e82c2b406f7 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Sat, 19 May 2018 23:12:35 +0300 Subject: [PATCH] Use official MariaDB builds for Ubuntu bionic We had been using the Ubuntu 17.10 "artful" builds for Ubuntu 18.04 "bionic" but there are now official bionic builds. --- README.md | 1 - roles/mariadb/templates/mariadb.list.j2 | 5 ----- 2 files changed, 6 deletions(-) diff --git a/README.md b/README.md index b992e86..1a7b18f 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ If setting up Tor relays, you need to install the [ansible-relayor](https://gith ## Todo -- Update packages for Ubuntu 18.04 (mariadb currently using packages for 17.10 artful) - Switch from `cron-apt` to [`unattended-upgrades`](https://wiki.debian.org/UnattendedUpgrades) ## License diff --git a/roles/mariadb/templates/mariadb.list.j2 b/roles/mariadb/templates/mariadb.list.j2 index 7d3679d..1343fff 100644 --- a/roles/mariadb/templates/mariadb.list.j2 +++ b/roles/mariadb/templates/mariadb.list.j2 @@ -1,12 +1,7 @@ # {{ ansible_managed }} {% if ansible_distribution == 'Ubuntu' %} -{% if ansible_distribution_version is version_compare('18.04', '==') %} -# 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" -deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.2/ubuntu artful main -{% else %} deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.2/ubuntu {{ ansible_distribution_release }} main -{% endif %} {% elif ansible_distribution == 'Debian' %}