From 72c70b23bf4b4bdc01761dc6be66e26343dc4dda Mon Sep 17 00:00:00 2001
From: Marco Gabriel <marcomgabriel@gmail.com>
Date: Sun, 15 Dec 2019 05:49:34 +0100
Subject: [PATCH] feat(easy_install): add support for debian 10

* Easy Installer did not support Debian 10 Buster, so I changed the playbooks to support Debian 10.
* Related Issue: #831
* Tested in a newly deployed Debian 10 Buster running on KVM and in a brand new deployed LXC Container (--container) also running fine.
---
 playbooks/install.py                          |  4 +--
 playbooks/roles/common/tasks/debian.yml       | 25 ++++++++++++++++---
 .../roles/nodejs/tasks/debian_family.yml      |  6 +++--
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/playbooks/install.py b/playbooks/install.py
index 7c23a6bb..e2905c6e 100644
--- a/playbooks/install.py
+++ b/playbooks/install.py
@@ -142,7 +142,7 @@ def install_bench(args):
 		shutil.rmtree(tmp_bench_repo)
 
 def check_distribution_compatibility():
-	supported_dists = {'ubuntu': [14, 15, 16, 18, 19], 'debian': [8, 9],
+	supported_dists = {'ubuntu': [14, 15, 16, 18, 19], 'debian': [8, 9, 10],
 		'centos': [7], 'macos': [10.9, 10.10, 10.11, 10.12]}
 
 	dist_name, dist_version = get_distribution_info()
@@ -389,7 +389,7 @@ def parse_commandline_args():
 
 	# set passwords
 	parser.add_argument('--mysql-root-password', dest='mysql_root_password', help='Set mysql root password')
-	parser.add_argument('--mariadb-version', dest='mariadb_version', default='10.2', help='Specify mariadb version')
+	parser.add_argument('--mariadb-version', dest='mariadb_version', default='10.4', help='Specify mariadb version')
 	parser.add_argument('--admin-password', dest='admin_password', help='Set admin password')
 	parser.add_argument('--bench-name', dest='bench_name', help='Create bench with specified name. Default name is frappe-bench')
 
diff --git a/playbooks/roles/common/tasks/debian.yml b/playbooks/roles/common/tasks/debian.yml
index 8aa2555c..4327e3b9 100644
--- a/playbooks/roles/common/tasks/debian.yml
+++ b/playbooks/roles/common/tasks/debian.yml
@@ -12,18 +12,37 @@
     - tk8.5-dev
   when: ansible_distribution_version | version_compare('8', 'lt')
 
-- name: install pillow prerequisites for Debian >= 8
+- name: install pillow prerequisites for Debian 8
   apt: pkg={{ item }} state=present
   with_items:
     - libjpeg62-turbo-dev
     - libtiff5-dev
     - tcl8.5-dev
     - tk8.5-dev
-  when: ansible_distribution_version | version_compare('8', 'ge')
+  when: ansible_distribution_version | version_compare('8', 'eq')
+
+- name: install pillow prerequisites for Debian 9
+  apt: pkg={{ item }} state=present
+  with_items:
+    - libjpeg62-turbo-dev
+    - libtiff5-dev
+    - tcl8.5-dev
+    - tk8.5-dev
+  when: ansible_distribution_version | version_compare('9', 'eq')
+
+
+- name: install pillow prerequisites for Debian >= 10
+  apt: pkg={{ item }} state=present
+  with_items:
+    - libjpeg62-turbo-dev
+    - libtiff5-dev
+    - tcl8.6-dev
+    - tk8.6-dev
+  when: ansible_distribution_version | version_compare('10', 'ge')
 
 - name: install pdf prerequisites debian
   apt: pkg={{ item }} state=present force=yes
   with_items:
     - libssl-dev
 
-...
\ No newline at end of file
+...
diff --git a/playbooks/roles/nodejs/tasks/debian_family.yml b/playbooks/roles/nodejs/tasks/debian_family.yml
index b2985729..0067e465 100644
--- a/playbooks/roles/nodejs/tasks/debian_family.yml
+++ b/playbooks/roles/nodejs/tasks/debian_family.yml
@@ -7,8 +7,10 @@
 
 - name: Install nodejs {{ node_version }}
   apt:
-    name: nodejs
+    name: 
+      - nodejs
+      - npm
     state: present
     update_cache: yes
     force: yes
-...
\ No newline at end of file
+...