diff options
| author | tv <tv@krebsco.de> | 2016-08-21 13:02:40 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-08-21 13:02:40 +0200 |
| commit | 315dde2dcf063c18f54ddfaf65bd7c3dce95d161 (patch) | |
| tree | 88dd3b15a0d8df30e26d731fa8be6781e3677ae9 /lass/1systems | |
| parent | 509a9f4ff47bd40856754b9440f07f9e7fa0f452 (diff) | |
| parent | 1d9f7b4f2d1a444bb7b19f18efa3bee63c8d3770 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/mors.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/prism.nix | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 84191da0b..92a1b51e9 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -17,7 +17,6 @@ ../2configs/wine.nix ../2configs/chromium-patched.nix ../2configs/git.nix - ../2configs/bitlbee.nix ../2configs/skype.nix ../2configs/teamviewer.nix ../2configs/libvirt.nix diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 1bc8d5744..9da261ed4 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -188,9 +188,16 @@ in { "fullchain.pem" "full.pem" ]; - user = "ejabberd"; + allowKeysForGroup = true; + group = "lasscert"; }; }; + users.groups.lasscert.members = [ + "dovecot2" + "ejabberd" + "exim" + "nginx" + ]; krebs.nginx.servers."lassul.us" = { server-names = [ "lassul.us" ]; locations = [ |