prepare for bookworm/lunar

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:

docker/base/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM debian:bullseye
 
 LABEL maintainer="0x2620@0x2620.org"
 

docker/base/install.sh

@@ -1,9 +1,17 @@
 #!/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
+if [ "$VERSION_CODENAME" = "bookworm" ]; then
+    UBUNTU_CODENAME=lunar
+fi
 
 export DEBIAN_FRONTEND=noninteractive
 echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/99languages

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:
 

vm/pandora_install.sh

@@ -28,6 +28,12 @@ fi
 if [ -z "$UBUNTU_CODENAME" ]; then
     UBUNTU_CODENAME=bionic
 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
 
@@ -106,12 +112,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 +130,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