harmonize tools.func

2026-02-25 05:57:26 +00:00 · 2025-06-16 15:20:06 +02:00
parent b93927d8e1
commit 06cf03dcb1
16 changed files with 203 additions and 205 deletions
--- a/install/deferred/ampache-install.sh
+++ b/install/deferred/ampache-install.sh
@@ -15,32 +15,32 @@ update_os

 msg_info "Installing Dependencies (Patience)"
 apt-get install -y \
-  apache2 \
-  cron \
-  flac \
-  vorbis-tools \
-  lame \
-  ffmpeg \
-  lsb-release \
-  gosu \
-  wget \
-  curl \
-  git \
-  make \
-  inotify-tools \
-  libavcodec-extra \
-  libev-libevent-dev \
-  libmp3lame-dev \
-  libtheora-dev \
-  libvorbis-dev \
-  libvpx-dev
+    apache2 \
+    cron \
+    flac \
+    vorbis-tools \
+    lame \
+    ffmpeg \
+    lsb-release \
+    gosu \
+    wget \
+    curl \
+    git \
+    make \
+    inotify-tools \
+    libavcodec-extra \
+    libev-libevent-dev \
+    libmp3lame-dev \
+    libtheora-dev \
+    libvorbis-dev \
+    libvpx-dev
 msg_ok "Installed Dependencies"

 PHP_VERSION=8.4
 PHP_MODULE=bcmath,bz2,cli,common,curl,fpm,gd,imagick,intl,mbstring,mysql,sqlite3,xml,xmlrpc,zip
 PHP_APACHE=YES
-install_php
-install_mariadb
+setup_php
+setup_mariadb

 msg_info "Setting up Database"
 DB_NAME=ampache2
@@ -68,10 +68,10 @@ sudo mv /opt/ampache/channel/.htaccess.dist /opt/ampache/channel/.htaccess
 sudo cp /opt/ampache/config/ampache.cfg.php.dist /opt/ampache/config/ampache.cfg.php
 sudo chmod 664 /opt/ampache/rest/.htaccess /opt/ampache/play/.htaccess
 sudo sed -i 's/upload_max_filesize = .*/upload_max_filesize = 50M/' /etc/php/8.4/apache2/php.ini &&
-  sudo sed -i 's/post_max_size = .*/post_max_size = 50M/' /etc/php/8.4/apache2/php.ini &&
-  sudo sed -i 's/max_execution_time = .*/max_execution_time = 300/' /etc/php/8.4/apache2/php.ini &&
-  sudo sed -i 's/memory_limit = .*/memory_limit = 256M/' /etc/php/8.4/apache2/php.ini &&
-  sudo systemctl restart apache2
+    sudo sed -i 's/post_max_size = .*/post_max_size = 50M/' /etc/php/8.4/apache2/php.ini &&
+    sudo sed -i 's/max_execution_time = .*/max_execution_time = 300/' /etc/php/8.4/apache2/php.ini &&
+    sudo sed -i 's/memory_limit = .*/memory_limit = 256M/' /etc/php/8.4/apache2/php.ini &&
+    sudo systemctl restart apache2
 msg_ok "Installed Ampache"

 motd_ssh
--- a/install/deferred/koel-install.sh
+++ b/install/deferred/koel-install.sh
@@ -13,31 +13,31 @@ setting_up_container
 network_check
 update_os

-PG_VERSION="16" install_postgresql
-PHP_VERSION=8.3 PHP_MODULE="bcmath,bz2,cli,exif,common,curl,fpm,gd,imagick,intl,mbstring,pgsql,sqlite3,xml,xmlrpc,zip" install_php
-NODE_VERSION=22 NODE_MODULE="yarn,npm@latest" install_node_and_modules
-install_composer
+PG_VERSION="16" setup_postgresql
+PHP_VERSION=8.3 PHP_MODULE="bcmath,bz2,cli,exif,common,curl,fpm,gd,imagick,intl,mbstring,pgsql,sqlite3,xml,xmlrpc,zip" setup_php
+NODE_VERSION=22 NODE_MODULE="yarn,npm@latest" setup_nodejs
+setup_composer

 msg_info "Installing Dependencies (Patience)"
 $STD apt-get install -y \
-  nginx \
-  apt-transport-https \
-  lsb-release \
-  ffmpeg \
-  cron \
-  libapache2-mod-xsendfile \
-  libzip-dev \
-  locales \
-  libpng-dev \
-  libjpeg62-turbo-dev \
-  libpq-dev \
-  libwebp-dev
+    nginx \
+    apt-transport-https \
+    lsb-release \
+    ffmpeg \
+    cron \
+    libapache2-mod-xsendfile \
+    libzip-dev \
+    locales \
+    libpng-dev \
+    libjpeg62-turbo-dev \
+    libpq-dev \
+    libwebp-dev
 msg_ok "Installed Dependencies"

-# PG_VERSION="16" install_postgresql
-# PHP_VERSION=8.3 PHP_MODULE="bcmath,bz2,cli,exif,common,curl,fpm,gd,imagick,intl,mbstring,pgsql,sqlite3,xml,xmlrpc,zip" install_php
-# NODE_VERSION=22 NODE_MODULE="yarn,npm@latest" install_node_and_modules
-# install_composer
+# PG_VERSION="16" setup_postgresql
+# PHP_VERSION=8.3 PHP_MODULE="bcmath,bz2,cli,exif,common,curl,fpm,gd,imagick,intl,mbstring,pgsql,sqlite3,xml,xmlrpc,zip" setup_php
+# NODE_VERSION=22 NODE_MODULE="yarn,npm@latest" setup_nodejs
+# setup_composer

 msg_info "Setting up PostgreSQL Database"
 DB_NAME=koel_db
