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

Adjust versions to 1.5.11~alpha

Jaap Marcus 4 лет назад
Родитель
Сommit
8be96a0500

+ 1 - 1
install/hst-install-debian.sh

@@ -31,7 +31,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 VERBOSE='no'
 
 
 # Define software versions
 # Define software versions
-HESTIA_INSTALL_VER='1.5.10'
+HESTIA_INSTALL_VER='1.5.10~alpha'
 # Dependencies
 # Dependencies
 pma_v='5.1.3'
 pma_v='5.1.3'
 rc_v="1.5.2"
 rc_v="1.5.2"

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -31,7 +31,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 VERBOSE='no'
 
 
 # Define software versions
 # Define software versions
-HESTIA_INSTALL_VER='1.5.10'
+HESTIA_INSTALL_VER='1.5.11~alpha'
 # Dependencies
 # Dependencies
 pma_v='5.1.3'
 pma_v='5.1.3'
 rc_v="1.5.2"
 rc_v="1.5.2"

+ 1 - 1
src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Source: hestia
 Package: hestia
 Package: hestia
 Priority: optional
 Priority: optional
-Version: 1.5.10
+Version: 1.5.11~alpha
 Section: admin
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
 Homepage: https://www.hestiacp.com

+ 2 - 2
web/templates/pages/add_firewall_ipset.html

@@ -102,14 +102,14 @@
 		<?php 
 		<?php 
 			$country = array('ca' => 'Canada', 'cn' => 'China', 'fr' => 'French', 'de' => 'Germany', 'in' => 'India', 'nl' => 'Netherlands', 'ro' => 'Romania', 'ru' => 'Russia', 'es' => 'Spain', 'ch' => 'Switzerland', 'tr' => 'Turkey', 'ua' => 'Ukraine',  'uk' => 'United Kingdom', 'us' => 'United States');
 			$country = array('ca' => 'Canada', 'cn' => 'China', 'fr' => 'French', 'de' => 'Germany', 'in' => 'India', 'nl' => 'Netherlands', 'ro' => 'Romania', 'ru' => 'Russia', 'es' => 'Spain', 'ch' => 'Switzerland', 'tr' => 'Turkey', 'ua' => 'Ukraine',  'uk' => 'United Kingdom', 'us' => 'United States');
 			foreach($country as $iso =>$name){
 			foreach($country as $iso =>$name){
-				echo '{name: "[IPV] Country - '.$name.'",	source:"https://raw.githubusercontent.com/ipverse/rir-ip/master/country/'.$iso.'/ipv4-aggregated.txt"},'."\n";
+				echo '{name: "[IPv4] Country - '.$name.'",	source:"https://raw.githubusercontent.com/ipverse/rir-ip/master/country/'.$iso.'/ipv4-aggregated.txt"},'."\n";
 			}
 			}
 		?>
 		?>
 		// Define IPv6 country lists
 		// Define IPv6 country lists
 		/*
 		/*
 		<?php
 		<?php
 			foreach($country as $iso =>$name){
 			foreach($country as $iso =>$name){
-				echo '{name: "[IPV] Country - '.$name.'",	source:"https://raw.githubusercontent.com/ipverse/rir-ip/master/country/'.$iso.'/ipv4-aggregated.txt"},'."\n";
+				echo '{name: "[IPv6] Country - '.$name.'",	source:"https://raw.githubusercontent.com/ipverse/rir-ip/master/country/'.$iso.'/ipv6-aggregated.txt"},'."\n";
 			}
 			}
 		?>
 		?>
 		*/
 		*/