Skip to content

Commit

Permalink
nixos/phoebus-olog: don't automatically enable elasticsearch
Browse files Browse the repository at this point in the history
see #75, #54, follow-up of #60

(cherry picked from commit fb00ef9)
  • Loading branch information
minijackson authored and github-actions[bot] committed Aug 2, 2024
1 parent af4ae3e commit a7e741e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
12 changes: 1 addition & 11 deletions nixos/modules/phoebus/olog.nix
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,8 @@ in {
# TODO: systemd hardening. Currently level 8.2 EXPOSED
};
};

services.elasticsearch = {
enable = true;
# Should be kept in sync with the phoebus-alarm-logger and phoebus-save-and-restore services
package = pkgs.elasticsearch7;
};
services.mongodb.enable = true;
};

meta = {
maintainers = with epnixLib.maintainers; [minijackson];
# TODO:
# doc = ./olog.md;
};
meta.maintainers = with epnixLib.maintainers; [minijackson];
}
7 changes: 6 additions & 1 deletion nixos/tests/phoebus/olog.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@
meta.maintainers = with epnixLib.maintainers; [minijackson];

nodes = {
server = {
server = {pkgs, ...}: {
services.phoebus-olog = {
enable = true;
settings."demo_auth.enabled" = true;
};

services.elasticsearch = {
enable = true;
package = pkgs.elasticsearch7;
};

nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
# Elasticsearch can be used as an SSPL-licensed software, which is
Expand Down

0 comments on commit a7e741e

Please sign in to comment.