Compare commits

..

3 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 816ead8b96 add astro user 2019-04-21 10:44:14 +08:00
Sebastien Bourdeauducq 87a664721b set up wireshark 2019-04-21 10:44:08 +08:00
Sebastien Bourdeauducq 7487560b10 host website 2019-04-21 10:43:48 +08:00
1 changed files with 20 additions and 2 deletions

View File

@ -38,6 +38,7 @@
# 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:
@ -67,14 +68,19 @@
users.extraGroups.plugdev = { }; users.extraGroups.plugdev = { };
users.extraUsers.sb = { users.extraUsers.sb = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel" "plugdev" "dialout" "lp" "scanner"]; extraGroups = ["wheel" "plugdev" "dialout" "lp" "scanner" "wireshark"];
uid = 1000; uid = 1000;
}; };
users.extraUsers.rj = { users.extraUsers.rj = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel" "plugdev" "dialout"]; extraGroups = ["wheel" "plugdev" "dialout" "wireshark"];
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;
@ -162,6 +168,8 @@ 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;
@ -173,6 +181,16 @@ 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";