From: Julien Moutinho <julm+burette@autogeree.net>
Date: Tue, 19 Mar 2013 16:29:16 +0000 (+0100)
Subject: Correction : évite de dépasser GROUP_NAME_MAX_LENGTH==32 .
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=11ad3e26a495747801c9290a1fb7b4537d123ae0

Correction : évite de dépasser GROUP_NAME_MAX_LENGTH==32 .
---

diff --git a/etc/nginx/site.d/80.git.heureux-cyclage.org/server.conf b/etc/nginx/site.d/80.git.heureux-cyclage.org/server.conf
index f3551fd..410304f 100644
--- a/etc/nginx/site.d/80.git.heureux-cyclage.org/server.conf
+++ b/etc/nginx/site.d/80.git.heureux-cyclage.org/server.conf
@@ -57,7 +57,7 @@ location @gitweb {
 	fastcgi_pass_header Set-Cookie;
 	fastcgi_split_path_info ^(.+\.php)(/.+)$;
 	
-	fastcgi_pass unix:/run/nginx/fastcgi/spawn-fcgi.git.80.git.heureux-cyclage.org;
+	fastcgi_pass unix:/run/nginx/fastcgi/fcgi.git.80.git.heureux-cyclage.org;
  }
 root /usr/share/gitweb;
 ssl_session_timeout 5m;
diff --git a/etc/sv/fcgi.80.git.heureux-cyclage.org/configure b/etc/sv/fcgi.80.git.heureux-cyclage.org/configure
new file mode 100755
index 0000000..c01e6d0
--- /dev/null
+++ b/etc/sv/fcgi.80.git.heureux-cyclage.org/configure
@@ -0,0 +1,11 @@
+#!/bin/sh -efux
+run_user=fcgi.80.git.heureux-cyclage.org
+id "$run_user" >/dev/null ||
+sudo adduser \
+ --disabled-login \
+ --disabled-password \
+ --group \
+ --home /no-home \
+ --shell /bin/false \
+ --system \
+ "$run_user"
diff --git a/etc/sv/fcgi.80.git.heureux-cyclage.org/run b/etc/sv/fcgi.80.git.heureux-cyclage.org/run
new file mode 100755
index 0000000..5e19e1f
--- /dev/null
+++ b/etc/sv/fcgi.80.git.heureux-cyclage.org/run
@@ -0,0 +1,15 @@
+#!/bin/sh -efux
+exec 2>&1
+run_user=fcgi.80.git.heureux-cyclage.org
+sock_user=www-data
+exec /usr/bin/spawn-fcgi \
+ -g "$run_user" \
+ -G "$sock_user" \
+ -M 0660 \
+ -n \
+ -s /run/nginx/fastcgi/fcgi.80.git.heureux-cyclage.org \
+ -u "$run_user" \
+ -U "$sock_user" \
+ -- /usr/bin/multiwatch \
+ --forks 10 \
+ -- /usr/sbin/fcgiwrap
diff --git a/etc/sv/spawn-fcgi.80.git.heureux-cyclage.org/configure b/etc/sv/spawn-fcgi.80.git.heureux-cyclage.org/configure
deleted file mode 100755
index b563226..0000000
--- a/etc/sv/spawn-fcgi.80.git.heureux-cyclage.org/configure
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -efux
-run_user=spawn-fcgi.80.git.heureux-cyclage.org
-id "$run_user" >/dev/null ||
-sudo adduser \
- --disabled-login \
- --disabled-password \
- --group \
- --home /no-home \
- --shell /bin/false \
- --system \
- "$run_user"
diff --git a/etc/sv/spawn-fcgi.80.git.heureux-cyclage.org/run b/etc/sv/spawn-fcgi.80.git.heureux-cyclage.org/run
deleted file mode 100755
index 6b97f39..0000000
--- a/etc/sv/spawn-fcgi.80.git.heureux-cyclage.org/run
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -efux
-exec 2>&1
-run_user=spawn-fcgi.80.git.heureux-cyclage.org
-sock_user=www-data
-exec /usr/bin/spawn-fcgi
- -g "$run_user" \
- -G "$sock_user" \
- -M 0660 \
- -n \
- -s /run/nginx/fastcgi/spawn-fcgi.80.git.heureux-cyclage.org \
- -u "$run_user" \
- -U "$sock_user" \
- -- /usr/bin/multiwatch \
- --forks 10 \
- -- /usr/sbin/fcgiwrap
diff --git a/vm_hosted b/vm_hosted
index 94916c6..de2074e 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -599,7 +599,7 @@ rule_gitolite_configure () {
 		rmdir "$home"/etc/gitolite/"$d"
 	 done
 	rule apt_get_install gitweb highlight
-	#sudo sv restart spawn-fcgi.git.80.git.heureux-cyclage.org
+	#sudo sv restart fcgi.git.80.git.heureux-cyclage.org
 	#sudo sv restart git-daemon.git.9418
  }
 rule_locales_configure () {