From af6dab0e6052405a6656d61de044de3d322270a8 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 25 May 2020 12:00:05 +0200
Subject: [PATCH] Update to 2020-05-25 12:00

---
 roles/graylog/defaults/main.yml                   | 6 +++---
 roles/graylog/templates/graylog-server.service.j2 | 2 +-
 roles/graylog/templates/server.conf.j2            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/graylog/defaults/main.yml b/roles/graylog/defaults/main.yml
index 9febc4e..1d02908 100644
--- a/roles/graylog/defaults/main.yml
+++ b/roles/graylog/defaults/main.yml
@@ -17,9 +17,9 @@ graylog_libs:
 
 graylog_plugins:
   auth-sso:
-    version: 3.2.1
-    sha1: e0e96424b763c635a1d5456a534704711fb2bbe2
-    url: https://github.com/Graylog2/graylog-plugin-auth-sso/releases/download/3.2.1/graylog-plugin-auth-sso-3.2.1.jar
+    version: 3.3.0
+    sha1: 300e41632ea2495f9735c82ad1237a97c015044d
+    url: https://github.com/Graylog2/graylog-plugin-auth-sso/releases/download/3.3.0/graylog-plugin-auth-sso-3.3.0.jar
   dnsresolver:
     version: 1.2.0
     sha1: b470bd4b39a22574527e01a943a601c10cc2520b
diff --git a/roles/graylog/templates/graylog-server.service.j2 b/roles/graylog/templates/graylog-server.service.j2
index 9ab0f5c..1f4b1f0 100644
--- a/roles/graylog/templates/graylog-server.service.j2
+++ b/roles/graylog/templates/graylog-server.service.j2
@@ -15,7 +15,7 @@ ExecStart=/usr/bin/java \
             -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB \
             -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled \
             -XX:+CMSClassUnloadingEnabled -XX:-OmitStackTraceInFastThrow \
-            -cp {{ graylog_root_dir }}/app/graylog.jar{% if graylog_libs.keys() | list | length > 0 %}{% for lib in graylog_libs.keys() | list %}:{{ graylog_root_dir }}/libs/{{ lib }}-{{ graylog_libs[lib].version }}.jar{% endfor %} {% endif %} \
+            -cp {{ graylog_root_dir }}/app/graylog.jar{% if graylog_libs.keys() | list | length > 0 %}{% for lib in graylog_libs.keys() | list %}:{{ graylog_root_dir }}/app/lib/{{ lib }}-{{ graylog_libs[lib].version }}.jar{% endfor %} {% endif %} \
             -Dlog4j.configurationFile=file://{{ graylog_root_dir }}/etc/log4j2.xml \
             -Djava.library.path={{ graylog_root_dir }}/app/lib/sigar \
             org.graylog2.bootstrap.Main server -f {{ graylog_root_dir }}/etc/server.conf -np
diff --git a/roles/graylog/templates/server.conf.j2 b/roles/graylog/templates/server.conf.j2
index 2c648d3..0bc7f38 100644
--- a/roles/graylog/templates/server.conf.j2
+++ b/roles/graylog/templates/server.conf.j2
@@ -33,9 +33,9 @@ http_proxy_uri = {{ system_proxy }}
 http_non_proxy_hosts = {{ (system_proxy_no_proxy | default([]) + ansible_all_ipv4_addresses) | join(',') }}
 {% endif %}
 
-bin_dir = /usr/share/graylog-server/bin
+bin_dir = {{ graylog_root_dir }}/app/bin
 data_dir = {{ graylog_root_dir }}/data
-plugin_dir = /usr/share/graylog-server/plugin
+plugin_dir = {{ graylog_root_dir }}/app/plugin
 message_journal_dir = {{ graylog_root_dir }}/data/journal
 
 allow_leading_wildcard_searches = true