From bd267d5d88c2dbe19bed94d243b4fcfef4a3def9 Mon Sep 17 00:00:00 2001
From: John Kristensen <john@jerrykan.com>
Date: Thu, 5 Sep 2019 00:06:44 +1000
Subject: [PATCH] Debian 10/buster support

The formula needs to be updated to support Debian 10/buster so that
Wallabag can be installed on the latest release.

It isn't currently possible to initialise a new Wallabag v2.3.8 instance
on Debian 10/buster due to the default PostgreSQL version, but importing
the database from a previous install should still work. See:

    https://github.com/wallabag/wallabag/issues/3739
---
 Vagrantfile        | 16 ++++++++++------
 wallabag/map.jinja |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 69a3bdf..8e2327c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -43,17 +43,21 @@ OS_CODENAME="$(. /etc/os-release; echo $VERSION | sed s/[^a-z]//g)"
 APT_REPO_FILE="/etc/apt/sources.list.d/saltstack.list"
 APT_REPO="deb http://repo.saltstack.com/apt/debian/$OS_VERSION/amd64/latest $OS_CODENAME main"
 
-# Add the saltstack repostory
-echo "$APT_REPO" > $APT_REPO_FILE
+if [[ $OS_VERSION -lt 10 ]]; then
+    # Add the saltstack repostory
+    echo "$APT_REPO" > $APT_REPO_FILE
 
-# Trust the saltstack repository signing key
-echo "$PUBLIC_KEY" | apt-key add -
+    # Trust the saltstack repository signing key
+    echo "$PUBLIC_KEY" | apt-key add -
+fi
 
 # Install salt minion and packages for testing wallabag
 if [[ $OS_VERSION -eq 8 ]]; then
     LIBAPACHE_MOD_PHP="libapache2-mod-php5"
+elif [[ $OS_VERSION -eq 9 ]]; then
+    LIBAPACHE_MOD_PHP="libapache2-mod-php7.0"
 else
-    LIBAPACHE_MOD_PHP="libapache2-mod-php"
+    LIBAPACHE_MOD_PHP="libapache2-mod-php7.3"
 fi
 
 apt-get update
@@ -125,7 +129,7 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.define "wallabag", primary: true do |host|
-        host.vm.box = 'debian/contrib-stretch64'
+        host.vm.box = 'debian/contrib-buster64'
         host.vm.host_name = 'wallabag.salt.example.com'
         host.vm.network :private_network, type: "dhcp"
         host.vm.synced_folder "./", "/srv/salt"
diff --git a/wallabag/map.jinja b/wallabag/map.jinja
index 74e6a42..1d30e51 100644
--- a/wallabag/map.jinja
+++ b/wallabag/map.jinja
@@ -7,18 +7,22 @@
         'php_modules': {
             '8': ['php5-curl', 'php5-gd', 'php5-json', 'php5-tidy'],
             '9': ['php-bcmath', 'php-curl', 'php-gd', 'php-json', 'php-mbstring', 'php-tidy', 'php-xml'],
+            '10': ['php-bcmath', 'php-curl', 'php-gd', 'php-json', 'php-mbstring', 'php-tidy', 'php-xml'],
         }[distro_release],
         'pkg_mysql': {
             '8': 'php5-mysql',
             '9': 'php-mysql',
+            '10': 'php-mysql',
         }[distro_release],
         'pkg_postgresql': {
             '8': 'php5-pgsql',
             '9': 'php-pgsql',
+            '10': 'php-pgsql',
         }[distro_release],
         'pkg_sqlite': {
             '8': 'php5-sqlite',
             '9': 'php-sqlite3',
+            '10': 'php-sqlite3',
         }[distro_release],
     },
 }, grain='os_family',