diff --git a/roles/base/templates/iptables/iptables.staging b/roles/base/templates/iptables/iptables.staging index c1e6930c50..b5f54cf43b 100644 --- a/roles/base/templates/iptables/iptables.staging +++ b/roles/base/templates/iptables/iptables.staging @@ -31,6 +31,10 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.16 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 38.145.60.15 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 10.3.163.10 -j ACCEPT +# zabbix01.stg +-A INPUT -p tcp -m tcp --dport 10051 -j ACCEPT +-A INPUT -p tcp -m tcp --dport 10050 -s 10.3.166.61 -j ACCEPT + # if the host declares a fedmsg-enabled wsgi app, open ports for it {% if wsgi_fedmsg_service is defined %} diff --git a/roles/zabbix/zabbix_server/defaults/main.yml b/roles/zabbix/zabbix_server/defaults/main.yml index 83f6214af9..ddafa9fc26 100644 --- a/roles/zabbix/zabbix_server/defaults/main.yml +++ b/roles/zabbix/zabbix_server/defaults/main.yml @@ -17,4 +17,5 @@ zabbix_server_pkgs: - zabbix-agent - postgresql-server - python3-psycopg2 + - nmap diff --git a/roles/zabbix/zabbix_server/tasks/db.yml b/roles/zabbix/zabbix_server/tasks/db.yml index 553e31cf04..ab440b3d0c 100644 --- a/roles/zabbix/zabbix_server/tasks/db.yml +++ b/roles/zabbix/zabbix_server/tasks/db.yml @@ -4,6 +4,7 @@ ansible.builtin.shell: postgresql-setup initdb args: executable: /bin/bash + ignore_errors: True tags: - db-configure @@ -28,7 +29,6 @@ - name: Configure the zabbix db ansible.builtin.shell: "sudo -u postgres createdb -O {{ zabbix_db_user }} {{ zabbix_db_name }}" -# no_log: True tags: - db-configure @@ -36,6 +36,7 @@ ansible.builtin.shell: "zcat /usr/share/zabbix-sql-scripts/postgresql/server.sql.gz | sudo -u zabbix psql zabbix" args: executable: /bin/bash + ignore_errors: True tags: - db-configure diff --git a/roles/zabbix/zabbix_server/tasks/install.yml b/roles/zabbix/zabbix_server/tasks/install.yml index ecf7ee616c..2aa34ecb2c 100644 --- a/roles/zabbix/zabbix_server/tasks/install.yml +++ b/roles/zabbix/zabbix_server/tasks/install.yml @@ -17,6 +17,7 @@ - name: Install the zabbix rpm command: "rpm -Uvh https://repo.zabbix.com/zabbix/6.0/rhel/9/x86_64/zabbix-release-6.0-4.el9.noarch.rpm" + ignore_errors: True tags: - packages diff --git a/roles/zabbix/zabbix_server/tasks/main.yml b/roles/zabbix/zabbix_server/tasks/main.yml index 3ced79bf83..e0a8e07326 100644 --- a/roles/zabbix/zabbix_server/tasks/main.yml +++ b/roles/zabbix/zabbix_server/tasks/main.yml @@ -1,7 +1,6 @@ --- - include_tasks: install.yml -# - include_tasks: db.yml # - include_tasks: plugins.yml - include_tasks: start_services.yml