From 73a74c63b5fca0816d0354234d35c051d921dda4 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Mon, 6 Sep 2021 15:39:01 +0200 Subject: [PATCH] fix: [etherpad] keep API key Signed-off-by: Valentin Lab --- etherpad/hooks/init | 39 +++++++++++++++++++++++++++++++++++++++ etherpad/metadata.yml | 19 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100755 etherpad/hooks/init diff --git a/etherpad/hooks/init b/etherpad/hooks/init new file mode 100755 index 0000000..7f2e43e --- /dev/null +++ b/etherpad/hooks/init @@ -0,0 +1,39 @@ +#!/bin/bash + +## Init is run on host +## For now it is run every time the script is launched, but +## it should be launched only once after build. + +## Accessible variables are: +## - SERVICE_NAME Name of current service +## - DOCKER_BASE_IMAGE Base image from which this service might be built if any +## - SERVICE_DATASTORE Location on host of the DATASTORE of this service +## - SERVICE_CONFIGSTORE Location on host of the CONFIGSTORE of this service + + +. lib/common + +set -e + + +dirs=( + "$SERVICE_DATASTORE/var/lib/etherpad" +) + +uid_gid=($(docker_get_uid_gid "$SERVICE_NAME" "etherpad" "etherpad")) || { + err "Could not fetch uid/gid on image of service ${DARKYELLOW}$SERVICE_NAME${NORMAL}." + return 1 +} + +uid="${uid_gid[0]}" +gid="${uid_gid[1]}" +for dir in "${dirs[@]}"; do + mkdir -p "$dir" + find "$dir" \! -uid "$uid" -print0 | while read-0 f; do + chown -v "$uid" "$f" || return 1 + done + find "$dir" \! -gid "$gid" -print0 | while read-0 f; do + chgrp -v "$gid" "$f" || return 1 + done +done + diff --git a/etherpad/metadata.yml b/etherpad/metadata.yml index 0963add..15c6a08 100644 --- a/etherpad/metadata.yml +++ b/etherpad/metadata.yml @@ -8,7 +8,11 @@ docker-image: docker.0k.io/etherpad:1.8.14-soffice ## custom built from git m e description: | Etherpad-lite service. +data-resources: + - /var/lib/etherpad + docker-compose: + command: node src/node/server.js --apikey /var/lib/etherpad/APIKEY.txt environment: SOFFICE: '/usr/bin/soffice' @@ -32,3 +36,18 @@ uses: proxy: "Public access" default-options: target: !var-expand ${MASTER_BASE_SERVICE_NAME}:9001 + + backup: + constraint: recommended + auto: pair + solves: + backup: "Automatic regular backup" + default-options: + ## First pattern matching wins, no pattern matching includes. + ## include-patterns are checked first, then exclude-patterns + ## Patterns rules: + ## - ending / for directory + ## - '*' authorized + ## - must start with a '/', will start from $SERVICE_DATASTORE + #exclude-patterns: + # - "/var/lib/odoo/sessions/"