From 8b052cae15b059d00f53f4cfc28e887eee6f138f Mon Sep 17 00:00:00 2001 From: Boris Gallet Date: Tue, 14 Nov 2023 16:05:07 +0100 Subject: [PATCH] chg: [docuseal] clean folder, rm init --- docuseal/README.org | 4 ++-- docuseal/hooks/init | 24 ------------------- .../hooks/postgres_database-relation-joined | 2 ++ docuseal/hooks/web_proxy-relation-joined | 15 ++++++------ 4 files changed, 11 insertions(+), 34 deletions(-) delete mode 100755 docuseal/hooks/init diff --git a/docuseal/README.org b/docuseal/README.org index fdf8387..28f8f89 100644 --- a/docuseal/README.org +++ b/docuseal/README.org @@ -1,5 +1,5 @@ # -*- ispell-local-dictionary: "english" -*- -## Charm for DocuSeal - allow to sign Documents +* Info -repo : https://github.com/docusealco/docuseal \ No newline at end of file +From: https://github.com/docusealco/docuseal diff --git a/docuseal/hooks/init b/docuseal/hooks/init deleted file mode 100755 index 84552a7..0000000 --- a/docuseal/hooks/init +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 - - -set -e - -version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } - -## bug: https://github.com/adoptium/containers/issues/215#issuecomment-1142046045 -docker_version=$(docker info --format '{{.ServerVersion}}') -if ! version_gt "$docker_version" 20.10.0; then - err "Sorry, $SERVICE_NAME require docker version >= 20.10 (current: $docker_version)" - exit 1 -fi - diff --git a/docuseal/hooks/postgres_database-relation-joined b/docuseal/hooks/postgres_database-relation-joined index ccc2f6c..ca195f3 100755 --- a/docuseal/hooks/postgres_database-relation-joined +++ b/docuseal/hooks/postgres_database-relation-joined @@ -1,3 +1,5 @@ +#!/bin/bash + set -e PASSWORD="$(relation-get password)" diff --git a/docuseal/hooks/web_proxy-relation-joined b/docuseal/hooks/web_proxy-relation-joined index 3e2d624..3a3625f 100755 --- a/docuseal/hooks/web_proxy-relation-joined +++ b/docuseal/hooks/web_proxy-relation-joined @@ -4,18 +4,17 @@ set -e DOMAIN=$(relation-get domain) || exit 1 -## These are mainly to setup the correct web-hook -if [ "$MASTER_BASE_SERVICE_NAME" == "$DOMAIN" ]; then - ## This is because the IP will be the docker container version - USESSL="" -else - USESSL="CMD_PROTOCOL_USESSL: 'true'" -fi +## Don’t know why this is needed so removed +# if [ "$MASTER_BASE_SERVICE_NAME" == "$DOMAIN" ]; then +# ## This is because the IP will be the docker container version +# USESSL="" +# else +# USESSL="CMD_PROTOCOL_USESSL: 'true'" +# fi config-add "\ services: $MASTER_BASE_SERVICE_NAME: environment: FORCE_SSL: $DOMAIN - $USESSL " \ No newline at end of file