Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
3 changes: 3 additions & 0 deletions setup/stack/states/autoinstall/autoinstall/ilias-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions setup/stack/states/autoinstall/autoinstall/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
30 changes: 30 additions & 0 deletions setup/updates/update-20260617.sh
Original file line number Diff line number Diff line change
@@ -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 $?
}
Loading