1
mirror of https://github.com/jakejarvis/mastodon-utils.git synced 2025-04-26 07:55:22 -04:00

sturdier apply patches script

This commit is contained in:
Jake Jarvis 2022-12-07 13:12:03 -05:00
parent 26c8fdcad9
commit 1f8f30d8cf
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
3 changed files with 9 additions and 5 deletions

View File

@ -62,9 +62,9 @@ server {
gzip_buffers 16 8k;
gzip_http_version 1.1;
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml image/x-icon;
# jake: added
gzip_min_length 256;
gzip_min_length 256; # jake: added
# jake: added
access_log off;
location / {

View File

@ -8,14 +8,18 @@ MASTODON_ROOT=/home/mastodon
if [ ! -d "$MASTODON_ROOT/scripts" ]
then
sudo -u mastodon git clone https://github.com/jakejarvis/mastodon-scripts.git ./scripts
# clone repo
sudo -u mastodon git clone https://github.com/jakejarvis/mastodon-scripts.git "$MASTODON_ROOT/scripts"
# fix permissions
sudo chown -R mastodon:mastodon "$MASTODON_ROOT/scripts"
sudo git config --global --add safe.directory "$MASTODON_ROOT/scripts"
fi
# pull latest patches
cd "$MASTODON_ROOT/scripts"
sudo -u mastodon git fetch --all
sudo -u mastodon git pull origin main
# apply custom patches
cd "$MASTODON_ROOT/live"
sudo -u mastodon git apply --allow-binary-replacement --whitespace=warn "$MASTODON_ROOT"/mastodon-scripts/patches/*.patch || true
sudo -u mastodon git apply --allow-binary-replacement --whitespace=warn "$MASTODON_ROOT"/scripts/patches/*.patch || true