commit 92d55be6123e30e16f4e23d937a1b24645578f36
parent e0426e6a9b479e25624b0c0430e85ca058c74b66
Author: Josuah Demangeon <josuah.demangeon@gandi.net>
Date: Tue, 4 Jul 2017 15:25:41 +0200
added cgit and fixed SERVICE and nginx
Diffstat:
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/SERVICE b/SERVICE
@@ -35,17 +35,17 @@ do
do grep -q -F "$@" "$VAR/pid/$srv/$pid" || continue 2
done
- if cmp "$VAR/pid/$srv/$pid" "/proc/$pid/cmdline"
+ if cmp "$VAR/pid/$srv/$pid" "/proc/$pid/cmdline" 2> /dev/null
then
- act=1 cmd="$(tr '\0' ' ' < "$VAR/pid/$srv/$pid")"
+ act=1 cmdline="$(tr '\0' ' ' < "$VAR/pid/$srv/$pid")"
if [ "$cmd" = stop ] || [ "$cmd" = restart ]
then
- kill -14 "$pid" &&
- printf '%-15s [stopped] %s\n' "$srv" "$cmd"
+ kill -s QUIT "$pid" &&
+ printf '%-15s [stopped] %s\n' "$srv" "$cmdline"
else
run=1
- printf '%-15s [running] %s\n' "$srv" "$cmd"
+ printf '%-15s [running] %s\n' "$srv" "$cmdline"
fi
fi
done
diff --git a/cgit/build b/cgit/build
@@ -0,0 +1,3 @@
+[ -f git/configure ] || gmake get-git
+
+gmake prefix="$PREFIX" CGIT_SCRIPT_PATH="$VAR/cgit" prefix="$PREFIX" install
diff --git a/cgit/url b/cgit/url
@@ -0,0 +1 @@
+http://git.zx2c4.com/cgit/snapshot/cgit-1.1.tar.xz
diff --git a/nginx/build b/nginx/build
@@ -1,8 +1,9 @@
./configure \
- --prefix="$PREFIX" \
- --error-log-path='/dev/stderr' \
- --http-log-path='/dev/stdout' \
- --pid-path="$VAR/pid/nginx/pid" \
+ --prefix="$PREFIX" \
+ --sbin-path="$PREFIX/bin" \
+ --pid-path="$VAR/nginx/pid" \
+ --error-log-path='/dev/stderr' \
+ --http-log-path='/dev/stdout' \
&&
make install
diff --git a/nginx/start b/nginx/start
@@ -1,5 +1,5 @@
-mkdir -p "$VAR/pid/nginx"
+mkdir -p "$VAR/nginx/"
-nginx -c "$ETC/nginx/nginx.conf"
+nginx -c "$ETC/nginx/nginx.conf" -p "$VAR/nginx"
-PID=$(cat "$VAR/pid/nginx/pid")
+PID=$(cat "$VAR/nginx/pid")