From 83a22cb6ab7ee8128725285bce4b15be76f3905f Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Thu, 16 Nov 2023 04:06:48 +0400 Subject: [PATCH] migrate to selfprivacy.modules userdata structure --- flake.lock | 28 ++++++++++++++-------------- sp-modules/flake.lock | 16 ++++++++-------- userdata.json | 21 ++++++++------------- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 259d2f1..3362481 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "nextcloud": { "locked": { "dir": "sp-modules/nextcloud", - "lastModified": 1700072764, - "narHash": "sha256-Jy+bo5/0k0eZkvl/Dhjy5xTHnXUZmI9EaMyfW0g4+yk=", + "lastModified": 1700092815, + "narHash": "sha256-HrEJjBZC7cUalbbnWKi+VZqGjHqmmCb8XGL3rR28LPg=", "ref": "flakes", - "rev": "c590285ec38f1407f8da0b17dd7953e07badf1c1", - "revCount": 135, + "rev": "80447abb2ee947098a7e170076e71f6cba2ef7f3", + "revCount": 137, "type": "git", "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/nextcloud" }, @@ -165,13 +165,13 @@ "selfprivacy-graphql-api": "selfprivacy-graphql-api" }, "locked": { - "lastModified": 1700072764, - "narHash": "sha256-Jy+bo5/0k0eZkvl/Dhjy5xTHnXUZmI9EaMyfW0g4+yk=", + "lastModified": 1700092815, + "narHash": "sha256-HrEJjBZC7cUalbbnWKi+VZqGjHqmmCb8XGL3rR28LPg=", "ref": "flakes", - "rev": "c590285ec38f1407f8da0b17dd7953e07badf1c1", - "revCount": 135, + "rev": "80447abb2ee947098a7e170076e71f6cba2ef7f3", + "revCount": 137, "type": "git", - "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config" + "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git" }, "original": { "type": "git", @@ -184,11 +184,11 @@ }, "locked": { "dir": "sp-modules/simple-nixos-mailserver", - "lastModified": 1700008280, - "narHash": "sha256-/iy/smT1yyeNSYS9Ak8rhdvc7+JtZe08FNb3ggH+N1A=", + "lastModified": 1700092815, + "narHash": "sha256-HrEJjBZC7cUalbbnWKi+VZqGjHqmmCb8XGL3rR28LPg=", "ref": "flakes", - "rev": "4419a1323adb05d542da1cd54c5dbfecb8aa2a77", - "revCount": 132, + "rev": "80447abb2ee947098a7e170076e71f6cba2ef7f3", + "revCount": 137, "type": "git", "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/simple-nixos-mailserver" }, @@ -205,7 +205,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-K1ADzSKkr+EyJ4m8ambNG5jXbFDa3Qobmszv+I6CHhQ=", + "narHash": "sha256-+TjcLM5ADsOd76YpHDZby90Zj8Z10MSKEwko7to9UaU=", "path": "./sp-modules", "type": "path" }, diff --git a/sp-modules/flake.lock b/sp-modules/flake.lock index 70b18ba..57968f0 100644 --- a/sp-modules/flake.lock +++ b/sp-modules/flake.lock @@ -58,11 +58,11 @@ "nextcloud": { "locked": { "dir": "sp-modules/nextcloud", - "lastModified": 1700072764, - "narHash": "sha256-Jy+bo5/0k0eZkvl/Dhjy5xTHnXUZmI9EaMyfW0g4+yk=", + "lastModified": 1700092815, + "narHash": "sha256-HrEJjBZC7cUalbbnWKi+VZqGjHqmmCb8XGL3rR28LPg=", "ref": "flakes", - "rev": "c590285ec38f1407f8da0b17dd7953e07badf1c1", - "revCount": 135, + "rev": "80447abb2ee947098a7e170076e71f6cba2ef7f3", + "revCount": 137, "type": "git", "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/nextcloud" }, @@ -129,11 +129,11 @@ }, "locked": { "dir": "sp-modules/simple-nixos-mailserver", - "lastModified": 1700008280, - "narHash": "sha256-/iy/smT1yyeNSYS9Ak8rhdvc7+JtZe08FNb3ggH+N1A=", + "lastModified": 1700092815, + "narHash": "sha256-HrEJjBZC7cUalbbnWKi+VZqGjHqmmCb8XGL3rR28LPg=", "ref": "flakes", - "rev": "4419a1323adb05d542da1cd54c5dbfecb8aa2a77", - "revCount": 132, + "rev": "80447abb2ee947098a7e170076e71f6cba2ef7f3", + "revCount": 137, "type": "git", "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/simple-nixos-mailserver" }, diff --git a/userdata.json b/userdata.json index 903496c..8676285 100644 --- a/userdata.json +++ b/userdata.json @@ -1,11 +1,4 @@ { - "api": { - "token": "UKyDoDP3ynlZ9pYBydckZi7RFFk0SV768ZpQ2ZpQ5eMOb1zBYTKjrhfB6nvY70Ca", - "skippedMigrations": [ - "migrate_to_selfprivacy_channel", - "mount_volume" - ] - }, "backup": { "provider": "BACKBLAZE", "accountId": "", @@ -27,10 +20,6 @@ "domain": "meow-corp.xyz", "hashedMasterPassword": "$6$WrO.K8riC8c/uuJ$9l/5aP4HY4q3g0.QBAWAnL37f7JUsA0nhBHQpyem1fLnnOijDoQbgKmC0W5Nzajdtw5IVuQT5FnLJyQPZAfrw/", "hostname": "meow-corp", - "nextcloud": { - "enable": true, - "location": "sdb" - }, "gitea": { "enable": true, "location": "sdb" @@ -62,7 +51,13 @@ }, "sshKeys": [], "users": [], - "simple-nixos-mailserver": { - "enable": true + "modules": { + "nextcloud": { + "enable": true, + "location": "sdb" + }, + "simple-nixos-mailserver": { + "enable": true + } } }