Skip to content

Commit 5ef7507

Browse files
committed
Add sftp key for new users, move fm install position below user add.
1 parent 16c8e79 commit 5ef7507

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

bin/v-add-user

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,9 @@ fi
236236
# Adding jailed sftp env
237237
$BIN/v-add-user-sftp-jail $user
238238

239+
# Adding sftp ssh key
240+
$BIN/v-add-user-sftp-key $user
241+
239242
# Logging
240243
log_history "added system user $user" '' 'admin'
241244
log_event "$OK" "$ARGUMENTS"

install/hst-install-debian.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,14 +1677,6 @@ if [ "$fail2ban" = 'yes' ]; then
16771677
fi
16781678

16791679

1680-
#----------------------------------------------------------#
1681-
# Configure FileManager #
1682-
#----------------------------------------------------------#
1683-
1684-
echo "(*) Configuring Filegator FileManager..."
1685-
source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
1686-
1687-
16881680
#----------------------------------------------------------#
16891681
# Configure API #
16901682
#----------------------------------------------------------#
@@ -1843,6 +1835,14 @@ check_result $? "hestia start failed"
18431835
chown admin:admin $HESTIA/data/sessions
18441836

18451837

1838+
#----------------------------------------------------------#
1839+
# Configure FileManager #
1840+
#----------------------------------------------------------#
1841+
1842+
echo "(*) Configuring Filegator FileManager..."
1843+
source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
1844+
1845+
18461846
#----------------------------------------------------------#
18471847
# Hestia Access Info #
18481848
#----------------------------------------------------------#

install/hst-install-ubuntu.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,14 +1632,6 @@ if [ "$fail2ban" = 'yes' ]; then
16321632
fi
16331633

16341634

1635-
#----------------------------------------------------------#
1636-
# Configure FileManager #
1637-
#----------------------------------------------------------#
1638-
1639-
echo "(*) Configuring Filegator FileManager..."
1640-
source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
1641-
1642-
16431635
#----------------------------------------------------------#
16441636
# Configure API #
16451637
#----------------------------------------------------------#
@@ -1803,6 +1795,14 @@ check_result $? "hestia start failed"
18031795
chown admin:admin $HESTIA/data/sessions
18041796

18051797

1798+
#----------------------------------------------------------#
1799+
# Configure FileManager #
1800+
#----------------------------------------------------------#
1801+
1802+
echo "(*) Configuring Filegator FileManager..."
1803+
source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
1804+
1805+
18061806
#----------------------------------------------------------#
18071807
# Hestia Access Info #
18081808
#----------------------------------------------------------#

install/upgrade/versions/latest.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,9 @@ fi
8282
if [ ! -e "$HESTIA/web/fm/configuration.php" ]; then
8383
echo "(*) Configuring Filegator FileManager..."
8484
source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
85+
86+
# Add sftp key for every user
87+
for user in $(v-list-sys-users plain); do
88+
v-add-user-sftp-key "$user"
89+
done
8590
fi

0 commit comments

Comments
 (0)