M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

Compare commits

base: M-Labs:d78930d09acb46384d981c10a2f9c252a510c1c8
Branches Tags
M-Labs:master
...
compare: M-Labs:9d29f4fcccd28653f3bc6240b99d84dd11d03d8e
Branches Tags
M-Labs:master

2 Commits
d78930d09a ... 9d29f4fccc

Author SHA1 Message Date
Sebastien Bourdeauducq 9d29f4fccc add whitequark user 2019-05-02 13:18:31 +08:00
Sebastien Bourdeauducq cbc1df481b remove buildbot.m-labs.hk 2019-05-02 13:09:46 +08:00
1 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

11
nixbld-etc-nixos/configuration.nix
View File

@ -82,6 +82,11 @@
extraGroups = ["plugdev" "dialout" "wireshark"]; extraGroups = ["plugdev" "dialout" "wireshark"];
uid = 1003; uid = 1003;
}; };
users.extraUsers.whitequark = {
isNormalUser = true;
extraGroups = ["plugdev" "dialout"];
uid = 1004;
};
users.extraUsers.nix = { users.extraUsers.nix = {
isNormalUser = true; isNormalUser = true;
uid = 1001; uid = 1001;
@ -177,7 +182,6 @@ ACTION=="add", SUBSYSTEM=="tty", \
extraDomains = { extraDomains = {
"m-labs.hk" = null; "m-labs.hk" = null;
"www.m-labs.hk" = null; "www.m-labs.hk" = null;
"buildbot.m-labs.hk" = null;
"lab.m-labs.hk" = null; "lab.m-labs.hk" = null;
"git.m-labs.hk" = null; "git.m-labs.hk" = null;
"chat.m-labs.hk" = null; "chat.m-labs.hk" = null;
@ -198,11 +202,6 @@ ACTION=="add", SUBSYSTEM=="tty", \
useACMEHost = "nixbld.m-labs.hk"; useACMEHost = "nixbld.m-labs.hk";
root = "/var/www/m-labs.hk"; root = "/var/www/m-labs.hk";
}; };
"buildbot.m-labs.hk" = {
addSSL = true;
useACMEHost = "nixbld.m-labs.hk";
locations."/".proxyPass = "http://192.168.1.100";
};
"lab.m-labs.hk" = { "lab.m-labs.hk" = {
addSSL = true; addSSL = true;
useACMEHost = "nixbld.m-labs.hk"; useACMEHost = "nixbld.m-labs.hk";