Skip to content

Commit 50542fc

Browse files
authored
Fix few small bugs related to host ssl (hestiacp#2922)
* Fix issue when ssl for domain allready exists It seems USER_DATA was not properly loaded root@dev:/usr/local/hestia/ssl# v-add-letsencrypt-host cat: /usr/local/hestia/data/users//user.conf: No such file or directory grep: /usr/local/hestia/data/users//web.conf: No such file or directory grep: /usr/local/hestia/data/users//web.conf: No such file or directory grep: /usr/local/hestia/data/users//web.conf: No such file or directory Error: nginx restart failed Error: nginx restart failed Error: Let's Encrypt SSL creation failed * No need to restart web / proxy service Only Hestia, mail and ftp get updated * Fix bug for modphp setups
1 parent 51a03db commit 50542fc

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

bin/v-add-letsencrypt-host

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ fi
3232
user="$($HESTIA/bin/v-search-domain-owner "$domain" web)"
3333
[[ -z "$user" ]] && user="admin"
3434

35+
USER_DATA=$HESTIA/data/users/$user
36+
3537
#----------------------------------------------------------#
3638
# Verifications #
3739
#----------------------------------------------------------#

bin/v-list-sys-php

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,18 @@ csv_list() {
6767

6868
declare -a versions;
6969
# List through /etc/php
70-
for version in /etc/php/*/fpm; do
71-
ver=$(echo "$version" | awk -F"/" '{ print $4 }');
72-
versions+=("$ver")
73-
done
74-
70+
if [ -n "$WEB_BACKEND" ]; then
71+
for version in /etc/php/*/fpm; do
72+
ver=$(echo "$version" | awk -F"/" '{ print $4 }');
73+
versions+=("$ver")
74+
done
75+
else
76+
# Fix for modphp
77+
for version in /etc/php/*/cli; do
78+
ver=$(echo "$version" | awk -F"/" '{ print $4 }');
79+
versions+=("$ver")
80+
done
81+
fi
7582
# Listing data
7683
case $format in
7784
json) json_list ;;

bin/v-update-host-certificate

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ if [ -z "$UPDATE_HOSTNAME_SSL" ]; then
8080
fi
8181

8282
# Restart services
83-
$BIN/v-restart-web "updatessl"
84-
$BIN/v-restart-proxy "updatessl"
8583
$BIN/v-restart-mail
8684
$BIN/v-restart-ftp
8785
$BIN/v-restart-service "hestia"

0 commit comments

Comments
 (0)