From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 23 Jan 2020 10:51:04 +0000 (+0100)
Subject: Fix.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/edit?a=commitdiff_plain;h=c16124e4816d361e6a7156a54465c348df2ffaad;p=config

Fix.
---

diff --git a/buster/apt-mark/pleroma b/buster/apt-mark/pleroma
index 623ea67..643aee2 100644
--- a/buster/apt-mark/pleroma
+++ b/buster/apt-mark/pleroma
@@ -10,4 +10,4 @@ postgresql-contrib
 curl
 unzip
 libncurses5
-pleroma
+pwgen
diff --git a/buster/setup_scripts/setup_pleroma.sh b/buster/setup_scripts/setup_pleroma.sh
index ef736e8..1493dd4 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" "" all "$@"
+./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" pleroma
 nft -f /etc/nftables.conf
 
 # Set up letsencrypt certificate. TODO: Is it auto-renewed?
@@ -39,7 +39,7 @@ chown -R pleroma /etc/pleroma
 
 # Configure and set up DB.
 su pleroma -s $SHELL -lc './bin/pleroma_ctl instance gen '\
-   '--output /etc/pleroma/config.exs '\
+   '--output /etc/pleroma/config.exs' \
    '--output-psql /tmp/setup_db.psql' \
    "--domain ${domain}" \
    '--instance-name plom-roma' \