diff --git a/features/server/caddy.nix b/features/server/caddy.nix index 101e08e..9dbdd2f 100644 --- a/features/server/caddy.nix +++ b/features/server/caddy.nix @@ -4,6 +4,10 @@ enable = true; virtualHosts = { + ":5050".extraConfig = '' + reverse_proxy :8083 + ''; + "http://sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :8003 ''; @@ -12,6 +16,10 @@ reverse_proxy :3333 ''; + "http://photos.hypervirtual.world".extraConfig = '' + reverse_proxy :2342 + ''; + "http://books.hypervirtual.world".extraConfig = '' reverse_proxy :8083 ''; @@ -20,6 +28,10 @@ reverse_proxy :3030 ''; + ":2344".extraConfig = '' + reverse_proxy :2342 + ''; + "http://jellyfin.sisyphe.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :8096 ''; @@ -51,10 +63,6 @@ "http://status.normandy.hypervirtual.world".extraConfig = '' reverse_proxy :4000 ''; - - "http://transmission.normandy.hypervirtual.world".extraConfig = '' - reverse_proxy :9091 - ''; }; }; diff --git a/features/server/services/nextcloud.nix b/features/server/services/nextcloud.nix index c8b7fa1..2540dec 100644 --- a/features/server/services/nextcloud.nix +++ b/features/server/services/nextcloud.nix @@ -1,9 +1,4 @@ -{ - config, - pkgs, - lib, - ... -}: +{ config, pkgs, ... }: { imports = [ "${ @@ -49,16 +44,8 @@ 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 - all.bz2 - ]; phpOptions."opcache.interned_strings_buffer" = "23"; extraApps = { inherit (config.services.nextcloud.package.packages.apps) @@ -73,24 +60,20 @@ url = "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.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"; - }; - */ + + 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 = "1dfpmnyyrjyn7wbjfj3w072rzfl7zwm8ppphgsg8ampw2dy7y6yk"; + sha256 = "sha256-1dfpmnyyrjyn7wbjfj3w072rzfl7zwm8ppphgsg8ampw2dy7y6yk"; url = "https://github.com/matiasdelellis/facerecognition/releases/download/v0.9.51/facerecognition.tar.gz"; license = "agpl3Only"; }; }; extraAppsEnable = true; - appstoreEnable = true; # why i would want appstore to be disabled ??? - autoUpdateApps.enable = true; - extraOptions."memories.exiftool" = "${lib.getExe pkgs.exiftool}"; }; } diff --git a/hosts/sisyphe/server-configuration.nix b/hosts/sisyphe/server-configuration.nix index c673d69..ce8855b 100644 --- a/hosts/sisyphe/server-configuration.nix +++ b/hosts/sisyphe/server-configuration.nix @@ -38,6 +38,12 @@ in 22 # ssh 8008 # matrix-synapse 8448 # matrix-synapse + 3030 + 3333 + 2344 + 4000 + 5050 # calibre-web + 9091 # transmission ]; allowedUDPPorts = [ ]; };