From e61b929e86a9f7fb86ddc619e5d2a25ced8d3d28 Mon Sep 17 00:00:00 2001
From: Dominic Ricottone <me@dominic-ricottone.com>
Date: Tue, 8 Oct 2024 01:05:06 -0500
Subject: [PATCH] Okay now really things are updated

---
 nginx/Dockerfile.webdav |  2 +-
 nginx/nginx.conf        | 15 +++++++++++++++
 srht-core/Dockerfile    |  6 +++---
 srht-nginx/Dockerfile   |  6 +++---
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/nginx/Dockerfile.webdav b/nginx/Dockerfile.webdav
index 5229c2c..ff32f34 100644
--- a/nginx/Dockerfile.webdav
+++ b/nginx/Dockerfile.webdav
@@ -1,4 +1,4 @@
-FROM docker.io/library/nginx:alpine as builder
+FROM docker.io/library/nginx:alpine AS builder
 
 COPY nginx-dav-ext-module /nginx-dav-ext-module
 
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index af3a6df..9a6a6c2 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -34,6 +34,21 @@ http {
 	deny 85.208.96.0/24;
 	deny 185.191.171.0/24;
 
+	# Fuck you OpenAI
+	deny 20.171.206.0/24;
+
+	# Fuck you Google
+	deny 66.249.69.0/24;
+	deny 66.249.75.0/24;
+
+	# Fuck you Ahref
+	deny 51.222.253.0/24;
+
+	# Fuck you Bytedance
+	deny 47.128.32.0/24;
+	deny 47.128.37.0/24;
+	deny 47.128.48.0/24;
+
 	log_format main '$remote_addr - $remote_user [$time_local] "$request" '
 		'$status $body_bytes_sent "$http_referer" '
 		'"$http_user_agent" "$http_x_forwarded_for"';
diff --git a/srht-core/Dockerfile b/srht-core/Dockerfile
index 33e2057..c43165c 100644
--- a/srht-core/Dockerfile
+++ b/srht-core/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN apk add --no-cache wget
 
@@ -6,12 +6,12 @@ RUN mv /etc/apk/repositories /etc/apk/repositories.bak
 RUN arch="$(apk --print-arch)"; \
 	case "$arch" in \
 		x86_64) \
-			repouri="https://mirror.sr.ht/alpine/v3.19/sr.ht"; \
+			repouri="https://mirror.sr.ht/alpine/v3.20/sr.ht"; \
 			keyuri="https://mirror.sr.ht/alpine"; \
 			keyfile="alpine@sr.ht.rsa.pub"; \
 			;; \
 		aarch64) \
-			repouri="https://pkg.intra.dominic-ricottone.com/alpine/v3.19"; \
+			repouri="https://pkg.intra.dominic-ricottone.com/alpine/v3.20"; \
 			keyuri="https://pkg.intra.dominic-ricottone.com/alpine"; \
 			keyfile="me@dominic-ricottone.com.rsa.pub"; \
 			;; \
diff --git a/srht-nginx/Dockerfile b/srht-nginx/Dockerfile
index 89bd900..702b1f5 100644
--- a/srht-nginx/Dockerfile
+++ b/srht-nginx/Dockerfile
@@ -4,7 +4,7 @@ RUN apk add --no-cache git.sr.ht meta.sr.ht todo.sr.ht
 
 FROM registry.intra.dominic-ricottone.com/nginx:latest
 
-COPY --from=builder /usr/lib/python3.11/site-packages/gitsrht /var/www/gitsrht/
-COPY --from=builder /usr/lib/python3.11/site-packages/metasrht /var/www/metasrht/
-COPY --from=builder /usr/lib/python3.11/site-packages/todosrht /var/www/todosrht/
+COPY --from=builder /usr/lib/python3.12/site-packages/gitsrht /var/www/gitsrht/
+COPY --from=builder /usr/lib/python3.12/site-packages/metasrht /var/www/metasrht/
+COPY --from=builder /usr/lib/python3.12/site-packages/todosrht /var/www/todosrht/
 
-- 
2.45.2