update from main
This commit is contained in:
parent
0e5982e398
commit
4a44b2898d
|
@ -18,4 +18,4 @@
|
||||||
- name: restart nginx
|
- name: restart nginx
|
||||||
systemd:
|
systemd:
|
||||||
name: nginx
|
name: nginx
|
||||||
state: reloaded
|
state: restarted
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
- name: '[Server] - Install Zabbix from repository'
|
- name: '[Server] - Install Zabbix from repository'
|
||||||
apt:
|
apt:
|
||||||
pkg: "{{ zabbix_server_apt }}"
|
pkg: "{{ zabbix_server_pkg }}"
|
||||||
state: latest
|
state: latest
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
install_recommends: no
|
install_recommends: no
|
||||||
|
@ -10,17 +10,12 @@
|
||||||
notify:
|
notify:
|
||||||
- restart zabbix_server
|
- restart zabbix_server
|
||||||
|
|
||||||
- name: "[Agent] - Make sure the service is enabled"
|
|
||||||
systemd:
|
|
||||||
name: zabbix-server
|
|
||||||
enabled: yes
|
|
||||||
|
|
||||||
- name: '[Server] - Remove apache2'
|
- name: '[Server] - Remove apache2'
|
||||||
apt:
|
apt:
|
||||||
name: "{{ zabbix_apache }}"
|
name: "{{ zabbix_apache }}"
|
||||||
state: absent
|
state: absent
|
||||||
|
|
||||||
- name: "[Check] - Zabbix is already installed?"
|
- name: "[Server] - Check if Zabbix is already installed"
|
||||||
shell:
|
shell:
|
||||||
cmd: "{{ zabbix_server_db_plugin }} -h {{ zabbix_server_db_host }} -u {{ zabbix_server_db_user }} -p{{ zabbix_server_db_passwd }} {{ zabbix_server_db_name }} -se 'SELECT instanceid from config;'"
|
cmd: "{{ zabbix_server_db_plugin }} -h {{ zabbix_server_db_host }} -u {{ zabbix_server_db_user }} -p{{ zabbix_server_db_passwd }} {{ zabbix_server_db_name }} -se 'SELECT instanceid from config;'"
|
||||||
register: zabbix_installed
|
register: zabbix_installed
|
||||||
|
@ -38,9 +33,9 @@
|
||||||
# ERROR 1146 means the table doesn't exist
|
# ERROR 1146 means the table doesn't exist
|
||||||
notify:
|
notify:
|
||||||
- restart zabbix_server
|
- restart zabbix_server
|
||||||
|
- restart nginx
|
||||||
|
|
||||||
- name: "[Server] - Remove default nginx vhost"
|
- name: "[Server] - Make sure the service is enabled"
|
||||||
file:
|
systemd:
|
||||||
path: '/etc/nginx/sites-enabled/default'
|
name: zabbix-server
|
||||||
state: 'absent'
|
enabled: yes
|
||||||
notify: restart nginx
|
|
|
@ -59,18 +59,10 @@ UserParameter=lufi[*],cat /tmp/lufi_stats | grep $1 | cut -d' ' -f2-
|
||||||
# PrivateBin
|
# PrivateBin
|
||||||
UserParameter=privatebin[*],cat /tmp/bin_stats | grep $1 | cut -d' ' -f2-
|
UserParameter=privatebin[*],cat /tmp/bin_stats | grep $1 | cut -d' ' -f2-
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if item.name == 'framadate' %}
|
|
||||||
# Framadate
|
|
||||||
UserParameter=framadate[*],cat /tmp/framadate_stats | grep $1 | cut -d' ' -f2-
|
|
||||||
{% endif %}
|
|
||||||
{% if item.name == 'etherpad' %}
|
{% if item.name == 'etherpad' %}
|
||||||
# Etherpad
|
# Etherpad
|
||||||
UserParameter=etherpad[*],cat /tmp/pad_stats | grep $1 | cut -d' ' -f2-
|
UserParameter=etherpad[*],cat /tmp/pad_stats | grep $1 | cut -d' ' -f2-
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if item.name == 'ethercalc' %}
|
|
||||||
# Ethercalc
|
|
||||||
UserParameter=ethercalc[*],cat /tmp/ethercalc_stats | grep $1 | cut -d' ' -f2-
|
|
||||||
{% endif %}
|
|
||||||
{% if item.name == 'mariadb' %}
|
{% if item.name == 'mariadb' %}
|
||||||
# Mariadb
|
# Mariadb
|
||||||
UserParameter=mysql.ping[*], mysqladmin -h"$1" -P"$2" ping
|
UserParameter=mysql.ping[*], mysqladmin -h"$1" -P"$2" ping
|
||||||
|
|
Loading…
Reference in New Issue