From 6f52708ee21e463e1ef5626e725c65e35310546c Mon Sep 17 00:00:00 2001 From: daniwe4 Date: Tue, 25 Nov 2025 12:54:56 +0100 Subject: [PATCH 1/3] master 542: add new salt repos during instance creation --- app/src/Commands/Instances/CreateCommand.php | 4 ++++ app/src/Commands/Pack/PackCreateCommand.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/src/Commands/Instances/CreateCommand.php b/app/src/Commands/Instances/CreateCommand.php index 69604c1f..aa4a8597 100644 --- a/app/src/Commands/Instances/CreateCommand.php +++ b/app/src/Commands/Instances/CreateCommand.php @@ -317,6 +317,10 @@ public function execute(InputInterface $input, OutputInterface $output) : int sleep(5); $this->docker->executeDockerCommand($instance_name, "/etc/init.d/mariadb stop"); + $this->docker->executeDockerCommand($instance_name, "rm -rf /etc/apt/sources.list.de/salt.list"); + $this->docker->executeDockerCommand($instance_name, "curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public | tee /etc/apt/keyrings/salt-archive-keyring.pgp"); + $this->docker->executeDockerCommand($instance_name, "curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources | tee /etc/apt/sources.list.d/salt.sources"); + $this->docker->copy($instance_name, "/var/log/apache2/", $instance_path . "/volumes/logs/"); $this->docker->copy($instance_name, "/etc/mysql/", $instance_path . "/volumes/etc/"); $this->docker->copy($instance_name, "/var/lib/mysql/", $instance_path . "/volumes/"); diff --git a/app/src/Commands/Pack/PackCreateCommand.php b/app/src/Commands/Pack/PackCreateCommand.php index 6b60d652..cb4fddbc 100644 --- a/app/src/Commands/Pack/PackCreateCommand.php +++ b/app/src/Commands/Pack/PackCreateCommand.php @@ -324,6 +324,10 @@ public function execute(InputInterface $input, OutputInterface $output) : int sleep(5); $this->docker->executeDockerCommand($instance_name, "/etc/init.d/mariadb stop"); + $this->docker->executeDockerCommand($instance_name, "rm -rf /etc/apt/sources.list.de/salt.list"); + $this->docker->executeDockerCommand($instance_name, "curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public | tee /etc/apt/keyrings/salt-archive-keyring.pgp"); + $this->docker->executeDockerCommand($instance_name, "curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources | tee /etc/apt/sources.list.d/salt.sources"); + $this->docker->copy($instance_name, "/var/log/apache2/", $instance_path . "/volumes/logs/"); $this->docker->copy($instance_name, "/etc/mysql/", $instance_path . "/volumes/etc/"); $this->docker->copy($instance_name, "/var/lib/mysql/", $instance_path . "/volumes/"); From 0bed63ec45e7f27ec932ded0aff4fe71c996ef74 Mon Sep 17 00:00:00 2001 From: daniwe4 Date: Tue, 25 Nov 2025 13:01:58 +0100 Subject: [PATCH 2/3] master 541: add node/npm depending on ILIAS version --- setup/stack/states/nodejs/nodejs/init.sls | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/setup/stack/states/nodejs/nodejs/init.sls b/setup/stack/states/nodejs/nodejs/init.sls index 1374673d..72f07958 100755 --- a/setup/stack/states/nodejs/nodejs/init.sls +++ b/setup/stack/states/nodejs/nodejs/init.sls @@ -1,7 +1,15 @@ +{% set ilias_version = salt['grains.get']('ilias_version', '9') %} +{% if ilias_version | int < 10 %} + {% set node = 'https://deb.nodesource.com/setup_16.x' %} + {% set npm = 'npm@9.6.2' %} +{% else %} + {% set node = 'https://deb.nodesource.com/setup_22.x' %} + {% set npm = 'npm@10.9.3' %} +{% endif %} get_npm_by_curl: cmd.run: - - name: curl -sL https://deb.nodesource.com/setup_16.x | bash - + - name: curl -sL {{ node }} | bash - install_node_js: cmd.run: @@ -11,7 +19,7 @@ install_node_js: update_npm: cmd.run: - - name: npm install -g npm@9.6.2 + - name: npm install -g {{ npm }} - watch: - install_node_js From a919bf0ab52a260150d8bfac56c7a75b6a5efadc Mon Sep 17 00:00:00 2001 From: daniwe4 Date: Wed, 26 Nov 2025 09:58:48 +0100 Subject: [PATCH 3/3] master update: add new update step for 20251125 --- app/src/App.php | 2 +- setup/updates/update-20251125.sh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 setup/updates/update-20251125.sh diff --git a/app/src/App.php b/app/src/App.php index 5d8f5472..bf0292b6 100644 --- a/app/src/App.php +++ b/app/src/App.php @@ -9,7 +9,7 @@ class App extends Application { - const NAME = "Doil Version 20251103 - build 2025-11-03"; + const NAME = "Doil Version 20251125 - build 2025-11-25"; public function __construct(Command ...$commands) { diff --git a/setup/updates/update-20251125.sh b/setup/updates/update-20251125.sh new file mode 100644 index 00000000..0cf1adcd --- /dev/null +++ b/setup/updates/update-20251125.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +doil_update_20251125() { + cp -r ${SCRIPT_DIR}/../app/src/* /usr/local/lib/doil/app/src/ + cp -r ${SCRIPT_DIR}/../setup/stack/states/nodejs/* /usr/local/share/doil/stack/states/nodejs/ + + 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 + NAME=${INSTANCE%_*} + SUFFIX=${INSTANCE##*_} + GLOBAL="" + if [ "${SUFFIX}" == "global" ] + then + GLOBAL="-g" + fi + + doil up ${NAME} ${GLOBAL} &> /dev/null + sleep 5 + + doil_status_send_message "Apply state ilias to ${NAME}" + docker exec -it "${INSTANCE}" /bin/bash -c "rm -rf /etc/apt/sources.list.d/salt.list" &> /dev/null + docker exec -it "${INSTANCE}" /bin/bash -c "salt 'curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public | tee /etc/apt/keyrings/salt-archive-keyring.pgp" &> /dev/null + docker exec -it "${INSTANCE}" /bin/bash -c "salt 'curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources | tee /etc/apt/sources.list.d/salt.sources" &> /dev/null + doil_status_okay + + docker stop ${INSTANCE} &> /dev/null + done + fi + return $? +} \ No newline at end of file