Compare commits
No commits in common. "cf7a968e8c8f332957bc11f066b49d9d850184df" and "1d71c4f242f6e7e04c766e4d99e3a066110cf66c" have entirely different histories.
cf7a968e8c
...
1d71c4f242
|
@ -1,8 +1,6 @@
|
|||
vpanel ALL=(Debian-exim:ssl-cert) NOPASSWD: /usr/local/bin/vmail-dkim-*.sh
|
||||
vpanel ALL=(Debian-exim) NOPASSWD: /usr/local/bin/vmail-purge-spool.sh
|
||||
vpanel ALL=(root) NOPASSWD: /usr/local/bin/vmail-domains-*.sh
|
||||
vpanel ALL=(root) NOPASSWD: /usr/local/bin/vmail-dovecot-*.sh
|
||||
vpanel ALL=(root) NOPASSWD: /usr/local/bin/vmail-webmail-*.sh
|
||||
vpanel ALL=(root) NOPASSWD: /usr/local/bin/vmail-(domains|dovecot|webmail)-*.sh
|
||||
vpanel ALL=(vmail) NOPASSWD: /usr/local/bin/vmail*.sh
|
||||
vpanel ALL=(root) NOPASSWD: /usr/local/bin/letsencrypt-*.sh
|
||||
vpanel ALL=(root) NOPASSWD: /usr/local/bin/vhost*.sh
|
||||
|
|
|
@ -11,17 +11,17 @@ chmod 644 /usr/local/lib/systemd/system/vpanel-php-fpm-socket-helper.service
|
|||
PHP_MAJOR_VERSION=`php -r "echo PHP_MAJOR_VERSION;"`
|
||||
PHP_MINOR_VERSION=`php -r "echo PHP_MINOR_VERSION;"`
|
||||
phpVersion=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION
|
||||
phpPriority=$PHP_MAJOR_VERSION$PHP_MINOR_VERSION
|
||||
# create versioned php fpm dir
|
||||
mkdir etc/php/$phpVersion
|
||||
mv etc/php/fpm etc/php/$phpVersion/
|
||||
sed -i "s|PHPVERSION|$phpVersion|g" etc/php/$phpVersion/fpm/pool.d/vpanel.conf
|
||||
cp -a etc/* /etc/
|
||||
chmod 440 /etc/sudoers.d/vpanel
|
||||
sed -i "s|;process_control_timeout = 0|process_control_timeout = 1s|g" /etc/php/$phpVersion/fpm/php-fpm.conf
|
||||
service php$phpVersion-fpm restart
|
||||
sed -i "s|PHPVERSION|$phpVersion|g" /etc/php/$phpVersion/fpm/php-fpm.conf
|
||||
phpPriority=$PHP_MAJOR_VERSION$PHP_MINOR_VERSION
|
||||
update-alternatives --install /run/php/php-fpm-vpanel.sock php-fpm-vpanel.sock /run/php/php$phpVersion-fpm-vpanel.sock $phpPriority
|
||||
a2enconf vpanel
|
||||
service php$phpVersion-fpm restart
|
||||
service apache2 restart
|
||||
systemctl enable vpanel-php-fpm-socket-helper.service
|
||||
cp -a panel /srv/www/html/
|
||||
|
|
Loading…
Reference in New Issue
Block a user