Attachment 180476 Details for Bug 216593 – Patch graylog to 2.2.1

[patch] Patch graylog to 2.2.1

graylog.diff (text/plain), 27.81 KB, created by Palle Girgensohn on 2017-03-03 21:06:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Palle Girgensohn

Created: 2017-03-03 21:06:48 UTC

Size: 27.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 435348)
>+++ Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	graylog
>-PORTVERSION=	1.3.3
>+PORTVERSION=	2.2.1
> CATEGORIES=	sysutils java
>-MASTER_SITES=	https://packages.graylog2.org/releases/graylog2-server/ \
>-		http://packages.graylog2.org/releases/graylog2-server/
>+MASTER_SITES=	https://packages.graylog2.org/releases/graylog/ \
>+		http://packages.graylog2.org/releases/graylog/
> 
> MAINTAINER=	thomas@bartelmess.io
> COMMENT=	Tool for centralized log collection
>@@ -16,29 +16,33 @@
> USE_JAVA=	yes
> JAVA_VERSION=	1.7+
> JAVA_EXTRACT=	yes
>+NO_ARCH=	yes
> JAVA_RUN=	yes
> NO_BUILD=	yes
> 
>-GRAYLOG_DIR=	${PREFIX}/${PORTNAME}
>-
> USE_RC_SUBR=	graylog
>+SUB_FILES=	server.conf.sample pkg-message
> 
> GRAYLOGUSER?=	graylog
> GRAYLOGGROUP?=	${GRAYLOGUSER}
> USERS=		${GRAYLOGUSER}
> GROUPS=		${GRAYLOGGROUP}
>+GRAYLOG_DATA_DIR=	/var/db/graylog
> 
> SUB_LIST=	GRAYLOGUSER=${GRAYLOGUSER} \
> 		GRAYLOGGROUP=${GRAYLOGGROUP} \
>-		JAVA_HOME=${JAVA_HOME} \
>-		GRAYLOG_DIR=${GRAYLOG_DIR} \
>-		ETCDIR=${ETCDIR}
>+		GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR}
> 
>+PLIST_SUB=	GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \
>+		GRAYLOGUSER=${GRAYLOGUSER} \
>+		GRAYLOGGROUP=${GRAYLOGGROUP}
>+
> do-install:
>-	${MKDIR} ${STAGEDIR}${GRAYLOG_DIR}
>-	${MKDIR} ${STAGEDIR}${ETCDIR}
>-	${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${GRAYLOG_DIR}
>-	${INSTALL_DATA} ${WRKSRC}/graylog.conf.example ${STAGEDIR}${ETCDIR}
>-	${INSTALL_DATA} ${FILESDIR}/graylog_logging.xml ${STAGEDIR}${ETCDIR}
>+	${MKDIR} ${STAGEDIR}${DATADIR}/plugin
>+	${MKDIR} ${STAGEDIR}${ETCDIR}/server
>+	${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR}
>+	${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${DATADIR}
>+	(cd ${WRKSRC}/plugin && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin)
>+	${INSTALL_DATA} ${WRKDIR}/server.conf.sample ${STAGEDIR}${ETCDIR}/server/server.conf.sample
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 435348)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (graylog-1.3.3.tgz) = 1e98509376dc22ff1602838cebb49b4732618296acc58063ba34f4a97f667ba0
>-SIZE (graylog-1.3.3.tgz) = 70204863
>+TIMESTAMP = 1488453914
>+SHA256 (graylog-2.2.1.tgz) = c7b322477882880b51e59bdd8d858fe50c59760dffb411d0b4a92f61bd797ca6
>+SIZE (graylog-2.2.1.tgz) = 99202584
>Index: files/graylog.conf.example
>===================================================================
>--- files/graylog.conf.example	(revision 435348)
>+++ files/graylog.conf.example	(nonexistent)
>@@ -1,376 +0,0 @@
>-# If you are running more than one instances of graylog2-server you have to select one of these
>-# instances as master. The master will perform some periodical tasks that non-masters won't perform.
>-is_master = true
>-
>-# The auto-generated node ID will be stored in this file and read after restarts. It is a good idea
>-# to use an absolute file path here if you are starting graylog2-server from init scripts or similar.
>-node_id_file = /var/graylog/server/node-id
>-
>-# You MUST set a secret to secure/pepper the stored user passwords here. Use at least 64 characters.
>-# Generate one by using for example: pwgen -N 1 -s 96
>-password_secret =
>-
>-# The default root user is named 'admin'
>-#root_username = admin
>-
>-# You MUST specify a hash password for the root user (which you only need to initially set up the
>-# system and in case you lose connectivity to your authentication backend)
>-# This password cannot be changed using the API or via the web interface. If you need to change it,
>-# modify it in this file.
>-# Create one by using for example: echo -n yourpassword | shasum -a 256
>-# and put the resulting hash value into the following line
>-root_password_sha2 =
>-
>-# The email address of the root user.
>-# Default is empty
>-#root_email = ""
>-
>-# The time zone setting of the root user.
>-# Default is UTC
>-#root_timezone = UTC
>-
>-# Set plugin directory here (relative or absolute)
>-plugin_dir = plugin
>-
>-# REST API listen URI. Must be reachable by other graylog2-server nodes if you run a cluster.
>-rest_listen_uri = http://127.0.0.1:12900/
>-
>-# REST API transport address. Defaults to the value of rest_listen_uri. Exception: If rest_listen_uri
>-# is set to a wildcard IP address (0.0.0.0) the first non-loopback IPv4 system address is used.
>-# If set, his will be promoted in the cluster discovery APIs, so other nodes may try to connect on
>-# this address and it is used to generate URLs addressing entities in the REST API. (see rest_listen_uri)
>-# You will need to define this, if your Graylog server is running behind a HTTP proxy that is rewriting
>-# the scheme, host name or URI.
>-#rest_transport_uri = http://192.168.1.1:12900/
>-
>-# Enable CORS headers for REST API. This is necessary for JS-clients accessing the server directly.
>-# If these are disabled, modern browsers will not be able to retrieve resources from the server.
>-# This is disabled by default. Uncomment the next line to enable it.
>-#rest_enable_cors = true
>-
>-# Enable GZIP support for REST API. This compresses API responses and therefore helps to reduce
>-# overall round trip times. This is disabled by default. Uncomment the next line to enable it.
>-#rest_enable_gzip = true
>-
>-# Enable HTTPS support for the REST API. This secures the communication with the REST API with
>-# TLS to prevent request forgery and eavesdropping. This is disabled by default. Uncomment the
>-# next line to enable it.
>-#rest_enable_tls = true
>-
>-# The X.509 certificate file to use for securing the REST API.
>-#rest_tls_cert_file = /path/to/graylog2.crt
>-
>-# The private key to use for securing the REST API.
>-#rest_tls_key_file = /path/to/graylog2.key
>-
>-# The password to unlock the private key used for securing the REST API.
>-#rest_tls_key_password = secret
>-
>-# The maximum size of a single HTTP chunk in bytes.
>-#rest_max_chunk_size = 8192
>-
>-# The maximum size of the HTTP request headers in bytes.
>-#rest_max_header_size = 8192
>-
>-# The maximal length of the initial HTTP/1.1 line in bytes.
>-#rest_max_initial_line_length = 4096
>-
>-# The size of the execution handler thread pool used exclusively for serving the REST API.
>-#rest_thread_pool_size = 16
>-
>-# The size of the worker thread pool used exclusively for serving the REST API.
>-#rest_worker_threads_max_pool_size = 16
>-
>-# Embedded Elasticsearch configuration file
>-# pay attention to the working directory of the server, maybe use an absolute path here
>-#elasticsearch_config_file = /usr/local/etc/graylog/server/elasticsearch.yml
>-
>-# Graylog will use multiple indices to store documents in. You can configured the strategy it uses to determine
>-# when to rotate the currently active write index.
>-# It supports multiple rotation strategies:
>-#   - "count" of messages per index, use elasticsearch_max_docs_per_index below to configure
>-#   - "size" per index, use elasticsearch_max_size_per_index below to configure
>-# valid values are "count", "size" and "time", default is "count"
>-rotation_strategy = count
>-
>-# (Approximate) maximum number of documents in an Elasticsearch index before a new index
>-# is being created, also see no_retention and elasticsearch_max_number_of_indices.
>-# Configure this if you used 'rotation_strategy = count' above.
>-elasticsearch_max_docs_per_index = 20000000
>-
>-# (Approximate) maximum size in bytes per Elasticsearch index on disk before a new index is being created, also see
>-# no_retention and elasticsearch_max_number_of_indices. Default is 1GB.
>-# Configure this if you used 'rotation_strategy = size' above.
>-#elasticsearch_max_size_per_index = 1073741824
>-
>-# (Approximate) maximum time before a new Elasticsearch index is being created, also see
>-# no_retention and elasticsearch_max_number_of_indices. Default is 1 day.
>-# Configure this if you used 'rotation_strategy = time' above.
>-# Please note that this rotation period does not look at the time specified in the received messages, but is
>-# using the real clock value to decide when to rotate the index!
>-# Specify the time using a duration and a suffix indicating which unit you want:
>-#  1w  = 1 week
>-#  1d  = 1 day
>-#  12h = 12 hours
>-# Permitted suffixes are: d for day, h for hour, m for minute, s for second.
>-#elasticsearch_max_time_per_index = 1d
>-
>-# Disable checking the version of Elasticsearch for being compatible with this Graylog release.
>-# WARNING: Using Graylog with unsupported and untested versions of Elasticsearch may lead to data loss!
>-#elasticsearch_disable_version_check = true
>-
>-# Disable message retention on this node, i. e. disable Elasticsearch index rotation.
>-#no_retention = false
>-
>-# How many indices do you want to keep?
>-elasticsearch_max_number_of_indices = 20
>-
>-# Decide what happens with the oldest indices when the maximum number of indices is reached.
>-# The following strategies are availble:
>-#   - delete # Deletes the index completely (Default)
>-#   - close # Closes the index and hides it from the system. Can be re-opened later.
>-retention_strategy = delete
>-
>-# How many Elasticsearch shards and replicas should be used per index? Note that this only applies to newly created indices.
>-elasticsearch_shards = 4
>-elasticsearch_replicas = 0
>-
>-# Prefix for all Elasticsearch indices and index aliases managed by Graylog.
>-elasticsearch_index_prefix = graylog2
>-
>-# Do you want to allow searches with leading wildcards? This can be extremely resource hungry and should only
>-# be enabled with care. See also: https://www.graylog.org/documentation/general/queries/
>-allow_leading_wildcard_searches = false
>-
>-# Do you want to allow searches to be highlighted? Depending on the size of your messages this can be memory hungry and
>-# should only be enabled after making sure your Elasticsearch cluster has enough memory.
>-allow_highlighting = false
>-
>-# settings to be passed to elasticsearch's client (overriding those in the provided elasticsearch_config_file)
>-# all these
>-# this must be the same as for your Elasticsearch cluster
>-#elasticsearch_cluster_name = graylog2
>-
>-# you could also leave this out, but makes it easier to identify the graylog2 client instance
>-#elasticsearch_node_name = graylog2-server
>-
>-# we don't want the graylog2 server to store any data, or be master node
>-#elasticsearch_node_master = false
>-#elasticsearch_node_data = false
>-
>-# use a different port if you run multiple Elasticsearch nodes on one machine
>-#elasticsearch_transport_tcp_port = 9350
>-
>-# we don't need to run the embedded HTTP server here
>-#elasticsearch_http_enabled = false
>-
>-#elasticsearch_discovery_zen_ping_multicast_enabled = false
>-#elasticsearch_discovery_zen_ping_unicast_hosts = 192.168.1.203:9300
>-
>-# Change the following setting if you are running into problems with timeouts during Elasticsearch cluster discovery.
>-# The setting is specified in milliseconds, the default is 5000ms (5 seconds).
>-#elasticsearch_cluster_discovery_timeout = 5000
>-
>-# the following settings allow to change the bind addresses for the Elasticsearch client in graylog2
>-# these settings are empty by default, letting Elasticsearch choose automatically,
>-# override them here or in the 'elasticsearch_config_file' if you need to bind to a special address
>-# refer to http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/modules-network.html
>-# for special values here
>-#elasticsearch_network_host =
>-#elasticsearch_network_bind_host =
>-#elasticsearch_network_publish_host =
>-
>-# The total amount of time discovery will look for other Elasticsearch nodes in the cluster
>-# before giving up and declaring the current node master.
>-#elasticsearch_discovery_initial_state_timeout = 3s
>-
>-# Analyzer (tokenizer) to use for message and full_message field. The "standard" filter usually is a good idea.
>-# All supported analyzers are: standard, simple, whitespace, stop, keyword, pattern, language, snowball, custom
>-# Elasticsearch documentation: http://www.elasticsearch.org/guide/reference/index-modules/analysis/
>-# Note that this setting only takes effect on newly created indices.
>-elasticsearch_analyzer = standard
>-
>-# Batch size for the Elasticsearch output. This is the maximum (!) number of messages the Elasticsearch output
>-# module will get at once and write to Elasticsearch in a batch call. If the configured batch size has not been
>-# reached within output_flush_interval seconds, everything that is available will be flushed at once. Remember
>-# that every outputbuffer processor manages its own batch and performs its own batch write calls.
>-# ("outputbuffer_processors" variable)
>-output_batch_size = 500
>-
>-# Flush interval (in seconds) for the Elasticsearch output. This is the maximum amount of time between two
>-# batches of messages written to Elasticsearch. It is only effective at all if your minimum number of messages
>-# for this time period is less than output_batch_size * outputbuffer_processors.
>-output_flush_interval = 1
>-
>-# As stream outputs are loaded only on demand, an output which is failing to initialize will be tried over and
>-# over again. To prevent this, the following configuration options define after how many faults an output will
>-# not be tried again for an also configurable amount of seconds.
>-output_fault_count_threshold = 5
>-output_fault_penalty_seconds = 30
>-
>-# The number of parallel running processors.
>-# Raise this number if your buffers are filling up.
>-processbuffer_processors = 5
>-outputbuffer_processors = 3
>-
>-#outputbuffer_processor_keep_alive_time = 5000
>-#outputbuffer_processor_threads_core_pool_size = 3
>-#outputbuffer_processor_threads_max_pool_size = 30
>-
>-# UDP receive buffer size for all message inputs (e. g. SyslogUDPInput).
>-#udp_recvbuffer_sizes = 1048576
>-
>-# Wait strategy describing how buffer processors wait on a cursor sequence. (default: sleeping)
>-# Possible types:
>-#  - yielding
>-#     Compromise between performance and CPU usage.
>-#  - sleeping
>-#     Compromise between performance and CPU usage. Latency spikes can occur after quiet periods.
>-#  - blocking
>-#     High throughput, low latency, higher CPU usage.
>-#  - busy_spinning
>-#     Avoids syscalls which could introduce latency jitter. Best when threads can be bound to specific CPU cores.
>-processor_wait_strategy = blocking
>-
>-# Size of internal ring buffers. Raise this if raising outputbuffer_processors does not help anymore.
>-# For optimum performance your LogMessage objects in the ring buffer should fit in your CPU L3 cache.
>-# Start server with --statistics flag to see buffer utilization.
>-# Must be a power of 2. (512, 1024, 2048, ...)
>-ring_size = 65536
>-
>-inputbuffer_ring_size = 65536
>-inputbuffer_processors = 2
>-inputbuffer_wait_strategy = blocking
>-
>-# Enable the disk based message journal.
>-message_journal_enabled = true
>-
>-# The directory which will be used to store the message journal. The directory must me exclusively used by Graylog and
>-# must not contain any other files than the ones created by Graylog itself.
>-message_journal_dir = data/journal
>-
>-# Journal hold messages before they could be written to Elasticsearch.
>-# For a maximum of 12 hours or 5 GB whichever happens first.
>-# During normal operation the journal will be smaller.
>-#message_journal_max_age = 12h
>-#message_journal_max_size = 5gb
>-
>-#message_journal_flush_age = 1m
>-#message_journal_flush_interval = 1000000
>-#message_journal_segment_age = 1h
>-#message_journal_segment_size = 100mb
>-
>-# Number of threads used exclusively for dispatching internal events. Default is 2.
>-#async_eventbus_processors = 2
>-
>-# EXPERIMENTAL: Dead Letters
>-# Every failed indexing attempt is logged by default and made visible in the web-interface. You can enable
>-# the experimental dead letters feature to write every message that was not successfully indexed into the
>-# MongoDB "dead_letters" collection to make sure that you never lose a message. The actual writing of dead
>-# letter should work fine already but it is not heavily tested yet and will get more features in future
>-# releases.
>-dead_letters_enabled = false
>-
>-# How many seconds to wait between marking node as DEAD for possible load balancers and starting the actual
>-# shutdown process. Set to 0 if you have no status checking load balancers in front.
>-lb_recognition_period_seconds = 3
>-
>-# Every message is matched against the configured streams and it can happen that a stream contains rules which
>-# take an unusual amount of time to run, for example if its using regular expressions that perform excessive backtracking.
>-# This will impact the processing of the entire server. To keep such misbehaving stream rules from impacting other
>-# streams, Graylog limits the execution time for each stream.
>-# The default values are noted below, the timeout is in milliseconds.
>-# If the stream matching for one stream took longer than the timeout value, and this happened more than "max_faults" times
>-# that stream is disabled and a notification is shown in the web interface.
>-#stream_processing_timeout = 2000
>-#stream_processing_max_faults = 3
>-
>-# Length of the interval in seconds in which the alert conditions for all streams should be checked
>-# and alarms are being sent.
>-#alert_check_interval = 60
>-
>-# Since 0.21 the graylog2 server supports pluggable output modules. This means a single message can be written to multiple
>-# outputs. The next setting defines the timeout for a single output module, including the default output module where all
>-# messages end up.
>-#
>-# Time in milliseconds to wait for all message outputs to finish writing a single message.
>-#output_module_timeout = 10000
>-
>-# Time in milliseconds after which a detected stale master node is being rechecked on startup.
>-#stale_master_timeout = 2000
>-
>-# Time in milliseconds which Graylog is waiting for all threads to stop on shutdown.
>-#shutdown_timeout = 30000
>-
>-# MongoDB Configuration
>-mongodb_useauth = false
>-#mongodb_user = grayloguser
>-#mongodb_password = 123
>-mongodb_host = 127.0.0.1
>-#mongodb_replica_set = localhost:27017,localhost:27018,localhost:27019
>-mongodb_database = graylog2
>-mongodb_port = 27017
>-
>-# Raise this according to the maximum connections your MongoDB server can handle if you encounter MongoDB connection problems.
>-mongodb_max_connections = 100
>-
>-# Number of threads allowed to be blocked by MongoDB connections multiplier. Default: 5
>-# If mongodb_max_connections is 100, and mongodb_threads_allowed_to_block_multiplier is 5, then 500 threads can block. More than that and an exception will be thrown.
>-# http://api.mongodb.org/java/current/com/mongodb/MongoOptions.html#threadsAllowedToBlockForConnectionMultiplier
>-mongodb_threads_allowed_to_block_multiplier = 5
>-
>-# Drools Rule File (Use to rewrite incoming log messages)
>-# See: https://www.graylog.org/documentation/general/rewriting/
>-#rules_file = /usr/local/etc/graylog/server/rules.drl
>-
>-# Email transport
>-#transport_email_enabled = false
>-#transport_email_hostname = mail.example.com
>-#transport_email_port = 587
>-#transport_email_use_auth = true
>-#transport_email_use_tls = true
>-#transport_email_use_ssl = true
>-#transport_email_auth_username = you@example.com
>-#transport_email_auth_password = secret
>-#transport_email_subject_prefix = [graylog2]
>-#transport_email_from_email = graylog2@example.com
>-
>-# Specify and uncomment this if you want to include links to the stream in your stream alert mails.
>-# This should define the fully qualified base url to your web interface exactly the same way as it is accessed by your users.
>-#transport_email_web_interface_url = https://graylog2.example.com
>-
>-# HTTP proxy for outgoing HTTP calls
>-#http_proxy_uri =
>-
>-# Disable the optimization of Elasticsearch indices after index cycling. This may take some load from Elasticsearch
>-# on heavily used systems with large indices, but it will decrease search performance. The default is to optimize
>-# cycled indices.
>-#disable_index_optimization = true
>-
>-# Optimize the index down to <= index_optimization_max_num_segments. A higher number may take some load from Elasticsearch
>-# on heavily used systems with large indices, but it will decrease search performance. The default is 1.
>-#index_optimization_max_num_segments = 1
>-
>-# Disable the index range calculation on all open/available indices and only calculate the range for the latest
>-# index. This may speed up index cycling on systems with large indices but it might lead to wrong search results
>-# in regard to the time range of the messages (i. e. messages within a certain range may not be found). The default
>-# is to calculate the time range on all open/available indices.
>-#disable_index_range_calculation = true
>-
>-# The threshold of the garbage collection runs. If GC runs take longer than this threshold, a system notification
>-# will be generated to warn the administrator about possible problems with the system. Default is 1 second.
>-#gc_warning_threshold = 1s
>-
>-# Connection timeout for a configured LDAP server (e. g. ActiveDirectory) in milliseconds.
>-#ldap_connection_timeout = 2000
>-
>-# https://github.com/bazhenov/groovy-shell-server
>-#groovy_shell_enable = false
>-#groovy_shell_port = 6789
>-
>-# Enable collection of Graylog-related metrics into MongoDB
>-#enable_metrics_collection = false
>-
>-# Disable the use of SIGAR for collecting system stats
>-#disable_sigar = false
>-
>
>Property changes on: files/graylog.conf.example
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/graylog.in
>===================================================================
>--- files/graylog.in	(revision 435348)
>+++ files/graylog.in	(working copy)
>@@ -19,7 +19,7 @@
> #   Name of the graylog group
> #
> # graylog_config (string)
>-#   Default value %%ETCDIR%%/graylog.conf
>+#   Default value %%ETCDIR%%/server/server.conf
> #   Path to the graylog configuration file
> #
> # graylog_min_mem (string):
>@@ -31,20 +31,20 @@
> #   Maximum JVM heap size
> #
> # graylog_dir (string):
>-#   Default value: %%GRAYLOG_DIR%%
>-#   Path the the graylog installation.
>+#   Default value: %%DATADIR%%
>+#   Path to the graylog installation.
> #
>+# graylog_data_dir (string):
>+#   Default vaule: %%GRAYLOG_DATA_DIR%%
>+#   Storage location for the graylog journal
>+#
> # graylog_run_dir (string):
> #   Default value: /var/graylog
>-#   Path the the graylog run folder.
>+#   Path to the graylog run folder.
> #
>-# graylog_java_home (string):
>-#   Default value: %%JAVA_HOME%%
>-#   Root directory of the desired Java SDK.
>-#
>-# graylog_log4j_config (string):
>-#   Default value: file://%%ETCDIR%%/graylog_logging.xml
>-#   Path to the log4j configuration file for graylog
>+# graylog_log_file (string):
>+#   Default value: /var/log/graylog-server.log
>+#   Path to the Graylog Server logfile
> 
> . /etc/rc.subr
> 
>@@ -55,13 +55,13 @@
> : ${graylog_enable:="NO"}
> : ${graylog_user:="%%GRAYLOGUSER%%"}
> : ${graylog_group:="%%GRAYLOGGROUP%%"}
>-: ${graylog_config:="%%ETCDIR%%/${name}.conf"}
>+: ${graylog_config:="%%ETCDIR%%/server/server.conf"}
> : ${graylog_min_mem:="256m"}
> : ${graylog_max_mem:="1g"}
>-: ${graylog_dir:="%%GRAYLOG_DIR%%"}
>-: ${graylog_run_dir:="/var/graylog"}
>-: ${graylog_java_home:="%%JAVA_HOME%%"}
>-: ${graylog_log4j_config="file://%%ETCDIR%%/graylog_logging.xml"}
>+: ${graylog_dir:="%%DATADIR%%"}
>+: ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"}
>+: ${graylog_run_dir:="/var/run/graylog"}
>+: ${graylog_log_file:="/var/log/graylog-server.log"}
> 
> 
> java_options=" -Xms${graylog_min_mem} \
>@@ -72,25 +72,33 @@
>                -XX:+CMSConcurrentMTEnabled \
>                -XX:+CMSClassUnloadingEnabled \
>                -XX:+UseParNewGC \
>-               -XX:-OmitStackTraceInFastThrow\
>-               -Djava.library.path=${graylog_dir}/lib/sigar \
>-               -Dlog4j.configuration=${graylog_log4j_config}"
>+               -XX:-OmitStackTraceInFastThrow"
> 
> start_precmd="graylog_precmd"
> 
>-pidfile=/var/run/${name}.pid
>-command=/usr/sbin/daemon
>-procname=`env JAVAVM_DRYRUN=true JAVA_VERSION=1.7+ %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -f 2 -d =`
>+pidfile="${graylog_run_dir}/${name}.pid"
>+command=/usr/bin/nohup
> 
>-command_args="-p $pidfile -f /usr/local/bin/java ${java_options} -jar ${graylog_dir}/graylog.jar server --configfile ${graylog_config} --no-pid-file"
>+command_args="%%LOCALBASE%%/bin/java -jar ${graylog_dir}/graylog.jar server \
>+              --configfile \"${graylog_config}\" \
>+              --pidfile \"${pidfile}\" \
>+              >> \"${graylog_log_file}\" \
>+              2>> \"${graylog_log_file}\" &"
> 
> graylog_precmd() {
>-    /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 /var/log/graylog
>-    /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 /var/log/graylog/server
>-    /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 ${graylog_run_dir}
>-    touch $pidfile
>-    chown ${graylog_user}:${graylog_group} ${pidfile}
>-    cd ${graylog_run_dir}
>+    if [ ! -f "${graylog_config}" ]; then
>+        echo "Configuration file ${graylog_config} not found"
>+        exit 1
>+    fi
>+
>+    if [ ! -f "${graylog_log_file}" ]; then
>+        touch "${graylog_log_file}"
>+        chown "${graylog_user}:${graylog_group}" "${graylog_log_file}"
>+        chmod 640 "${graylog_log_file}"
>+    fi
>+
>+    install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_data_dir}"
>+    install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_run_dir}"
> }
> 
> run_rc_command "$1"
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(nonexistent)
>+++ files/pkg-message.in	(working copy)
>@@ -0,0 +1,10 @@
>+======================================================================
>+
>+Please see %%ETCDIR%% for sample versions of
>+server.conf
>+
>+For GeoIP support you need to install the net/GeoIP port and
>+configure the path to the GeoIP databases in the Graylog Web Interface
>+
>+When running graylog in a jail, you need to set enforce_statfs for the jail.
>+======================================================================
>
>Property changes on: files/pkg-message.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/server.conf.sample.in
>===================================================================
>--- files/server.conf.sample.in	(revision 435348)
>+++ files/server.conf.sample.in	(working copy)
>@@ -30,7 +30,7 @@
> #root_timezone = UTC
> 
> # Set plugin directory here (relative or absolute)
>-plugin_dir = plugin
>+plugin_dir = %%DATADIR%%/plugin
> 
> # REST API listen URI. Must be reachable by other graylog2-server nodes if you run a cluster.
> rest_listen_uri = http://127.0.0.1:12900/
>@@ -247,7 +247,7 @@
> 
> # The directory which will be used to store the message journal. The directory must me exclusively used by Graylog and
> # must not contain any other files than the ones created by Graylog itself.
>-message_journal_dir = data/journal
>+message_journal_dir = %%GRAYLOG_DATA_DIR%%/journal
> 
> # Journal hold messages before they could be written to Elasticsearch.
> # For a maximum of 12 hours or 5 GB whichever happens first.
>@@ -372,5 +372,5 @@
> #enable_metrics_collection = false
> 
> # Disable the use of SIGAR for collecting system stats
>-#disable_sigar = false
>+disable_sigar = true
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 435348)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,9 @@
>-%%ETCDIR%%/graylog.conf.example
>-%%ETCDIR%%/graylog_logging.xml
>-graylog/graylog.jar
>+@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/server/server.conf.sample
>+%%DATADIR%%/graylog.jar
>+%%DATADIR%%/plugin/graylog-plugin-anonymous-usage-statistics-2.2.1.jar
>+%%DATADIR%%/plugin/graylog-plugin-beats-2.2.1.jar
>+%%DATADIR%%/plugin/graylog-plugin-collector-2.2.1.jar
>+%%DATADIR%%/plugin/graylog-plugin-enterprise-integration-2.2.1.jar
>+%%DATADIR%%/plugin/graylog-plugin-map-widget-2.2.1.jar
>+%%DATADIR%%/plugin/graylog-plugin-pipeline-processor-2.2.1.jar
>+@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%GRAYLOG_DATA_DIR%%

Flags:

thomas: maintainer-approval+

Actions: View | Diff

Attachments on bug 216593: 179417 | 180078 | 180435 | 180476