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

Compare commits

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

No commits in common. "9d29f4fcccd28653f3bc6240b99d84dd11d03d8e" and "d78930d09acb46384d981c10a2f9c252a510c1c8" have entirely different histories.
9d29f4fccc ... d78930d09a

1 changed files with 6 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -82,11 +82,6 @@
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;
@ -182,6 +177,7 @@ 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;
@ -202,6 +198,11 @@ 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";