From ee3ff4847b44d301eb635202bf82ab965b83418d Mon Sep 17 00:00:00 2001 From: Miguelangel Freitas Date: Tue, 15 May 2018 01:19:52 +0000 Subject: [PATCH] Update License and copyright, thanks @jlruizmlg --- README.md | 4 ++++ docker-compose.yml | 5 +++-- kibana/Dockerfile | 1 + kibana/config/entrypoint.sh | 1 + logstash/Dockerfile | 1 + logstash/config/01-wazuh.conf | 1 + logstash/config/run.sh | 2 +- nginx/Dockerfile | 1 + nginx/config/entrypoint.sh | 1 + wazuh/Dockerfile | 1 + wazuh/config/entrypoint.sh | 1 + wazuh/config/filebeat.yml | 1 + wazuh/config/init.bash | 1 + 13 files changed, 18 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 88b1b9ea..9bfe6b26 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,10 @@ These Docker containers are based on: We thank you them and everyone else who has contributed to this project. +## License and copyright + +Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) + ## Wazuh official website [Wazuh website](http://wazuh.com) diff --git a/docker-compose.yml b/docker-compose.yml index 24dfe8c3..1c9dc053 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) version: '2' services: @@ -48,12 +49,12 @@ services: - cluster.name=wazuh - network.host=0.0.0.0 - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms4g -Xmx4g" + - "ES_JAVA_OPTS=-Xms1g -Xmx1g" ulimits: memlock: soft: -1 hard: -1 - mem_limit: 8g + mem_limit: 2g # volumes: # - my-path:/usr/share/elasticsearch/data:Z networks: diff --git a/kibana/Dockerfile b/kibana/Dockerfile index be9ab9db..a62a77bb 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,3 +1,4 @@ +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/kibana/kibana-oss:6.2.4 ARG WAZUH_APP_VERSION=3.2.2_6.2.4 USER root diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh index 603ee1b2..a597af8f 100644 --- a/kibana/config/entrypoint.sh +++ b/kibana/config/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) set -e diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 3cfa1d9f..02b6a1ab 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,3 +1,4 @@ +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/logstash/logstash-oss:6.2.4 RUN rm -f /usr/share/logstash/pipeline/logstash.conf diff --git a/logstash/config/01-wazuh.conf b/logstash/config/01-wazuh.conf index ed998448..ee23fb08 100644 --- a/logstash/config/01-wazuh.conf +++ b/logstash/config/01-wazuh.conf @@ -1,3 +1,4 @@ +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) # Wazuh - Logstash configuration file ## Remote Wazuh Manager - Filebeat input input { diff --git a/logstash/config/run.sh b/logstash/config/run.sh index 55d3de67..016c5b5b 100644 --- a/logstash/config/run.sh +++ b/logstash/config/run.sh @@ -1,5 +1,5 @@ #!/bin/bash - +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) # # OSSEC container bootstrap. See the README for information of the environment # variables expected by this script. diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 96decefd..29d4062f 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,3 +1,4 @@ +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM nginx:latest ENV DEBIAN_FRONTEND noninteractive diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index fb1409d6..dca71c34 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/sh +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) set -e diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 47534db9..2c53afde 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,3 +1,4 @@ +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=6.2.4 ARG WAZUH_VERSION=3.2.2-1 diff --git a/wazuh/config/entrypoint.sh b/wazuh/config/entrypoint.sh index 4887e666..b1fbab6e 100644 --- a/wazuh/config/entrypoint.sh +++ b/wazuh/config/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) # # OSSEC container bootstrap. See the README for information of the environment diff --git a/wazuh/config/filebeat.yml b/wazuh/config/filebeat.yml index 7f076793..750d0ed9 100644 --- a/wazuh/config/filebeat.yml +++ b/wazuh/config/filebeat.yml @@ -1,3 +1,4 @@ +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) filebeat: prospectors: - input_type: log diff --git a/wazuh/config/init.bash b/wazuh/config/init.bash index 335da4e1..21306499 100644 --- a/wazuh/config/init.bash +++ b/wazuh/config/init.bash @@ -1,4 +1,5 @@ #!/bin/bash +# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) # # Initialize the custom data directory layout