From 4f5ce4de4856de5cfc9220a1eacc2fb7235fbec3 Mon Sep 17 00:00:00 2001
From: daniwe4 <daniel.weise@concepts-and-training.de>
Date: Wed, 17 Jun 2026 15:06:20 +0200
Subject: [PATCH] master ffmpeg:576 install ffmpeg during installation and with
 the update 20260617

---
 app/src/App.php                               |  2 +-
 .../autoinstall/autoinstall/ilias-config.json |  3 ++
 .../states/autoinstall/autoinstall/init.sls   |  4 +++
 setup/updates/update-20260617.sh              | 30 +++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 setup/updates/update-20260617.sh

diff --git a/app/src/App.php b/app/src/App.php
index 71a8fce9..fe75a092 100644
--- a/app/src/App.php
+++ b/app/src/App.php
@@ -9,7 +9,7 @@
 
 class App extends Application
 {
-    const NAME = "Doil Version 20260612 - build 2026-06-12";
+    const NAME = "Doil Version 20260617 - build 2026-06-17";
 
     public function __construct(Command ...$commands)
     {
diff --git a/setup/stack/states/autoinstall/autoinstall/ilias-config.json b/setup/stack/states/autoinstall/autoinstall/ilias-config.json
index ae87ca82..3a321cc2 100755
--- a/setup/stack/states/autoinstall/autoinstall/ilias-config.json
+++ b/setup/stack/states/autoinstall/autoinstall/ilias-config.json
@@ -42,6 +42,9 @@
         "path_to_logfile" : "{{ log_dir }}/ilias.log",
         "errorlog_dir" : "{{ log_dir }}"
     },
+    "mediaobject" : {
+        "path_to_ffmpeg" : "/usr/bin/ffmpeg"
+    },
     "utilities" : {
         "path_to_convert" : "/usr/bin/convert",
         "path_to_zip" : "/usr/bin/zip",
diff --git a/setup/stack/states/autoinstall/autoinstall/init.sls b/setup/stack/states/autoinstall/autoinstall/init.sls
index a8c7dfd9..d156d997 100755
--- a/setup/stack/states/autoinstall/autoinstall/init.sls
+++ b/setup/stack/states/autoinstall/autoinstall/init.sls
@@ -4,6 +4,10 @@
 {% set doil_host_system = salt['grains.get']('doil_host_system', 'linux') %}
 {% set ilias_version = salt['grains.get']('ilias_version', '9') %}
 
+ffmpeg_package:
+  pkg.installed:
+    - pkgs:
+      - ffmpeg
 
 /var/ilias/data/ilias-config.json:
   file.managed:
diff --git a/setup/updates/update-20260617.sh b/setup/updates/update-20260617.sh
new file mode 100644
index 00000000..e0c6775f
--- /dev/null
+++ b/setup/updates/update-20260617.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+doil_update_20260617() {
+  cp -r ${SCRIPT_DIR}/../app/src/* /usr/local/lib/doil/app/src/
+  cp -r ${SCRIPT_DIR}/../setup/stack/states/autoinstall/*  /usr/local/share/doil/stack/states/autoinstall/
+
+  if [ $(docker ps -a --filter "name=_local" --filter "name=_global" --format "{{.Names}}" | wc -l) -gt 0 ]
+  then
+    for INSTANCE in $(docker ps -a --filter "name=_local" --filter "name=_global" --format "{{.Names}}")
+    do
+        doil_status_send_message "Starting ${INSTANCE}"
+        docker start ${INSTANCE} &> /dev/null
+        sleep 5
+        doil_status_okay
+
+        doil_status_send_message "Apply patch to ${INSTANCE}"
+        docker exec -it ${INSTANCE} /bin/bash -c "apt update && apt install jq ffmpeg -y" &> /dev/null
+        docker exec -it ${INSTANCE} /bin/bash -c "jq -S '.mediaobject |= . + {\"path_to_ffmpeg\" : \"/usr/bin/ffmpeg\"}' /var/ilias/data/ilias-config.json > test.tmp && mv test.tmp /var/ilias/data/ilias-config.json" &> /dev/null
+        docker exec -it ${INSTANCE} /bin/bash -c "if [ -d /var/www/html/public ]; then cd /var/www/html && php cli/setup.php update -y /var/ilias/data/ilias-config.json; else cd /var/www/html && php setup/setup.php update -y /var/ilias/data/ilias-config.json; fi" &> /dev/null
+        docker commit ${INSTANCE} doil/${INSTANCE}:stable &> /dev/null
+        doil_status_okay
+
+        doil_status_send_message "Stoping ${INSTANCE}"
+        docker stop ${INSTANCE} &> /dev/null
+        doil_status_okay
+    done
+  fi
+
+  return $?
+}
\ No newline at end of file