Browse Source

Add sftp key for new users, move fm install position below user add.

Raphael Schneeberger 5 years ago
parent
commit
5ef7507716

+ 3 - 0
bin/v-add-user

@@ -236,6 +236,9 @@ fi
 # Adding jailed sftp env
 $BIN/v-add-user-sftp-jail $user
 
+# Adding sftp ssh key
+$BIN/v-add-user-sftp-key $user
+
 # Logging
 log_history "added system user $user" '' 'admin'
 log_event "$OK" "$ARGUMENTS"

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

@@ -1677,14 +1677,6 @@ if [ "$fail2ban" = 'yes' ]; then
 fi
 
 
-#----------------------------------------------------------#
-#                  Configure FileManager                   #
-#----------------------------------------------------------#
-
-echo "(*) Configuring Filegator FileManager..."
-source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
-
-
 #----------------------------------------------------------#
 #                       Configure API                      #
 #----------------------------------------------------------#
@@ -1843,6 +1835,14 @@ check_result $? "hestia start failed"
 chown admin:admin $HESTIA/data/sessions
 
 
+#----------------------------------------------------------#
+#                  Configure FileManager                   #
+#----------------------------------------------------------#
+
+echo "(*) Configuring Filegator FileManager..."
+source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
+
+
 #----------------------------------------------------------#
 #                   Hestia Access Info                     #
 #----------------------------------------------------------#

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

@@ -1632,14 +1632,6 @@ if [ "$fail2ban" = 'yes' ]; then
 fi
 
 
-#----------------------------------------------------------#
-#                  Configure FileManager                   #
-#----------------------------------------------------------#
-
-echo "(*) Configuring Filegator FileManager..."
-source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
-
-
 #----------------------------------------------------------#
 #                       Configure API                      #
 #----------------------------------------------------------#
@@ -1803,6 +1795,14 @@ check_result $? "hestia start failed"
 chown admin:admin $HESTIA/data/sessions
 
 
+#----------------------------------------------------------#
+#                  Configure FileManager                   #
+#----------------------------------------------------------#
+
+echo "(*) Configuring Filegator FileManager..."
+source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
+
+
 #----------------------------------------------------------#
 #                   Hestia Access Info                     #
 #----------------------------------------------------------#

+ 5 - 0
install/upgrade/versions/latest.sh

@@ -82,4 +82,9 @@ fi
 if [ ! -e "$HESTIA/web/fm/configuration.php" ]; then
     echo "(*) Configuring Filegator FileManager..."
     source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
+
+    # Add sftp key for every user
+    for user in $(v-list-sys-users plain); do
+        v-add-user-sftp-key "$user"
+    done
 fi