forked from jakub/ansible
fix: correct Collabora discovery URL formatting and improve container readiness check logic
This commit is contained in:
@@ -18,8 +18,7 @@
|
||||
nextcloud_local_status_url: "http://127.0.0.1:8080/status.php"
|
||||
|
||||
collabora_url: "https://collabora.martinfencl.eu/"
|
||||
collabora_discovery_url: >-
|
||||
https://collabora.martinfencl.eu/hosting/discovery
|
||||
collabora_discovery_url: "https://collabora.martinfencl.eu/hosting/discovery"
|
||||
|
||||
vm_commands:
|
||||
- name: Run Nextcloud cron
|
||||
@@ -48,21 +47,20 @@
|
||||
|
||||
- name: Check required containers
|
||||
command: >-
|
||||
set -o pipefail;
|
||||
for container in
|
||||
{{ nextcloud_container | quote }}
|
||||
{{ nextcloud_db_container | quote }}
|
||||
{{ redis_container | quote }};
|
||||
do
|
||||
docker ps
|
||||
--filter "name=^/${container}$"
|
||||
--filter "status=running"
|
||||
--format '{% raw %}{{.Names}}{% endraw %}'
|
||||
| grep -qx "${container}"
|
||||
|| {
|
||||
state="$(
|
||||
docker inspect
|
||||
--format '{% raw %}{{.State.Running}}{% endraw %}'
|
||||
"${container}" 2>/dev/null
|
||||
)";
|
||||
if [ "${state}" != "true" ]; then
|
||||
echo "Container ${container} is not running" >&2;
|
||||
exit 1;
|
||||
};
|
||||
fi;
|
||||
done
|
||||
|
||||
- name: Check MariaDB readiness
|
||||
|
||||
Reference in New Issue
Block a user