alexoundos
/
selfprivacy-nixos-top-level
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use simple-nixos-mailserver SP module; fix userdata; pass system arg

master
Alexander Tomokhov 2023-11-13 00:51:12 +04:00
parent d3993fe1ec
commit 357d93b93c
5 changed files with 182 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
flake.lock
View File

@ -148,26 +148,41 @@
"selfprivacy-graphql-api": "selfprivacy-graphql-api"
},
"locked": {
"lastModified": 1699588203,
"narHash": "sha256-nT25uKKYIL0FuCuLFmEbQrolMpG4zafYI5hcKYq2BHs=",
"lastModified": 1699821470,
"narHash": "sha256-I9jlfMzumsL13iM8si4XmJ1LBm/J3Z+9GbIA2VX/yIY=",
"ref": "flakes",
"rev": "41212f770accfcae3416c92c5dd46a4d19eda4d2",
"revCount": 128,
"rev": "80ba7d0bdafe9aad124b2336fb145b9d7a25a239",
"revCount": 127,
"type": "git",
"url": "file:///data/selfprivacy/selfprivacy-nixos-config"
"url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config"
},
"original": {
"type": "git",
"url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git"
}
},
"sp-modules": {
"simple-nixos-mailserver": {
"inputs": {
"mailserver": "mailserver"
},
"locked": {
"lastModified": 1699821460,
"narHash": "sha256-o4/mR5ACmhC/f3E7nY8W/G5A+IpyB7LIrksnyoazgP4=",
"path": "/data/selfprivacy/selfprivacy-nixos-config/sp-modules/simple-nixos-mailserver",
"type": "path"
},
"original": {
"path": "/data/selfprivacy/selfprivacy-nixos-config/sp-modules/simple-nixos-mailserver",
"type": "path"
}
},
"sp-modules": {
"inputs": {
"simple-nixos-mailserver": "simple-nixos-mailserver"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-I0bEECuJgrvEhmc82AjGcvONrkVc9sBRvRDNqc1IE+8=",
"narHash": "sha256-h/i1uHMWSAQLxNcLyStv2U33aYHbwA5oaOwnasBPRUo=",
"path": "./sp-modules",
"type": "path"
},

13
flake.nix
View File

@ -1,18 +1,19 @@
{
description = "SelfPrivacy NixOS configuration local flake";
inputs.selfprivacy-nixos-config.url = git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git;
# inputs.sp-modules.url = path:./sp-modules;
inputs.selfprivacy-nixos-config.url =
git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git;
# outputs = { self, selfprivacy-nixos-config, sp-modules }: {
outputs = { self, selfprivacy-nixos-config }: {
inputs.sp-modules.url = path:./sp-modules;
outputs = { self, selfprivacy-nixos-config, sp-modules }: {
nixosConfigurations =
selfprivacy-nixos-config.outputs.nixosConfigurations-fun {
system = "x86_64-linux";
hardware-configuration = ./hardware-configuration.nix;
userdata = builtins.fromJSON (builtins.readFile ./userdata.json);
top-level-flake = self;
# sp-modules = sp-modules.inputs;
sp-modules = builtins.getFlake (toString ./sp-modules);
sp-modules = sp-modules.inputs;
};
};
}

146
sp-modules/flake.lock Normal file
View File

@ -0,0 +1,146 @@
{
"nodes": {
"blobs": {
"flake": false,
"locked": {
"lastModified": 1604995301,
"narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
"owner": "simple-nixos-mailserver",
"repo": "blobs",
"rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
"repo": "blobs",
"type": "gitlab"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"mailserver": {
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs",
"nixpkgs-22_11": "nixpkgs-22_11",
"nixpkgs-23_05": "nixpkgs-23_05",
"utils": "utils"
},
"locked": {
"lastModified": 1695910380,
"narHash": "sha256-CyzeiXQGm8ceEOSK1dffBCfO7JNp8XhQeNkUiJ5HxgY=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "84783b661ecf33927c534b6476beb74ea3308968",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"type": "gitlab"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1670751203,
"narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs-22_11": {
"locked": {
"lastModified": 1669558522,
"narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.11",
"type": "indirect"
}
},
"nixpkgs-23_05": {
"locked": {
"lastModified": 1684782344,
"narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.05",
"type": "indirect"
}
},
"root": {
"inputs": {
"simple-nixos-mailserver": "simple-nixos-mailserver"
}
},
"simple-nixos-mailserver": {
"inputs": {
"mailserver": "mailserver"
},
"locked": {
"dir": "sp-modules/simple-nixos-mailserver",
"lastModified": 1699821470,
"narHash": "sha256-I9jlfMzumsL13iM8si4XmJ1LBm/J3Z+9GbIA2VX/yIY=",
"ref": "flakes",
"rev": "80ba7d0bdafe9aad124b2336fb145b9d7a25a239",
"revCount": 127,
"type": "git",
"url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config?dir=sp-modules/simple-nixos-mailserver"
},
"original": {
"dir": "sp-modules/simple-nixos-mailserver",
"type": "git",
"url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/simple-nixos-mailserver"
}
},
"utils": {
"locked": {
"lastModified": 1605370193,
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5021eac20303a61fafe17224c087f5519baed54d",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

3
sp-modules/flake.nix
View File

@ -1,7 +1,8 @@
{
description = "SelfPrivacy NixOS PoC modules/extensions/bundles/packages/etc";
inputs.mailserver.url = gitlab:simple-nixos-mailserver/nixos-mailserver;
inputs.simple-nixos-mailserver.url =
git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/simple-nixos-mailserver;
outputs = _: { };
}

10
userdata.json
View File

@ -24,14 +24,12 @@
"server": {
"provider": "HETZNER"
},
"databasePassword": "e5LTh9xt2UtaY0BXGzNpqFbnTfs1PS0W6eDnLgnE",
"domain": "meow-corp.xyz",
"hashedMasterPassword": "$6$WrO.K8riC8c/uuJ$9l/5aP4HY4q3g0.QBAWAnL37f7JUsA0nhBHQpyem1fLnnOijDoQbgKmC0W5Nzajdtw5IVuQT5FnLJyQPZAfrw/",
"hostname": "meow-corp",
"nextcloud": {
"enable": true,
"adminPassword": "tMzoy1yEaBPcgVheoXUj11S5dVlC5I4TSFxr0pCHoeMvOV2YICYqFqFJne2SgbOFr6QxZTw6QGdYmCLW",
"databasePassword": "tMzoy1yEaBPcgVheoXUj11S5dVlC5I4TSFxr0pCHoeMvOV2YICYqFqFJne2SgbOFr6QxZTw6QGdYmCLW",
"location": "sdb"
},
"gitea": {
@ -49,7 +47,6 @@
"location": "sdb"
},
"timezone": "Europe/Uzhgorod",
"resticPassword": "tMzoy1yEaBPcgVheoXUj11S5dVlC5I4TSFxr0pCHoeMvOV2YICYqFqFJne2SgbOFr6QxZTw6QGdYmCLW",
"username": "admin",
"volumes": [
{
@ -65,5 +62,8 @@
]
},
"sshKeys": [],
"users": []
}
"users": [],
"simple-nixos-mailserver": {
"enable": true
}
}