port patches

Containerfile

@@ -32,8 +32,8 @@ RUN set -xe;\
   git apply /patches/0001-remove-IP-logging.patch &&\
   git apply /patches/0002-hardcode-discovery-settings.patch &&\
   git apply /patches/0003-point-to-modified-sourcecode.patch &&\
-  git apply /patches/0004-disable-beagle-service.patch &&\
-  git apply /patches/0005-allow-30-char-usernames.patch &&\
+  git apply /patches/0004-allow-30-char-usernames.patch &&\
+  git apply /patches/0005-disable-beagle.patch &&\
   ENABLE_CONFIG_CACHE=false composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\
   ln -s public html &&\
   chown -R www-data:www-data /var/www &&\

Containerfile.fpm

@@ -31,8 +31,8 @@ RUN set -xe;\
   git apply /patches/0001-remove-IP-logging.patch &&\
   git apply /patches/0002-hardcode-discovery-settings.patch &&\
   git apply /patches/0003-point-to-modified-sourcecode.patch &&\
-  git apply /patches/0004-disable-beagle-service.patch &&\
-  git apply /patches/0005-allow-30-char-usernames.patch &&\
+  git apply /patches/0004-allow-30-char-usernames.patch &&\
+  git apply /patches/0005-disable-beagle.patch &&\
   ENABLE_CONFIG_CACHE=false composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\
   chown -R www-data:www-data /var/www &&\
   cp -r storage storage.skel &&\

Jenkinsfile

@@ -31,7 +31,7 @@ pipeline {
         steps {
           script {
             sh "echo nop"
-            // sh "TMPDIR=/buildah/tmp buildah bud -f Containerfile --build-arg DATE=$timeStamp --manifest pixelfed-dev --arch arm64"
+            sh "TMPDIR=/buildah/tmp buildah bud -f Containerfile --build-arg DATE=$timeStamp --manifest pixelfed-dev --arch arm64"
           }
         }
       }
@@ -46,7 +46,7 @@ pipeline {
         steps {
           script {
             sh "echo nop"
-            // sh "TMPDIR=/buildah/tmp buildah bud -f Containerfile.fpm --build-arg DATE=$timeStamp --manifest pixelfed-dev-fpm --arch arm64"
+            sh "TMPDIR=/buildah/tmp buildah bud -f Containerfile.fpm --build-arg DATE=$timeStamp --manifest pixelfed-dev-fpm --arch arm64"
           }
         }
       }

patches/0001-remove-IP-logging.patch

@@ -1,6 +1,6 @@
-From 48a103b02fcef4a950e3f72141c49ae1ce92ef8c Mon Sep 17 00:00:00 2001
+From 08a91732cd39a087c2471f63c108b172943d5dbb Mon Sep 17 00:00:00 2001
 From: chris <cg@zknt.org>
-Date: Sun, 6 Oct 2024 16:04:35 +0200
+Date: Mon, 18 Nov 2024 13:43:42 +0100
 Subject: [PATCH 1/6] remove IP logging
 
 Replace unneeded logging of IPs and User-Agent strings with hashed data.
@@ -38,7 +38,7 @@ index 25c1b1b6..00000000
 -public/img/* binary -diff
 -public/fonts/* binary -diff
 diff --git a/app/Http/Controllers/Api/ApiV1Dot1Controller.php b/app/Http/Controllers/Api/ApiV1Dot1Controller.php
-index 31c2e866..3037be11 100644
+index 38550e5f..79ed50fe 100644
 --- a/app/Http/Controllers/Api/ApiV1Dot1Controller.php
 +++ b/app/Http/Controllers/Api/ApiV1Dot1Controller.php
 @@ -295,8 +295,8 @@ class ApiV1Dot1Controller extends Controller

patches/0002-hardcode-discovery-settings.patch

@@ -1,6 +1,6 @@
-From a3fa9b01c902e35674c912182505b321f62c5ea0 Mon Sep 17 00:00:00 2001
+From 295702b9a7f4b3236bc68bbf5bc453956f5f4978 Mon Sep 17 00:00:00 2001
 From: chris <cg@zknt.org>
-Date: Sun, 6 Oct 2024 16:05:30 +0200
+Date: Mon, 18 Nov 2024 13:44:07 +0100
 Subject: [PATCH 2/6] hardcode discovery settings
 
 force enable discovery (as dynamic settings are not saved properly)

patches/0003-point-to-modified-sourcecode.patch

@@ -1,6 +1,6 @@
-From 8f2b8743a370ef6cd9c0311eed5c9eb5b876bdad Mon Sep 17 00:00:00 2001
+From 09fae8ec220547ddf369122a1ddf687667705187 Mon Sep 17 00:00:00 2001
 From: chris <cg@zknt.org>
-Date: Sun, 6 Oct 2024 16:05:56 +0200
+Date: Mon, 18 Nov 2024 13:44:36 +0100
 Subject: [PATCH 3/6] point to modified sourcecode
 
 as per AGPL license of original source, modifications must be disclosed.

patches/0004-allow-30-char-usernames.patch

@@ -1,6 +1,6 @@
-From dfa3f018cd2669820f92a72d0e4059ff29d46b1a Mon Sep 17 00:00:00 2001
+From e8dda2d6347b6c3bd88b4befa97d68e949ae2cf3 Mon Sep 17 00:00:00 2001
 From: chris <cg@zknt.org>
-Date: Sun, 6 Oct 2024 16:06:24 +0200
+Date: Mon, 18 Nov 2024 13:44:59 +0100
 Subject: [PATCH 4/6] allow 30 char usernames
 
 raise maximum username length, because why not?

patches/0005-disable-beagle.patch

@@ -1,15 +1,14 @@
-From cc6dccd3513ab3b77dcbf45bac20cc6904545245 Mon Sep 17 00:00:00 2001
+From b32f213bd3ef168f5c39420ff1afc8cfc58ca215 Mon Sep 17 00:00:00 2001
 From: chris <cg@zknt.org>
-Date: Sun, 6 Oct 2024 16:11:33 +0200
-Subject: [PATCH 6/6] disable beagle and push service
+Date: Mon, 18 Nov 2024 13:45:58 +0100
+Subject: [PATCH 5/6] disable beagle
 
 beagle is a remote API service provided by dansup and used for centralised lookups.
 Using the beagle service without users explicit consent violates GDPR.
 As it's not configurable at the moment this patch disables remote communication of user data with beagle.
 ---
  app/Services/Account/RemoteAuthService.php | 3 +++
- config/instance.php                        | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ 1 file changed, 3 insertions(+)
 
 diff --git a/app/Services/Account/RemoteAuthService.php b/app/Services/Account/RemoteAuthService.php
 index 4412352a..abab2151 100644
@@ -39,19 +38,6 @@ index 4412352a..abab2151 100644
          try {
              $url = 'https://beagle.pixelfed.net/api/v1/raa/submit';
              $res = Http::throw()->timeout(10)->get($url, [
-diff --git a/config/instance.php b/config/instance.php
-index 18d88787..2b7cb8b9 100644
---- a/config/instance.php
-+++ b/config/instance.php
-@@ -156,7 +156,7 @@ return [
-         'nag' => [
-             'enabled' => (bool) env('INSTANCE_NOTIFY_APP_GATEWAY', true),
-             'api_key' => env('PIXELFED_PUSHGATEWAY_KEY', false),
--            'endpoint' => 'push.pixelfed.net',
-+            'endpoint' => 'localhost',
-         ],
-     ],
- 
 -- 
 2.44.1