From 66deb3aa29801db9c42ef70f0f17fd6d8d47f603 Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Sun, 25 Mar 2018 21:19:21 +0200
Subject: [PATCH] quagga service: fix service and re-enable test

adding quagga to quaggavty
reverting 8a18e1f
---
 nixos/modules/module-list.nix                | 2 +-
 nixos/modules/services/networking/quagga.nix | 2 +-
 nixos/release.nix                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d47600fbc61..da52cb9acdc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -530,7 +530,7 @@
   ./services/networking/prayer.nix
   ./services/networking/privoxy.nix
   ./services/networking/prosody.nix
-  # ./services/networking/quagga.nix
+  ./services/networking/quagga.nix
   ./services/networking/quassel.nix
   ./services/networking/racoon.nix
   ./services/networking/radicale.nix
diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix
index aab58cc77b9..22204e53203 100644
--- a/nixos/modules/services/networking/quagga.nix
+++ b/nixos/modules/services/networking/quagga.nix
@@ -133,7 +133,7 @@ in
     users.groups = {
       quagga = {};
       # Members of the quaggavty group can use vtysh to inspect the Quagga daemons
-      quaggavty = {};
+      quaggavty = { members = [ "quagga" ]; };
     };
 
     systemd.services =
diff --git a/nixos/release.nix b/nixos/release.nix
index 9b4aa4b0399..760fd918959 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -346,7 +346,7 @@ in rec {
   tests.prometheus = callTest tests/prometheus.nix {};
   tests.prosody = callTest tests/prosody.nix {};
   tests.proxy = callTest tests/proxy.nix {};
-  # tests.quagga = callTest tests/quagga.nix {};
+  tests.quagga = callTest tests/quagga.nix {};
   tests.quake3 = callTest tests/quake3.nix {};
   tests.rabbitmq = callTest tests/rabbitmq.nix {};
   tests.radicale = callTest tests/radicale.nix {};