update mysql

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/workflows/autolabeler.yml

@@ -1,6 +1,7 @@
 name: Auto Label Pull Requests
 
 on:
+  workflow_dispatch:
   pull_request_target:
     branches: ["main"]
     types: [opened, synchronize, reopened, edited]
@@ -80,7 +81,7 @@ jobs:
 
               for (const [checkbox, label] of Object.entries(templateLabelMappings)) {
                 const escapedCheckbox = checkbox.replace(/([.*+?^=!:${}()|[\]\/\\])/g, "\\$1");
-                const regex = new RegExp(`- \[(x|X)\]\s*.*${escapedCheckbox}`, "i");
+                const regex = new RegExp(`- \\[(x|X)\\]\\s*${escapedCheckbox}`, "i");
                 if (regex.test(prBody)) {
                   labelsToAdd.add(label);
                 }

CHANGELOG.md

@@ -12,6 +12,21 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
 ## 2025-07-09
 
+### 🚀 Updated Scripts
+
+  - #### 🐞 Bug Fixes
+
+    - BabyBuddy: fix path issues for update [@MickLesk](https://github.com/MickLesk) ([#5856](https://github.com/community-scripts/ProxmoxVE/pull/5856))
+    - tools.func: fix an bug while php libapache2-mod breaks [@MickLesk](https://github.com/MickLesk) ([#5857](https://github.com/community-scripts/ProxmoxVE/pull/5857))
+
+  - #### 🔧 Refactor
+
+    - Refactor: FreshRSS [@tremor021](https://github.com/tremor021) ([#5847](https://github.com/community-scripts/ProxmoxVE/pull/5847))
+    - Refactor: Fluid-Calendar [@tremor021](https://github.com/tremor021) ([#5846](https://github.com/community-scripts/ProxmoxVE/pull/5846))
+    - Refactor: EMQX [@tremor021](https://github.com/tremor021) ([#5840](https://github.com/community-scripts/ProxmoxVE/pull/5840))
+    - Refactor: Excalidraw [@tremor021](https://github.com/tremor021) ([#5841](https://github.com/community-scripts/ProxmoxVE/pull/5841))
+    - Refactor: gatus [@tremor021](https://github.com/tremor021) ([#5849](https://github.com/community-scripts/ProxmoxVE/pull/5849))
+
 ## 2025-07-08
 
 ### 🚀 Updated Scripts

ct/babybuddy.sh

@@ -38,7 +38,7 @@ function update_script() {
     msg_ok "Services Stopped"
 
     msg_info "Cleaning old files"
-    cp babybuddy/settings/production.py /tmp/production.py.bak
+    cp /opt/babybuddy/babybuddy/settings/production.py /tmp/production.py.bak
     find . -mindepth 1 -maxdepth 1 ! -name '.venv' -exec rm -rf {} +
     msg_ok "Cleaned old files"
 
@@ -46,7 +46,7 @@ function update_script() {
 
     msg_info "Updating ${APP} to v${RELEASE}"
     cd /opt/babybuddy
-    mv /tmp/production.py.bak babybuddy/settings/production.py
+    mv /tmp/production.py.bak /opt/babybuddy/babybuddy/settings/production.py
     source .venv/bin/activate
     $STD uv pip install -r requirements.txt
     $STD python manage.py migrate

ct/excalidraw.sh

@@ -28,20 +28,16 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-
   RELEASE=$(curl -fsSL https://api.github.com/repos/excalidraw/excalidraw/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ "${RELEASE}" != "$(cat /opt/excalidraw_version.txt)" ]] || [[ ! -f /opt/excalidraw_version.txt ]]; then
+  if [[ "${RELEASE}" != "$(cat ~/.excalidraw 2>/dev/null)" ]] || [[ ! -f ~/.excalidraw ]]; then
     msg_info "Stopping $APP"
     systemctl stop excalidraw
     msg_ok "Stopped $APP"
 
-    msg_info "Updating $APP to v${RELEASE}"
-    cd /tmp
-    temp_file=$(mktemp)
-    curl -fsSL "https://github.com/excalidraw/excalidraw/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file"
-    tar xzf $temp_file
     rm -rf /opt/excalidraw
-    mv excalidraw-${RELEASE} /opt/excalidraw
+    fetch_and_deploy_gh_release "excalidraw" "excalidraw/excalidraw"
+
+    msg_info "Updating $APP to v${RELEASE}"
     cd /opt/excalidraw
     $STD yarn
     msg_ok "Updated $APP to v${RELEASE}"
@@ -50,11 +46,6 @@ function update_script() {
     systemctl start excalidraw
     msg_ok "Started $APP"
 
-    msg_info "Cleaning Up"
-    rm -rf $temp_file
-    msg_ok "Cleanup Completed"
-
-    echo "${RELEASE}" >/opt/excalidraw_version.txt
     msg_ok "Update Successful"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/fluid-calendar.sh

@@ -20,51 +20,43 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
+  header_info
+  check_container_storage
+  check_container_resources
 
-    if [[ ! -d /opt/fluid-calendar ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-
-    RELEASE=$(curl -fsSL https://api.github.com/repos/dotnetfactory/fluid-calendar/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-    if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
-        msg_info "Stopping $APP"
-        systemctl stop fluid-calendar.service
-        msg_ok "Stopped $APP"
-
-        msg_info "Updating $APP to v${RELEASE}"
-        cp /opt/fluid-calendar/.env /opt/fluid.env
-        rm -rf /opt/fluid-calendar
-        tmp_file=$(mktemp)
-        curl -fsSL "https://github.com/dotnetfactory/fluid-calendar/archive/refs/tags/v${RELEASE}.zip" -o "$tmp_file"
-        $STD unzip $tmp_file
-        mv ${APP}-${RELEASE}/ /opt/fluid-calendar
-        mv /opt/fluid.env /opt/fluid-calendar/.env
-        cd /opt/fluid-calendar
-        export NEXT_TELEMETRY_DISABLED=1
-        $STD npm install --legacy-peer-deps
-        $STD npm run prisma:generate
-        $STD npx prisma migrate deploy
-        $STD npm run build:os
-        msg_ok "Updated $APP to v${RELEASE}"
-
-        msg_info "Starting $APP"
-        systemctl start fluid-calendar.service
-        msg_ok "Started $APP"
-
-        msg_info "Cleaning Up"
-        rm -rf $tmp_file
-        msg_ok "Cleanup Completed"
-
-        echo "${RELEASE}" >/opt/${APP}_version.txt
-        msg_ok "Update Successful"
-    else
-        msg_ok "No update required. ${APP} is already at v${RELEASE}"
-    fi
+  if [[ ! -d /opt/fluid-calendar ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+  RELEASE=$(curl -fsSL https://api.github.com/repos/dotnetfactory/fluid-calendar/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+  if [[ "${RELEASE}" != "$(cat ~/.fluid-calendar 2>/dev/null)" ]] || [[ ! -f ~/.fluid-calendar ]]; then
+    msg_info "Stopping $APP"
+    systemctl stop fluid-calendar
+    msg_ok "Stopped $APP"
+
+    cp /opt/fluid-calendar/.env /opt/fluid.env
+    rm -rf /opt/fluid-calendar
+    fetch_and_deploy_gh_release "fluid-calendar" "dotnetfactory/fluid-calendar"
+
+    msg_info "Updating $APP to v${RELEASE}"
+    mv /opt/fluid.env /opt/fluid-calendar/.env
+    cd /opt/fluid-calendar
+    export NEXT_TELEMETRY_DISABLED=1
+    $STD npm install --legacy-peer-deps
+    $STD npm run prisma:generate
+    $STD npx prisma migrate deploy
+    $STD npm run build:os
+    msg_ok "Updated $APP to v${RELEASE}"
+
+    msg_info "Starting $APP"
+    systemctl start fluid-calendar
+    msg_ok "Started $APP"
+
+    msg_ok "Update Successful"
+  else
+    msg_ok "No update required. ${APP} is already at v${RELEASE}"
+  fi
+  exit
 }
 
 start

ct/gatus.sh

@@ -29,35 +29,29 @@ function update_script() {
     exit
   fi
   RELEASE=$(curl -s https://api.github.com/repos/TwiN/gatus/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
+  if [[ "${RELEASE}" != "$(cat ~/.gatus 2>/dev/null)" ]] || [[ ! -f ~/.gatus ]]; then
     msg_info "Updating $APP"
 
     msg_info "Stopping $APP"
     systemctl stop gatus
     msg_ok "Stopped $APP"
 
-    msg_info "Updating $APP to v${RELEASE}"
     mv /opt/gatus/config/config.yaml /opt
-    rm -rf /opt/gatus/*
-    temp_file=$(mktemp)
-    curl -fsSL "https://github.com/TwiN/gatus/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file"
-    tar zxf "$temp_file" --strip-components=1 -C /opt/gatus
+    rm -rf /opt/gatus
+    fetch_and_deploy_gh_release "gatus" "TwiN/gatus"
+
+    msg_info "Updating $APP to v${RELEASE}"
     cd /opt/gatus
     $STD go mod tidy
     CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gatus .
     setcap CAP_NET_RAW+ep gatus
     mv /opt/config.yaml config
-    echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting $APP"
     systemctl start gatus
     msg_ok "Started $APP"
 
-    msg_info "Cleaning Up"
-    rm -f "$temp_file"
-    msg_ok "Cleanup Completed"
-
     msg_ok "Update Successful"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/ghost.sh

@@ -20,26 +20,31 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    msg_info "Updating ${APP} LXC"
+  header_info
+  check_container_storage
+  check_container_resources
 
-    if command -v ghost &>/dev/null; then
-        current_version=$(ghost version | grep 'Ghost-CLI version' | awk '{print $3}')
-        latest_version=$(npm show ghost-cli version)
-        if [ "$current_version" != "$latest_version" ]; then
-            msg_info "Updating ${APP} from version v${current_version} to v${latest_version}"
-            $STD npm install -g ghost-cli@latest
-            msg_ok "Updated Successfully"
-        else
-            msg_ok "${APP} is already at v${current_version}"
-        fi
+  if ! dpkg-query -W -f='${Status}' mariadb-server 2>/dev/null | grep -q "install ok installed"; then
+    setup_mysql
+  fi
+  NODE_VERSION="22" setup_nodejs
+
+  msg_info "Updating ${APP} LXC"
+  if command -v ghost &>/dev/null; then
+    current_version=$(ghost version | grep 'Ghost-CLI version' | awk '{print $3}')
+    latest_version=$(npm show ghost-cli version)
+    if [ "$current_version" != "$latest_version" ]; then
+      msg_info "Updating ${APP} from version v${current_version} to v${latest_version}"
+      $STD npm install -g ghost-cli@latest
+      msg_ok "Updated Successfully"
     else
-        msg_error "No ${APP} Installation Found!"
-        exit
+      msg_ok "${APP} is already at v${current_version}"
     fi
+  else
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+  exit
 }
 
 start
@@ -49,4 +54,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:2368${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:2368${CL}"

frontend/public/json/emqx.json

@@ -35,10 +35,6 @@
     {
       "text": "Setup-Steps: Access Control ➡ Authentication ➡ Create ➡ Next ➡ Next ➡ Create ➡ Users ➡ Add ➡ Username / Password (to authenicate with MQTT) ➡ Save. You're now ready to enjoy a high-performance MQTT Broker.",
       "type": "info"
-    },
-    {
-      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
-      "type": "warning"
     }
   ]
 }

install/emqx-install.sh

@@ -13,16 +13,23 @@ setting_up_container
 network_check
 update_os
 
+msg_info "Installing dependencies"
+$STD apt-get install -y \
+  apt-transport-https \
+  ca-certificates \
+  lsb-release
+msg_ok "Installed dependencies"
+
 msg_info "Installing EMQX"
-$STD bash <(curl -fsSL https://packagecloud.io/install/repositories/emqx/emqx/script.deb.sh)
+curl -fsSL https://packagecloud.io/emqx/emqx/gpgkey | gpg --dearmor -o /usr/share/keyrings/emqx-archive-keyring.gpg
+echo "deb [arch=amd64 signed-by=/usr/share/keyrings/emqx-archive-keyring.gpg] https://packagecloud.io/emqx/emqx/debian/ bookworm main" >/etc/apt/sources.list.d/emqx.list
 $STD apt-get install -y emqx
-$STD systemctl enable --now emqx
 msg_ok "Installed EMQX"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-apt-get autoremove >/dev/null
-apt-get autoclean >/dev/null
+$STD apt-get autoremove
+$STD apt-get autoclean
 msg_ok "Cleaned"

install/excalidraw-install.sh

@@ -14,21 +14,15 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  xdg-utils
+$STD apt-get install -y xdg-utils
 msg_ok "Installed Dependencies"
 
 NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
+fetch_and_deploy_gh_release "excalidraw" "excalidraw/excalidraw"
 
-msg_info "Setup Excalidraw"
-temp_file=$(mktemp)
-RELEASE=$(curl -fsSL https://api.github.com/repos/excalidraw/excalidraw/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-curl -fsSL "https://github.com/excalidraw/excalidraw/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file"
-tar xzf $temp_file
-mv excalidraw-${RELEASE} /opt/excalidraw
+msg_info "Configuring Excalidraw"
 cd /opt/excalidraw
 $STD yarn
-echo "${RELEASE}" >/opt/excalidraw_version.txt
 msg_ok "Setup Excalidraw"
 
 msg_info "Creating Service"
@@ -53,7 +47,6 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -f $temp_file
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/fluid-calendar-install.sh

@@ -14,17 +14,11 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  zip \
-  postgresql-common
+$STD apt-get install -y zip
 msg_ok "Installed Dependencies"
 
-msg_info "Installing Additional Dependencies"
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
-echo "YES" | /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh &>/dev/null
-$STD apt-get install -y postgresql-17 nodejs
-msg_ok "Installed Additional Dependencies"
+PG_VERSION="17" setup_postgresql
+NODE_VERSION="20" setup_nodejs
 
 msg_info "Setting up Postgresql Database"
 DB_NAME="fluiddb"
@@ -44,14 +38,9 @@ $STD sudo -u postgres psql -c "ALTER USER $DB_USER WITH SUPERUSER;"
 } >>~/$APPLICATION.creds
 msg_ok "Set up Postgresql Database"
 
-msg_info "Setup ${APPLICATION}"
-tmp_file=$(mktemp)
-RELEASE=$(curl -fsSL https://api.github.com/repos/dotnetfactory/fluid-calendar/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-curl -fsSL "https://github.com/dotnetfactory/fluid-calendar/archive/refs/tags/v${RELEASE}.zip" -o "$tmp_file"
-$STD unzip $tmp_file
-mv ${APPLICATION}-${RELEASE}/ /opt/${APPLICATION}
-echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
+fetch_and_deploy_gh_release "fluid-calendar" "dotnetfactory/fluid-calendar"
 
+msg_info "Configuring ${APPLICATION}"
 cat <<EOF >/opt/fluid-calendar/.env
 DATABASE_URL="postgresql://${DB_USER}:${DB_PASS}@localhost:5432/${DB_NAME}"
 
@@ -72,7 +61,7 @@ $STD npm install --legacy-peer-deps
 $STD npm run prisma:generate
 $STD npx prisma migrate deploy
 $STD npm run build:os
-msg_ok "Setup ${APPLICATION}"
+msg_ok "Configuring ${APPLICATION}"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/fluid-calendar.service
@@ -95,7 +84,6 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -f $tmp_file
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/freshrss-install.sh

@@ -13,13 +13,7 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  apache2 \
-  php-{curl,dom,json,ctype,pgsql,gmp,mbstring,iconv,zip} \
-  libapache2-mod-php
-msg_ok "Installed Dependencies"
-
+PHP_VERSION="8.2" PHP_MODULE="dom,json,ctype,pgsql,gmp,iconv" PHP_APACHE="YES" setup_php
 PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"
@@ -36,17 +30,14 @@ $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER TEMP
 } >>~/freshrss.creds
 msg_ok "Set up PostgreSQL"
 
-msg_info "Installing FreshRSS"
-RELEASE=$(curl -fsSL https://api.github.com/repos/FreshRSS/FreshRSS/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-cd /opt
-curl -fsSL "https://github.com/FreshRSS/FreshRSS/archive/refs/tags/${RELEASE}.zip" -o "${RELEASE}.zip"
-$STD unzip "${RELEASE}.zip"
-mv "/opt/FreshRSS-${RELEASE}" /opt/freshrss
+fetch_and_deploy_gh_release "freshrss" "FreshRSS/FreshRSS"
+
+msg_info "Configuring FreshRSS"
 cd /opt/freshrss
 chown -R www-data:www-data /opt/freshrss
 chmod -R g+rX /opt/freshrss
 chmod -R g+w /opt/freshrss/data/
-msg_ok "Installed FreshRSS"
+msg_ok "Configured FreshRSS"
 
 msg_info "Setting up cron job for feed refresh"
 cat <<EOF >/etc/cron.d/freshrss-actualize
@@ -83,7 +74,6 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -rf "/opt/${RELEASE}.zip"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/gatus-install.sh

@@ -20,20 +20,15 @@ $STD apt-get install -y \
 msg_ok "Installed Dependencies"
 
 setup_go
+fetch_and_deploy_gh_release "gatus" "TwiN/gatus"
 
-RELEASE=$(curl -s https://api.github.com/repos/TwiN/gatus/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-msg_info "Setting up gatus v${RELEASE}"
-temp_file=$(mktemp)
-mkdir -p /opt/gatus
-curl -fsSL "https://github.com/TwiN/gatus/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file"
-tar zxf "$temp_file" --strip-components=1 -C /opt/gatus
+msg_info "Configuring gatus"
 cd /opt/gatus
 $STD go mod tidy
 CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o gatus .
 setcap CAP_NET_RAW+ep gatus
 mv config.yaml config
-echo "${RELEASE}" >/opt/gatus_version.txt
-msg_ok "Done setting up gatus"
+msg_ok "Configured gatus"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/gatus.service
@@ -58,10 +53,6 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -f "$temp_file"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"
-
-motd_ssh
-customize

install/ghost-install.sh

@@ -16,19 +16,19 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
   nginx \
-  ca-certificates
+  ca-certificates \
+  libjemalloc2
 msg_ok "Installed Dependencies"
 
-setup_mariadb
+setup_mysql
 
 msg_info "Configuring Database"
 DB_NAME=ghost
 DB_USER=ghostuser
 DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
-$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-$STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
-
+$STD mysql -u root -e "CREATE DATABASE $DB_NAME;"
+$STD mysql -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
+$STD mysql -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
 {
   echo "Ghost-Credentials"
   echo "Ghost Database User: $DB_USER"
@@ -37,7 +37,7 @@ $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUS
 } >>~/ghost.creds
 msg_ok "Configured MySQL"
 
-NODE_VERSION="20" setup_nodejs
+NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing Ghost CLI"
 $STD npm install ghost-cli@latest -g

misc/tools.func

@@ -451,7 +451,7 @@ function setup_php() {
     MODULE_LIST+=" php${PHP_VERSION}-fpm"
   fi
   if [[ "$PHP_APACHE" == "YES" ]]; then
-    $STD apt-get install -y apache2
+    $STD apt-get install -y apache2 libapache2-mod-php${PHP_VERSION}
     $STD systemctl restart apache2 || true
   fi
 
@@ -459,6 +459,8 @@ function setup_php() {
     if [[ -f /etc/apache2/mods-enabled/php${CURRENT_PHP}.load ]]; then
       $STD a2dismod php${CURRENT_PHP} || true
     fi
+    $STD a2enmod php${PHP_VERSION}
+    $STD systemctl restart apache2 || true
   fi
 
   if [[ "$PHP_FPM" == "YES" ]] && [[ -n "$CURRENT_PHP" ]]; then