Revert "galene: increase limit of open files for galene process"

This reverts commit 16d90017
because new use of collective.recipe.template is forbidden.

software/galene/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [instance-cfg]
 filename = instance.cfg.in
-md5sum = 8341d1d8c1839a1c623dd0fd771ef104
+md5sum = a9a3b63b6fb4ecd957fb86fe30f3d1cf

software/galene/instance.cfg.in

@@ -67,21 +67,18 @@ input = inline:{
 output = $${directory:groups}/public.json
 
 [galene-wrapper]
-recipe = collective.recipe.template
+recipe = slapos.cookbook:wrapper
 port = 8443
 ip = $${slap-configuration:ipv6-random}
-input = inline:
-  #!/bin/bash
-  ulimit -n $(ulimit -Hn)
-  exec ${galene:location}/bin/galene \
-    -static ${galene-repository:location}/static \
-    -recordings $${directory:recordings} \
-    -groups $${directory:groups} \
-    -data $${directory:data} \
-    -http [$${:ip}]:$${:port} \
+command-line = 
+  ${galene:location}/bin/galene
+    -static ${galene-repository:location}/static
+    -recordings $${directory:recordings}
+    -groups $${directory:groups}
+    -data $${directory:data}
+    -http [$${:ip}]:$${:port}
     -turn ""
-output = $${directory:services}/galene
-mode = 0755
+wrapper-path = $${directory:services}/galene
 depends =
   $${ice-servers.json:recipe}
   $${groups-json:recipe}

[Julien Muchembled]

• slapos.recipe.template
• /bin/sh instead of /bin/bash when possible

/cc @tomo

[Thomas Gambier]

OK I will do.

/bin/sh instead of /bin/bash when possible

I though ulimit was bash only.

[Thomas Gambier]

Also, why is this a merge commit ???

[Julien Muchembled]

/bin/sh instead of /bin/bash when possible

I though ulimit was bash only.

Oh. Well, posix shell does have ulimit but it only supports -f. Since dash runs ulimit -n $(ulimit -Hn) correctly, we could ignore platforms with a more-limited implementation of /bin/sh. As you prefer.

Also, why is this a merge commit ???

The question is rather why reverting a commit does not produce a merge commit, so that git-blame returns pertinent information. I am not the author of the resurrected lines.