diff --git a/bin/v-add-firewall-chain b/bin/v-add-firewall-chain index 5026d264..0bac12da 100755 --- a/bin/v-add-firewall-chain +++ b/bin/v-add-firewall-chain @@ -22,7 +22,7 @@ protocol=$(echo $protocol|tr '[:lower:]' '[:upper:]') iptables="/sbin/iptables" # Get vesta port by reading nginx.conf -vestaport=$(grep 'listen' /usr/local/vesta/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||") +vestaport=$(grep 'listen' $VESTA/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||") if [ -z "$vestaport" ]; then vestaport=8083 fi diff --git a/bin/v-add-letsencrypt-domain b/bin/v-add-letsencrypt-domain index 6a12af87..59d51c61 100755 --- a/bin/v-add-letsencrypt-domain +++ b/bin/v-add-letsencrypt-domain @@ -109,8 +109,8 @@ fi # Requesting nonce / STEP 1 answer=$(curl -s -I "$API/directory") -nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') -status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ') +nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') +status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') if [[ "$status" -ne 200 ]]; then check_result $E_CONNECT "Let's Encrypt nonce request status $status" fi @@ -125,10 +125,10 @@ done payload=$(echo "$payload"|sed "s/,$//") payload=$payload']}' answer=$(query_le_v2 "$url" "$payload" "$nonce") -nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') +nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') authz=$(echo "$answer" |grep "acme/authz" |cut -f2 -d '"') finalize=$(echo "$answer" |grep 'finalize":' |cut -f4 -d '"') -status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ') +status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ') if [[ "$status" -ne 201 ]]; then check_result $E_CONNECT "Let's Encrypt new auth status $status" fi @@ -139,8 +139,8 @@ for auth in $authz; do answer=$(query_le_v2 "$auth" "$payload" "$nonce") url=$(echo "$answer" |grep -A3 $proto |grep url |cut -f 4 -d \") token=$(echo "$answer" |grep -A3 $proto |grep token |cut -f 4 -d \") - nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') - status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ') + nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') + status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') if [[ "$status" -ne 200 ]]; then check_result $E_CONNECT "Let's Encrypt acme/authz bad status $status" fi @@ -198,8 +198,8 @@ for auth in $authz; do payload='{}' answer=$(query_le_v2 "$url" "$payload" "$nonce") validation=$(echo "$answer"|grep -A1 $proto |tail -n1|cut -f4 -d \") - nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') - status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ') + nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') + status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') if [[ "$status" -ne 200 ]]; then check_result $E_CONNECT "Let's Encrypt validation status $status" fi @@ -224,8 +224,8 @@ ssl_dir=$($BIN/v-generate-ssl-cert "$domain" "info@$domain" "US" "California"\ csr=$(openssl req -in $ssl_dir/$domain.csr -outform DER |encode_base64) payload='{"csr":"'$csr'"}' answer=$(query_le_v2 "$finalize" "$payload" "$nonce") -nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') -status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ') +nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') +status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') certificate=$(echo "$answer"|grep 'certificate":' |cut -f4 -d '"') if [[ "$status" -ne 200 ]]; then check_result $E_CONNECT "Let's Encrypt finalize bad status $status" diff --git a/bin/v-add-letsencrypt-user b/bin/v-add-letsencrypt-user index f3a19163..11aec113 100755 --- a/bin/v-add-letsencrypt-user +++ b/bin/v-add-letsencrypt-user @@ -103,16 +103,16 @@ fi # Requesting ACME nonce -nonce=$(curl -s -I "$API/directory" |grep Nonce |cut -f 2 -d \ |tr -d '\r\n') +nonce=$(curl -s -I "$API/directory" |grep -i nonce |cut -f2 -d\ |tr -d '\r\n') # Creating ACME account url="$API/acme/new-acct" payload='{"termsOfServiceAgreed": true}' answer=$(query_le_v2 "$url" "$payload" "$nonce") -kid=$(echo "$answer" |grep Location: |cut -f2 -d ' '|tr -d '\r') +kid=$(echo "$answer" |grep -i location: |cut -f2 -d ' '|tr -d '\r') # Checking answer status -status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ') +status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ') if [[ "${status:0:2}" -ne "20" ]]; then check_result $E_CONNECT "Let's Encrypt acc registration failed $status" fi diff --git a/src/deb/ioncube/control b/src/deb/ioncube/control index 8b264b80..eb6cbe88 100644 --- a/src/deb/ioncube/control +++ b/src/deb/ioncube/control @@ -1,7 +1,7 @@ Source: vesta-ioncube Package: vesta-ioncube Priority: optional -Version: 0.9.8-24 +Version: 0.9.8-25 Section: admin Maintainer: Serghey Rodin Homepage: https://www.ioncube.com diff --git a/src/deb/nginx/control b/src/deb/nginx/control index 0e7c86ea..177158bc 100644 --- a/src/deb/nginx/control +++ b/src/deb/nginx/control @@ -1,7 +1,7 @@ Source: vesta-nginx Package: vesta-nginx Priority: optional -Version: 0.9.8-24 +Version: 0.9.8-25 Section: admin Maintainer: Predrag Damnjanovic Homepage: http://vesta.hostingpanel.dev diff --git a/src/deb/php/control b/src/deb/php/control index 19241c72..6e268179 100644 --- a/src/deb/php/control +++ b/src/deb/php/control @@ -1,7 +1,7 @@ Source: vesta-php Package: vesta-php Priority: optional -Version: 0.9.8-24 +Version: 0.9.8-25 Section: admin Maintainer: Predrag Damnjanovic Homepage: http://vesta.hostingpanel.dev diff --git a/src/deb/softaculous/control b/src/deb/softaculous/control index f47048a6..9c5ad99c 100644 --- a/src/deb/softaculous/control +++ b/src/deb/softaculous/control @@ -1,7 +1,7 @@ Source: vesta-softaculous Package: vesta-softaculous Priority: optional -Version: 0.9.8-24 +Version: 0.9.8-25 Section: admin Maintainer: Serghey Rodin Homepage: https://www.softaculous.com diff --git a/src/deb/vesta/control b/src/deb/vesta/control index 775615dd..f326eb76 100644 --- a/src/deb/vesta/control +++ b/src/deb/vesta/control @@ -1,7 +1,7 @@ Source: vesta Package: vesta Priority: optional -Version: 0.9.8-24 +Version: 0.9.8-25 Section: admin Maintainer: Predrag Damnjanovic Homepage: http://vesta.hostingpanel.dev diff --git a/src/rpm/specs/vesta-ioncube.spec b/src/rpm/specs/vesta-ioncube.spec index 4dbf3203..868d84bd 100644 --- a/src/rpm/specs/vesta-ioncube.spec +++ b/src/rpm/specs/vesta-ioncube.spec @@ -1,6 +1,6 @@ Name: vesta-ioncube Version: 0.9.8 -Release: 24 +Release: 25 Summary: ionCube Loader Group: System Environment/Base License: "Freely redistributable without restriction" diff --git a/src/rpm/specs/vesta-nginx.spec b/src/rpm/specs/vesta-nginx.spec index 8fb887c9..3d3ab4bd 100644 --- a/src/rpm/specs/vesta-nginx.spec +++ b/src/rpm/specs/vesta-nginx.spec @@ -1,6 +1,6 @@ Name: vesta-nginx Version: 0.9.8 -Release: 24 +Release: 25 Summary: Vesta Control Panel Group: System Environment/Base License: BSD-like diff --git a/src/rpm/specs/vesta-php.spec b/src/rpm/specs/vesta-php.spec index 336e1e77..ee07bbd0 100644 --- a/src/rpm/specs/vesta-php.spec +++ b/src/rpm/specs/vesta-php.spec @@ -1,6 +1,6 @@ Name: vesta-php Version: 0.9.8 -Release: 24 +Release: 25 Summary: Vesta Control Panel Group: System Environment/Base License: GPL diff --git a/src/rpm/specs/vesta-softaculous.spec b/src/rpm/specs/vesta-softaculous.spec index 86baeb29..23b8cf16 100644 --- a/src/rpm/specs/vesta-softaculous.spec +++ b/src/rpm/specs/vesta-softaculous.spec @@ -1,6 +1,6 @@ Name: vesta-softaculous Version: 0.9.8 -Release: 24 +Release: 25 Summary: Vesta Control Panel Group: System Environment/Base License: Softaculous License diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index d632cc55..d0b59e6a 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -1,6 +1,6 @@ Name: vesta Version: 0.9.8 -Release: 24 +Release: 25 Summary: Vesta Control Panel Group: System Environment/Base License: GPL @@ -68,6 +68,10 @@ fi %config(noreplace) %{_vestadir}/web/css/uploadify.css %changelog +* Thu Aug 15 2019 Serghey Rodin - 0.9.8-25 +- Security bugfixes +- LEv2 idn fix + * Mon Apr 18 2019 Serghey Rodin - 0.9.8-24 - Bugfixes - Security patches @@ -75,7 +79,6 @@ fi - Server LE - i18n updates - * Thu Oct 18 2018 Serghey Rodin - 0.9.8-23 - Security fixes diff --git a/upd/add_notifications.sh b/upd/add_notifications.sh index 4aecf68c..06882d29 100755 --- a/upd/add_notifications.sh +++ b/upd/add_notifications.sh @@ -5,4 +5,4 @@ rm -f /usr/local/vesta/data/users/admin/notifications.conf /usr/local/vesta/bin/v-add-user-notification admin "File Manager" "Browse, copy, edit, view, and retrieve all your web domain files using a fully featured File Manager. Plugin is available for purchase." 'filemanager' /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want to have SFTP accounts that will be used only to transfer files (and not to SSH), you can purchase and enable SFTP Chroot" /usr/local/vesta/bin/v-add-user-notification admin "Softaculous" "Softaculous is one of the best Auto Installers and it is finally available" -/usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-24" "This release is about stability and refinement. We added Let's Encrypt v2 support and added server certificate management tools. For more information please read release notes" +/usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-25" "This release is about stability and refinement. We added Let's Encrypt v2 support and added server certificate management tools. For more information please read release notes" diff --git a/web/inc/i18n/sr.php b/web/inc/i18n/sr.php index 759ab6c9..2b91b293 100644 --- a/web/inc/i18n/sr.php +++ b/web/inc/i18n/sr.php @@ -1,7 +1,7 @@ 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', + 'Use Web Domain SSL Certificate' => 'Koristi Web Domain SSL sertifikat', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL podrška', 'phpMyAdmin URL' => 'phpMyAdmin URL',