From 42bfbb08089e902e0db76101840f5cabc44704d7 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Wed, 7 Jun 2023 22:26:52 +0200
Subject: [PATCH 1/3] use focal oxframe builds for bullseye

---
 docker/base/Dockerfile | 2 +-
 docker/base/install.sh | 7 ++++++-
 vm/pandora_install.sh  | 8 +++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 727891e8..32c536ae 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM debian:bullseye
 
 LABEL maintainer="0x2620@0x2620.org"
 
diff --git a/docker/base/install.sh b/docker/base/install.sh
index 2d016eba..4ac3ebbe 100755
--- a/docker/base/install.sh
+++ b/docker/base/install.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 
-UBUNTU_CODENAME=bionic
 if [ -e /etc/os-release ]; then
     . /etc/os-release
 fi
+if [ -z "$UBUNTU_CODENAME" ]; then
+    UBUNTU_CODENAME=bionic
+fi
+if [ "$VERSION_CODENAME" = "bullseye" ]; then
+    UBUNTU_CODENAME=focal
+fi
 
 export DEBIAN_FRONTEND=noninteractive
 echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/99languages
diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh
index 98ddc1ba..38aa6165 100755
--- a/vm/pandora_install.sh
+++ b/vm/pandora_install.sh
@@ -28,6 +28,9 @@ fi
 if [ -z "$UBUNTU_CODENAME" ]; then
     UBUNTU_CODENAME=bionic
 fi
+if [ "$VERSION_CODENAME" = "bullseye" ]; then
+    UBUNTU_CODENAME=focal
+fi
 export DEBIAN_FRONTEND=noninteractive
 echo "deb http://ppa.launchpad.net/j/pandora/ubuntu ${UBUNTU_CODENAME} main" > /etc/apt/sources.list.d/j-pandora.list
 
@@ -106,12 +109,13 @@ apt-get install -y \
     python3-psycopg2 \
     python3-pyinotify \
     python3-simplejson \
+    python3-maxminddb \
+    libmaxminddb-dev \
     python3-lxml \
     python3-cssselect \
     python3-html5lib \
     python3-ox \
     python3-elasticsearch \
-    oxframe \
     ffmpeg \
     mkvtoolnix \
     gpac \
@@ -123,8 +127,10 @@ apt-get install -y \
     postfix \
     postgresql-client $EXTRA
 
+apt-get install -y oxframe
 apt-get install -y --no-install-recommends youtube-dl rtmpdump
 
+
 # setup database
 
 if [ "$POSTGRES" == "local" ]; then

From 448a4ff5e10672c811703c6fda317a1aef07581f Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Wed, 7 Jun 2023 22:41:50 +0200
Subject: [PATCH 2/3] update readme to bullseye

---
 README.md        | 2 +-
 vm/LXC_README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7801e180..bf0b41b1 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
   We recommend to run pan.do/ra inside of LXD or LXC or dedicated VM or server.
   You will need at least 2GB of free disk space
 
-  pan.do/ra is known to work with Ubuntu 18.04, 20.04 and Debian/10 (buster),
+  pan.do/ra is known to work with Debian/11 (bullseye) and Ubuntu 20.04,
   other distributions might also work, let us know if it works for you.
 
   Use the following commands as root to install pan.do/ra and all dependencies:
diff --git a/vm/LXC_README.md b/vm/LXC_README.md
index 440d412a..edc5110c 100644
--- a/vm/LXC_README.md
+++ b/vm/LXC_README.md
@@ -19,7 +19,7 @@
 
     or
 
-    sudo lxc-create -n pandora -t debian -- -r buster
+    sudo lxc-create -n pandora -t debian -- -r bullseye
 
 3) Install pan.do/ra in container:
 

From 19bd8184613a2e47ba25dceeff4664bf7a857ca0 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Thu, 8 Jun 2023 00:41:08 +0200
Subject: [PATCH 3/3] prepare for bookworm/lunar

---
 docker/base/install.sh | 3 +++
 vm/pandora_install.sh  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/docker/base/install.sh b/docker/base/install.sh
index 4ac3ebbe..9ca3ac66 100755
--- a/docker/base/install.sh
+++ b/docker/base/install.sh
@@ -9,6 +9,9 @@ fi
 if [ "$VERSION_CODENAME" = "bullseye" ]; then
     UBUNTU_CODENAME=focal
 fi
+if [ "$VERSION_CODENAME" = "bookworm" ]; then
+    UBUNTU_CODENAME=lunar
+fi
 
 export DEBIAN_FRONTEND=noninteractive
 echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/99languages
diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh
index 38aa6165..a98504d3 100755
--- a/vm/pandora_install.sh
+++ b/vm/pandora_install.sh
@@ -31,6 +31,9 @@ fi
 if [ "$VERSION_CODENAME" = "bullseye" ]; then
     UBUNTU_CODENAME=focal
 fi
+if [ "$VERSION_CODENAME" = "bookworm" ]; then
+    UBUNTU_CODENAME=lunar
+fi
 export DEBIAN_FRONTEND=noninteractive
 echo "deb http://ppa.launchpad.net/j/pandora/ubuntu ${UBUNTU_CODENAME} main" > /etc/apt/sources.list.d/j-pandora.list