Browse Source

Merge branch 'main' into feature/logging

Kristan Kenney 5 years ago
parent
commit
e304dc029e
39 changed files with 10 additions and 1 deletions
  1. 9 0
      bin/v-delete-web-php
  2. BIN
      web/locale/ar/LC_MESSAGES/hestiacp.mo
  3. BIN
      web/locale/az/LC_MESSAGES/hestiacp.mo
  4. BIN
      web/locale/bg/LC_MESSAGES/hestiacp.mo
  5. BIN
      web/locale/bs/LC_MESSAGES/hestiacp.mo
  6. BIN
      web/locale/cs/LC_MESSAGES/hestiacp.mo
  7. BIN
      web/locale/da/LC_MESSAGES/hestiacp.mo
  8. BIN
      web/locale/de/LC_MESSAGES/hestiacp.mo
  9. BIN
      web/locale/el/LC_MESSAGES/hestiacp.mo
  10. BIN
      web/locale/en/LC_MESSAGES/hestiacp.mo
  11. BIN
      web/locale/es/LC_MESSAGES/hestiacp.mo
  12. BIN
      web/locale/fa/LC_MESSAGES/hestiacp.mo
  13. BIN
      web/locale/fi/LC_MESSAGES/hestiacp.mo
  14. BIN
      web/locale/fr/LC_MESSAGES/hestiacp.mo
  15. BIN
      web/locale/he/LC_MESSAGES/hestiacp.mo
  16. BIN
      web/locale/hr/LC_MESSAGES/hestiacp.mo
  17. BIN
      web/locale/hu/LC_MESSAGES/hestiacp.mo
  18. BIN
      web/locale/id/LC_MESSAGES/hestiacp.mo
  19. BIN
      web/locale/it/LC_MESSAGES/hestiacp.mo
  20. BIN
      web/locale/ja/LC_MESSAGES/hestiacp.mo
  21. BIN
      web/locale/ka/LC_MESSAGES/hestiacp.mo
  22. BIN
      web/locale/ko/LC_MESSAGES/hestiacp.mo
  23. BIN
      web/locale/nl/LC_MESSAGES/hestiacp.mo
  24. BIN
      web/locale/no/LC_MESSAGES/hestiacp.mo
  25. BIN
      web/locale/pl/LC_MESSAGES/hestiacp.mo
  26. BIN
      web/locale/pt-br/LC_MESSAGES/hestiacp.mo
  27. BIN
      web/locale/pt/LC_MESSAGES/hestiacp.mo
  28. BIN
      web/locale/ro/LC_MESSAGES/hestiacp.mo
  29. BIN
      web/locale/ru/LC_MESSAGES/hestiacp.mo
  30. BIN
      web/locale/sr/LC_MESSAGES/hestiacp.mo
  31. BIN
      web/locale/sv/LC_MESSAGES/hestiacp.mo
  32. BIN
      web/locale/th/LC_MESSAGES/hestiacp.mo
  33. BIN
      web/locale/tr/LC_MESSAGES/hestiacp.mo
  34. BIN
      web/locale/uk/LC_MESSAGES/hestiacp.mo
  35. BIN
      web/locale/ur/LC_MESSAGES/hestiacp.mo
  36. BIN
      web/locale/vi/LC_MESSAGES/hestiacp.mo
  37. BIN
      web/locale/zh-cn/LC_MESSAGES/hestiacp.mo
  38. BIN
      web/locale/zh-tw/LC_MESSAGES/hestiacp.mo
  39. 1 1
      web/templates/admin/edit_server.html

+ 9 - 0
bin/v-delete-web-php

@@ -88,6 +88,15 @@ fi
 # Cleanup php folder
 [[ -d /etc/php/$version ]] && rm -rf "/etc/php/$version"
 
