From dabd1d3c22297466a102076a5e4d12f8dd534aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc?= Date: Sun, 4 Jul 2021 20:10:37 +0200 Subject: [PATCH] =?UTF-8?q?ne=20pas=20ex=C3=A9cuter=20l'installation=20si?= =?UTF-8?q?=20au=20moins=20un=20volume=20existe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- podman-matrix/05_freshinstall.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/podman-matrix/05_freshinstall.sh b/podman-matrix/05_freshinstall.sh index e101023..0ad5121 100755 --- a/podman-matrix/05_freshinstall.sh +++ b/podman-matrix/05_freshinstall.sh @@ -9,19 +9,18 @@ ensure_not_root ensure_variables_are_defined "$envvars" -if [[ ! -d ~/.local/share/containers/storage/volumes/${confvolume} ]]; then - podman volume create matrixdotorg_synapse-data +if [[ -d ~/.local/share/containers/storage/volumes/${confvolume} || -d ~/.local/share/containers/storage/volumes/${dbvolume} ]]; then + echo "Files or volumes from previous installation already exists" + echo "Please remove them before fresh install, or try continue with normal installation" + exit 1 fi -if [[ ! -d ~/.local/share/containers/storage/volumes/${dbvolume} ]]; then - podman volume create matrixdotorg_synapse-pgsql -fi -if [[ ! -f `podman volume inspect --format '{{ .Mountpoint }}' matrixdotorg_synapse-data`/homeserver.yaml ]]; then - podman run -it --name ${container_name}-generate --mount type=volume,src=matrixdotorg_synapse-data,dst=/data -e SYNAPSE_SERVER_NAME=garbaye.fr -e SYNAPSE_REPORT_STATS=no ${synapse_image}:${synapse_version} generate && \ -podman rm ${container_name}-generate -fi -podman unshare sed -i -e "s|^#public_baseurl: https://example.com/$|public_baseurl: ${GARBAYE_MATRIX_URL}|g" `podman volume inspect --format '{{ .Mountpoint }}' matrixdotorg_synapse-data`/homeserver.yaml && \ -podman unshare sed -z -i -e "s|database:\n name: sqlite3\n args:\n database: /data/homeserver.db|database:\n name: psycopg2\n args:\n user: synapse\n password: ${GARBAYE_MATRIX_POSTGRES_PASSWORD}\n database: synapse\n host: synapse-db\n port: 5432\n cp_min: 5\n cp_max: 10|g" `podman volume inspect --format '{{ .Mountpoint }}' matrixdotorg_synapse-data`/homeserver.yaml && \ -podman unshare sed -i -e "s|^#enable_registration: false$|enable_registration: false|g" `podman volume inspect --format '{{ .Mountpoint }}' matrixdotorg_synapse-data`/homeserver.yaml && \ +podman volume create ${confvolume} \ +podman volume create ${dbvolume} \ +podman run -it --name ${container_name}-generate --mount type=volume,src=${confvolume},dst=/data -e SYNAPSE_SERVER_NAME=garbaye.fr -e SYNAPSE_REPORT_STATS=no ${synapse_image}:${synapse_version} generate && \ +podman rm ${container_name}-generate \ +podman unshare sed -i -e "s|^#public_baseurl: https://example.com/$|public_baseurl: ${GARBAYE_MATRIX_URL}|g" `podman volume inspect --format '{{ .Mountpoint }}' ${confvolume}`/homeserver.yaml && \ +podman unshare sed -z -i -e "s|database:\n name: sqlite3\n args:\n database: /data/homeserver.db|database:\n name: psycopg2\n args:\n user: synapse\n password: ${GARBAYE_MATRIX_POSTGRES_PASSWORD}\n database: synapse\n host: synapse-db\n port: 5432\n cp_min: 5\n cp_max: 10|g" `podman volume inspect --format '{{ .Mountpoint }}' ${confvolume}`/homeserver.yaml && \ +podman unshare sed -i -e "s|^#enable_registration: false$|enable_registration: false|g" `podman volume inspect --format '{{ .Mountpoint }}' ${confvolume}`/homeserver.yaml && \ ${ABSDIR}/10_install.sh