diff --git a/all.yml b/all.yml index 65f0d5e..0c53d5f 100644 --- a/all.yml +++ b/all.yml @@ -15,7 +15,6 @@ msg: "{{ ansible_hostname }} : {{ ansible_distribution }} {{ ansible_distribution_version }} - {{ ansible_default_ipv4.address }}" tags: - always - - test - name: Ensure specified repository packages are into sources list ansible.builtin.apt_repository: @@ -25,13 +24,13 @@ tags: - repo - roles: - { role: grog.management-user, tags: user } - { role: willshersystems.sshd, tags: ssh } - { role: claranet.apt, tags: apt } - { role: robertdebock.fail2ban, tags: ban } - { role: nickhammond.logrotate, tags: log } + - { role: geerlingguy.pip, tags: pip } tasks: diff --git a/docker.yml b/docker.yml index 29097d3..a59ca40 100644 --- a/docker.yml +++ b/docker.yml @@ -1,5 +1,5 @@ --- -- name: Main playbook +- name: Docker and Docker-Compose playbook hosts: all become: true @@ -8,7 +8,6 @@ # roles: - - { role: geerlingguy.pip, tags: [docker, pip] } - { role: geerlingguy.docker, tags: [docker] } # manage docker-compose@dev systemd unit file - { role: tumf.systemd-service, tags: docker-compose, diff --git a/templates/alerts.sh.j2 b/templates/alerts.sh.j2 index 595483b..838f95d 100644 --- a/templates/alerts.sh.j2 +++ b/templates/alerts.sh.j2 @@ -60,4 +60,4 @@ elif [ "$parametre" = "cpu" ]; then [ "$(echo "$(ps -eo %cpu --sort=-%cpu | awk 'NR>1 { sum += $1 } END { print sum }') > $(nproc) * 50" | bc)" -eq 1 ] && curl -u "$username:$password" -H "Title: CPU `nproc` cores" -H "ta:warning" -d "High usage `ps -eo %cpu --sort=-%cpu | awk 'NR>1 { sum += $1 } END { print sum }'`" https://alert.jingoh.fr/{{ alerts_cpu }} else echo "Paramètre invalide : Utilisez [storage|load|ping|health|ssl|backup_git|backup_vault|cpu]" -fi \ No newline at end of file +fi