From 647833580df813bdd105a7e0c28ca1d004ded668 Mon Sep 17 00:00:00 2001 From: Joachim Desroches Date: Fri, 14 Aug 2020 13:46:05 +0200 Subject: [PATCH] Split out service management from the installation type. --- type/__wikijs/gencode-remote | 1 - type/__wikijs/manifest | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/type/__wikijs/gencode-remote b/type/__wikijs/gencode-remote index 66d7df7..a45ac22 100644 --- a/type/__wikijs/gencode-remote +++ b/type/__wikijs/gencode-remote @@ -18,5 +18,4 @@ EOF cat << EOF cd /var/wiki || exit 1 npm install -service start wikijs EOF diff --git a/type/__wikijs/manifest b/type/__wikijs/manifest index 7ee42ac..2e3e96c 100644 --- a/type/__wikijs/manifest +++ b/type/__wikijs/manifest @@ -48,11 +48,12 @@ fi db_pass="$(cat "${__object:?}/parameter/database-password")" __package nodejs -__package nghttp2-dev # Required for some reason, else a symbol is missing __package npm __directory /var/wiki/ + +# These things are Alpine-dependant. __file /etc/init.d/wikijs --source "${__files:?}/files/wikijs-openrc" -require='__file/etc/init.d/wikijs' __start_on_boot wikijs +__package nghttp2-dev # Required for some reason, else a symbol is missing mkdir -p "${__object:?}/files" "${__type:?}/files/config.yml.sh" "$db_pass" > "${__object:?}/files/config.yml"