Update to 2020-05-25 12:00

master
Daniel Berteaud 5 years ago
parent 229a175c86
commit af6dab0e60
  1. 6
      roles/graylog/defaults/main.yml
  2. 2
      roles/graylog/templates/graylog-server.service.j2
  3. 4
      roles/graylog/templates/server.conf.j2

@ -17,9 +17,9 @@ graylog_libs:
graylog_plugins: graylog_plugins:
auth-sso: auth-sso:
version: 3.2.1 version: 3.3.0
sha1: e0e96424b763c635a1d5456a534704711fb2bbe2 sha1: 300e41632ea2495f9735c82ad1237a97c015044d
url: https://github.com/Graylog2/graylog-plugin-auth-sso/releases/download/3.2.1/graylog-plugin-auth-sso-3.2.1.jar url: https://github.com/Graylog2/graylog-plugin-auth-sso/releases/download/3.3.0/graylog-plugin-auth-sso-3.3.0.jar
dnsresolver: dnsresolver:
version: 1.2.0 version: 1.2.0
sha1: b470bd4b39a22574527e01a943a601c10cc2520b sha1: b470bd4b39a22574527e01a943a601c10cc2520b

@ -15,7 +15,7 @@ ExecStart=/usr/bin/java \
-Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB \ -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB \
-XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled \ -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled \
-XX:+CMSClassUnloadingEnabled -XX:-OmitStackTraceInFastThrow \ -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 \ -Dlog4j.configurationFile=file://{{ graylog_root_dir }}/etc/log4j2.xml \
-Djava.library.path={{ graylog_root_dir }}/app/lib/sigar \ -Djava.library.path={{ graylog_root_dir }}/app/lib/sigar \
org.graylog2.bootstrap.Main server -f {{ graylog_root_dir }}/etc/server.conf -np org.graylog2.bootstrap.Main server -f {{ graylog_root_dir }}/etc/server.conf -np

@ -33,9 +33,9 @@ http_proxy_uri = {{ system_proxy }}
http_non_proxy_hosts = {{ (system_proxy_no_proxy | default([]) + ansible_all_ipv4_addresses) | join(',') }} http_non_proxy_hosts = {{ (system_proxy_no_proxy | default([]) + ansible_all_ipv4_addresses) | join(',') }}
{% endif %} {% endif %}
bin_dir = /usr/share/graylog-server/bin bin_dir = {{ graylog_root_dir }}/app/bin
data_dir = {{ graylog_root_dir }}/data 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 message_journal_dir = {{ graylog_root_dir }}/data/journal
allow_leading_wildcard_searches = true allow_leading_wildcard_searches = true

Loading…
Cancel
Save