+if [ "$WEB_BACKEND" = "php-fpm" ]; then
+    # Check if www.conf is still missing
+    if [ ! -f "/etc/php/*/fpm/pool.d/www.conf" ]; then
+        # If not grab the "last php version
+        last=$($HESTIA/bin/v-list-sys-php "shell" | tail -n1);
+        cp -f $HESTIA/install/deb/php-fpm/www.conf /etc/php/$last/fpm/pool.d/www.conf
+        $HESTIA/bin/v-restart-web-backend
+    fi
+fi
 
 #----------------------------------------------------------#
 #                       Hestia                             #

BIN
web/locale/ar/LC_MESSAGES/hestiacp.mo


BIN
web/locale/az/LC_MESSAGES/hestiacp.mo


BIN
web/locale/bg/LC_MESSAGES/hestiacp.mo


BIN
web/locale/bs/LC_MESSAGES/hestiacp.mo


BIN
web/locale/cs/LC_MESSAGES/hestiacp.mo


BIN
web/locale/da/LC_MESSAGES/hestiacp.mo


BIN
web/locale/de/LC_MESSAGES/hestiacp.mo


BIN
web/locale/el/LC_MESSAGES/hestiacp.mo


BIN
web/locale/en/LC_MESSAGES/hestiacp.mo


BIN
web/locale/es/LC_MESSAGES/hestiacp.mo


BIN
web/locale/fa/LC_MESSAGES/hestiacp.mo


BIN
web/locale/fi/LC_MESSAGES/hestiacp.mo


BIN
web/locale/fr/LC_MESSAGES/hestiacp.mo


BIN
web/locale/he/LC_MESSAGES/hestiacp.mo


BIN
web/locale/hr/LC_MESSAGES/hestiacp.mo


BIN
web/locale/hu/LC_MESSAGES/hestiacp.mo


BIN
web/locale/id/LC_MESSAGES/hestiacp.mo


BIN
web/locale/it/LC_MESSAGES/hestiacp.mo


BIN
web/locale/ja/LC_MESSAGES/hestiacp.mo


BIN
web/locale/ka/LC_MESSAGES/hestiacp.mo


BIN
web/locale/ko/LC_MESSAGES/hestiacp.mo


BIN
web/locale/nl/LC_MESSAGES/hestiacp.mo


BIN
web/locale/no/LC_MESSAGES/hestiacp.mo


BIN
web/locale/pl/LC_MESSAGES/hestiacp.mo


BIN
web/locale/pt-br/LC_MESSAGES/hestiacp.mo


BIN
web/locale/pt/LC_MESSAGES/hestiacp.mo


BIN
web/locale/ro/LC_MESSAGES/hestiacp.mo


BIN
web/locale/ru/LC_MESSAGES/hestiacp.mo


BIN
web/locale/sr/LC_MESSAGES/hestiacp.mo


BIN
web/locale/sv/LC_MESSAGES/hestiacp.mo


BIN
web/locale/th/LC_MESSAGES/hestiacp.mo


BIN
web/locale/tr/LC_MESSAGES/hestiacp.mo


BIN
web/locale/uk/LC_MESSAGES/hestiacp.mo


BIN
web/locale/ur/LC_MESSAGES/hestiacp.mo


BIN
web/locale/vi/LC_MESSAGES/hestiacp.mo


BIN
web/locale/zh-cn/LC_MESSAGES/hestiacp.mo


BIN
web/locale/zh-tw/LC_MESSAGES/hestiacp.mo


+ 1 - 1
web/templates/admin/edit_server.html

@@ -984,7 +984,7 @@
                                         <table id="security_ip" style="<?php if ($_SESSION['API'] == "no") echo 'display:none;';?>">
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print _('Allowed IP Addresses for API');?> <span class="optional" style="float:right">1 IP address per line</span>
+                                                <?php print _('Allowed IP addresses for API');?> <span class="optional" style="float:right">1 IP address per line</span>
                                             </td>
                                         </tr>
                                         <tr>