fix: format latest nginx conf changes

1 files changed, 37 insertions, 133 deletions

diff --git a/linux/nginx/etc/nginx/custom.d/redirects/blog.conf b/linux/nginx/etc/nginx/custom.d/redirects/blog.conf
index 55bd584..b1281fe 100644
--- a/linux/nginx/etc/nginx/custom.d/redirects/blog.conf
+++ b/linux/nginx/etc/nginx/custom.d/redirects/blog.conf
@@ -1,139 +1,43 @@
-# Legacy blog redirects
-
-location = /blog/how-to-set-up-a-vps-web-server {
-    return 301 /blog/vps-web-server.html;
-}
-
-location = /blog/how-to-set-up-a-vps-web-server.html {
-    return 301 /blog/vps-web-server.html;
-}
-
-location = /blog/doom-emacs-org-mode.html {
-    return 301 /blog/doom-emacs.html;
-}
-
-location = /blog/2020-01-25-aes-encryption.html {
-    return 301 /blog/aes-encryption.html;
-}
-
-location = /blog/2020-01-26-steam-on-ntfs-drives.html {
-    return 301 /blog/steam-on-ntfs.html;
-}
-
-location = /blog/updating-dynamic-dns-with-cloudflare-api {
-    return 301 /blog/cloudflare-dns-api.html;
-}
-
-location = /blog/launching-a-gemini-capsule.html {
-    return 301 /blog/gemini-capsule.html;
-}
-
-location = /blog/jumping-back-into-photography {
-    return 301 /blog/photography.html;
-}
-
-location = /blog/jumping-back-into-photography.html {
-    return 301 /blog/photography.html;
-}
-
-location = /blog/i-passed-the-cisa.html {
-    return 301 /blog/cisa.html;
-}
-
-location = /blog/fedora-remove-login-manager.html {
-    return 301 /blog/fedora-login-manager.html;
-}
-
-location = /blog/corporate-security.html {
-    return 301 /blog/internal-audit.html;
-}
-
-location = /blog/secure-your-network-with-the-uncomplicated-firewall {
-    return 301 /blog/ufw.html;
-}
-
-location = /blog/secure-your-network-with-the-uncomplicated-firewall.html {
-    return 301 /blog/ufw.html;
-}
-
-location = /blog/running-flatpak-apps-easily.html {
-    return 301 /blog/flatpak-symlinks.html;
-}
+# Top-level redirects
 
-location = /blog/random-mullvad-wireguard {
-    return 301 /blog/random-wireguard.html;
-}
+location /atom.xml { return 301 $scheme://$host/feed.xml; }
+location /blog/salary-transparency.html { return 301 $scheme://$host/salary/; }
+location /blog/salary-transparency { return 301 /salary/; }
 
-location = /blog/note-taking.html {
-    return 301 /blog/reliable-notes.html;
-}
-
-location = /blog/matrix-synapse.html {
-    return 301 /blog/self-hosting-matrix.html;
-}
-
-location = /blog/macos-testing-out-a-new-os {
-    return 301 /blog/macos.html;
-}
-
-location = /blog/hosting-a-gemini-server.html {
-    return 301 /blog/gemini-server.html;
-}
-
-location = /blog/gitweb.html {
-    return 301 /blog/self-hosting-gitweb.html;
-}
-
-location = /blog/freshrss.html {
-    return 301 /blog/self-hosting-freshrss.html;
-}
-
-location = /blog/foss-macos-apps {
-    return 301 /blog/macos.html;
-}
-
-location = /blog/foss-macos-apps.html {
-    return 301 /blog/macos.html;
-}
-
-location = /blog/doom-emacs {
-    return 301 /blog/doom-emacs.html;
-}
-
-location = /blog/digital-minimalism {
-    return 301 /blog/digital-minimalism.html;
-}
-
-location = /blog/cryptography-basics.html {
-    return 301 /blog/cryptography.html;
-}
-
-location = /blog/alpine-desktop {
-    return 301 /blog/alpine-desktop.html;
-}
+# Legacy blog redirects
 
-location = /blog/salary-transparency {
-    return 301 /salary/;
-}
+location = /blog/how-to-set-up-a-vps-web-server { return 301 /blog/vps-web-server.html; }
+location = /blog/how-to-set-up-a-vps-web-server.html { return 301 /blog/vps-web-server.html; }
+location = /blog/doom-emacs-org-mode.html { return 301 /blog/doom-emacs.html; }
+location = /blog/2020-01-25-aes-encryption.html { return 301 /blog/aes-encryption.html; }
+location = /blog/2020-01-26-steam-on-ntfs-drives.html { return 301 /blog/steam-on-ntfs.html; }
+location = /blog/updating-dynamic-dns-with-cloudflare-api { return 301 /blog/cloudflare-dns-api.html; }
+location = /blog/launching-a-gemini-capsule.html { return 301 /blog/gemini-capsule.html; }
+location = /blog/jumping-back-into-photography { return 301 /blog/photography.html; }
+location = /blog/jumping-back-into-photography.html { return 301 /blog/photography.html; }
+location = /blog/i-passed-the-cisa.html { return 301 /blog/cisa.html; }
+location = /blog/fedora-remove-login-manager.html { return 301 /blog/fedora-login-manager.html; }
+location = /blog/corporate-security.html { return 301 /blog/internal-audit.html; }
+location = /blog/secure-your-network-with-the-uncomplicated-firewall { return 301 /blog/ufw.html; }
+location = /blog/secure-your-network-with-the-uncomplicated-firewall.html { return 301 /blog/ufw.html; }
+location = /blog/running-flatpak-apps-easily.html { return 301 /blog/flatpak-symlinks.html; }
+location = /blog/random-mullvad-wireguard { return 301 /blog/random-wireguard.html; }
+location = /blog/note-taking.html { return 301 /blog/reliable-notes.html; }
+location = /blog/matrix-synapse.html { return 301 /blog/self-hosting-matrix.html; }
+location = /blog/macos-testing-out-a-new-os { return 301 /blog/macos.html; }
+location = /blog/hosting-a-gemini-server.html { return 301 /blog/gemini-server.html; }
+location = /blog/gitweb.html { return 301 /blog/self-hosting-gitweb.html; }
+location = /blog/freshrss.html { return 301 /blog/self-hosting-freshrss.html; }
+location = /blog/foss-macos-apps { return 301 /blog/macos.html; }
+location = /blog/foss-macos-apps.html { return 301 /blog/macos.html; }
+location = /blog/doom-emacs { return 301 /blog/doom-emacs.html; }
+location = /blog/digital-minimalism { return 301 /blog/digital-minimalism.html; }
+location = /blog/cryptography-basics.html { return 301 /blog/cryptography.html; }
+location = /blog/alpine-desktop { return 301 /blog/alpine-desktop.html; }
 
 # Bad/bot paths
 
-location = /blog/wp-login.php {
-    return 410;
-}
-
-location = /blog/signatur.php {
-    return 410;
-}
-
-location = /blog/data:, {
-    return 410;
-}
-
-location = /org/blog/index.org {
-    return 410;
-}
-
-location = /.well-known/ {
-    return 404;
-}
+location = /blog/wp-login.php { return 410; }
+location = /blog/signatur.php { return 410; }
+location = /org/blog/index.org { return 410; }
+location = /.well-known/ { return 404; }