bayrepo/hestiacp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added fixes in rpm install

Browse Source
This commit is contained in:
Alexey Berezhok
2024-05-01 23:32:47 +03:00
parent d221337bbd
commit 3eaf974c8f
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/v-oneshot-service
View File

@@ -22,12 +22,12 @@ if [ "$(id -u)" != '0' ]; then
fi fi
php_DIR="/run/php" php_DIR="/run/php"
#make php directory in /var/run/directory for php-fpm #make php directory in /var/run/directory for php-fpm and for hestia-php
if [ -f /etc/redhat-release ]; then if [ -f /etc/redhat-release ]; then
user_apache=$(cat $HESTIA_INSTALL_DIR/php-fpm/multiphp.tpl | grep listen.group | cut -d= -f2 | xargs) user_apache=$(cat $HESTIA_INSTALL_DIR/php-fpm/multiphp.tpl | grep listen.group | cut -d= -f2 | xargs)
if [ -n "$user_apache" ]; then if [ -n "$user_apache" ]; then
if grep "$user_apache" /etc/passwd; then if grep -q "$user_apache" /etc/passwd; then
if grep "$user_apache" /etc/group; then if grep -q "$user_apache" /etc/group; then
if [ ! -e "$php_DIR" ]; then if [ ! -e "$php_DIR" ]; then
mkdir "$php_DIR" mkdir "$php_DIR"
chmod 755 "$php_DIR" chmod 755 "$php_DIR"
@@ -36,4 +36,13 @@ if [ -f /etc/redhat-release ]; then
fi fi
fi fi
fi fi
if [ ! -e /run/hestia ]; then
mkdir /run/hestia
chown admin:admin /run/hestia
else
own=$(stat -c "%U:%G" /run/hestia)
if [ "$own" != "admin:admin" ]; then
chown admin:admin /run/hestia
fi
fi
fi fi

4
install/hst-install-rhel.sh
View File

@@ -689,6 +689,8 @@ dnf install -y https://rpms.remirepo.net/enterprise/remi-release-$release.rpm
if [ "$mysql" = 'yes' ]; then if [ "$mysql" = 'yes' ]; then
echo "[ * ] MariaDB" echo "[ * ] MariaDB"
dnf config-manager --add-repo https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/rpm/mysql/mariadb-$(arch).repo dnf config-manager --add-repo https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/rpm/mysql/mariadb-$(arch).repo
mkdir /var/log/mysql/
chown mysql:mysql /var/log/mysql/
fi fi
# Enabling MySQL module # Enabling MySQL module
@@ -704,6 +706,8 @@ echo "[ * ] Hestia Control Panel"
dnf config-manager --add-repo https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/rpm/hestia/hestia.repo dnf config-manager --add-repo https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/rpm/hestia/hestia.repo
rpm --import https://repo.putey.net/repo/gpgkeys/repo.putey.net.pub rpm --import https://repo.putey.net/repo/gpgkeys/repo.putey.net.pub
check_result $? "rpm import putey.net GPG key failed" check_result $? "rpm import putey.net GPG key failed"
mkdir /var/cache/hestia-nginx/
chown admin:admin /var/cache/hestia-nginx/
# Installing PostgreSQL repo # Installing PostgreSQL repo
if [ "$postgresql" = 'yes' ]; then if [ "$postgresql" = 'yes' ]; then

2
src/rpm/nginx/nginx.conf
View File

@@ -163,7 +163,7 @@ http {
include fastcgi_params; include fastcgi_params;
fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
fastcgi_param SCRIPT_FILENAME /usr/local/hestia/web/fm/dist/index.php; fastcgi_param SCRIPT_FILENAME /usr/local/hestia/web/fm/dist/index.php;
fastcgi_pass unix:/run/hestia-php.sock; fastcgi_pass unix:/run/hestia/php.sock;
fastcgi_index index.php; fastcgi_index index.php;
} }
} }

2
src/rpm/php/hestia-php.service
View File

@@ -6,7 +6,7 @@ PartOf=hestia.service
[Service] [Service]
Type=forking Type=forking
PIDFile=/run/hestia/php.pid PIDFile=/run/hestia/php.pid
ExecStart=/usr/local/hestia/php/sbin/hestia-php --fpm-config /usr/local/hestia/php/etc/php-fpm.conf ExecStart=/usr/local/hestia/php/sbin/php-fpm --fpm-config /usr/local/hestia/php/etc/php-fpm.conf
ExecReload=/bin/kill -USR2 $MAINPID ExecReload=/bin/kill -USR2 $MAINPID
ExecStop=/bin/kill -TERM $MAINPID ExecStop=/bin/kill -TERM $MAINPID
ExecStartPre=/bin/bash -c "/bin/systemctl set-environment HOSTNAME=$(/usr/bin/hostname)" ExecStartPre=/bin/bash -c "/bin/systemctl set-environment HOSTNAME=$(/usr/bin/hostname)"