diff --git a/update.sh b/update.sh index f9252de9e..addd8d926 100755 --- a/update.sh +++ b/update.sh @@ -34,7 +34,7 @@ else fi APP_ENV="${APP_ENV:-production}" -UPDATE_REVISION="${UPDATE_REVISION:-62}" +UPDATE_REVISION="${UPDATE_REVISION:-63}" echo "Updating AzuraCast (Environment: $APP_ENV, Update revision: $UPDATE_REVISION)" diff --git a/util/ansible/roles/mariadb/tasks/main.yml b/util/ansible/roles/mariadb/tasks/main.yml index 456db5c90..7775f4b04 100644 --- a/util/ansible/roles/mariadb/tasks/main.yml +++ b/util/ansible/roles/mariadb/tasks/main.yml @@ -1,44 +1,20 @@ --- - - name: Add MariaDB Repository (Xenial/Bionic) - template: src=mariadb_ubuntu.list.j2 dest=/etc/apt/sources.list.d/mariadb.list owner=root group=root mode=0644 - register: mariadb_list - when: - - ansible_distribution_release == 'xenial' or ansible_distribution_release == 'bionic' +- name : Update MariaDB Dependencies + shell : curl -sSL https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | bash -s -- --mariadb-server-version="mariadb-10.5" - - name: Add repo key (Xenial) - apt_key: - keyserver: keyserver.ubuntu.com - id: "0xF1656F24C74CD1D8" - state: present - when: - - ansible_distribution_release == 'xenial' +- name : Unattended package installation + shell : export DEBIAN_FRONTEND=noninteractive + changed_when : false - - name: Add repo key (Bionic) - apt_key: - keyserver: keyserver.ubuntu.com - id: "0xF1656F24C74CD1D8" - state: present - when: - - ansible_distribution_release == 'bionic' +- name : Install MariaDB + apt : + name : "{{ packages }}" + state : latest + update_cache : yes + vars : + packages : + - mariadb-server + - mariadb-client - - name: Update apt cache - apt: update_cache=yes - when: - - ansible_distribution_release == 'xenial' or ansible_distribution_release == 'bionic' - - mariadb_list.changed == True - - - name: Unattended package installation - shell: export DEBIAN_FRONTEND=noninteractive - changed_when: false - - - name: Install MariaDB - apt: - name: "{{ packages }}" - state: latest - vars: - packages: - - mariadb-server - - mariadb-client - - - name: Start and enable service - service: name=mysql state=started enabled=yes +- name : Start and enable service + service : name=mysql state=started enabled=yes diff --git a/util/ansible/roles/mariadb/templates/mariadb_ubuntu.list.j2 b/util/ansible/roles/mariadb/templates/mariadb_ubuntu.list.j2 deleted file mode 100644 index 94a46d8ee..000000000 --- a/util/ansible/roles/mariadb/templates/mariadb_ubuntu.list.j2 +++ /dev/null @@ -1,4 +0,0 @@ -# MariaDB Ubuntu {{ ansible_distribution_release | title }} repository list -# http://mariadb.org/mariadb/repositories/ -deb http://ams2.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu {{ ansible_distribution_release | lower }} main -deb-src http://ams2.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu {{ ansible_distribution_release | lower }} main diff --git a/util/ansible/update.yml b/util/ansible/update.yml index b95f30353..a6c3dc1a8 100644 --- a/util/ansible/update.yml +++ b/util/ansible/update.yml @@ -15,7 +15,7 @@ - azuracast-config - { role : azuracast-radio, when : update_revision|int < 59 } - { role : supervisord, when : update_revision|int < 13 } - - { role : mariadb, when : update_revision|int < 15 } + - { role : mariadb, when : update_revision|int < 63 } - { role : nginx, when : update_revision|int < 60 } - { role : redis, when : update_revision|int < 57 } - { role : php, when : update_revision|int < 62 }