From 83b3ca83e8d9f263b25052cc1be78af145623857 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+heureux-cyclage@autogeree.net>
Date: Sat, 27 Apr 2013 17:24:08 +0200
Subject: [PATCH] Correction : Burette de la Cyclofficine Paris Est.

---
 etc/sv/cyclo_paris_est__openerp/run           | 57 -------------------
 etc/sv/nginx/local.sh                         |  5 +-
 etc/sv/nginx/remote.sh                        |  3 +
 .../local.sh                                  | 34 ++++++++++-
 .../log/local.sh                              |  0
 .../log/run                                   |  0
 etc/sv/openerp_cyclo_paris_est/run            | 26 +++++++++
 local/runit-sv-configure                      |  2 +
 remote/runit-configure                        |  1 +
 9 files changed, 66 insertions(+), 62 deletions(-)
 delete mode 100755 etc/sv/cyclo_paris_est__openerp/run
 rename etc/sv/{cyclo_paris_est__openerp => openerp_cyclo_paris_est}/local.sh (59%)
 rename etc/sv/{cyclo_paris_est__openerp => openerp_cyclo_paris_est}/log/local.sh (100%)
 rename etc/sv/{cyclo_paris_est__openerp => openerp_cyclo_paris_est}/log/run (100%)
 create mode 100755 etc/sv/openerp_cyclo_paris_est/run

