lol

Revert "nixos/tests/elk: remove OSS ELK-7 test"

This reverts commit 35db6bc5543d352ea7e54375ba12acd70033a7f9.

+18 -11
+18 -11
nixos/tests/elk.nix
··· 216 216 ) 217 217 ''; 218 218 }) { inherit pkgs system; }; 219 - in pkgs.lib.mapAttrs mkElkTest ({ 219 + in pkgs.lib.mapAttrs mkElkTest { 220 220 ELK-6 = 221 221 if enableUnfree 222 222 then { ··· 233 233 journalbeat = pkgs.journalbeat6; 234 234 metricbeat = pkgs.metricbeat6; 235 235 }; 236 - } // pkgs.lib.optionalAttrs enableUnfree { 237 - ELK-7 = 238 - { 239 - elasticsearch = pkgs.elasticsearch7; 240 - logstash = pkgs.logstash7; 241 - kibana = pkgs.kibana7; 242 - journalbeat = pkgs.journalbeat7; 243 - metricbeat = pkgs.metricbeat7; 244 - }; 245 - }) 236 + ELK-7 = 237 + if enableUnfree 238 + then { 239 + elasticsearch = pkgs.elasticsearch7; 240 + logstash = pkgs.logstash7; 241 + kibana = pkgs.kibana7; 242 + journalbeat = pkgs.journalbeat7; 243 + metricbeat = pkgs.metricbeat7; 244 + } 245 + else { 246 + elasticsearch = pkgs.elasticsearch7-oss; 247 + logstash = pkgs.logstash7-oss; 248 + kibana = pkgs.kibana7-oss; 249 + journalbeat = pkgs.journalbeat7; 250 + metricbeat = pkgs.metricbeat7; 251 + }; 252 + }