From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 24 Dec 2022 14:15:11 +0000 (+0100)
Subject: Improve microblog.pub setup.
X-Git-Url: https://plomlompom.com/repos/index.html?a=commitdiff_plain;h=50f3cd94e1c67293c2e79133722c2955fc38523d;p=config

Improve microblog.pub setup.
---

diff --git a/bullseye/apt-mark/microblogpub b/bullseye/apt-mark/microblogpub
new file mode 100644
index 0000000..feeff57
--- /dev/null
+++ b/bullseye/apt-mark/microblogpub
@@ -0,0 +1,4 @@
+# to get python3.11 tgz
+wget
+# to set up poetry
+curl
diff --git a/bullseye/etc_files/microblogpub/etc/apt/sources.list b/bullseye/etc_files/microblogpub/etc/apt/sources.list
new file mode 100644
index 0000000..1e7fd2e
--- /dev/null
+++ b/bullseye/etc_files/microblogpub/etc/apt/sources.list
@@ -0,0 +1,5 @@
+deb http://deb.debian.org/debian bullseye main contrib non-free
+deb-src http://deb.debian.org/debian bullseye main contrib non-free
+deb http://security.debian.org/debian-security bullseye-security main contrib non-free
+deb http://deb.debian.org/debian bullseye-updates main contrib non-free
+deb http://ftp.debian.org/debian bullseye-backports main contrib non-free
diff --git a/bullseye/setup_scripts/setup_microblogpub.sh b/bullseye/setup_scripts/setup_microblogpub.sh
index 814f6b9..5bc6830 100755
--- a/bullseye/setup_scripts/setup_microblogpub.sh
+++ b/bullseye/setup_scripts/setup_microblogpub.sh
@@ -2,22 +2,12 @@
 set -e
 set -x
 
-if [ "$#" -ne 3 ] && [ "$#" -ne 4 ]; then
-    echo 'Need domain name and mail and init state and possibly old server IP as argument.'
-    false
-fi
-if [ ! "$3" = "copy" ] && [ ! "$3" = "new" ]; then
-    echo "Need init state to be either 'copy' or 'new'."
-    false
-fi
-if [ ! "$3" = "new" ] && [ "$#" -ne 4 ]; then
-    echo "With init state != 'new' need fifth argument old server IP."
+if [ "$#" -ne 2 ]; then
+    echo 'Need domain name and mail.'
     false
 fi
 domain="$1"
 mail="$2"
-init_state="$3"
-old_server="$4"
 
 # Install configs, set up firewall.
 config_tree_prefix="${HOME}/config/bullseye"
@@ -33,8 +23,8 @@ rm /etc/nginx/sites-enabled/default
 # Install Python 3.10 from source (Bullseye only has 3.9).
 apt build-dep python3
 python_version=3.11.1
-python_dirname="Python-3.1.11.1"
-su -lc "wget https://www.python.org/ftp/python/3.11.1/${python_dirname}.tgz" plom
+python_dirname="Python-${python_version}"
+su -lc "wget https://www.python.org/ftp/python/${python_version}/${python_dirname}.tgz" plom
 su -lc "tar -xvf ${python_dirname}.tgz" plom
 su -lc "cd ${python_dirname} && ./configure && make && make test"
 cd /home/plom/${python_dirname}/