From fca1497885ece8b1f8e9c6e14310420ba7f3e102 Mon Sep 17 00:00:00 2001 From: harry Date: Sat, 17 Aug 2024 14:52:36 +0200 Subject: [PATCH 1/5] (feat): replaced photoprism by nextcloud memories --- features/server/services/default.nix | 4 +- features/server/services/nextcloud.nix | 52 +++++++++++++++++--------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/features/server/services/default.nix b/features/server/services/default.nix index 4601715..9c31a01 100644 --- a/features/server/services/default.nix +++ b/features/server/services/default.nix @@ -1,9 +1,9 @@ -{config, ...}: +{ config, ... }: { imports = [ ./homelab-dashboard.nix ./nextcloud.nix - ./photoprism.nix + # ./photoprism.nix ./grafana.nix ./forgejo.nix ./synapse-matrix.nix diff --git a/features/server/services/nextcloud.nix b/features/server/services/nextcloud.nix index 1bf28aa..3b0e9ad 100644 --- a/features/server/services/nextcloud.nix +++ b/features/server/services/nextcloud.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { imports = [ "${ @@ -24,25 +24,41 @@ dbtype = "pgsql"; adminpassFile = config.sops.secrets.adminNextcloudPass.path; }; - settings.enabledPreviewProviders = [ - "OC\\Preview\\BMP" - "OC\\Preview\\GIF" - "OC\\Preview\\JPEG" - "OC\\Preview\\Krita" - "OC\\Preview\\MarkDown" - "OC\\Preview\\MP3" - "OC\\Preview\\OpenDocument" - "OC\\Preview\\PNG" - "OC\\Preview\\TXT" - "OC\\Preview\\XBitmap" - "OC\\Preview\\HEIC" - ]; - settings.trustedDomains = [ "cloud.hypervirtual.world" ]; - settings.overwriteprotocol = "https"; - settings.log_type = "file"; - settings.default_phone_region = "FR"; + settings = { + enabledPreviewProviders = [ + "OC\\Preview\\BMP" + "OC\\Preview\\GIF" + "OC\\Preview\\JPEG" + "OC\\Preview\\Krita" + "OC\\Preview\\MarkDown" + "OC\\Preview\\MP3" + "OC\\Preview\\OpenDocument" + "OC\\Preview\\PNG" + "OC\\Preview\\TXT" + "OC\\Preview\\XBitmap" + "OC\\Preview\\HEIC" + ]; + + trustedDomains = [ "cloud.hypervirtual.world" ]; + overwriteprotocol = "https"; + log_type = "file"; # temporary fix for https://nixos.org/manual/nixos/stable/#module-services-nextcloud-warning-logreader + default_phone_region = "FR"; + }; + phpOptions."opcache.interned_strings_buffer" = "23"; + extraApps = { + inherit (config.services.nextcloud.package.packages.apps) + contacts + calendar + ; + memories = pkgs.fetchNextcloudApp { + sha256 = ""; + url = "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz"; + license = "agpl3Only"; + }; + }; + extraAppsEnable = true; }; } From a5f2697c72a9364940171c8c081bb803b25d67c2 Mon Sep 17 00:00:00 2001 From: harry Date: Sat, 17 Aug 2024 14:55:40 +0200 Subject: [PATCH 2/5] (bug): added missing checksum --- features/server/services/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/server/services/nextcloud.nix b/features/server/services/nextcloud.nix index 3b0e9ad..49295cf 100644 --- a/features/server/services/nextcloud.nix +++ b/features/server/services/nextcloud.nix @@ -53,7 +53,7 @@ calendar ; memories = pkgs.fetchNextcloudApp { - sha256 = ""; + sha256 = "sha256-DJPskJ4rTECTaO1XJFeOD1EfA3TQR4YXqG+NIti0UPE="; url = "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz"; license = "agpl3Only"; From ec9d28d0b48a129d119e7be0a3ec660adb944257 Mon Sep 17 00:00:00 2001 From: harry Date: Sat, 17 Aug 2024 15:13:08 +0200 Subject: [PATCH 3/5] (bug): fixed wrong domain for mails --- features/server/services/forgejo-smtp.nix | 10 +++++----- secrets/secrets.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/features/server/services/forgejo-smtp.nix b/features/server/services/forgejo-smtp.nix index 0000234..837585b 100644 --- a/features/server/services/forgejo-smtp.nix +++ b/features/server/services/forgejo-smtp.nix @@ -1,5 +1,5 @@ -U2FsdGVkX18oY3efQYeXqacnpNaOkre/hn/Ck1shbtZiKPQbD7G+tdQBjxPdZxIL -7oZi2qay/Z6ZKgjmd5zMW+jFejxl9/PSbDFbydn3nADkOCgPO5QSjN2QX+cswV/T -MlSQovYhJzhBgy37cPNU4oZBM8u5ZyRKLgBdUcbaKOJShyzirwKaKdn4abN0QC9B -nPIRIY5INzJPDHJEi/hgOfp4PLeiJTOvrGjvKF2N65f4Uyi8BOW3NSDK+qp6VcUI -tfF/C6r6XQF4w3p9GD2Zxw== +U2FsdGVkX1+OxQJs9k/4JL1g9iZi/V4LYrvEhkf6JFwvTFhv+sIYDI9YFXpGFk2f +DxWy76EO2LgRWZxTeBAQWTyinbDpYM2Efr3EqJvZmocBsrzrAIOfUyQ5gX9a3f9v +QHIYSPSwapr9qVEkl92bbdLKw8aQExz7SLG4viIouIb8sXShq7HGeajwrXgpj8F9 +UsFVRnrsWznu5Ubg5X40Q7EQy3vswzACkL65MeeT1AlF//vbPs/CAqa9zyc1pkoa +QGHEinlNI/0Rb/RJ7rzmuEU28Z8M24tMajQWt5JmJ6Y= diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 38635d3..1c6e367 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -35,8 +35,8 @@ sops: UTYrZ1dWUG5ka1p0b3JrREZXUzZiWlEKBFn4I/U3bwyurfa8gyfy7D3wYAwOtDw7 K0jQE5SeExD9kluwH0gyGDZbk/DWn+ppWoMNqQKDmICrUQpns6GJnQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-17T10:09:08Z" - mac: ENC[AES256_GCM,data:cREWNP3tUUzJETDE3FXKaUrT1yn4b9RezCOvjf+DywYbPLPECKAWThhbDw8xJHvjoUWlPIaQ7eOTbiYIJbPY2k8ZYsXjbzuag2BZhOby2f+Z+09lDpI/sSUkYHei3wRSJnbE7/L5DD6XR8naIoAh3IzCmEtlsKh5m4y89Y157A8=,iv:1RlpPvekxjsN4Pk9rcd5cRY+PWK2abgZYT3eoiYDLBU=,tag:mVKBGJ7gYqxNGsEQ5ic06g==,type:str] + lastmodified: "2024-08-17T13:12:06Z" + mac: ENC[AES256_GCM,data:Ojux0nJZptl1sZ0/TppLF/fiE6Iq9hh+s6ywqe3ulOGCVznzygfXcGjQTKsdJJEcRU4I0bdq38mWfFADPj2j86MUPQq9kBYjpwGSNyndIWBpGHf0XEBCMEXNHAtGr1xIBRfYZ6L61hcKNCjdCOBDcnAfM2HLNx4qFI2mqPDf+eg=,iv:QrKqh9lwP+K3rVNKJFw/Hi7WcDgXIzROwy0Q6wE83DE=,tag:ae5DgEKQ0qktNv3FZHn/2w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.0 From 4198a74036bab4d38d282ac7ecc965edc4a809ef Mon Sep 17 00:00:00 2001 From: harry Date: Sat, 17 Aug 2024 15:31:10 +0200 Subject: [PATCH 4/5] (feat): added more plugins --- features/server/services/nextcloud.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/features/server/services/nextcloud.nix b/features/server/services/nextcloud.nix index 49295cf..afa6673 100644 --- a/features/server/services/nextcloud.nix +++ b/features/server/services/nextcloud.nix @@ -51,13 +51,28 @@ inherit (config.services.nextcloud.package.packages.apps) contacts calendar + previewgenerator + twofactor_nextcloud_notification + photos ; + memories = pkgs.fetchNextcloudApp { sha256 = "sha256-DJPskJ4rTECTaO1XJFeOD1EfA3TQR4YXqG+NIti0UPE="; url = "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz"; license = "agpl3Only"; - }; + + registration = pkgs.fetchNextcloudApp { + sha256 = ""; + url = "https://github.com/nextcloud-releases/registration/releases/download/v2.4.0/registration-v2.4.0.tar.gz"; + license = "agpl3Only"; + }; + + facerecognition = pkgs.fetchNextcloudApp { + url = "https://github.com/matiasdelellis/facerecognition/releases/download/v0.9.51/facerecognition.tar.gz"; + license = "agpl3Only"; + }; + }; extraAppsEnable = true; }; From efa25914cb480a39a8ea594228d078d86af8a45e Mon Sep 17 00:00:00 2001 From: harry Date: Sat, 17 Aug 2024 15:37:25 +0200 Subject: [PATCH 5/5] (feat): fix sha256 --- features/server/services/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/server/services/nextcloud.nix b/features/server/services/nextcloud.nix index afa6673..2540dec 100644 --- a/features/server/services/nextcloud.nix +++ b/features/server/services/nextcloud.nix @@ -53,7 +53,6 @@ calendar previewgenerator twofactor_nextcloud_notification - photos ; memories = pkgs.fetchNextcloudApp { @@ -63,12 +62,13 @@ }; registration = pkgs.fetchNextcloudApp { - sha256 = ""; + sha256 = "sha256-dDaQHyHdkkd8ZammLdck2HNGqqfEaunwevdPzbWzB8Y="; url = "https://github.com/nextcloud-releases/registration/releases/download/v2.4.0/registration-v2.4.0.tar.gz"; license = "agpl3Only"; }; facerecognition = pkgs.fetchNextcloudApp { + sha256 = "sha256-1dfpmnyyrjyn7wbjfj3w072rzfl7zwm8ppphgsg8ampw2dy7y6yk"; url = "https://github.com/matiasdelellis/facerecognition/releases/download/v0.9.51/facerecognition.tar.gz"; license = "agpl3Only"; };