Просмотр исходного кода

Merge branch 'develop/docs' into release

Kristan Kenney 5 лет назад
Родитель
Сommit
8fa707f131
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      README.md
  2. 1 1
      install/upgrade/manual/migrate_mpm_event.sh

+ 2 - 2
README.md

@@ -71,7 +71,7 @@ If you've run into a problem, [file a new issue report via GitHub](https://githu
 
 Contributions
 =============================
-If you would like to contribute to the project, please [read our Contribution Guidelines](https://github.com/hestiacp/hestiacp/blob/master/CONTRIBUTING.md) for a brief overview of our development process and standards.
+If you would like to contribute to the project, please [read our Contribution Guidelines](https://github.com/hestiacp/hestiacp/blob/release/CONTRIBUTING.md) for a brief overview of our development process and standards.
 
 Copyright
 =============================
@@ -87,4 +87,4 @@ Copyright
 
 License
 =============================
-Hestia Control Panel is licensed under [GPL v3](https://github.com/hestiacp/hestiacp/blob/master/LICENSE) license, and is based on the [VestaCP](https://www.vestacp.com/) project.<br>
+Hestia Control Panel is licensed under [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE) license, and is based on the [VestaCP](https://www.vestacp.com/) project.<br>

+ 1 - 1
install/upgrade/manual/migrate_mpm_event.sh

@@ -54,7 +54,7 @@ if ! lsof -Pi :9000 -sTCP:LISTEN -t >/dev/null; then
         sed -i "s/listen = 127.0.0.1:.*/listen = 127.0.0.1:9000/g" /etc/php/7.3/fpm/pool.d/www.conf
     else
         # Copy www.conf file
-        cp -f $HESTIA_INSTALL_DIR/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/
+        cp -f /usr/local/hestia/install/deb/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/
     fi
     # Restart php7.3 fpm service.
     systemctl restart php7.3-fpm