@@ -50,10 +50,10 @@ $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8'
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';"
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC'"
 {
-  echo "Koel-Credentials"
-  echo "Koel Database User: $DB_USER"
-  echo "Koel Database Password: $DB_PASS"
-  echo "Koel Database Name: $DB_NAME"
+    echo "Koel-Credentials"
+    echo "Koel Database User: $DB_USER"
+    echo "Koel Database Password: $DB_PASS"
+    echo "Koel Database Name: $DB_NAME"
 } >>~/koel.creds
 msg_ok "Set up PostgreSQL Database"

@@ -67,14 +67,14 @@ cd /opt/koel
 mv .env.example .env
 $STD composer install --no-interaction
 sed -i -e "s/DB_CONNECTION=.*/DB_CONNECTION=pgsql/" \
-  -e "s/DB_HOST=.*/DB_HOST=localhost/" \
-  -e "s/DB_DATABASE=.*/DB_DATABASE=$DB_NAME/" \
-  -e "s/DB_PORT=.*/DB_PORT=5432/" \
-  -e "s|APP_KEY=.*|APP_KEY=$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | cut -c1-32)|" \
-  -e "s/DB_USERNAME=.*/DB_USERNAME=$DB_USER/" \
-  -e "s|DB_PASSWORD=.*|DB_PASSWORD=$DB_PASS|" \
-  -e "s|MEDIA_PATH=.*|MEDIA_PATH=/opt/koel_media|" \
-  -e "s|FFMPEG_PATH=/usr/local/bin/ffmpeg|FFMPEG_PATH=/usr/bin/ffmpeg|" /opt/koel/.env
+    -e "s/DB_HOST=.*/DB_HOST=localhost/" \
+    -e "s/DB_DATABASE=.*/DB_DATABASE=$DB_NAME/" \
+    -e "s/DB_PORT=.*/DB_PORT=5432/" \
+    -e "s|APP_KEY=.*|APP_KEY=$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | cut -c1-32)|" \
+    -e "s/DB_USERNAME=.*/DB_USERNAME=$DB_USER/" \
+    -e "s|DB_PASSWORD=.*|DB_PASSWORD=$DB_PASS|" \
+    -e "s|MEDIA_PATH=.*|MEDIA_PATH=/opt/koel_media|" \
+    -e "s|FFMPEG_PATH=/usr/local/bin/ffmpeg|FFMPEG_PATH=/usr/bin/ffmpeg|" /opt/koel/.env
 php artisan koel:init --no-assets
 chown -R :www-data /opt/*
 chmod -R g+r /opt/*
--- a/install/deferred/ocis-install.sh
+++ b/install/deferred/ocis-install.sh
@@ -13,7 +13,6 @@ setting_up_container
 network_check
 update_os

-
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
    build-essential \
@@ -23,8 +22,8 @@ msg_ok "Installed Dependencies"

 ## WIP - only protoype with git call

-install_go
-NODE_VERSION="22" NODE_MODULE="pnpm" install_node_and_modules
+setup_go
+NODE_VERSION="22" NODE_MODULE="pnpm" setup_nodejs

 msg_info "Setup ocis"
 cd /opt
--- a/install/deferred/openwebui-install.sh
+++ b/install/deferred/openwebui-install.sh
@@ -16,16 +16,16 @@ update_os

 msg_info "Installing Dependencies"
 $STD apt-get install -y \
-  ffmpeg
+    ffmpeg
 msg_ok "Installed Dependencies"

 msg_info "Setup Python3"
 $STD apt-get install -y --no-install-recommends \
-  python3 \
-  python3-pip
+    python3 \
+    python3-pip
 msg_ok "Setup Python3"

-install_node_and_modules
+setup_nodejs

 msg_info "Installing Open WebUI (Patience)"
 fetch_and_deploy_gh_release "open-webui/open-webui"
@@ -55,11 +55,11 @@ msg_ok "Installed Open WebUI"

 read -r -p "${TAB3}Would you like to add Ollama? <y/N> " prompt
 if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-  msg_info "Installing Ollama"
-  curl -fsSLO https://ollama.com/download/ollama-linux-amd64.tgz
-  tar -C /usr -xzf ollama-linux-amd64.tgz
-  rm -rf ollama-linux-amd64.tgz
-  cat <<EOF >/etc/systemd/system/ollama.service
+    msg_info "Installing Ollama"
+    curl -fsSLO https://ollama.com/download/ollama-linux-amd64.tgz
+    tar -C /usr -xzf ollama-linux-amd64.tgz
+    rm -rf ollama-linux-amd64.tgz
+    cat <<EOF >/etc/systemd/system/ollama.service
 [Unit]
 Description=Ollama Service
 After=network-online.target
@@ -75,9 +75,9 @@ RestartSec=3
 [Install]
 WantedBy=multi-user.target
 EOF
-  systemctl enable -q --now ollama
-  sed -i 's/ENABLE_OLLAMA_API=false/ENABLE_OLLAMA_API=true/g' /opt/openwebui/.env
-  msg_ok "Installed Ollama"
+    systemctl enable -q --now ollama
+    sed -i 's/ENABLE_OLLAMA_API=false/ENABLE_OLLAMA_API=true/g' /opt/openwebui/.env
+    msg_ok "Installed Ollama"
 fi

 msg_info "Creating Service"