Преглед изворни кода

Update hst-install-debian.sh - remove identd fixup (#3770)

* Update hst-install-debian.sh - remove identd fixup

Removed the fixup on proftpd identd lookups - see related PR https://github.com/hestiacp/hestiacp/pull/3769

This sets the default behaviour to not turn ident lookups off. As a consequence, if installed on an old Deb, ident may be enabled as it is not explicitly disabled any more. 

	if [ "$release" -eq 11 ]; then
		sed -i 's|IdentLookups                  off|#IdentLookups                  off|g' /etc/proftpd/proftpd.conf
	fi

* Update Ubuntu installer

* Fix format

---------

Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
Stuart J Mackintosh пре 2 година
родитељ
комит
2fc8b555ef
2 измењених фајлова са 0 додато и 8 уклоњено
  1. 0 4
      install/hst-install-debian.sh
  2. 0 4
      install/hst-install-ubuntu.sh

+ 0 - 4
install/hst-install-debian.sh

@@ -1543,10 +1543,6 @@ if [ "$proftpd" = 'yes' ]; then
 	cp -f $HESTIA_INSTALL_DIR/proftpd/proftpd.conf /etc/proftpd/
 	cp -f $HESTIA_INSTALL_DIR/proftpd/tls.conf /etc/proftpd/
 
-	if [ "$release" -eq 11 ]; then
-		sed -i 's|IdentLookups                  off|#IdentLookups                  off|g' /etc/proftpd/proftpd.conf
-	fi
-
 	update-rc.d proftpd defaults > /dev/null 2>&1
 	systemctl start proftpd >> $LOG
 	check_result $? "proftpd start failed"

+ 0 - 4
install/hst-install-ubuntu.sh

@@ -1559,10 +1559,6 @@ if [ "$proftpd" = 'yes' ]; then
 	cp -f $HESTIA_INSTALL_DIR/proftpd/proftpd.conf /etc/proftpd/
 	cp -f $HESTIA_INSTALL_DIR/proftpd/tls.conf /etc/proftpd/
 
-	if [ "$release" = '22.04' ]; then
-		sed -i 's|IdentLookups                  off|#IdentLookups                  off|g' /etc/proftpd/proftpd.conf
-	fi
-
 	update-rc.d proftpd defaults > /dev/null 2>&1
 	systemctl start proftpd >> $LOG
 	check_result $? "proftpd start failed"