From 09ec8c3554521b48e00cb9e02644111e0ac40fd8 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 5 Jan 2023 11:11:22 +0100 Subject: [PATCH 01/15] Add 'overlays/transmission.nix' --- overlays/transmission.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 overlays/transmission.nix diff --git a/overlays/transmission.nix b/overlays/transmission.nix new file mode 100644 index 0000000..3294870 --- /dev/null +++ b/overlays/transmission.nix @@ -0,0 +1,8 @@ +self: super: +{ + transmission = (super.transmission.overrideAttrs (oA: { + patches = []; + })).override { + openssl = super.openssl_legacy; + }; +} \ No newline at end of file From eff9aadf902365f0721e58b1955d4073670d7d79 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 5 Jan 2023 11:13:39 +0100 Subject: [PATCH 02/15] Update 'systems/LoutreOS/configuration.nix' --- systems/LoutreOS/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index d0adf48..3ab6c2a 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -12,6 +12,11 @@ ./services.nix ]; + nixpkgs.overlays = [ + (import ../../overlays/transmission.nix) + ]; + + nix.settings.trusted-users = [ "root" "paul" ]; boot = { From 3d472d07c2f6666a2f55e7e3692b067aebc8dfac Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 5 Jan 2023 11:18:09 +0100 Subject: [PATCH 03/15] Update 'systems/LoutreOS/configuration.nix' --- systems/LoutreOS/configuration.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 3ab6c2a..75a7df1 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -12,11 +12,6 @@ ./services.nix ]; - nixpkgs.overlays = [ - (import ../../overlays/transmission.nix) - ]; - - nix.settings.trusted-users = [ "root" "paul" ]; boot = { @@ -169,6 +164,7 @@ nixpkgs.overlays = [ (import ../../overlays/riot-web.nix) + (import ../../overlays/transmission.nix) ]; services.openssh = { From 884498f5736ae5ba3aae947fb9383f199630198e Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 5 Jan 2023 11:25:26 +0100 Subject: [PATCH 04/15] Update 'systems/LoutreOS/services.nix' --- systems/LoutreOS/services.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index cb0cdfb..2bc5e41 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -551,7 +551,7 @@ in originalsPath = "/mnt/backup_loutre/amandoleen/d/Users/Amand/Pictures"; extraConfig = { PHOTOPRISM_AUTH_MODE = "public"; - PHOTOPRISM_READONLY = true; + PHOTOPRISM_READONLY = "1"; }; }; }; From 0cddbf1def860643f4f76a1a590d6703aaacbdc0 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 5 Jan 2023 11:22:52 +0100 Subject: [PATCH 05/15] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/913a47cd064cc06440ea84e5e0452039a85781f0' (2022-12-29) → 'github:NixOS/nixpkgs/e9ade2c8240e00a4784fac282a502efff2786bdc' (2023-01-04) • Updated input 'nixpkgs-photoprism': 'github:Stunkymonkey/nixpkgs/6805f176fcc4b3673f23df5ee67caccc24bfba8c' (2022-12-24) → 'github:Stunkymonkey/nixpkgs/9f3d8078ecec6f757b6fde1734f258913e062be2' (2023-01-01) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/e182da8622a354d44c39b3d7a542dc12cd7baa5f' (2022-12-28) → 'github:NixOS/nixpkgs/9813adc7f7c0edd738c6bdd8431439688bb0cb3d' (2023-01-04) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e6dea1e..8c26b8b 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672353432, - "narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=", + "lastModified": 1672844754, + "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "913a47cd064cc06440ea84e5e0452039a85781f0", + "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-photoprism": { "locked": { - "lastModified": 1671922246, - "narHash": "sha256-Xh/pWG2mdheCtJZFmuuZIsvR9PVgs15Rn6yt/G1lINc=", + "lastModified": 1672609663, + "narHash": "sha256-qDon3TnuGPW8L4+xLqUs6/Ev8yRR8qV7v5PHMrCtnao=", "owner": "Stunkymonkey", "repo": "nixpkgs", - "rev": "6805f176fcc4b3673f23df5ee67caccc24bfba8c", + "rev": "9f3d8078ecec6f757b6fde1734f258913e062be2", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1672262501, - "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=", + "lastModified": 1672791794, + "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f", + "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", "type": "github" }, "original": { From a449f29502028e36df5b28374763fc5d80c1c6f8 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 5 Jan 2023 11:26:38 +0100 Subject: [PATCH 06/15] remove backup mount and add photoprism mount --- systems/LoutreOS/hardware-configuration.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/systems/LoutreOS/hardware-configuration.nix b/systems/LoutreOS/hardware-configuration.nix index 2c3303b..b32d6f1 100644 --- a/systems/LoutreOS/hardware-configuration.nix +++ b/systems/LoutreOS/hardware-configuration.nix @@ -123,10 +123,10 @@ fsType = "zfs"; }; - fileSystems."/mnt/backup" = - { device = "backup"; - fsType = "zfs"; - }; + # fileSystems."/mnt/backup" = + # { device = "backup"; + # fsType = "zfs"; + # }; fileSystems."/mnt/backup_loutre" = { device = "loutrepool/backup"; @@ -158,6 +158,11 @@ fsType = "zfs"; }; + fileSystems."/var/lib/private/photoprism" = + { device = "loutrepool/var/photoprism"; + fsType = "zfs"; + }; + fileSystems."/mnt/paul-home" = { device = "loutrepool/zfs-replicate/paul-fixe/fastaf/home"; fsType = "zfs"; From d97d8a59491430776d6cff8776882e6d410fa60b Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 5 Jan 2023 11:28:10 +0100 Subject: [PATCH 07/15] add photoprism url --- systems/LoutreOS/services.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 2bc5e41..4c8fb80 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -552,6 +552,7 @@ in extraConfig = { PHOTOPRISM_AUTH_MODE = "public"; PHOTOPRISM_READONLY = "1"; + PHOTOPRISM_SITE_URL = "https://photo.nyanlout.re/"; }; }; }; From 166219459f6911defe243e68c273fa429e917c51 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 7 Jan 2023 23:34:55 +0100 Subject: [PATCH 08/15] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e9ade2c8240e00a4784fac282a502efff2786bdc' (2023-01-04) → 'github:NixOS/nixpkgs/2dea8991d89b9f1e78d874945f78ca15f6954289' (2023-01-06) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/9813adc7f7c0edd738c6bdd8431439688bb0cb3d' (2023-01-04) → 'github:NixOS/nixpkgs/a518c77148585023ff56022f09c4b2c418a51ef5' (2023-01-05) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8c26b8b..ea354b4 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672844754, - "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", + "lastModified": 1672968032, + "narHash": "sha256-26Jns3GmHem44a06UN5Rj/KOD9qNJThyQrom02Ijur8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", + "rev": "2dea8991d89b9f1e78d874945f78ca15f6954289", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1672791794, - "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", + "lastModified": 1672953546, + "narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", + "rev": "a518c77148585023ff56022f09c4b2c418a51ef5", "type": "github" }, "original": { From 734f54f69fab055c37976bfce6176dad3c4f66f0 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 13 Jan 2023 09:53:31 +0100 Subject: [PATCH 09/15] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2dea8991d89b9f1e78d874945f78ca15f6954289' (2023-01-06) → 'github:NixOS/nixpkgs/6a3f9996408c970b99b8b992b11bb249d1455b62' (2023-01-12) • Updated input 'nixpkgs-photoprism': 'github:Stunkymonkey/nixpkgs/9f3d8078ecec6f757b6fde1734f258913e062be2' (2023-01-01) → 'github:Stunkymonkey/nixpkgs/2dc710c13cfd1f33b16439c84afd9eafeb3371f2' (2023-01-12) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/a518c77148585023ff56022f09c4b2c418a51ef5' (2023-01-05) → 'github:NixOS/nixpkgs/6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e' (2023-01-11) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ea354b4..ef80203 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672968032, - "narHash": "sha256-26Jns3GmHem44a06UN5Rj/KOD9qNJThyQrom02Ijur8=", + "lastModified": 1673527292, + "narHash": "sha256-903EpRSDCfUvic7Hsiqwy+h7zlMTLAUbCXkEGGriCfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2dea8991d89b9f1e78d874945f78ca15f6954289", + "rev": "6a3f9996408c970b99b8b992b11bb249d1455b62", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-photoprism": { "locked": { - "lastModified": 1672609663, - "narHash": "sha256-qDon3TnuGPW8L4+xLqUs6/Ev8yRR8qV7v5PHMrCtnao=", + "lastModified": 1673563714, + "narHash": "sha256-NPVs2Sff5ubtCnsG5fciNZtM30d4nlgZxmpSK4zqwDU=", "owner": "Stunkymonkey", "repo": "nixpkgs", - "rev": "9f3d8078ecec6f757b6fde1734f258913e062be2", + "rev": "2dc710c13cfd1f33b16439c84afd9eafeb3371f2", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1672953546, - "narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=", + "lastModified": 1673450908, + "narHash": "sha256-b8em+kwrNtnB7gR8SyVf6WuTyQ+6tHS6dzt9D9wgKF0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a518c77148585023ff56022f09c4b2c418a51ef5", + "rev": "6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e", "type": "github" }, "original": { From ea61674cffa0302e2189dc4edaf1db0ff3abc1b9 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 26 Jan 2023 20:42:59 +0100 Subject: [PATCH 10/15] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6a3f9996408c970b99b8b992b11bb249d1455b62' (2023-01-12) → 'github:NixOS/nixpkgs/ab1254087f4cdf4af74b552d7fc95175d9bdbb49' (2023-01-22) • Updated input 'nixpkgs-photoprism': 'github:Stunkymonkey/nixpkgs/2dc710c13cfd1f33b16439c84afd9eafeb3371f2' (2023-01-12) → 'github:Stunkymonkey/nixpkgs/0214f02419f80674ffcaa26e9f20769a56b5f0c1' (2023-01-15) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e' (2023-01-11) → 'github:NixOS/nixpkgs/1b1f50645af2a70dc93eae18bfd88d330bfbcf7f' (2023-01-23) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ef80203..3259cce 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673527292, - "narHash": "sha256-903EpRSDCfUvic7Hsiqwy+h7zlMTLAUbCXkEGGriCfM=", + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a3f9996408c970b99b8b992b11bb249d1455b62", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-photoprism": { "locked": { - "lastModified": 1673563714, - "narHash": "sha256-NPVs2Sff5ubtCnsG5fciNZtM30d4nlgZxmpSK4zqwDU=", + "lastModified": 1673802166, + "narHash": "sha256-0D/Fnl7nF9tOoCFgfu8dReShYjal7LwvIRkCAjxtK78=", "owner": "Stunkymonkey", "repo": "nixpkgs", - "rev": "2dc710c13cfd1f33b16439c84afd9eafeb3371f2", + "rev": "0214f02419f80674ffcaa26e9f20769a56b5f0c1", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1673450908, - "narHash": "sha256-b8em+kwrNtnB7gR8SyVf6WuTyQ+6tHS6dzt9D9wgKF0=", + "lastModified": 1674459583, + "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e", + "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", "type": "github" }, "original": { From a8b8356e0d24261aff88c5e40fa3fa6a6ed3eba5 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Feb 2023 17:04:00 +0100 Subject: [PATCH 11/15] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ab1254087f4cdf4af74b552d7fc95175d9bdbb49' (2023-01-22) → 'github:NixOS/nixpkgs/c43f676c938662072772339be6269226c77b51b8' (2023-02-14) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/1b1f50645af2a70dc93eae18bfd88d330bfbcf7f' (2023-01-23) → 'github:NixOS/nixpkgs/545c7a31e5dedea4a6d372712a18e00ce097d462' (2023-02-13) --- flake.lock | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 3259cce..eecc94f 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "lastModified": 1676375384, + "narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "rev": "c43f676c938662072772339be6269226c77b51b8", "type": "github" }, "original": { @@ -88,29 +88,13 @@ "type": "indirect" } }, - "nixpkgs-photoprism": { - "locked": { - "lastModified": 1673802166, - "narHash": "sha256-0D/Fnl7nF9tOoCFgfu8dReShYjal7LwvIRkCAjxtK78=", - "owner": "Stunkymonkey", - "repo": "nixpkgs", - "rev": "0214f02419f80674ffcaa26e9f20769a56b5f0c1", - "type": "github" - }, - "original": { - "owner": "Stunkymonkey", - "ref": "photoprism-module-init", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1674459583, - "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", + "lastModified": 1676300157, + "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", + "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", "type": "github" }, "original": { @@ -124,7 +108,6 @@ "dogetipbot-telegram": "dogetipbot-telegram", "ipmihddtemp": "ipmihddtemp", "nixpkgs": "nixpkgs", - "nixpkgs-photoprism": "nixpkgs-photoprism", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "utils": "utils_2" From 4d7fc25aaf6e568c7a7a3e366f58a17d76bc22b7 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Feb 2023 17:11:20 +0100 Subject: [PATCH 12/15] remove riot --- overlays/riot-web.nix | 15 --------------- systems/LoutreOS/configuration.nix | 1 - systems/LoutreOS/web.nix | 1 - 3 files changed, 17 deletions(-) delete mode 100644 overlays/riot-web.nix diff --git a/overlays/riot-web.nix b/overlays/riot-web.nix deleted file mode 100644 index 33428ff..0000000 --- a/overlays/riot-web.nix +++ /dev/null @@ -1,15 +0,0 @@ -self: super: -{ - riot-web = super.riot-web.override { - conf = { - default_hs_url = "https://matrix.nyanlout.re"; - default_is_url = "https://vector.im"; - brand = "Nyanloutre"; - default_theme = "dark"; - integrations_ui_url = "https://dimension.t2bot.io/riot"; - integrations_rest_url = "https://dimension.t2bot.io/api/v1/scalar"; - integrations_widgets_urls = ["https://dimension.t2bot.io/widgets"]; - integrations_jitsi_widget_url = "https://dimension.t2bot.io/widgets/jitsi"; - }; - }; -} diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 75a7df1..e292f44 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -163,7 +163,6 @@ }; nixpkgs.overlays = [ - (import ../../overlays/riot-web.nix) (import ../../overlays/transmission.nix) ]; diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index c7f0169..8390254 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -224,7 +224,6 @@ in ''; }; } // { default = true; }; - "riot.nyanlout.re" = base { "/" = { root = pkgs.element-web; }; }; "factorio.nyanlout.re" = base { "/" = { root = "/var/www/factorio"; }; }; "minecraft.nyanlout.re" = base { "/" = { root = "/var/www/minecraft-overviewer"; }; }; "musique-meyenheim.fr" = base { From 2fac85824a2c9c0efd785de978166e2e0e76675c Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Feb 2023 17:13:06 +0100 Subject: [PATCH 13/15] install photoprism from unstable --- flake.nix | 5 ++--- systems/LoutreOS/services.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index fe8260a..e9ef184 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ inputs = { nixpkgs.url = "flake:nixpkgs/nixos-22.11"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; - nixpkgs-photoprism.url = "github:Stunkymonkey/nixpkgs/photoprism-module-init"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; simple-nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11"; @@ -21,7 +20,7 @@ }; }; - outputs = inputs@{ self, utils, nixpkgs, nixpkgs-unstable, nixpkgs-photoprism, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: utils.lib.mkFlake { + outputs = inputs@{ self, utils, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: utils.lib.mkFlake { inherit self inputs; @@ -47,7 +46,7 @@ ]; hosts.loutreos.modules = [ - "${nixpkgs-photoprism}/nixos/modules/services/web-apps/photoprism.nix" + "${nixpkgs-unstable}/nixos/modules/services/web-apps/photoprism.nix" simple-nixos-mailserver.nixosModule dogetipbot-telegram.nixosModule ipmihddtemp.nixosModule diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 4c8fb80..3b8df04 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -549,7 +549,7 @@ in photoprism = { enable = true; originalsPath = "/mnt/backup_loutre/amandoleen/d/Users/Amand/Pictures"; - extraConfig = { + settings = { PHOTOPRISM_AUTH_MODE = "public"; PHOTOPRISM_READONLY = "1"; PHOTOPRISM_SITE_URL = "https://photo.nyanlout.re/"; From 0ae3cd7ba4ddfc35c590c7b301bf52b5de1bd1ce Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Feb 2023 17:30:46 +0100 Subject: [PATCH 14/15] redirect www.musique-meyenheim.fr --- systems/LoutreOS/web.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index 8390254..6df086c 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -237,6 +237,11 @@ in alias = "/var/www/site-musique/media/"; }; }; + "www.musique-meyenheim.fr" = { + enableACME = true; + forceSSL = true; + globalRedirect = "musique-meyenheim.fr"; + }; # "maxspiegel.fr" = base { "/" = { root = "/run/python-ci/nyanloutre/site-max"; }; }; "stream.nyanlout.re" = base { "/" = { From 94ab3f04fe39281c3940de48972cfc75737a547e Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Feb 2023 17:31:01 +0100 Subject: [PATCH 15/15] ajout amandoline-creations.fr --- systems/LoutreOS/web.nix | 55 +++++++--------------------------------- 1 file changed, 9 insertions(+), 46 deletions(-) diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index 6df086c..aa7ca38 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -327,52 +327,15 @@ in } ]; "designyourfuture.amandoline-creations.fr" = base { - "/".alias = "/var/www/amandoleene-designyourfuture/"; - # "/" = { - # priority = 200; - # extraConfig = '' - # try_files $uri $uri/ /index.php$is_args$args; - # ''; - # }; - # "~ \\.php$" = { - # priority = 500; - # extraConfig = '' - # fastcgi_split_path_info ^(.+\.php)(/.+)$; - # fastcgi_pass unix:${config.services.phpfpm.pools."wordpress-designyourfuture".socket}; - # fastcgi_index index.php; - # include "${config.services.nginx.package}/conf/fastcgi.conf"; - # fastcgi_param PATH_INFO $fastcgi_path_info; - # fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; - # # Mitigate https://httpoxy.org/ vulnerabilities - # fastcgi_param HTTP_PROXY ""; - # fastcgi_intercept_errors off; - # fastcgi_buffer_size 16k; - # fastcgi_buffers 4 16k; - # fastcgi_connect_timeout 300; - # fastcgi_send_timeout 300; - # fastcgi_read_timeout 300; - # ''; - # }; - # "~ /\\." = { - # priority = 800; - # extraConfig = "deny all;"; - # }; - # "~* /(?:uploads|files)/.*\\.php$" = { - # priority = 900; - # extraConfig = "deny all;"; - # }; - # "~* \\.(js|css|png|jpg|jpeg|gif|ico)$" = { - # priority = 1000; - # extraConfig = '' - # expires max; - # log_not_found off; - # ''; - # }; - } // { - # root = "/var/www/wordpress-designyourfuture"; - # extraConfig = '' - # index index.php; - # ''; + "/".alias = "/var/www/amandoline-designyourfuture/"; + }; + "amandoline-creations.fr" = base { + "/".alias = "/var/www/amandoline-portfolio/"; + }; + "www.amandoline-creations.fr" = { + enableACME = true; + forceSSL = true; + globalRedirect = "amandoline-creations.fr"; }; }; };