From 532004d77bdbe1d6b1389a3fc3a36b85d8feefbe Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 17 2014 18:36:07 +0000 Subject: Replace the fedmsg-gateway service file with our own to do resource limits the systemd way. --- diff --git a/roles/fedmsg/gateway/files/fedmsg-gateway.service b/roles/fedmsg/gateway/files/fedmsg-gateway.service new file mode 100644 index 0000000..1515e51 --- /dev/null +++ b/roles/fedmsg/gateway/files/fedmsg-gateway.service @@ -0,0 +1,14 @@ +[Unit] +Description=Outbound fedmsg gateway +After=network.target +Documentation=http://fedmsg.readthedocs.org/en/latest/commands/ + +[Service] +ExecStart=/usr/bin/fedmsg-gateway +Type=simple +User=fedmsg +Group=fedmsg +LimitNOFILE=160000 + +[Install] +WantedBy=multi-user.target diff --git a/roles/fedmsg/gateway/files/limits.conf b/roles/fedmsg/gateway/files/limits.conf deleted file mode 100644 index 73387d3..0000000 --- a/roles/fedmsg/gateway/files/limits.conf +++ /dev/null @@ -1,53 +0,0 @@ -# /etc/security/limits.conf -# -#Each line describes a limit for a user in the form: -# -# -# -#Where: -# can be: -# - an user name -# - a group name, with @group syntax -# - the wildcard *, for default entry -# - the wildcard %, can be also used with %group syntax, -# for maxlogin limit -# -# can have the two values: -# - "soft" for enforcing the soft limits -# - "hard" for enforcing hard limits -# -# can be one of the following: -# - core - limits the core file size (KB) -# - data - max data size (KB) -# - fsize - maximum filesize (KB) -# - memlock - max locked-in-memory address space (KB) -# - nofile - max number of open files -# - rss - max resident set size (KB) -# - stack - max stack size (KB) -# - cpu - max CPU time (MIN) -# - nproc - max number of processes -# - as - address space limit (KB) -# - maxlogins - max number of logins for this user -# - maxsyslogins - max number of logins on the system -# - priority - the priority to run user process with -# - locks - max number of file locks the user can hold -# - sigpending - max number of pending signals -# - msgqueue - max memory used by POSIX message queues (bytes) -# - nice - max nice priority allowed to raise to values: [-20, 19] -# - rtprio - max realtime priority -# -# -# - -#* soft core 0 -#* hard rss 10000 -#@student hard nproc 20 -#@faculty soft nproc 20 -#@faculty hard nproc 50 -#ftp hard nproc 0 -#@student - maxlogins 4 - -@fedmsg hard nofile 170000 -@fedmsg soft nofile 160000 - -# End of file diff --git a/roles/fedmsg/gateway/tasks/main.yml b/roles/fedmsg/gateway/tasks/main.yml index 0463f9c..44a6b1a 100644 --- a/roles/fedmsg/gateway/tasks/main.yml +++ b/roles/fedmsg/gateway/tasks/main.yml @@ -20,8 +20,10 @@ notify: - restart fedmsg-gateway -- name: bump fs limits - copy: src=limits.conf dest=/etc/security/limits.conf +- name: bump fs limits by installing our own systemd service file + copy: > + src=fedmsg-gateway.service + dest=/usr/lib/systemd/system/fedmsg-gateway.service tags: - config - fedmsg/gateway