← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~pelpsi/turnip:nofile-limit-configuration into turnip:master

 

Simone Pelosi has proposed merging ~pelpsi/turnip:nofile-limit-configuration into turnip:master.

Commit message:
Add NOFILE configuration for charms that are missing it


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pelpsi/turnip/+git/turnip/+merge/472497
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/turnip:nofile-limit-configuration into turnip:master.
diff --git a/charm/turnip-pack-frontend-git/templates/turnip-pack-frontend-git.service.j2 b/charm/turnip-pack-frontend-git/templates/turnip-pack-frontend-git.service.j2
index dc26fa9..42abf8c 100644
--- a/charm/turnip-pack-frontend-git/templates/turnip-pack-frontend-git.service.j2
+++ b/charm/turnip-pack-frontend-git/templates/turnip-pack-frontend-git.service.j2
@@ -12,6 +12,7 @@ Environment=PACK_VIRT_HOST={{ pack_virt_host }}
 Environment=PACK_VIRT_PORT={{ pack_virt_port }}
 ExecStart={{ venv_dir }}/bin/twistd --nodaemon --pidfile= --logfile={{ base_dir }}/logs/turnip-pack-frontend-git.log --python=packfrontendserver.tac
 ExecReload=/bin/kill -s HUP $MAINPID
+LimitNOFILE=1048576
 Restart=on-failure
 
 [Install]
diff --git a/charm/turnip-pack-frontend-ssh/templates/turnip-pack-frontend-ssh.service.j2 b/charm/turnip-pack-frontend-ssh/templates/turnip-pack-frontend-ssh.service.j2
index d9d5a1e..c2d8403 100644
--- a/charm/turnip-pack-frontend-ssh/templates/turnip-pack-frontend-ssh.service.j2
+++ b/charm/turnip-pack-frontend-ssh/templates/turnip-pack-frontend-ssh.service.j2
@@ -16,6 +16,7 @@ Environment=SMART_SSH_PORT={{ port }}
 Environment=TURNIP_LOG_DIR={{ base_dir }}/logs
 ExecStart={{ venv_dir }}/bin/twistd --nodaemon --pidfile= --logfile={{ base_dir }}/logs/turnip-pack-frontend-ssh.log --python=sshserver.tac
 ExecReload=/bin/kill -s HUP $MAINPID
+LimitNOFILE=1048576
 Restart=on-failure
 
 [Install]
diff --git a/charm/turnip-pack-virt/templates/turnip-pack-virt.service.j2 b/charm/turnip-pack-virt/templates/turnip-pack-virt.service.j2
index 062cb79..b7fe671 100644
--- a/charm/turnip-pack-virt/templates/turnip-pack-virt.service.j2
+++ b/charm/turnip-pack-virt/templates/turnip-pack-virt.service.j2
@@ -14,6 +14,7 @@ Environment=VIRTINFO_ENDPOINT={{ virtinfo_endpoint }}
 Environment=VIRTINFO_TIMEOUT={{ virtinfo_timeout }}
 ExecStart={{ venv_dir }}/bin/twistd --nodaemon --pidfile= --logfile={{ base_dir }}/logs/turnip-pack-virt.log --python=virtserver.tac
 ExecReload=/bin/kill -s HUP $MAINPID
+LimitNOFILE=1048576
 Restart=on-failure
 
 [Install]