Merge pull request #482 from wazuh/feature-manager-remove-nodejs

Remove unnecesary nodejs dependency
This commit is contained in:
Manuel J. Bernal 2020-11-09 18:14:43 +01:00 committed by GitHub
commit fe67ea2d51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 156 deletions

View File

@ -4,12 +4,6 @@ wazuh_manager_version: 4.0.0-1
wazuh_manager_fqdn: "wazuh-server" wazuh_manager_fqdn: "wazuh-server"
wazuh_manager_package_state: present wazuh_manager_package_state: present
nodejs:
repo_dict:
debian: "deb"
redhat: "rpm"
repo_url_ext: "nodesource.com/setup_10.x"
# Custom packages installation # Custom packages installation
wazuh_custom_packages_installation_manager_enabled: false wazuh_custom_packages_installation_manager_enabled: false
wazuh_custom_packages_installation_manager_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/" wazuh_custom_packages_installation_manager_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/"

View File

@ -1,12 +0,0 @@
---
- name: Debian/Ubuntu | Remove Wazuh repository.
apt_repository:
repo: deb https://packages.wazuh.com/apt {{ ansible_distribution_release }} main
state: absent
changed_when: false
- name: Debian/Ubuntu | Remove Nodejs repository.
apt_repository:
repo: deb https://deb.nodesource.com/node_6.x {{ ansible_distribution_release }} main
state: absent
changed_when: false

View File

@ -1,12 +0,0 @@
---
- name: RedHat/CentOS/Fedora | Remove NodeJS repository (and clean up left-over metadata)
yum_repository:
name: NodeJS
state: absent
changed_when: false
- name: RedHat/CentOS/Fedora | Remove Wazuh repository (and clean up left-over metadata)
yum_repository:
name: wazuh_repo
state: absent
changed_when: false

View File

@ -15,28 +15,6 @@
- tar - tar
state: present state: present
- name: Check if NodeJS service exists
stat:
path: /usr/bin/node
register: node_service_status
- name: Install NodeJS repository
block:
- name: Download NodeJS repository script
get_url:
url: "https://{{ nodejs['repo_dict'][ansible_os_family|lower] }}.{{ nodejs['repo_url_ext'] }}"
dest: /etc/nodejs.sh
mode: 0775
changed_when: false
- name: Run NodeJS bash script
command: sh /etc/nodejs.sh
register: nodejs_script
changed_when: nodejs_script.rc == 0
when:
- not node_service_status.stat.exists
- wazuh_manager_config.cluster.node_type == "master"
- include_tasks: "RedHat.yml" - include_tasks: "RedHat.yml"
when: (ansible_os_family == "RedHat" and ansible_distribution_major_version|int > 5) or (ansible_os_family == "RedHat" and ansible_distribution == "Amazon") when: (ansible_os_family == "RedHat" and ansible_distribution_major_version|int > 5) or (ansible_os_family == "RedHat" and ansible_distribution == "Amazon")
@ -343,12 +321,6 @@
- ( agent_groups is defined) and ( agent_groups|length > 0) - ( agent_groups is defined) and ( agent_groups|length > 0)
tags: molecule-idempotence-notest tags: molecule-idempotence-notest
- include_tasks: "RMRedHat.yml" - name: Run uninstall tasks
when: include_tasks: uninstall.yml
- ansible_os_family == "RedHat" or ansible_os_family == "Amazon" when: not wazuh_manager_sources_installation.enabled
- not wazuh_manager_sources_installation.enabled
- include_tasks: "RMDebian.yml"
when:
- ansible_os_family == "Debian"
- not wazuh_manager_sources_installation.enabled

View File

@ -0,0 +1,15 @@
---
- name: Debian/Ubuntu | Remove Wazuh repository.
apt_repository:
repo: deb https://packages.wazuh.com/apt {{ ansible_distribution_release }} main
state: absent
changed_when: false
when: not wazuh_manager_sources_installation.enabled
- name: RedHat/CentOS/Fedora | Remove Wazuh repository (and clean up left-over metadata)
yum_repository:
name: wazuh_repo
state: absent
changed_when: false
when: ansible_os_family == "RedHat" or ansible_os_family == "Amazon"

