diff --git a/nginx/sites-available/default.conf b/etc/nginx/sites-available/default.conf similarity index 100% rename from nginx/sites-available/default.conf rename to etc/nginx/sites-available/default.conf diff --git a/nginx/sites-available/fediverse.jarv.is.conf b/etc/nginx/sites-available/fediverse.jarv.is.conf similarity index 99% rename from nginx/sites-available/fediverse.jarv.is.conf rename to etc/nginx/sites-available/fediverse.jarv.is.conf index 719c97a..8ebf03f 100644 --- a/nginx/sites-available/fediverse.jarv.is.conf +++ b/etc/nginx/sites-available/fediverse.jarv.is.conf @@ -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 / { diff --git a/scripts/apply_patches.sh b/scripts/apply_patches.sh index de72e11..afebeb2 100755 --- a/scripts/apply_patches.sh +++ b/scripts/apply_patches.sh @@ -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