From 2ae226c5ef609da22951d37e2edc70552e643cf3 Mon Sep 17 00:00:00 2001 From: harry Date: Sun, 18 Aug 2024 15:34:52 +0200 Subject: [PATCH 1/5] feat: closed ports and using reverse proxy only --- features/server/caddy.nix | 12 ------------ hosts/sisyphe/server-configuration.nix | 6 ------ 2 files changed, 18 deletions(-) diff --git a/features/server/caddy.nix b/features/server/caddy.nix index 9dbdd2f..30ab50e 100644 --- a/features/server/caddy.nix +++ b/features/server/caddy.nix @@ -4,10 +4,6 @@ enable = true; virtualHosts = { - ":5050".extraConfig = '' - reverse_proxy :8083 - ''; - "http://sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :8003 ''; @@ -16,10 +12,6 @@ reverse_proxy :3333 ''; - "http://photos.hypervirtual.world".extraConfig = '' - reverse_proxy :2342 - ''; - "http://books.hypervirtual.world".extraConfig = '' reverse_proxy :8083 ''; @@ -28,10 +20,6 @@ reverse_proxy :3030 ''; - ":2344".extraConfig = '' - reverse_proxy :2342 - ''; - "http://jellyfin.sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :8096 ''; diff --git a/hosts/sisyphe/server-configuration.nix b/hosts/sisyphe/server-configuration.nix index ce8855b..c673d69 100644 --- a/hosts/sisyphe/server-configuration.nix +++ b/hosts/sisyphe/server-configuration.nix @@ -38,12 +38,6 @@ in 22 # ssh 8008 # matrix-synapse 8448 # matrix-synapse - 3030 - 3333 - 2344 - 4000 - 5050 # calibre-web - 9091 # transmission ]; allowedUDPPorts = [ ]; }; From 0124543874ef3679e79902141d193a0d03aaf165 Mon Sep 17 00:00:00 2001 From: harry Date: Sun, 18 Aug 2024 15:35:30 +0200 Subject: [PATCH 2/5] (bug): removed unused packages --- features/server/services/nextcloud.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/features/server/services/nextcloud.nix b/features/server/services/nextcloud.nix index 2540dec..80455cf 100644 --- a/features/server/services/nextcloud.nix +++ b/features/server/services/nextcloud.nix @@ -45,7 +45,11 @@ log_type = "file"; # temporary fix for https://nixos.org/manual/nixos/stable/#module-services-nextcloud-warning-logreader default_phone_region = "FR"; }; - + phpExtraExtensions = all: [ + all.pdlib + all.redis + all.bz2 + ]; phpOptions."opcache.interned_strings_buffer" = "23"; extraApps = { inherit (config.services.nextcloud.package.packages.apps) @@ -60,13 +64,14 @@ url = "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz"; license = "agpl3Only"; }; - - registration = pkgs.fetchNextcloudApp { - sha256 = "sha256-dDaQHyHdkkd8ZammLdck2HNGqqfEaunwevdPzbWzB8Y="; - url = "https://github.com/nextcloud-releases/registration/releases/download/v2.4.0/registration-v2.4.0.tar.gz"; - license = "agpl3Only"; - }; - + /* + not useful for me + registration = pkgs.fetchNextcloudApp { + 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"; From 4b7a5ce7cb1bb8c1019254813357be3a2f42ed12 Mon Sep 17 00:00:00 2001 From: harry Date: Sun, 18 Aug 2024 16:03:04 +0200 Subject: [PATCH 3/5] (feat): added transmission url --- features/server/caddy.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/features/server/caddy.nix b/features/server/caddy.nix index 30ab50e..101e08e 100644 --- a/features/server/caddy.nix +++ b/features/server/caddy.nix @@ -51,6 +51,10 @@ "http://status.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :4000 ''; + + "http://transmission.normandy.hypervirtual.world".extraConfig = '' + reverse_proxy :9091 + ''; }; }; From e7d916476f6ef0135a01e331f3b7910b8cd28cbf Mon Sep 17 00:00:00 2001 From: harry Date: Sun, 18 Aug 2024 16:05:23 +0200 Subject: [PATCH 4/5] (bug): fixed wrong hash --- 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 80455cf..d6ff1ea 100644 --- a/features/server/services/nextcloud.nix +++ b/features/server/services/nextcloud.nix @@ -73,7 +73,7 @@ }; */ facerecognition = pkgs.fetchNextcloudApp { - sha256 = "sha256-1dfpmnyyrjyn7wbjfj3w072rzfl7zwm8ppphgsg8ampw2dy7y6yk"; + sha256 = "1dfpmnyyrjyn7wbjfj3w072rzfl7zwm8ppphgsg8ampw2dy7y6yk"; url = "https://github.com/matiasdelellis/facerecognition/releases/download/v0.9.51/facerecognition.tar.gz"; license = "agpl3Only"; }; From 7dd0e90312a8612a0c9dd68c4b538eecd6338e03 Mon Sep 17 00:00:00 2001 From: harry Date: Sun, 18 Aug 2024 19:58:22 +0200 Subject: [PATCH 5/5] (fix): used correct language --- features/server/services/nextcloud.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/features/server/services/nextcloud.nix b/features/server/services/nextcloud.nix index d6ff1ea..c8b7fa1 100644 --- a/features/server/services/nextcloud.nix +++ b/features/server/services/nextcloud.nix @@ -1,4 +1,9 @@ -{ config, pkgs, ... }: +{ + config, + pkgs, + lib, + ... +}: { imports = [ "${ @@ -44,7 +49,11 @@ overwriteprotocol = "https"; log_type = "file"; # temporary fix for https://nixos.org/manual/nixos/stable/#module-services-nextcloud-warning-logreader default_phone_region = "FR"; + default_locale = "fr_FR"; + default_language = "fr"; + default_timezone = "Europe/Paris"; }; + phpExtraExtensions = all: [ all.pdlib all.redis @@ -80,5 +89,8 @@ }; extraAppsEnable = true; + appstoreEnable = true; # why i would want appstore to be disabled ??? + autoUpdateApps.enable = true; + extraOptions."memories.exiftool" = "${lib.getExe pkgs.exiftool}"; }; }