From ed28bd840d1751e642141ed0c250b0e2584bc5b2 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 28 Jan 2022 12:54:55 +0100 Subject: [PATCH] Seafile : introduction et utilisation de la fonction get_podman_volume_path --- functions.sh | 6 ++++++ podman-seafile/10_install.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/functions.sh b/functions.sh index d01533e..431545e 100644 --- a/functions.sh +++ b/functions.sh @@ -253,3 +253,9 @@ ensure_pod_not_running () { return 0 fi } + +# Get podman volume path +# WARNING : this function assumes the volume exists +get_podman_volume_path () { + podman volume inspect --format '{{ .Mountpoint }}' ${1} +} diff --git a/podman-seafile/10_install.sh b/podman-seafile/10_install.sh index bc9fb30..9f059f6 100755 --- a/podman-seafile/10_install.sh +++ b/podman-seafile/10_install.sh @@ -31,12 +31,12 @@ export GARBAYE_SEAFILE_SEAFILE_VERSION="${seafile_release}" podman-compose up -d echo -n "Waiting for seahub_settings.py " -while [ ! -e `podman volume inspect --format '{{ .Mountpoint }}' ${datavolume}`/seafile/conf/seahub_settings.py ]; do +while [ ! -e `get_podman_volume_path ${datavolume}`/seafile/conf/seahub_settings.py ]; do echo -n "." sleep 1 done ; echo "OK" -sed -i -e "s|^FILE_SERVER_ROOT = \"http://${GARBAYE_SEAFILE_SERVER_HOSTNAME}/seafhttp\"|FILE_SERVER_ROOT = \"https://${GARBAYE_SEAFILE_SERVER_HOSTNAME}/seafhttp\"\nEMAIL_USE_TLS = False\nEMAIL_HOST = '${GARBAYE_SEAFILE_SMTP_SERVER}'\nEMAIL_HOST_USER = ''\nEMAIL_HOST_PASSWORD = ''\nEMAIL_PORT = 25\nDEFAULT_FROM_EMAIL = 'noreply@seafile.garbaye.fr'\nSERVER_EMAIL = 'noreply@seafile.garbaye.fr'|g" `podman volume inspect --format '{{ .Mountpoint }}' ${datavolume}`/seafile/conf/seahub_settings.py +sed -i -e "s|^FILE_SERVER_ROOT = \"http://${GARBAYE_SEAFILE_SERVER_HOSTNAME}/seafhttp\"|FILE_SERVER_ROOT = \"https://${GARBAYE_SEAFILE_SERVER_HOSTNAME}/seafhttp\"\nEMAIL_USE_TLS = False\nEMAIL_HOST = '${GARBAYE_SEAFILE_SMTP_SERVER}'\nEMAIL_HOST_USER = ''\nEMAIL_HOST_PASSWORD = ''\nEMAIL_PORT = 25\nDEFAULT_FROM_EMAIL = 'noreply@seafile.garbaye.fr'\nSERVER_EMAIL = 'noreply@seafile.garbaye.fr'|g" `get_podman_volume_path ${datavolume}`/seafile/conf/seahub_settings.py shred -u .env