Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

l: use genid_uint31 where needed

Browse Source
This commit is contained in:
lassulus 2018-12-03 09:47:35 +01:00
parent 692271b2b9
commit 79e5320e6b
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lass/1systems/prism/config.nix
View File

@ -25,7 +25,7 @@ with import <stockholm/lib>;
{ # TODO make new hfos.nix out of this vv { # TODO make new hfos.nix out of this vv
boot.kernel.sysctl."net.ipv4.ip_forward" = 1; boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
users.users.riot = { users.users.riot = {
uid = genid "riot"; uid = genid_uint31 "riot";
isNormalUser = true; isNormalUser = true;
extraGroups = [ "libvirtd" ]; extraGroups = [ "libvirtd" ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
@ -44,21 +44,21 @@ with import <stockholm/lib>;
} }
{ {
users.users.tv = { users.users.tv = {
uid = genid "tv"; uid = genid_uint31 "tv";
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
config.krebs.users.tv.pubkey config.krebs.users.tv.pubkey
]; ];
}; };
users.users.makefu = { users.users.makefu = {
uid = genid "makefu"; uid = genid_uint31 "makefu";
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
config.krebs.users.makefu.pubkey config.krebs.users.makefu.pubkey
]; ];
}; };
users.extraUsers.dritter = { users.extraUsers.dritter = {
uid = genid "dritter"; uid = genid_uint31 "dritter";
isNormalUser = true; isNormalUser = true;
extraGroups = [ extraGroups = [
"download" "download"
@ -75,7 +75,7 @@ with import <stockholm/lib>;
]; ];
}; };
users.users.hellrazor = { users.users.hellrazor = {
uid = genid "hellrazor"; uid = genid_uint31 "hellrazor";
isNormalUser = true; isNormalUser = true;
extraGroups = [ extraGroups = [
"download" "download"
@ -168,7 +168,7 @@ with import <stockholm/lib>;
} }
{ {
users.users.jeschli = { users.users.jeschli = {
uid = genid "jeschli"; uid = genid_uint31 "jeschli";
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = with config.krebs.users; [ openssh.authorizedKeys.keys = with config.krebs.users; [
jeschli.pubkey jeschli.pubkey

3
lass/2configs/radio.nix
View File

@ -5,7 +5,6 @@ with import <stockholm/lib>;
let let
name = "radio"; name = "radio";
mainUser = config.users.extraUsers.mainUser; mainUser = config.users.extraUsers.mainUser;
inherit (import <stockholm/lib>) genid;
admin-password = import <secrets/icecast-admin-pw>; admin-password = import <secrets/icecast-admin-pw>;
source-password = import <secrets/icecast-source-pw>; source-password = import <secrets/icecast-source-pw>;
@ -31,7 +30,7 @@ in {
"${name}" = rec { "${name}" = rec {
inherit name; inherit name;
group = name; group = name;
uid = genid name; uid = genid_uint31 name;
description = "radio manager"; description = "radio manager";
home = "/home/${name}"; home = "/home/${name}";
useDefaultShell = true; useDefaultShell = true;

6
lass/2configs/websites/lassulus.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
let let
inherit (import <stockholm/lib>) inherit (import <stockholm/lib>)
genid genid_uint31
; ;
in { in {
@ -22,7 +22,7 @@ in {
krebs.tinc_graphs.enable = true; krebs.tinc_graphs.enable = true;
users.users.lass-stuff = { users.users.lass-stuff = {
uid = genid "lass-stuff"; uid = genid_uint31 "lass-stuff";
description = "lassul.us blog cgi stuff"; description = "lassul.us blog cgi stuff";
home = "/var/empty"; home = "/var/empty";
}; };
@ -124,7 +124,7 @@ in {
}; };
users.users.blog = { users.users.blog = {
uid = genid "blog"; uid = genid_uint31 "blog";
description = "lassul.us blog deployment"; description = "lassul.us blog deployment";
home = "/srv/http/lassul.us"; home = "/srv/http/lassul.us";
useDefaultShell = true; useDefaultShell = true;

2
lass/3modules/xjail.nix
View File

@ -142,7 +142,7 @@ with import <stockholm/lib>;
users.users = mapAttrs' (_: cfg: users.users = mapAttrs' (_: cfg:
nameValuePair cfg.name { nameValuePair cfg.name {
uid = genid cfg.name; uid = genid_uint31 cfg.name;
home = "/home/${cfg.name}"; home = "/home/${cfg.name}";
useDefaultShell = true; useDefaultShell = true;
createHome = true; createHome = true;