jake/mastodon-utils
1
Fork 0
mirror of https://github.com/jakejarvis/mastodon-utils.git synced 2025-09-17 16:15:32 -04:00
Code Issues Releases Wiki Activity

sturdier apply patches script

Browse Source
This commit is contained in:
Jake Jarvis
2022-12-07 13:12:03 -05:00
parent 26c8fdcad9
commit 1f8f30d8cf
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
nginx/sites-available/default.conf → etc/nginx/sites-available/default.conf
View File

4
nginx/sites-available/fediverse.jarv.is.conf → etc/nginx/sites-available/fediverse.jarv.is.conf
View File

@@ -62,9 +62,9 @@ server {
gzip_buffers 16 8k; gzip_buffers 16 8k;
gzip_http_version 1.1; 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; 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; # jake: added
gzip_min_length 256;
# jake: added
access_log off; access_log off;
location / { location / {

10
scripts/apply_patches.sh
View File

@@ -8,14 +8,18 @@ MASTODON_ROOT=/home/mastodon
if [ ! -d "$MASTODON_ROOT/scripts" ] if [ ! -d "$MASTODON_ROOT/scripts" ]
then 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 fi
# pull latest patches # pull latest patches
cd "$MASTODON_ROOT/scripts" cd "$MASTODON_ROOT/scripts"
sudo -u mastodon git fetch --all
sudo -u mastodon git pull origin main sudo -u mastodon git pull origin main
# apply custom patches # apply custom patches
cd "$MASTODON_ROOT/live" 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