Skip to content
Snippets Groups Projects
Verified Commit 13078f86 authored by Florian Pritz's avatar Florian Pritz
Browse files

Enable cpu/memory accounting by default


The discovery script now uses a regex and no longer cares where exactly
accounting is enabled. Follow systemd upstream by enabling it by
default.

Signed-off-by: default avatarFlorian Pritz <bluewind@xinu.at>
parent d2911ed1
No related branches found
No related tags found
No related merge requests found
......@@ -49,6 +49,3 @@
- name: start spampd
service: name=spampd enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property spampd CPUAccounting=yes MemoryAccounting=yes
......@@ -17,9 +17,6 @@
- name: start and enable sshd
service: name=sshd enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property sshd CPUAccounting=yes MemoryAccounting=yes
- name: open firewall holes
firewalld: service=ssh permanent=true state=enabled
when: configure_firewall
......@@ -27,9 +27,6 @@
- syncrepo.timer
- rsyncd.socket
- name: enable systemd ressource accounting
command: systemctl set-property system-rsyncd.slice CPUAccounting=yes MemoryAccounting=yes
- name: set local mirror as cachedir
lineinfile:
dest: /etc/pacman.conf
......
......@@ -13,6 +13,3 @@
- name: Active service
service: name=unbound state=started enabled=yes
- name: enable systemd ressource accounting
command: systemctl set-property unbound CPUAccounting=yes MemoryAccounting=yes
......@@ -59,16 +59,9 @@
service: name=nginx-zabbix.service enabled=yes state=started
when: "'nginx' in group_names"
- name: enable systemd ressource accounting
command: systemctl set-property nginx-zabbix CPUAccounting=yes MemoryAccounting=yes
when: "'nginx' in group_names"
- name: run zabbix agent service
service: name=zabbix-agent enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property zabbix-agent CPUAccounting=yes MemoryAccounting=yes
- name: open firewall holes
firewalld: service=zabbix-agent permanent=true state=enabled
when: configure_firewall
......@@ -63,8 +63,3 @@
- name: start and enable systemd socket
service: name=php-fpm@zabbix-web.socket state=started enabled=true
- name: enable systemd ressource accounting php-fpm
command: systemctl set-property php-fpm@zabbix-web CPUAccounting=yes MemoryAccounting=yes
- name: enable systemd ressource accounting zabbix-server
command: systemctl set-property zabbix-server-pgsql CPUAccounting=yes MemoryAccounting=yes
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment