From: Christian Heller Date: Mon, 10 Feb 2020 18:34:18 +0000 (+0100) Subject: Fix. X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/static/ledger?a=commitdiff_plain;h=08fcaeb6b6e33fcf226a738306ae808529eac6e9;p=config Fix. --- diff --git a/buster/apt-mark/peertube b/buster/apt-mark/peertube index 4e4c19a..676bda9 100644 --- a/buster/apt-mark/peertube +++ b/buster/apt-mark/peertube @@ -13,3 +13,4 @@ curl unzip libncurses5 pwgen +wget diff --git a/buster/setup_scripts/setup_pleroma.sh b/buster/setup_scripts/setup_pleroma.sh index 9fb937a..7dd7b3f 100755 --- a/buster/setup_scripts/setup_pleroma.sh +++ b/buster/setup_scripts/setup_pleroma.sh @@ -16,7 +16,9 @@ config_tree_prefix="${HOME}/config/buster" nft -f /etc/nftables.conf # Set up letsencrypt certificate. TODO: Is it auto-renewed? +ln -sf /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default certbot --nginx --agree-tos --redirect --no-eff-email -m "${mail}" -d "${domain}" +rm /etc/nginx/sites-enabled/default # Prepare user. adduser --system --shell /bin/false --home /opt/pleroma pleroma @@ -75,7 +77,6 @@ cp "${config_tree_prefix}/other_files/pleroma_panel.html" /var/lib/pleroma/stati cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/sites-available/pleroma.nginx sed -i "s/example\.tld/${domain}/g" /etc/nginx/sites-available/pleroma.nginx ln -s /etc/nginx/sites-available/pleroma.nginx /etc/nginx/sites-enabled/pleroma.nginx -rm /etc/nginx/sites-enabled/default # Systemd integration. cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service