removed Java installation tasks for SysV systems

This commit is contained in:
Rshad Zhran 2019-08-16 10:27:42 +02:00
parent 69427edea6
commit da005fea58
7 changed files with 42 additions and 60 deletions

View File

@ -11,23 +11,23 @@ lint:
platforms:
- name: trusty
image: ubuntu:trusty
- name: bionic
image: solita/ubuntu-systemd:bionic
command: /sbin/init
privileged: true
- name: xenial
image: solita/ubuntu-systemd:xenial
privileged: true
command: /sbin/init
- name: centos6
image: geerlingguy/docker-centos6-ansible
privileged: true
command: /sbin/init
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- name: centos7
image: milcom/centos7-systemd
privileged: true
# - name: bionic
# image: solita/ubuntu-systemd:bionic
# command: /sbin/init
# privileged: true
# - name: xenial
# image: solita/ubuntu-systemd:xenial
# privileged: true
# command: /sbin/init
#- name: centos6
# image: geerlingguy/docker-centos6-ansible
# privileged: true
# command: /sbin/init
# volumes:
# - /sys/fs/cgroup:/sys/fs/cgroup:ro
#- name: centos7
# image: milcom/centos7-systemd
# privileged: true
provisioner:
name: ansible
playbooks:

View File

@ -7,6 +7,7 @@
- name: "Install Python packages for Trusty to solve trust issues"
package:
name:
- python-apt
- python-setuptools
- python-pip
state: latest

View File

@ -9,31 +9,31 @@ lint:
config-data:
ignore: .virtualenv
platforms:
- name: bionic
image: solita/ubuntu-systemd:bionic
command: /sbin/init
ulimits:
- nofile:262144:262144
privileged: true
memory_reservation: 1024m
- name: xenial
image: solita/ubuntu-systemd:xenial
privileged: true
memory_reservation: 1024m
command: /sbin/init
ulimits:
- nofile:262144:262144
# - name: bionic
# image: solita/ubuntu-systemd:bionic
# command: /sbin/init
# ulimits:
# - nofile:262144:262144
# privileged: true
# memory_reservation: 1024m
# - name: xenial
# image: solita/ubuntu-systemd:xenial
# privileged: true
# memory_reservation: 1024m
# command: /sbin/init
# ulimits:
# - nofile:262144:262144
# - name: trusty
# image: ubuntu:trusty
# memory_reservation: 1024m
# ulimits:
# - nofile:262144:262144
- name: centos6
image: centos:6
privileged: true
memory_reservation: 1024m
ulimits:
- nofile:262144:262144
# - name: centos6
# image: centos:6
# privileged: true
# memory_reservation: 1024m
# ulimits:
# - nofile:262144:262144
- name: centos7
image: milcom/centos7-systemd
memory_reservation: 1024m

View File

@ -3,3 +3,4 @@
hosts: all
roles:
- role: elastic-stack/ansible-kibana

View File

@ -8,12 +8,6 @@
register: elasticsearch_ca_packages_installed
until: elasticsearch_ca_packages_installed is succeeded
- name: "Install Java Repo for Trusty"
apt_repository: repo='ppa:openjdk-r/ppa'
when:
- ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14
- name: Update and upgrade apt packages
become: true
apt:
@ -24,14 +18,6 @@
- ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14
- name: Install Oracle Java 8
become: true
apt: name=openjdk-8-jdk
when:
- ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14
- name: Update and upgrade apt packages
become: true
apt:

View File

@ -9,13 +9,6 @@
gpgcheck: true
changed_when: false
- name: CentOS x.x => x.x < 7.0 | Installing Java
yum:
name: java-1.8.0-openjdk.x86_64
state: present
when:
- ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int < 7
- name: RedHat/CentOS/Fedora | Install Elasticsarch
package: name=elasticsearch-{{ elastic_stack_version }} state=present
tags: install

View File

@ -90,13 +90,14 @@
- name: Download Filebeat module package
get_url:
url: https://packages-dev.wazuh.com/3.x/filebeat/{{ filebeat_module_package_name }}
url: https://packages.wazuh.com/3.x/filebeat/{{ filebeat_module_package_name }}
dest: "{{ filebeat_module_package_path }}"
- name: Unpakcaging Filebeat module package
unarchive:
unarchive:
src: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}"
dest: "{{ filebeat_module_destination }}"
remote_src: yes
- name: Setting 0755 permission for Filebeat module folder
file: dest={{ filebeat_module_folder }} mode=u=rwX,g=rwX,o=rwX recurse=yes