From 3e0eae6d7d9fda8d86d82ec97ea170dea055654a Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 9 Jan 2024 22:04:53 +0300 Subject: [PATCH 1/8] Test SP API 3.0.0 --- flake.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 3a06119..1193ee6 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1704039216, - "narHash": "sha256-ooMgVCLR+3BHxGiEOqjzp2YXsR067SAHT7yNinm6U9k=", - "ref": "flakes", - "rev": "8ffd08e95fecd8f649f6cc00f098e81eb8f03caf", - "revCount": 1070, + "lastModified": 1704826689, + "narHash": "sha256-Ke4sHDg6W56hS66FaRAGy2f13CBVCOVNM3dY7q28bDo=", + "ref": "remove-rest-flaked", + "rev": "d95e4fdb2ce4a7adb749e2a51870e3727f83010f", + "revCount": 1162, "type": "git", "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git" }, From 94456c8bd810910c213f4e01b0381a42e6cffea5 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 9 Jan 2024 22:33:24 +0300 Subject: [PATCH 2/8] upd --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 1193ee6..914c7df 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1704826689, - "narHash": "sha256-Ke4sHDg6W56hS66FaRAGy2f13CBVCOVNM3dY7q28bDo=", + "lastModified": 1704828580, + "narHash": "sha256-dp1jhADV9YeZ/ETC84PTgSPeRemttjmmMpc3RoJ/kw0=", "ref": "remove-rest-flaked", - "rev": "d95e4fdb2ce4a7adb749e2a51870e3727f83010f", - "revCount": 1162, + "rev": "fb5a8142da48436cd7a30f267d156d50f47829f6", + "revCount": 1163, "type": "git", "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git" }, From c08d56ae1c51b6750ed8bee6022efb6f6a2bae54 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Wed, 10 Jan 2024 06:56:47 +0400 Subject: [PATCH 3/8] 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/1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f' (2023-12-17) → 'github:nixos/nixpkgs/c1be43e8e837b8dbee2b3665a007e761680f0c3d' (2024-01-05) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 914c7df..3d34657 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1702780907, - "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", + "lastModified": 1704420045, + "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", + "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d", "type": "github" }, "original": { From 842d5a0dd1aa803f7fb0df8f064e0dbc1765ba34 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Thu, 11 Jan 2024 00:13:44 +0400 Subject: [PATCH 4/8] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'selfprivacy-api': 'git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git?ref=remove-rest-flaked&rev=fb5a8142da48436cd7a30f267d156d50f47829f6' (2024-01-09) → 'git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git?ref=refs/heads/master&rev=0ccb85d5cc24a20ecc8647035c93bc08e3e31b78' (2024-01-10) --- flake.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 3d34657..34f9a2a 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1704828580, - "narHash": "sha256-dp1jhADV9YeZ/ETC84PTgSPeRemttjmmMpc3RoJ/kw0=", - "ref": "remove-rest-flaked", - "rev": "fb5a8142da48436cd7a30f267d156d50f47829f6", - "revCount": 1163, + "lastModified": 1704898392, + "narHash": "sha256-6+XJxYGW/1Ouvo/zOQQb6RRrKTFyiFc7c0cSJ+axtc8=", + "ref": "refs/heads/master", + "rev": "0ccb85d5cc24a20ecc8647035c93bc08e3e31b78", + "revCount": 1166, "type": "git", "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git" }, From c96e6fe09977ccc26dba9ec6310f1dcb6ea72a23 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Thu, 18 Jan 2024 15:18:32 +0400 Subject: [PATCH 5/8] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'selfprivacy-api': 'git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git?ref=refs/heads/master&rev=0ccb85d5cc24a20ecc8647035c93bc08e3e31b78' (2024-01-10) → 'git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git?ref=refs/heads/master&rev=e3761a200c1ce244b285772a0c731a10e6169ef3' (2024-01-15) --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 34f9a2a..f93d146 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1704898392, - "narHash": "sha256-6+XJxYGW/1Ouvo/zOQQb6RRrKTFyiFc7c0cSJ+axtc8=", + "lastModified": 1705313551, + "narHash": "sha256-la/XZyI5bEgwMOO/v6kOb0gZgzfaOTD9wxPxGNL0N5M=", "ref": "refs/heads/master", - "rev": "0ccb85d5cc24a20ecc8647035c93bc08e3e31b78", - "revCount": 1166, + "rev": "e3761a200c1ce244b285772a0c731a10e6169ef3", + "revCount": 1169, "type": "git", "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git" }, From 643f7716ae79dd89743c8a9e885d4ed19a0f3093 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Fri, 19 Jan 2024 02:48:27 +0400 Subject: [PATCH 6/8] remove DOMAIN environment variable --- configuration.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index 6fe772d..09fad6b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -70,10 +70,6 @@ jq ]; # consider environment.defaultPackages = lib.mkForce []; - # TODO is it needed? - environment.variables = { - DOMAIN = config.selfprivacy.domain; - }; documentation.enable = false; # no {man,info}-pages & docs, etc to save space # (or create a systemd service with `ConditionFirstBoot=yes`?) systemd.tmpfiles.rules = [ From f9b86f403db6e187eb8ca5db7a05d5954bd2f7aa Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Fri, 19 Jan 2024 02:59:29 +0400 Subject: [PATCH 7/8] default timezone is "Etc/UTC" --- selfprivacy-module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfprivacy-module.nix b/selfprivacy-module.nix index b0fa077..b313a6d 100644 --- a/selfprivacy-module.nix +++ b/selfprivacy-module.nix @@ -20,7 +20,7 @@ with lib; Timezone used by the server ''; type = types.nullOr types.str; - default = "Europe/Uzhgorod"; + default = "Etc/UTC"; }; autoUpgrade = { enable = mkOption { From a8aca42762f30bf1ed25fadcbee3b0b347a1dc54 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 3 Oct 2023 16:34:47 +0300 Subject: [PATCH 8/8] feat(ssh): Allow ecdsa-sha2-nistp256 keys --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 09fad6b..f19966f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -62,7 +62,7 @@ openFirewall = false; }; programs.ssh = { - pubkeyAcceptedKeyTypes = [ "ssh-ed25519" "ssh-rsa" ]; + pubkeyAcceptedKeyTypes = [ "ssh-ed25519" "ssh-rsa" "ecdsa-sha2-nistp256" ]; hostKeyAlgorithms = [ "ssh-ed25519" "ssh-rsa" ]; }; environment.systemPackages = with pkgs; [