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: Florian Pritz's avatarFlorian Pritz <bluewind@xinu.at>
parent d2911ed1
......@@ -37,6 +37,3 @@
- name: start and enable arch-boxes timer
service: name='arch-boxes.timer' enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property arch-boxes CPUAccounting=yes MemoryAccounting=yes
......@@ -61,6 +61,3 @@
- name: activate systemd timers for backup
service: name=borg-backup.timer enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property borg-backup CPUAccounting=yes MemoryAccounting=yes
......@@ -38,11 +38,11 @@
#DefaultStartLimitIntervalSec=10s
#DefaultStartLimitBurst=5
#DefaultEnvironment=
DefaultCPUAccounting=no
DefaultCPUAccounting=yes
DefaultIOAccounting=no
DefaultIPAccounting=no
DefaultBlockIOAccounting=no
DefaultMemoryAccounting=no
DefaultMemoryAccounting=yes
DefaultTasksAccounting=yes
#DefaultTasksMax=15%
#DefaultLimitCPU=
......
......@@ -6,6 +6,3 @@
- name: activate cronie.service
service: name=cronie enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property cronie CPUAccounting=yes MemoryAccounting=yes
......@@ -225,9 +225,6 @@
- name: start and enable rsync
service: name=rsyncd.socket enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property system-rsyncd.slice CPUAccounting=yes MemoryAccounting=yes
- name: open firewall holes for rsync
firewalld: service=rsyncd permanent=true state=enabled
when: configure_firewall
......@@ -238,9 +235,6 @@
- name: start and enable svnserve
service: name=svnserve enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property svnserve CPUAccounting=yes MemoryAccounting=yes
- name: open firewall holes for svnserve
firewalld: port=3690/tcp permanent=true state=enabled
when: configure_firewall
......
......@@ -17,9 +17,6 @@
- name: start and enable dovecot
service: name=dovecot enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property dovecot CPUAccounting=yes MemoryAccounting=yes
- name: open firewall holes
firewalld: service={{item}} permanent=true state=enabled
with_items:
......
......@@ -59,6 +59,3 @@
- name: start and enable systemd socket
service: name=php-fpm@flyspray.socket state=started enabled=true
- name: enable systemd ressource accounting
command: systemctl set-property php-fpm@flyspray CPUAccounting=yes MemoryAccounting=yes
......@@ -21,6 +21,3 @@
- name: start and enable service
service: name=grafana state=started enabled=true
- name: enable systemd ressource accounting
command: systemctl set-property grafana CPUAccounting=yes MemoryAccounting=yes
......@@ -48,9 +48,6 @@
- name: start and enable systemd socket
service: name=php-fpm@kanboard.socket state=started enabled=true
- name: enable systemd ressource accounting
command: systemctl set-property php-fpm@kanboard CPUAccounting=yes MemoryAccounting=yes
- name: install systemd timers for kanboard cronjob
template: src={{ item }} dest=/etc/systemd/system/{{ item }} owner=root group=root mode=0644
with_items:
......
......@@ -15,9 +15,6 @@
- name: start and enable the service
service: name=mariadb state=started enabled=yes
- name: enable systemd ressource accounting
command: systemctl set-property mariadb CPUAccounting=yes MemoryAccounting=yes
- name: delete anonymous users
mysql_user: user='' host_all=yes state='absent'
......
......@@ -150,8 +150,3 @@
- synapse.service
- matrix-appservice-irc.service
- name: enable systemd ressource accounting
command: systemctl set-property {{item}} CPUAccounting=yes MemoryAccounting=yes
with_items:
- synapse
- matrix-appservice-irc
......@@ -66,9 +66,6 @@
- name: enable nginx
service: name=nginx enabled=yes
- name: enable systemd ressource accounting
command: systemctl set-property nginx CPUAccounting=yes MemoryAccounting=yes
- name: open firewall holes
firewalld: service={{item}} permanent=true state=enabled
with_items:
......
......@@ -32,6 +32,3 @@
- name: start and enable opendkim
service: name=opendkim enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property opendkim CPUAccounting=yes MemoryAccounting=yes
......@@ -40,6 +40,3 @@
service: name={{ item }} enabled=yes state=started
with_items:
- planet.timer
- name: enable systemd ressource accounting
command: systemctl set-property planet CPUAccounting=yes MemoryAccounting=yes
......@@ -63,9 +63,6 @@
- name: start and enable postfix
service: name=postfix enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property postfix CPUAccounting=yes MemoryAccounting=yes
- name: remove old files
file: path={{item}} state=absent
with_items:
......
......@@ -11,7 +11,3 @@
- name: start and enable postfwd
service: name=postfwd enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property postfwd CPUAccounting=yes MemoryAccounting=yes
......@@ -25,9 +25,6 @@
- name: start and enable postgres
service: name=postgresql enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property postgresql CPUAccounting=yes MemoryAccounting=yes
- name: set postgres user password
postgresql_user: name=postgres password={{ vault_postgres_users.postgres }} encrypted=yes
become: yes
......
......@@ -62,9 +62,6 @@
- quassel.service
- clean-quassel.timer
- name: enable systemd ressource accounting
command: systemctl set-property quassel CPUAccounting=yes MemoryAccounting=yes
- name: open firewall holes
firewalld: port=4242/tcp permanent=true state=enabled
when: configure_firewall
......@@ -69,6 +69,3 @@
- name: start and enable security-tracker timer
service: name="security-tracker-update.timer" enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property security-tracker-update CPUAccounting=yes MemoryAccounting=yes
......@@ -20,5 +20,3 @@
- name: start and enable sogrep units
service: name=createlinks.timer enabled=yes state=started
- name: enable systemd ressource accounting
command: systemctl set-property createlinks CPUAccounting=yes MemoryAccounting=yes
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment