summaryrefslogtreecommitdiffstats
path: root/lass/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-08-21 12:12:13 +0200
committermakefu <github@syntax-fehler.de>2016-08-21 12:12:13 +0200
commit054475b6230ec357523b9eed143667a11db92966 (patch)
treedd60906a6b0f6a5d2252536a50044d42e6098915 /lass/1systems
parent54ccd367175e33c0aab67e8ef46d4d73bcf8183c (diff)
parent1d9f7b4f2d1a444bb7b19f18efa3bee63c8d3770 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems')
-rw-r--r--lass/1systems/mors.nix1
-rw-r--r--lass/1systems/prism.nix9
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 = [