Correction : Burette de la Cyclofficine Paris Est.

diff --git a/etc/sv/cyclo_paris_est__openerp/local.sh b/etc/sv/cyclo_paris_est__openerp/local.sh
deleted file mode 100644 (file)
index 1cfa081..0000000
--- a/etc/sv/cyclo_paris_est__openerp/local.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-home=/home/"$sv"
-
-"$tool"/local/runit-sv-configure postgres
-"$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
-       #      ne sont pas signés par OpenPGP..
-"$tool"/local/insserv-remove  openerp
-
-"$tool"/local/postgresql-user-create     "$sv"
-"$tool"/local/postgresql-database-create "$sv"
-
-"$tool"/local/adduser "$sv" \
- --disabled-login \
- --disabled-password \
- --group \
- --home "$home" \
- --shell /bin/false \
- --system
-"$tool"/local/adduser "$sv"-addon \
- --disabled-login \
- --disabled-password \
- --group \
- --home "$home"/addon.d \
- --shell /bin/false \
- --system
-
-sudo install -d -m 710 -o root -g "$sv" \
- /etc/sv/"$sv" \
- /etc/sv/"$sv"/supervise
-sudo install -d -m 1777 -o root -g root \
- /etc/openerp
-sudo install -d -m 3771 -o "$sv" -g "$sv" \
- "$home"
-sudo install -d -m 2770 -o "$sv" -g "$sv"-addon \
- "$home"/addon.d
-sudo install -d -m 750 -o "$sv" -g "$sv" \
- "$home"/etc \
- /etc/openerp/"$sv"
-sudo ln -fns \
- /etc/openerp/"$sv" \
- "$home"/etc/openerp
-
-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/cyclo_paris_est__openerp/log/local.sh
deleted file mode 100644 (file)
index 19c7125..0000000
--- a/etc/sv/cyclo_paris_est__openerp/log/local.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-eval "home=~$sv/log"
-
-"$tool"/local/adduser log-"$sv"\
- --disabled-login \
- --disabled-password \
- --group \
- --home "$home" \
- --shell /bin/false \
- --system
-
-sudo install -d -m 770 -o log-"$sv" -g log-"$sv" \
- "$home"

diff --git a/etc/sv/cyclo_paris_est__openerp/log/run b/etc/sv/cyclo_paris_est__openerp/log/run
deleted file mode 100755 (executable)
index 4382b39..0000000
--- a/etc/sv/cyclo_paris_est__openerp/log/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -eux
-sv=${PWD%/log}
-sv=${sv#/etc/sv/}
-eval home="~log-$sv"
-
-cd "$home"
-exec chpst -u log-"$sv":log-"$sv" \
-       svlogd -v -tt "$home"

diff --git a/etc/sv/cyclo_paris_est__openerp/run b/etc/sv/cyclo_paris_est__openerp/run
deleted file mode 100755 (executable)
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 (file)
--- 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 (file)
--- 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/openerp_cyclo_paris_est/local.sh b/etc/sv/openerp_cyclo_paris_est/local.sh
new file mode 100644 (file)
index 0000000..777cbab
--- /dev/null
+++ b/etc/sv/openerp_cyclo_paris_est/local.sh
@@ -0,0 +1,80 @@
+home=/home/"$sv"
+
+"$tool"/local/runit-sv-configure postgres
+"$tool"/local/runit-sv-start     postgres
+while ! sudo -u postgres psql </dev/null
+do sleep 1; done
+
+"$tool"/local/apt-get-install openerp --force-yes
+       # XXX: --force-yes car les paquets de nightly.openerp.com
+       #      ne sont pas signés par OpenPGP..
+"$tool"/local/insserv-remove  openerp
+
+"$tool"/local/postgresql-user-create     "$sv"
+"$tool"/local/postgresql-database-create "$sv"
+
+"$tool"/local/adduser "$sv" \
+ --disabled-login \
+ --disabled-password \
+ --group \
+ --home "$home" \
+ --shell /bin/false \
+ --system
+"$tool"/local/adduser "$sv"-addon \
+ --disabled-login \
+ --disabled-password \
+ --group \
+ --home "$home"/addon.d \
+ --shell /bin/false \
+ --system
+
+sudo install -d -m 710 -o root -g "$sv" \
+ /etc/sv/"$sv" \
+ /etc/sv/"$sv"/supervise
+sudo install -d -m 1777 -o root -g root \
+ /etc/openerp
+sudo install -d -m 3771 -o "$sv" -g "$sv" \
+ "$home"
+sudo install -d -m 2770 -o "$sv" -g "$sv"-addon \
+ "$home"/addon.d
+sudo install -d -m 750 -o "$sv" -g "$sv" \
+ "$home"/etc \
+ /etc/openerp/"$sv"
+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/openerp_cyclo_paris_est/log/local.sh b/etc/sv/openerp_cyclo_paris_est/log/local.sh
new file mode 100644 (file)
index 0000000..19c7125
--- /dev/null
+++ b/etc/sv/openerp_cyclo_paris_est/log/local.sh
@@ -0,0 +1,12 @@
+eval "home=~$sv/log"
+
+"$tool"/local/adduser log-"$sv"\
+ --disabled-login \
+ --disabled-password \
+ --group \
+ --home "$home" \
+ --shell /bin/false \
+ --system
+
+sudo install -d -m 770 -o log-"$sv" -g log-"$sv" \
+ "$home"

diff --git a/etc/sv/openerp_cyclo_paris_est/log/run b/etc/sv/openerp_cyclo_paris_est/log/run
new file mode 100755 (executable)
index 0000000..4382b39
--- /dev/null
+++ b/etc/sv/openerp_cyclo_paris_est/log/run
@@ -0,0 +1,8 @@
+#!/bin/sh -eux
+sv=${PWD%/log}
+sv=${sv#/etc/sv/}
+eval home="~log-$sv"
+
+cd "$home"
+exec chpst -u log-"$sv":log-"$sv" \
+       svlogd -v -tt "$home"

diff --git a/etc/sv/openerp_cyclo_paris_est/run b/etc/sv/openerp_cyclo_paris_est/run
new file mode 100755 (executable)
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 (executable)
--- 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 (executable)
--- 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
                )