From cac7f7013e323664ddae5dc635bb89b511d366f8 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 14 Jun 2022 08:16:01 +0200 Subject: [PATCH 01/17] configure hetzner backup --- systems/LoutreOS/services.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 425592e..e1d336e 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -239,7 +239,8 @@ in "/var/lib/radarr/.config/Radarr/radarr.db-wal" "/var/lib/radarr/.config/Radarr/radarr.db-shm" ]; - repo = "/mnt/backup/borg"; + repo = "ssh://u306925@u306925.your-storagebox.de:23/./loutreos"; + environment = { BORG_RSH = "ssh -i /mnt/secrets/hetzner_ssh_key"; }; encryption = { mode = "repokey-blake2"; passCommand = "cat /mnt/secrets/borgbackup_loutre_encryption_pass"; From 70bb98ca2d78d4d4acd4559e9797dcffa358c796 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 14 Jun 2022 08:26:11 +0200 Subject: [PATCH 02/17] update nixos to 22.05 --- flake.lock | 14 +++++++------- flake.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 034c4bc..9ba50c8 100644 --- a/flake.lock +++ b/flake.lock @@ -75,16 +75,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652975354, - "narHash": "sha256-qP1DpEYQdSq7NZ542TSHffIT6xGm7MaSMG9faQWPcg0=", + "lastModified": 1655096306, + "narHash": "sha256-3B3zBaQVLL956deZgmucouvkZroObQ4JKHzbIfFS9/c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "685d243d971c4f9655c981036b9c7bafdb728a0d", + "rev": "a119e218ad27bea32057a3463e3694a61c9e3802", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "type": "indirect" } }, @@ -105,11 +105,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1652885393, - "narHash": "sha256-YIgvvlk4iQ1Hi7KD9o5gsojc+ApB+jiH1d5stK8uXiw=", + "lastModified": 1655043425, + "narHash": "sha256-A+oT+aQGhW5lXy8H0cqBLsYtgcnT5glmGOXWQDcGw6I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48037fd90426e44e4bf03e6479e88a11453b9b66", + "rev": "914ef51ffa88d9b386c71bdc88bffc5273c08ada", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6fae62a..28f27a2 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "flake:nixpkgs/nixos-21.11"; + nixpkgs.url = "flake:nixpkgs/nixos-22.05"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; simple-nixos-mailserver = { From fbffb59a86896935e514125d824dc8ec379caac3 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 14 Jun 2022 08:26:53 +0200 Subject: [PATCH 03/17] disable matrix synapse --- systems/LoutreOS/services.nix | 86 ----------------------------------- 1 file changed, 86 deletions(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index e1d336e..71d4ca5 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -128,92 +128,6 @@ in mountdPort = 4002; }; - matrix-synapse = { - enable = true; - enable_registration = true; - server_name = "nyanlout.re"; - listeners = [ - { # federation - bind_address = ""; - port = 8448; - resources = [ - { compress = true; names = [ "client" "webclient" ]; } - { compress = false; names = [ "federation" ]; } - ]; - tls = true; - type = "http"; - x_forwarded = false; - } - { # client - bind_address = "127.0.0.1"; - port = 8008; - resources = [ - { compress = true; names = [ "client" "webclient" ]; } - ]; - tls = false; - type = "http"; - x_forwarded = true; - } - ]; - max_upload_size = "100M"; - database_type = "psycopg2"; - database_args = { - database = "matrix-synapse"; - }; - tls_private_key_path = "/var/lib/acme/${domaine}/key.pem"; - tls_certificate_path = "/var/lib/acme/${domaine}/fullchain.pem"; - url_preview_enabled = true; - logConfig = '' - version: 1 - - formatters: - journal_fmt: - format: '%(name)s: [%(request)s] %(message)s' - - filters: - context: - (): synapse.util.logcontext.LoggingContextFilter - request: "" - - handlers: - journal: - class: systemd.journal.JournalHandler - formatter: journal_fmt - filters: [context] - SYSLOG_IDENTIFIER: synapse - - root: - level: WARNING - handlers: [journal] - - disable_existing_loggers: False - ''; - app_service_config_files = [ - "/var/lib/matrix-synapse/mautrix-telegram-registration.yaml" - ]; - }; - - mautrix-telegram = { - enable = true; - settings = { - homeserver = { - address = "https://matrix.nyanlout.re"; - domain = "nyanlout.re"; - }; - appservice = { - bot_username = "loutrebot"; - }; - bridge = { - relaybot.authless_portals = false; - permissions = { - "@nyanloutre:nyanlout.re" = "admin"; - }; - }; - }; - environmentFile = "/mnt/secrets/mautrix-telegram.env"; - serviceDependencies = [ "matrix-synapse.service" ]; - }; - borgbackup.jobs = { loutre = { paths = [ From b1cea27df05e19564e4a49344a78188ca7e0428f Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 14 Jun 2022 08:27:13 +0200 Subject: [PATCH 04/17] fix nginx home-assistant config --- systems/LoutreOS/web.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index a880437..8055900 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -238,7 +238,7 @@ in "ci.nyanlout.re" = simpleReverse 52350; "gitea.nyanlout.re" = simpleReverse config.services.gitea.httpPort; "musique.nyanlout.re" = simpleReverse config.services.navidrome.settings.Port; - "apart.nyanlout.re" = recursiveUpdate (simpleReverse config.services.home-assistant.port) { + "apart.nyanlout.re" = recursiveUpdate (simpleReverse config.services.home-assistant.config.http.server_port) { locations."/" = { proxyWebsockets = true; }; From 29e12eed94e7fdb671156b58b2c1751ac43c5d01 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 30 Jun 2022 19:57:50 +0200 Subject: [PATCH 05/17] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a119e218ad27bea32057a3463e3694a61c9e3802' (2022-06-13) → 'github:NixOS/nixpkgs/be6da3774db3746e6ae94bf412dd3707e35b2800' (2022-06-29) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/914ef51ffa88d9b386c71bdc88bffc5273c08ada' (2022-06-12) → 'github:NixOS/nixpkgs/cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c' (2022-06-29) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 9ba50c8..56978de 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1655096306, - "narHash": "sha256-3B3zBaQVLL956deZgmucouvkZroObQ4JKHzbIfFS9/c=", + "lastModified": 1656500841, + "narHash": "sha256-13IRoh3uu29S4IfoVO6Sb0UPwzDhSqXoBKKQ4ssEzF0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a119e218ad27bea32057a3463e3694a61c9e3802", + "rev": "be6da3774db3746e6ae94bf412dd3707e35b2800", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1655043425, - "narHash": "sha256-A+oT+aQGhW5lXy8H0cqBLsYtgcnT5glmGOXWQDcGw6I=", + "lastModified": 1656461576, + "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "914ef51ffa88d9b386c71bdc88bffc5273c08ada", + "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c", "type": "github" }, "original": { From d5c54d97c5aeec9ec5a56661540d971ba9662892 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 4 Jul 2022 22:33:55 +0200 Subject: [PATCH 06/17] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/be6da3774db3746e6ae94bf412dd3707e35b2800' (2022-06-29) → 'github:NixOS/nixpkgs/09c32b0bda4db98d6454e910206188e85d5b04cc' (2022-07-02) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c' (2022-06-29) → 'github:NixOS/nixpkgs/0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb' (2022-07-02) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 56978de..294f935 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1656500841, - "narHash": "sha256-13IRoh3uu29S4IfoVO6Sb0UPwzDhSqXoBKKQ4ssEzF0=", + "lastModified": 1656754140, + "narHash": "sha256-8thJUtZWIimyBtkYQ0tdmmnH0yJvOaw1K5W3OgKc6/A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be6da3774db3746e6ae94bf412dd3707e35b2800", + "rev": "09c32b0bda4db98d6454e910206188e85d5b04cc", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1656461576, - "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", + "lastModified": 1656753965, + "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c", + "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", "type": "github" }, "original": { From 371f28a7197e13568d52caaa137b1761c448bbe7 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 4 Jul 2022 23:38:41 +0200 Subject: [PATCH 07/17] LoutreOS: use unstable Jellyfin --- systems/LoutreOS/medias.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systems/LoutreOS/medias.nix b/systems/LoutreOS/medias.nix index c0bf930..60193b4 100644 --- a/systems/LoutreOS/medias.nix +++ b/systems/LoutreOS/medias.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: { services = { @@ -22,7 +22,7 @@ jellyfin = { enable = true; - package = pkgs.jellyfin; + package = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux.jellyfin; }; navidrome = { From c937ecd33cd9e99aa4a3228b4865073bd877f50d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 4 Jul 2022 23:39:05 +0200 Subject: [PATCH 08/17] LoutreOS: update Postgresql to 14 --- systems/LoutreOS/web.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index 8055900..ce8599f 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -300,6 +300,7 @@ in postgresql = { enable = true; + package = pkgs.postgresql_14; settings = { full_page_writes = false; }; From 580c33acbaad339bdf530db323804c25f91a0baa Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 20:09:13 +0200 Subject: [PATCH 09/17] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/09c32b0bda4db98d6454e910206188e85d5b04cc' (2022-07-02) → 'github:NixOS/nixpkgs/e8d47977286a44955262adbc76f2c8a66e7419d5' (2022-07-04) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb' (2022-07-02) → 'github:NixOS/nixpkgs/18b14a254dca6b68ca0ce2ce885ce2b550065799' (2022-07-03) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 294f935..e513dfb 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1656754140, - "narHash": "sha256-8thJUtZWIimyBtkYQ0tdmmnH0yJvOaw1K5W3OgKc6/A=", + "lastModified": 1656947410, + "narHash": "sha256-htDR/PZvjUJGyrRJsVqDmXR8QeoswBaRLzHt13fd0iY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09c32b0bda4db98d6454e910206188e85d5b04cc", + "rev": "e8d47977286a44955262adbc76f2c8a66e7419d5", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", + "lastModified": 1656835607, + "narHash": "sha256-zONMAG6JSfGyW20AsVWGnlZwNWws6Q/7IT0oDNGc1xY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "rev": "18b14a254dca6b68ca0ce2ce885ce2b550065799", "type": "github" }, "original": { From fe517173363af7547b7d6ba11703d698a9370791 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 20:25:00 +0200 Subject: [PATCH 10/17] LoutreOS: update nixos-mailserver --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 28f27a2..38aa468 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,10 @@ nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; simple-nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05"; inputs = { nixpkgs.follows = "nixpkgs-unstable"; - nixpkgs-21_11.follows = "nixpkgs"; + nixpkgs-22_05.follows = "nixpkgs"; }; }; dogetipbot-telegram = { From 4f0c846880194dd9ca2e5bfc0139b690ac7b83d3 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 20:25:04 +0200 Subject: [PATCH 11/17] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'simple-nixos-mailserver': 'gitlab:simple-nixos-mailserver/nixos-mailserver/6e3a7b2ea6f0d68b82027b988aa25d3423787303' (2021-12-07) → 'gitlab:simple-nixos-mailserver/nixos-mailserver/f535d8123c4761b2ed8138f3d202ea710a334a1d' (2022-06-22) • Removed input 'simple-nixos-mailserver/nixpkgs-21_05' • Removed input 'simple-nixos-mailserver/nixpkgs-21_11' • Added input 'simple-nixos-mailserver/nixpkgs-22_05': follows 'nixpkgs' --- flake.lock | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index e513dfb..7593ec2 100644 --- a/flake.lock +++ b/flake.lock @@ -88,21 +88,6 @@ "type": "indirect" } }, - "nixpkgs-21_05": { - "locked": { - "lastModified": 1625692408, - "narHash": "sha256-e9L3TLLDVIJpMnHtiNHJE62oOh6emRtSZ244bgYJUZs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c06613c25df3fe1dd26243847a3c105cf6770627", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.05", - "type": "indirect" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1656835607, @@ -134,23 +119,22 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "nixpkgs-21_05": "nixpkgs-21_05", - "nixpkgs-21_11": [ + "nixpkgs-22_05": [ "nixpkgs" ], "utils": "utils" }, "locked": { - "lastModified": 1638911354, - "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=", + "lastModified": 1655930346, + "narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303", + "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixos-mailserver", "type": "gitlab" } From be051f67d3f7ab090935898726e0c5e52acbe5b8 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 20:40:48 +0200 Subject: [PATCH 12/17] LoutreOS: disable redis --- systems/LoutreOS/services.nix | 2 +- systems/LoutreOS/web.nix | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 2411cb4..be75dfe 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -90,7 +90,7 @@ in secure_ip = ["0.0.0.0/0"]; ''; - redis.enable = true; + # redis.enable = true; logrotate = { enable = true; diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index ce8599f..dc20e52 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -65,19 +65,19 @@ in services = { phpfpm.pools = { - work = { - user = config.users.users.work.name; - phpPackage = pkgs.php.withExtensions ({ all, ... }: with all; [ redis filter ]); - settings = { - "listen.owner" = config.services.nginx.user; - "pm" = "dynamic"; - "pm.max_children" = 75; - "pm.start_servers" = 10; - "pm.min_spare_servers" = 5; - "pm.max_spare_servers" = 20; - "pm.max_requests" = 500; - }; - }; + # work = { + # user = config.users.users.work.name; + # phpPackage = pkgs.php.withExtensions ({ all, ... }: with all; [ redis filter ]); + # settings = { + # "listen.owner" = config.services.nginx.user; + # "pm" = "dynamic"; + # "pm.max_children" = 75; + # "pm.start_servers" = 10; + # "pm.min_spare_servers" = 5; + # "pm.max_spare_servers" = 20; + # "pm.max_requests" = 500; + # }; + # }; drive = { user = config.users.users.webdav.name; settings = { From 349d25b20103faa33eaf90320b6c00507e8099b3 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 20:41:04 +0200 Subject: [PATCH 13/17] LoutreOS: keep default logrotate config --- systems/LoutreOS/services.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index be75dfe..ce7f4aa 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -92,20 +92,8 @@ in # redis.enable = true; - logrotate = { - enable = true; - paths = { - nginx = { - path = "/var/log/nginx/*.log"; - user = config.services.nginx.user; - group = config.services.nginx.group; - keep = 7; - extraConfig = '' - compress - ''; - }; - }; - }; + # enable with nginx defult config + logrotate.enable = true; fail2ban.enable = true; From 89a8d3baa6ef7d39a435994d3186fbc9f5546164 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 20:41:35 +0200 Subject: [PATCH 14/17] LoutreOS: fix acme config --- systems/LoutreOS/web.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index dc20e52..7917507 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -44,7 +44,7 @@ let in { security.acme = { - email = "paul@nyanlout.re"; + defaults.email = "paul@nyanlout.re"; acceptTerms = true; }; From e35f6defa0a757e59a371fd40140f5eb873eba99 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 21:50:05 +0200 Subject: [PATCH 15/17] LoutreOS: remove unused game servers --- systems/LoutreOS/services.nix | 65 ----------------------------------- 1 file changed, 65 deletions(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index f5a7718..5042676 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -168,40 +168,6 @@ in }; }; - sdtdserver.enable = false; - - factorio = { - enable = false; - autosave-interval = 10; - game-name = "Shame"; - public = true; - username = "nyanloutre"; - }; - - minecraft-server = { - enable = false; - jvmOpts = "-Xms512m -Xmx3072m"; - eula = true; - declarative = true; - openFirewall = true; - whitelist = { - nyanloutre = "db0669ea-e332-4ca3-8d50-f5d1458f5822"; - Hautension = "f05677f4-be5a-47df-ad77-21c739180aa2"; - LordDarkKiwi = "79290cfc-0b00-484f-9c94-ab0786402de6"; - Madahin = "f5f747e3-fac2-43e8-9b9b-a67dc2f368ff"; - Hopegcx = "4497f759-2210-48db-8764-307d33011442"; - wyrd68 = "127a3021-cdc1-419f-9010-4651df9ae3af"; - sparsyateloutre = "d2ff63c1-4e9f-4b21-9bfc-decce5d987b3"; - }; - serverProperties = { - difficulty = 2; - gamemode = 0; - max-players = 50; - motd = "Hi Mark !"; - white-list = true; - }; - }; - kresd = { enable = true; }; @@ -570,37 +536,6 @@ in ipmihddtemp.enable = true; - # systemd.services.minecraft-overviewer = - # let - # clientJar = pkgs.fetchurl { - # url = "https://overviewer.org/textures/1.14"; - # sha256 = "0fij9wac7vj6h0kd3mfhqpn0w9gl8pbs9vs9s085zajm0szpr44k"; - # name = "client.jar"; - # }; - # configFile = pkgs.runCommand "overviewer-config" { CLIENT_JAR = clientJar; } '' - # substitute ${./config-overviewer.py} $out \ - # --subst-var CLIENT_JAR - # ''; - # in - # { - # script = '' - # ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} - # ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} --genpoi - # rm /var/www/minecraft-overviewer/progress.json - # ''; - # serviceConfig = { - # User = "nginx"; - # Group = "nginx"; - # }; - # }; - - # systemd.timers.minecraft-overviewer = { - # wantedBy = [ "multi-user.target" ]; - # timerConfig = { - # OnCalendar = "*-*-* 04:00:00"; - # }; - # }; - # systemd.packages = with pkgs; [ # tgt # ]; From 4371eb399bef7cee221eefd6d69b83ba5bbc08f0 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 21:51:06 +0200 Subject: [PATCH 16/17] LoutreOS: remove unused iscsi config --- systems/LoutreOS/services.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 5042676..e94ba67 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -536,17 +536,6 @@ in ipmihddtemp.enable = true; - # systemd.packages = with pkgs; [ - # tgt - # ]; - - # environment.etc."tgt/targets.conf".text = '' - # - # backing-store /dev/zvol/loutrepool/steam-lun - # initiator-address 10.30.50.3 - # - # ''; - users.groups.nginx.members = [ "matrix-synapse" ]; security.pam.services.sshd.text = pkgs.lib.mkDefault( pkgs.lib.mkAfter "session optional ${pkgs.pam}/lib/security/pam_exec.so seteuid ${login_mail_alert}/bin/mail_alert.sh" ); From 744d3fc57e1cd2f2540c7d753c52803c599e0fec Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 5 Jul 2022 21:53:47 +0200 Subject: [PATCH 17/17] LoutreOS: temporarily disable max website --- systems/LoutreOS/web.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index 7917507..6b8e924 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -216,7 +216,7 @@ in alias = "/var/www/site-musique/media/"; }; }; - "maxspiegel.fr" = base { "/" = { root = "/run/python-ci/nyanloutre/site-max"; }; }; + # "maxspiegel.fr" = base { "/" = { root = "/run/python-ci/nyanloutre/site-max"; }; }; "stream.nyanlout.re" = base { "/" = { proxyPass = "http://10.30.135.71";