View File

@ -1,95 +0,0 @@
var config = {};
// Basic configuration
// Path
config.ossec_path = "/var/ossec";
// The host to bind the API to.
config.host = "{{ wazuh_manager_config.api.bind_addr }}";
// TCP Port used by the API.
config.port = "{{ wazuh_manager_config.api.port }}";
// Use HTTP protocol over TLS/SSL. Values: yes, no.
config.https = "{{ wazuh_manager_config.api.https }}";
// Use HTTP authentication. Values: yes, no.
config.basic_auth = "{{ wazuh_manager_config.api.basic_auth }}";
//In case the API run behind a proxy server, turn to "yes" this feature. Values: yes, no.
config.BehindProxyServer = "{{ wazuh_manager_config.api.behind_proxy_server }}";
// HTTPS Certificates
config.https_key = "{{ wazuh_manager_config.api.https_key }}"
config.https_cert = "{{ wazuh_manager_config.api.https_cert }}"
config.https_use_ca = "{{ wazuh_manager_config.api.https_use_ca }}"
config.https_ca = "{{ wazuh_manager_config.api.https_ca }}"
// Advanced configuration
// Values for API log: disabled, info, warning, error, debug (each level includes the previous level).
config.logs = "info";
// Cross-origin resource sharing. Values: yes, no.
config.cors = "yes";
// Cache (time in milliseconds)
config.cache_enabled = "yes";
config.cache_debug = "no";
config.cache_time = "750";
// Log path
config.log_path = config.ossec_path + "/logs/api.log";
// Python
config.python = [
// Default installation
{
bin: "python",
lib: ""
},
// Python 3
{
bin: "python3",
lib: ""
},
// Package 'python27' for CentOS 6
{
bin: "/opt/rh/python27/root/usr/bin/python",
lib: "/opt/rh/python27/root/usr/lib64"
}
];
// Shared library path
config.ld_library_path = config.ossec_path + "/framework/lib"
// Option to force the use of authd to remove and add agents
config.use_only_authd = {{ wazuh_manager_config.api.use_only_authd }};
// Option to drop privileges (run as ossec)
config.drop_privileges = {{ wazuh_manager_config.api.drop_privileges }};
// Activate features still under development
config.experimental_features = {{ wazuh_manager_config.api.experimental_features }};
/************************* SSL OPTIONS ****************************************/
// SSL protocol
// SSL protocol to use. All available secure protocols available at:
// https://www.openssl.org/docs/man1.0.2/ssl/ssl.html#DEALING-WITH-PROTOCOL-METHODS
config.secureProtocol = "{{ wazuh_manager_config.api.secure_protocol }}";
try {
// Disable the use of SSLv3, TLSv1.1 and TLSv1.0. All available secureOptions at:
// https://nodejs.org/api/crypto.html#crypto_openssl_options
const crypto = require('crypto');
config.secureOptions = crypto.constants.SSL_OP_NO_SSLv3 |
crypto.constants.SSL_OP_NO_TLSv1 |
crypto.constants.SSL_OP_NO_TLSv1_1;
} catch (err) {
console.log("Could not configure NodeJS to avoid unsecure SSL/TLS protocols: " + err)
}
// SSL ciphersuit
// When choosing a cipher, use the server's preferences instead of the client
// preferences. When not set, the SSL server will always follow the clients
// preferences. More info at:
// https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html
config.honorCipherOrder = {{ wazuh_manager_config.api.honor_cipher_order }};
// Modify default ciphersuit. More info:
// https://nodejs.org/api/tls.html#tls_modifying_the_default_tls_cipher_suite
config.ciphers = "{{ wazuh_manager_config.api.ciphers }}";
module.exports = config;