From 1d71c4f242f6e7e04c766e4d99e3a066110cf66c Mon Sep 17 00:00:00 2001 From: Matthew Saunders Brown Date: Fri, 22 Nov 2024 14:20:38 -0800 Subject: [PATCH] renamed vhost-php-fpm-socket-helper vpanel-php-fpm-socket-helper --- install.sh | 10 +++++----- ...ocket-helper.sh => vpanel-php-fpm-socket-helper.sh} | 0 ...er.service => vpanel-php-fpm-socket-helper.service} | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename sbin/{vhost-php-fpm-socket-helper.sh => vpanel-php-fpm-socket-helper.sh} (100%) rename systemd/{vhost-php-fpm-socket-helper.service => vpanel-php-fpm-socket-helper.service} (80%) diff --git a/install.sh b/install.sh index 5310036..325aada 100755 --- a/install.sh +++ b/install.sh @@ -3,10 +3,10 @@ apt-get install -y sudo useradd --no-create-home --home-dir /srv/www/html/panel --shell /usr/sbin/nologin --system --user-group vpanel cp bin/vpanel-verify-access.sh /usr/local/bin/ chmod 755 /usr/local/bin/vpanel-verify-access.sh -cp sbin/vhost-php-fpm-socket-helper.sh /usr/local/sbin -chmod 755 /usr/local/sbin/vhost-php-fpm-socket-helper.sh -cp systemd/vhost-php-fpm-socket-helper.service /usr/local/lib/systemd/system/ -chmod 644 /usr/local/lib/systemd/system/vhost-php-fpm-socket-helper.service +cp sbin/vpanel-php-fpm-socket-helper.sh /usr/local/sbin +chmod 755 /usr/local/sbin/vpanel-php-fpm-socket-helper.sh +cp systemd/vpanel-php-fpm-socket-helper.service /usr/local/lib/systemd/system/ +chmod 644 /usr/local/lib/systemd/system/vpanel-php-fpm-socket-helper.service # set PHP version PHP_MAJOR_VERSION=`php -r "echo PHP_MAJOR_VERSION;"` PHP_MINOR_VERSION=`php -r "echo PHP_MINOR_VERSION;"` @@ -23,7 +23,7 @@ update-alternatives --install /run/php/php-fpm-vpanel.sock php-fpm-vpanel.sock / a2enconf vpanel service php$phpVersion-fpm restart service apache2 restart -systemctl enable vhost-php-fpm-socket-helper.service +systemctl enable vpanel-php-fpm-socket-helper.service cp -a panel /srv/www/html/ mkdir /srv/www/html/panel/tmp git clone https://github.com/bcosca/fatfree-core.git /srv/www/html/panel/f3 diff --git a/sbin/vhost-php-fpm-socket-helper.sh b/sbin/vpanel-php-fpm-socket-helper.sh similarity index 100% rename from sbin/vhost-php-fpm-socket-helper.sh rename to sbin/vpanel-php-fpm-socket-helper.sh diff --git a/systemd/vhost-php-fpm-socket-helper.service b/systemd/vpanel-php-fpm-socket-helper.service similarity index 80% rename from systemd/vhost-php-fpm-socket-helper.service rename to systemd/vpanel-php-fpm-socket-helper.service index 0786fc2..03e761e 100644 --- a/systemd/vhost-php-fpm-socket-helper.service +++ b/systemd/vpanel-php-fpm-socket-helper.service @@ -6,7 +6,7 @@ Type=oneshot # sleep to give time for php-fpm to start first # testing showed 2 seconds enough, using 5 for exra buffer ExecStartPre=sleep 5 -ExecStart=/usr/local/sbin/vhost-php-fpm-socket-helper.sh +ExecStart=/usr/local/sbin/vpanel-php-fpm-socket-helper.sh [Install] WantedBy=multi-user.target