diff --git a/playbooks/develop/includes/setup_erpnext.yml b/playbooks/develop/includes/setup_erpnext.yml index fb58ec03..33bb227b 100644 --- a/playbooks/develop/includes/setup_erpnext.yml +++ b/playbooks/develop/includes/setup_erpnext.yml @@ -14,6 +14,16 @@ stat: path="{{ bench_path }}/sites/site1.local" register: site_folder + - name: Add additional conf for MariaDB 10.2 in mariadb.conf.d + blockinfile: + path: /etc/mysql/conf.d/settings.cnf + block: | + # Import all .cnf files from configuration directory + !includedir /etc/mysql/mariadb.conf.d/ + become: yes + become_user: root + when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian' + - name: Add additional conf for MariaDB 10.2 in mariadb.conf.d blockinfile: path: /etc/mysql/mariadb.conf.d/erpnext.cnf @@ -24,6 +34,7 @@ create: yes become: yes become_user: root + when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian' - name: restart mysql service: name=mysql state=restarted diff --git a/playbooks/prerequisites/files/mariadb_config.cnf b/playbooks/prerequisites/files/mariadb_config.cnf index 2e76996c..b6512a22 100644 --- a/playbooks/prerequisites/files/mariadb_config.cnf +++ b/playbooks/prerequisites/files/mariadb_config.cnf @@ -59,6 +59,3 @@ slow-query-log-file = /var/lib/mysql/mysql-slow.log [mysql] default-character-set = utf8mb4 - -# Import all .cnf files from configuration directory -!includedir /etc/mysql/mariadb.conf.d/ \ No newline at end of file