Skip to content

Commit

Permalink
Bring back loghost, graylog, elasticsearch6 roles
Browse files Browse the repository at this point in the history
- frozen packages for graylog and elasticsearch6-oss taken from our
  22.05/22.11 platform versions
- services/roles taken from 22.05/22.11 platform versions
- use current upstream Elasticsearch module which is still compatible
  with ES 6

PL-132166
  • Loading branch information
dpausp committed Jan 23, 2025
1 parent 4c13474 commit d5579f9
Show file tree
Hide file tree
Showing 16 changed files with 2,052 additions and 4 deletions.
1 change: 1 addition & 0 deletions nixos/platform/static.nix
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ with lib;
# removed by upstream, we want to keep it
memcached = 177;
redis = 181;
graylog = 243;
solr = 309;

# Same as elasticsearch
Expand Down
7 changes: 3 additions & 4 deletions nixos/roles/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ in {
./ceph/osd.nix
./ceph/rgw.nix
./devhost
./elasticsearch.nix
./external_net
./ferretdb.nix
./gitlab.nix
./graylog.nix
./jitsi
./k3s
./lamp.nix
./loki.nix
./loghost.nix
./mailout.nix
./mailserver.nix
./matomo.nix
Expand All @@ -42,10 +45,6 @@ in {
./webproxy.nix

# Removed
(mkRemovedOptionModule [ "flyingcircus" "roles" "graylog" "enable" ] "Last platform version that supported graylog/loghost was 22.05.")
(mkRemovedOptionModule [ "flyingcircus" "roles" "elasticsearch6" "enable" ] "Last platform version that supported elasticsearch6 was 22.11.")
(mkRemovedOptionModule [ "flyingcircus" "roles" "elasticsearch7" "enable" ] "Last platform version that supported elasticsearch7 was 22.11.")
(mkRemovedOptionModule [ "flyingcircus" "roles" "loghost" "enable" ] "Last platform version that supported graylog/loghost was 22.05.")
(mkRemovedOptionModule [ "flyingcircus" "roles" "loghost-location" "enable" ] "Last platform version that supported graylog/loghost was 22.05.")
(mkRemovedOptionModule [ "flyingcircus" "roles" "mysql" "rootPassword" ] "Change the root password via MySQL and modify secret files.")
(mkRemovedOptionModule [ "flyingcircus" "roles" "statshostproxy" "enable" ] "Use flyingcircus.roles.statshost-location-proxy.enable instead.")
Expand Down
Loading

0 comments on commit d5579f9

Please sign in to comment.