From 3fdac7e14c99aa61c089f73fa11a1b1cb2a5febf Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Fri, 7 Feb 2020 18:39:06 +0100
Subject: [PATCH] Prepare introduction of PeerTube setup script.

---
 buster/apt-mark/peertube                          | 15 +++++++++++++++
 buster/apt-mark/pleroma                           |  1 -
 .../etc_files/{pleroma => web}/etc/nftables.conf  |  0
 buster/setup_scripts/setup_pleroma.sh             |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 buster/apt-mark/peertube
 rename buster/etc_files/{pleroma => web}/etc/nftables.conf (100%)

diff --git a/buster/apt-mark/peertube b/buster/apt-mark/peertube
new file mode 100644
index 0000000..4e4c19a
--- /dev/null
+++ b/buster/apt-mark/peertube
@@ -0,0 +1,15 @@
+nginx-light
+ffmpeg
+postgresql
+postgresql-contrib
+openssl
+redis-server
+python-dev
+# only needed for setup
+g++
+make
+git
+curl
+unzip
+libncurses5
+pwgen
diff --git a/buster/apt-mark/pleroma b/buster/apt-mark/pleroma
index 643aee2..eadc572 100644
--- a/buster/apt-mark/pleroma
+++ b/buster/apt-mark/pleroma
@@ -1,4 +1,3 @@
-# might need nginx-standard instead
 nginx-light
 # for SSL
 certbot
diff --git a/buster/etc_files/pleroma/etc/nftables.conf b/buster/etc_files/web/etc/nftables.conf
similarity index 100%
rename from buster/etc_files/pleroma/etc/nftables.conf
rename to buster/etc_files/web/etc/nftables.conf
diff --git a/buster/setup_scripts/setup_pleroma.sh b/buster/setup_scripts/setup_pleroma.sh
index f4d0d43..9fb937a 100755
--- a/buster/setup_scripts/setup_pleroma.sh
+++ b/buster/setup_scripts/setup_pleroma.sh
@@ -12,7 +12,7 @@ mail="$2"
 # Install dependencies, set up firewall.
 config_tree_prefix="${HOME}/config/buster"
 ./install_for_target.sh pleroma
-./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" pleroma
+./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" web
 nft -f /etc/nftables.conf
 
 # Set up letsencrypt certificate. TODO: Is it auto-renewed?
-- 
2.30.2