Skip to content
Snippets Groups Projects
Commit 073bde71 authored by Matevz Erzen's avatar Matevz Erzen Committed by Zitnik, Anze
Browse files

Vagrant update

parent 08c1873e
No related branches found
No related tags found
No related merge requests found
...@@ -16,14 +16,17 @@ In addition to Wazuh, ClamAV is also installed on agent machines. ...@@ -16,14 +16,17 @@ In addition to Wazuh, ClamAV is also installed on agent machines.
## Requirements ## Requirements
* Vagrant 2.2.14 * Vagrant `2.2.19`
* Ansible 2.9.16 * VirtualBox `6.1.32`
* Ansible `>=2.9.6`
* (optional / integrations) `npm` / `npx` in order to run the simple HTTP server for the integrations * (optional / integrations) `npm` / `npx` in order to run the simple HTTP server for the integrations
--- ---
## Setting up the demo ## Setting up the demo
> Important: make sure you have installed the right versions of Vagrant and VirtualBox!
1. Checkout Wazuh's tag `v4.1.5` into the current directory: 1. Checkout Wazuh's tag `v4.1.5` into the current directory:
``` ```
...@@ -48,6 +51,8 @@ In addition to Wazuh, ClamAV is also installed on agent machines. ...@@ -48,6 +51,8 @@ In addition to Wazuh, ClamAV is also installed on agent machines.
$ make create provision $ make create provision
``` ```
> Note: `create` command also adds `/etc/vbox/networks.conf` config required by Vagrant/VirtualBox.
--- ---
## Using demo components ## Using demo components
...@@ -69,14 +74,15 @@ Clouditor starts automatically when Clouditor VM is provisioned. ...@@ -69,14 +74,15 @@ Clouditor starts automatically when Clouditor VM is provisioned.
To see Clouditor's output, `ssh` to its machine and examine the log file: To see Clouditor's output, `ssh` to its machine and examine the log file:
``` ```
$ make ssh-clouditor $ make logs-clouditor
$ tail /var/log/clouditor.log
``` ```
To manually (re)start Clouditor (normally not needed), you can use the following command on the Clouditor VM (inside `/home/vagrant/clouditor`): To manually (re)start Clouditor (normally not needed), you can use the following command on the Clouditor VM (inside `/home/vagrant/clouditor`):
``` ```
$ make run $ make ssh-clouditor # on host machine
$ make run # on VM
``` ```
### Evidence Collector ### Evidence Collector
...@@ -84,8 +90,7 @@ $ make run ...@@ -84,8 +90,7 @@ $ make run
To see Evidence Collector's output, `ssh` to its machine and open Docker logs: To see Evidence Collector's output, `ssh` to its machine and open Docker logs:
``` ```
$ make ssh-evidence-collector $ make logs-evidence-collector
$ docker logs -ft evidence-collector
``` ```
### Wazuh ### Wazuh
......
...@@ -6,7 +6,6 @@ servers=[ ...@@ -6,7 +6,6 @@ servers=[
:hostname => "manager", :hostname => "manager",
:ip => "192.168.33.10", :ip => "192.168.33.10",
:box => "centos/stream8", :box => "centos/stream8",
:forward_ports => [{:guest => 55000, :host => 55000}, {:guest => 9200, :host => 9200}],
:ram => 2048, :ram => 2048,
:cpu => 2 :cpu => 2
}, },
...@@ -35,7 +34,6 @@ servers=[ ...@@ -35,7 +34,6 @@ servers=[
:hostname => "clouditor", :hostname => "clouditor",
:ip => "192.168.33.14", :ip => "192.168.33.14",
:box => "centos/stream8", :box => "centos/stream8",
:forward_ports => [{:guest => 9090, :host => 9090}],
:ram => 1024, :ram => 1024,
:cpu => 1 :cpu => 1
} }
...@@ -44,9 +42,6 @@ servers=[ ...@@ -44,9 +42,6 @@ servers=[
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
servers.each do |machine| servers.each do |machine|
config.vm.define machine[:hostname] do |node| config.vm.define machine[:hostname] do |node|
# node.vm.provision "ansible" do |ansible|
# ansible.playbook = "../../ansible/provision.yml"
# end
node.vm.box = machine[:box] node.vm.box = machine[:box]
node.vm.hostname = machine[:hostname] node.vm.hostname = machine[:hostname]
node.vm.network "private_network", ip: machine[:ip] node.vm.network "private_network", ip: machine[:ip]
......
...@@ -3,6 +3,9 @@ SSH_PRIVATE_KEY = $(HOME)/.vagrant.d/insecure_private_key ...@@ -3,6 +3,9 @@ SSH_PRIVATE_KEY = $(HOME)/.vagrant.d/insecure_private_key
SSH_USER = vagrant SSH_USER = vagrant
create: create:
sudo mkdir -p /etc/vbox
sudo touch /etc/vbox/networks.conf
grep -Fxq "* 192.168.33.0/24" /etc/vbox/networks.conf || sudo sh -c 'echo "* 192.168.33.0/24\n" >> /etc/vbox/networks.conf'
@$(VAGRANT_RUN) up @$(VAGRANT_RUN) up
delete: delete:
......
...@@ -3,6 +3,9 @@ SSH_PRIVATE_KEY = $(HOME)/.vagrant.d/insecure_private_key ...@@ -3,6 +3,9 @@ SSH_PRIVATE_KEY = $(HOME)/.vagrant.d/insecure_private_key
SSH_USER = vagrant SSH_USER = vagrant
create: create:
sudo mkdir -p /etc/vbox
sudo touch /etc/vbox/networks.conf
grep -Fxq "* 192.168.33.0/24" /etc/vbox/networks.conf || sudo sh -c 'echo "* 192.168.33.0/24\n" >> /etc/vbox/networks.conf'
@$(VAGRANT_RUN) up @$(VAGRANT_RUN) up
delete: delete:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment