From e42eeeeabc3c52551bb9b47b35a7ec2bc05271b7 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 23 Apr 2025 15:02:30 +0200
Subject: [PATCH] Fix

---
 bookworm/scripts/lib/init_packages |  6 +++---
 bookworm/scripts/setup_server.sh   |  2 +-
 trixie/aptmark                     |  1 -
 trixie/aptmark/all                 |  1 +
 trixie/aptmark/catgirl             |  1 +
 trixie/aptmark/seedbox             |  1 +
 trixie/aptmark/server              | 11 +++++++++++
 7 files changed, 18 insertions(+), 5 deletions(-)
 delete mode 120000 trixie/aptmark
 create mode 120000 trixie/aptmark/all
 create mode 120000 trixie/aptmark/catgirl
 create mode 120000 trixie/aptmark/seedbox
 create mode 100644 trixie/aptmark/server

diff --git a/bookworm/scripts/lib/init_packages b/bookworm/scripts/lib/init_packages
index 12a01c3..6ed30a0 100644
--- a/bookworm/scripts/lib/init_packages
+++ b/bookworm/scripts/lib/init_packages
@@ -10,10 +10,10 @@ init_packages() {
     _PATH_LIST_WHITE="${_PATH_LIST_PREFIX}white"
     _PATH_LIST_BLACK="${_PATH_LIST_PREFIX}black"
     _TOK_REQ=' required'
-    dpkg-query -Wf '${Package} ${Priority}\n' | grep "${_TOK_REQ}" | sed "s/${_TOK_REQ}//" > "${_PATH_LIST_UNSORTED}"
-    sort "${_PATH_LIST_UNSORTED}" | uniq > "${_PATH_LIST_WHITE}"
+    dpkg-query -Wf '${Package} ${Priority}\n' | grep "${_TOK_REQ}" | cut -d' ' -f1 > "${_PATH_LIST_UNSORTED}"
+    sort "${_PATH_LIST_UNSORTED}" > "${_PATH_LIST_WHITE}"
     dpkg-query -Wf '${Package}\n' > "${_PATH_LIST_UNSORTED}"
-    sort "${_PATH_LIST_UNSORTED}" | uniq > "${_PATH_LIST_ALL_PACKAGES}"
+    sort "${_PATH_LIST_UNSORTED}" > "${_PATH_LIST_ALL_PACKAGES}"
     comm -3 "${_PATH_LIST_ALL_PACKAGES}" "${_PATH_LIST_WHITE}" > "${_PATH_LIST_BLACK}"
     apt-mark auto `cat "${_PATH_LIST_BLACK}"` > /dev/null
     rm "${_PATH_LIST_UNSORTED}" "${_PATH_LIST_ALL_PACKAGES}" "${_PATH_LIST_WHITE}" "${_PATH_LIST_BLACK}"
diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index e5ac4fa..6597c64 100755
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -11,7 +11,7 @@ cd $(dirname "$0")
 . lib/setup_user
 . lib/set_hostname_and_hosts
 
-INSTALL_TAGS='all server caddy'
+INSTALL_TAGS='all server'
 
 expect_n_args 2 3 'CADDY_PASSWORD, HOSTNAME, [FQDN]' $@
 CADDY_PASSWORD="$1"
diff --git a/trixie/aptmark b/trixie/aptmark
deleted file mode 120000
index 8e3a4c4..0000000
--- a/trixie/aptmark
+++ /dev/null
@@ -1 +0,0 @@
-../bookworm/aptmark
\ No newline at end of file
diff --git a/trixie/aptmark/all b/trixie/aptmark/all
new file mode 120000
index 0000000..1913f5e
--- /dev/null
+++ b/trixie/aptmark/all
@@ -0,0 +1 @@
+../../bookworm/aptmark/all
\ No newline at end of file
diff --git a/trixie/aptmark/catgirl b/trixie/aptmark/catgirl
new file mode 120000
index 0000000..3e1bdbd
--- /dev/null
+++ b/trixie/aptmark/catgirl
@@ -0,0 +1 @@
+../../bookworm/aptmark/catgirl
\ No newline at end of file
diff --git a/trixie/aptmark/seedbox b/trixie/aptmark/seedbox
new file mode 120000
index 0000000..7fe9582
--- /dev/null
+++ b/trixie/aptmark/seedbox
@@ -0,0 +1 @@
+../../bookworm/aptmark/seedbox
\ No newline at end of file
diff --git a/trixie/aptmark/server b/trixie/aptmark/server
new file mode 100644
index 0000000..87e4111
--- /dev/null
+++ b/trixie/aptmark/server
@@ -0,0 +1,11 @@
+# so we can log in at all …
+openssh-server
+# necessary for DNS to work
+systemd-resolved
+# firewalling
+nftables
+# so every server can store borg backups
+borgbackup
+# so every server can serve some webspace 
+caddy
+#
-- 
2.30.2