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

Compare commits

base: M-Labs:816ead8b96194d1f0f469c62beb6a2ca6cca07f8
Branches Tags
M-Labs:master
..
compare: M-Labs:aa038520e958344c1bb596b4844fcc3c119f1b26
Branches Tags
M-Labs:master

No commits in common. "816ead8b96194d1f0f469c62beb6a2ca6cca07f8" and "aa038520e958344c1bb596b4844fcc3c119f1b26" have entirely different histories.
816ead8b96 ... aa038520e9

1 changed files with 2 additions and 20 deletions
Show Stats Expand all files Collapse all files

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

@ -38,7 +38,6 @@
# started in user sessions. # started in user sessions.
# programs.mtr.enable = true; # programs.mtr.enable = true;
# programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; # programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
programs.wireshark.enable = true;
# List services that you want to enable: # List services that you want to enable:
@ -68,19 +67,14 @@
users.extraGroups.plugdev = { }; users.extraGroups.plugdev = { };
users.extraUsers.sb = { users.extraUsers.sb = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel" "plugdev" "dialout" "lp" "scanner" "wireshark"]; extraGroups = ["wheel" "plugdev" "dialout" "lp" "scanner"];
uid = 1000; uid = 1000;
}; };
users.extraUsers.rj = { users.extraUsers.rj = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel" "plugdev" "dialout" "wireshark"]; extraGroups = ["wheel" "plugdev" "dialout"];
uid = 1002; uid = 1002;
}; };
users.extraUsers.astro = {
isNormalUser = true;
extraGroups = ["plugdev" "dialout" "wireshark"];
uid = 1003;
};
users.extraUsers.nix = { users.extraUsers.nix = {
isNormalUser = true; isNormalUser = true;
uid = 1001; uid = 1001;
@ -168,8 +162,6 @@ ACTION=="add", SUBSYSTEM=="tty", \
"nixbld.m-labs.hk" = { "nixbld.m-labs.hk" = {
webroot = "/var/lib/acme/acme-challenge"; webroot = "/var/lib/acme/acme-challenge";
extraDomains = { extraDomains = {
"m-labs.hk" = null;
"www.m-labs.hk" = null;
"buildbot.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;
@ -181,16 +173,6 @@ ACTION=="add", SUBSYSTEM=="tty", \
enable = true; enable = true;
recommendedProxySettings = true; recommendedProxySettings = true;
virtualHosts = { virtualHosts = {
"m-labs.hk" = {
addSSL = true;
useACMEHost = "nixbld.m-labs.hk";
root = "/var/www/m-labs.hk";
};
"www.m-labs.hk" = {
addSSL = true;
useACMEHost = "nixbld.m-labs.hk";
root = "/var/www/m-labs.hk";
};
"buildbot.m-labs.hk" = { "buildbot.m-labs.hk" = {
addSSL = true; addSSL = true;
useACMEHost = "nixbld.m-labs.hk"; useACMEHost = "nixbld.m-labs.hk";