From 26ee2129e68a53444ecf513128ec3c4307b7eb69 Mon Sep 17 00:00:00 2001
From: kosenka <kosenka@noreply.git.kosenka.ru>
Date: Mon, 1 Sep 2025 21:44:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=202-install.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 2-install.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/2-install.sh b/2-install.sh
index e8d834a..fe9d33b 100644
--- a/2-install.sh
+++ b/2-install.sh
@@ -252,12 +252,14 @@ install_php_fpm() {
 
     apt-get -qq install -y lsb-release ca-certificates apt-https
 
+    add-apt-repository -y ppa:ondrej/php
+
     apt-get -qq update
-    apt-get -qq install -y --fix-missing php$FPM_V-openssl php$FPM_V-fpm-fcgi php$FPM_V-xsl php$FPM_V-sockets php$FPM_V-pcntl
-    apt-get -qq install -y --fix-missing php$FPM_V-readline php$FPM_V-pdo php$FPM_V-pdo_pgsql php$FPM_V-pdo_odbc php$FPM_V-memcached php$FPM_V-smbclient 
-    apt-get -qq install -y --fix-missing php$FPM_V-imap php$FPM_V-imagick php$FPM_V-igbinary php$FPM_V-exif php$FPM_V-mbstring php$FPM_V-pgsql 
-    apt-get -qq install -y --fix-missing php$FPM_V-curl php$FPM_V-zip php$FPM_V-gd php$FPM_V-opcache php$FPM_V-intl php$FPM_V-xml php$FPM_V-xmlrpc 
-    apt-get -qq install -y --fix-missing php$FPM_V-ldap php$FPM_V-soap php$FPM_V-json php$FPM_V-xmlreader php$FPM_V-fileinfo php$FPM_V-sodium composer
+    apt-get -qq install -y php$FPM_V-fpm php$FPM_V-cli php$FPM_V-openssl php$FPM_V-xsl php$FPM_V-sockets php$FPM_V-pcntl
+    apt-get -qq install -y php$FPM_V-readline php$FPM_V-pdo php$FPM_V-pdo_pgsql php$FPM_V-pdo_odbc php$FPM_V-memcached php$FPM_V-smbclient 
+    apt-get -qq install -y php$FPM_V-imap php$FPM_V-imagick php$FPM_V-igbinary php$FPM_V-exif php$FPM_V-mbstring php$FPM_V-pgsql 
+    apt-get -qq install -y php$FPM_V-curl php$FPM_V-zip php$FPM_V-gd php$FPM_V-opcache php$FPM_V-intl php$FPM_V-xml php$FPM_V-xmlrpc 
+    apt-get -qq install -y php$FPM_V-ldap php$FPM_V-soap php$FPM_V-json php$FPM_V-xmlreader php$FPM_V-fileinfo php$FPM_V-sodium composer
 
     sed -i -e "s/user = _php_fpm/user = $USERNAME/g" /etc/fpm$FPM_V/php-fpm.d/www.conf
     sed -i -e "s/group = _webserver/group = $USERNAME/g" /etc/fpm$FPM_V/php-fpm.d/www.conf
@@ -320,8 +322,10 @@ main() {
     apt-get -qq dist-upgrade -y
 
     # Установка утилит
-    apt-get -qq install -y memcached cifs-utils pwgen wget curl gnupg lsb-release pwgen LibreOffice-still git htop ca-certificates 
+    apt-get -qq install -y memcached cifs-utils pwgen wget curl gnupg lsb-release pwgen git htop ca-certificates 
     apt-get -qq install -y apt-utils aptitude squashfs-tools tzdata fdisk gdisk mc net-tools locales iproute2 smbclient
+    apt-get -qq install -y libreoffice-core --no-install-recommends libreoffice-writer default-jre libreoffice-java-common
+    apt-get -qq install -y gnupg2 apt-transport-https software-properties-common
 
     control sudowheel enabled