summaryrefslogtreecommitdiffstats
path: root/lass/1systems/mors
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-09-05 23:00:23 +0200
committertv <tv@krebsco.de>2017-09-05 23:00:23 +0200
commit1436781119f92cbf431db5e817fba765b24d922a (patch)
treef8ee298cdddd02beab384b047cc1a76bd1bd26c1 /lass/1systems/mors
parent77e9bd83e2208d1d732ef505e0e996a2440d5d7c (diff)
parent71d3f53f2bf767cfbb6e941438431d6083f304b9 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/mors')
-rw-r--r--lass/1systems/mors/config.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 58f55ce68..4d2f8b0f8 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -24,10 +24,11 @@ with import <stockholm/lib>;
<stockholm/lass/2configs/fetchWallpaper.nix>
<stockholm/lass/2configs/mail.nix>
<stockholm/lass/2configs/repo-sync.nix>
- <stockholm/lass/2configs/ircd.nix>
+ <stockholm/krebs/2configs/ircd.nix>
<stockholm/lass/2configs/logf.nix>
<stockholm/lass/2configs/syncthing.nix>
<stockholm/lass/2configs/otp-ssh.nix>
+ <stockholm/lass/2configs/c-base.nix>
{
#risk of rain port
krebs.iptables.tables.filter.INPUT.rules = [
@@ -35,11 +36,6 @@ with import <stockholm/lib>;
];
}
{
- services.elasticsearch = {
- enable = true;
- };
- }
- {
lass.umts = {
enable = true;
modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_C12AD95CB7B78F90-if09";