diff --git a/etc/sv/cyclo_paris_est__openerp/run b/etc/sv/cyclo_paris_est__openerp/run
deleted file mode 100755
index f2b05d4..0000000
--- a/etc/sv/cyclo_paris_est__openerp/run
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh -eux
-exec 2>&1
-sv=${PWD#/etc/sv/}
-home=/home/"$sv"
-cd /
-
-for addon in \
-	bikecoop \
-	bikecoop_l10n_fr \
-	pos_membership \
-	remembership \
-	cyclofficine_paris_est
- do
-	sudo install -d -m 2771 -o "$sv" -g "$sv"-addon \
-	 "$home"/addon.d/"$addon"
-	sudo -u git git \
-	 --git-dir ~git-data/burette/"$addon".git \
-	 --work-tree="$home"/addon.d/"$addon" \
-	 checkout -f master
-	#sudo -u git git \
-	# --git-dir ~git-data/burette/"$addon".git \
-	# --work-tree="$home"/addon.d/"$addon" \
-	# clean -d -f -f -x
-	sudo install -m 550 -o git -g git /dev/stdin \
-	 /home/git/pub/burette/"$addon".git/hooks/post-update <<-EOF
-		git \
-		 --git-dir ~git-data/burette/"$addon".git \
-		 --work-tree="$home"/addon.d/"$addon" \
-		 checkout -f master
-		#git \
-		# --git-dir ~git-data/burette/"$addon".git \
-		# --work-tree="$home"/addon.d/"$addon" \
-		# clean -d -f -f -x
-		#sv restart "$sv"
-		EOF
- done
-
-test -e "$home"/etc/openerp/server.conf ||
-/usr/bin/chpst \
- -u "$sv":"$sv":"$sv"-addon:postgres-data \
- /usr/bin/openerp-server \
- --addons-path="$home"/addon.d \
- --config "$home"/etc/openerp/server.conf \
- --database="$sv" \
- --db_user="$sv" \
- --debug \
- --init=remembership,pos_membership,bikecoop \
- --load-language=fr_FR \
- --save \
- --stop-after-init \
- --without-demo=base \
- --workers=2
-
-exec /usr/bin/chpst \
- -u "$sv":"$sv":"$sv"-addon:postgres-data \
- /usr/bin/openerp-server \
-	 --config "$home"/etc/openerp/server.conf
diff --git a/etc/sv/nginx/local.sh b/etc/sv/nginx/local.sh
index dd3bd8e..56addd0 100644
--- a/etc/sv/nginx/local.sh
+++ b/etc/sv/nginx/local.sh
@@ -86,7 +86,8 @@ for site in $(find "$tool"/etc/nginx/site.d \
 		 }
 		EOF
 	(
-	test ! -r "$tool"/etc/nginx/site.d/"$site"/configure.sh ||
-	.         "$tool"/etc/nginx/site.d/"$site"/configure.sh || return 1
+	cd /
+	test ! -r "$tool"/etc/nginx/site.d/"$site"/local.sh ||
+	.         "$tool"/etc/nginx/site.d/"$site"/local.sh || return 1
 	)
  done
diff --git a/etc/sv/nginx/remote.sh b/etc/sv/nginx/remote.sh
index 92f4147..7f7403d 100644
--- a/etc/sv/nginx/remote.sh
+++ b/etc/sv/nginx/remote.sh
@@ -20,6 +20,9 @@ for site in $(find "$tool"/etc/nginx/site.d \
 			 /etc/nginx/x509.d/'"'$site'"'/key.pem
 		 '
 	 fi
+	(
+	cd /
 	test ! -r "$tool"/etc/nginx/site.d/"$site"/remote.sh ||
 	.         "$tool"/etc/nginx/site.d/"$site"/remote.sh
+	)
  done
diff --git a/etc/sv/cyclo_paris_est__openerp/local.sh b/etc/sv/openerp_cyclo_paris_est/local.sh
similarity index 59%
rename from etc/sv/cyclo_paris_est__openerp/local.sh
rename to etc/sv/openerp_cyclo_paris_est/local.sh
index 1cfa081..777cbab 100644
--- a/etc/sv/cyclo_paris_est__openerp/local.sh
+++ b/etc/sv/openerp_cyclo_paris_est/local.sh
@@ -4,9 +4,6 @@ home=/home/"$sv"
 "$tool"/local/runit-sv-start     postgres
 while ! sudo -u postgres psql </dev/null
 do sleep 1; done
-"$tool"/local/runit-sv-configure postfix
-"$tool"/local/runit-sv-start     postfix
-sudo postfix quiet-reload
 
 "$tool"/local/apt-get-install openerp --force-yes
 	# XXX: --force-yes car les paquets de nightly.openerp.com
@@ -47,6 +44,37 @@ sudo ln -fns \
  /etc/openerp/"$sv" \
  "$home"/etc/openerp
 
+for addon in \
+	bikecoop \
+	bikecoop_l10n_fr \
+	pos_membership \
+	remembership \
+	cyclofficine_paris_est
+ do
+	sudo install -d -m 2771 -o "$sv" -g "$sv"-addon \
+	 "$home"/addon.d/"$addon"
+	sudo -u git git \
+	 --git-dir ~git-data/burette/"$addon".git \
+	 --work-tree="$home"/addon.d/"$addon" \
+	 checkout -f master
+	#sudo -u git git \
+	# --git-dir ~git-data/burette/"$addon".git \
+	# --work-tree="$home"/addon.d/"$addon" \
+	# clean -d -f -f -x
+	sudo install -m 550 -o git -g git /dev/stdin \
+	 /home/git/pub/burette/"$addon".git/hooks/post-update <<-EOF
+		git \
+		 --git-dir ~git-data/burette/"$addon".git \
+		 --work-tree="$home"/addon.d/"$addon" \
+		 checkout -f master
+		#git \
+		# --git-dir ~git-data/burette/"$addon".git \
+		# --work-tree="$home"/addon.d/"$addon" \
+		# clean -d -f -f -x
+		#sv restart "$sv"
+		EOF
+ done
+
 sudo adduser git   "$sv"-addon
 sudo adduser "$sv" "$sv"-addon
 sudo adduser "$sv" postgres-data
diff --git a/etc/sv/cyclo_paris_est__openerp/log/local.sh b/etc/sv/openerp_cyclo_paris_est/log/local.sh
similarity index 100%
rename from etc/sv/cyclo_paris_est__openerp/log/local.sh
rename to etc/sv/openerp_cyclo_paris_est/log/local.sh
diff --git a/etc/sv/cyclo_paris_est__openerp/log/run b/etc/sv/openerp_cyclo_paris_est/log/run
similarity index 100%
rename from etc/sv/cyclo_paris_est__openerp/log/run
rename to etc/sv/openerp_cyclo_paris_est/log/run
diff --git a/etc/sv/openerp_cyclo_paris_est/run b/etc/sv/openerp_cyclo_paris_est/run
new file mode 100755
index 0000000..31af068
--- /dev/null
+++ b/etc/sv/openerp_cyclo_paris_est/run
@@ -0,0 +1,26 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+home=/home/"$sv"
+cd /
+
+test -e "$home"/etc/openerp/server.conf ||
+/usr/bin/chpst \
+ -u "$sv":"$sv":"$sv"-addon:postgres-data \
+ /usr/bin/openerp-server \
+ --addons-path="$home"/addon.d \
+ --config "$home"/etc/openerp/server.conf \
+ --database="$sv" \
+ --db_user="$sv" \
+ --debug \
+ --init=remembership,pos_membership,bikecoop \
+ --load-language=fr_FR \
+ --save \
+ --stop-after-init \
+ --without-demo=base \
+ --workers=2
+
+exec /usr/bin/chpst \
+ -u "$sv":"$sv":"$sv"-addon:postgres-data \
+ /usr/bin/openerp-server \
+ --config "$home"/etc/openerp/server.conf
diff --git a/local/runit-sv-configure b/local/runit-sv-configure
index 1bd8909..837db20 100755
--- a/local/runit-sv-configure
+++ b/local/runit-sv-configure
@@ -18,10 +18,12 @@ if test -e "$tool"/etc/sv/"$sv"/log/run
 	        /etc/sv/"$sv"/log/run
  fi
 (
+cd /
 test ! -r "$tool"/etc/sv/"$sv"/local.sh ||
 .         "$tool"/etc/sv/"$sv"/local.sh || return 1
 )
 (
+cd /
 test ! -r "$tool"/etc/sv/"$sv"/log/local.sh ||
 .         "$tool"/etc/sv/"$sv"/log/local.sh || return 1
 )
diff --git a/remote/runit-configure b/remote/runit-configure
index 0a9a5ea..6d6da6b 100755
--- a/remote/runit-configure
+++ b/remote/runit-configure
@@ -24,6 +24,7 @@ if test $# = 0
 	 -printf '%f\n')
 	 do
 		(
+		cd /
 		test ! -r "$tool"/etc/sv/"$sv"/remote.sh ||
 		.         "$tool"/etc/sv/"$sv"/remote.sh || return 1
 		)
-- 
2.20.1