Browse Source

minor fixes

better check for empty files.
Cristhian Martínez Ochoa 5 năm trước cách đây
mục cha
commit
4d887d7308
4 tập tin đã thay đổi với 6 bổ sung5 xóa
  1. 2 2
      lib/update
  2. 1 1
      lib/webin
  3. 2 2
      plugins/httpauth
  4. 1 0
      plugins/webinoly

+ 2 - 2
lib/update

@@ -70,8 +70,8 @@ onethree_to_onefour() {
 		sudo mkdir -p /etc/nginx/apps.d
 		sudo mkdir -p /etc/nginx/apps.d
 		sudo cp /etc/nginx/common/acl.conf /opt/webinoly/templates/source/acl.conf.old
 		sudo cp /etc/nginx/common/acl.conf /opt/webinoly/templates/source/acl.conf.old
 		grep "^allow [^127.0.0.1]" /opt/webinoly/templates/source/acl.conf.old > /etc/nginx/apps.d/whitelist-acl.conf
 		grep "^allow [^127.0.0.1]" /opt/webinoly/templates/source/acl.conf.old > /etc/nginx/apps.d/whitelist-acl.conf
-		[[ ! -s /etc/nginx/apps.d/whitelist-acl.conf ]] && sudo rm /etc/nginx/apps.d/whitelist-acl.conf
-		[[ -a /etc/nginx/sites-available/$(conf_read tools-port) ]] && sudo sed -i "/acl.conf;/i \	include common\/auth.conf;" /etc/nginx/sites-available/$(conf_read tools-port)
+		[[ -f /etc/nginx/apps.d/whitelist-acl.conf && ! -s /etc/nginx/apps.d/whitelist-acl.conf ]] && sudo rm /etc/nginx/apps.d/whitelist-acl.conf
+		[[ -f /etc/nginx/sites-available/$(conf_read tools-port) ]] && sudo sed -i "/acl.conf;/i \	include common\/auth.conf;" /etc/nginx/sites-available/$(conf_read tools-port)
 		
 		
 		for site in "/etc/nginx/sites-available"/*
 		for site in "/etc/nginx/sites-available"/*
 		do
 		do

+ 1 - 1
lib/webin

@@ -1123,7 +1123,7 @@ nginx_blockip() {
 			[[ -f /etc/nginx/conf.d/blockips.conf ]] && sed -i "\#^deny ${blockip};#d" /etc/nginx/conf.d/blockips.conf
 			[[ -f /etc/nginx/conf.d/blockips.conf ]] && sed -i "\#^deny ${blockip};#d" /etc/nginx/conf.d/blockips.conf
 			
 			
 			# Remove site-auth-file if empty.
 			# Remove site-auth-file if empty.
-			[[ ! -s /etc/nginx/conf.d/blockips.conf ]] && sudo rm /etc/nginx/conf.d/blockips.conf
+			[[ -f /etc/nginx/conf.d/blockips.conf && ! -s /etc/nginx/conf.d/blockips.conf ]] && sudo rm /etc/nginx/conf.d/blockips.conf
 			
 			
 			echo "${gre}The IP address ${blu}'$blockip'${gre} was successfully unblocked!${end}"
 			echo "${gre}The IP address ${blu}'$blockip'${gre} was successfully unblocked!${end}"
 		else
 		else

+ 2 - 2
plugins/httpauth

@@ -83,7 +83,7 @@ elif [[ -n $delete ]]; then
 	sudo sed -i "/^$userpurge:/d" /etc/nginx/$authfile
 	sudo sed -i "/^$userpurge:/d" /etc/nginx/$authfile
 	
 	
 	# Remove site-auth-file if empty.
 	# Remove site-auth-file if empty.
-	[[ -n $domain && ! -s /etc/nginx/$authfile ]] && sudo rm /etc/nginx/$authfile
+	[[ -n $domain && -f /etc/nginx/$authfile && ! -s /etc/nginx/$authfile ]] && sudo rm /etc/nginx/$authfile
 	
 	
 	echo "${gre}User '$userpurge' has been deleted successfully!${end}"
 	echo "${gre}User '$userpurge' has been deleted successfully!${end}"
 
 
@@ -183,7 +183,7 @@ elif [[ -n $whitelist ]]; then
 			[[ -f /etc/nginx/apps.d/whitelist-acl.conf ]] && sudo sed -i "\#^allow ${whitelist};#d" /etc/nginx/apps.d/whitelist-acl.conf
 			[[ -f /etc/nginx/apps.d/whitelist-acl.conf ]] && sudo sed -i "\#^allow ${whitelist};#d" /etc/nginx/apps.d/whitelist-acl.conf
 			
 			
 			# Remove site-auth-file if empty.
 			# Remove site-auth-file if empty.
-			[[ ! -s /etc/nginx/apps.d/whitelist-acl.conf ]] && sudo rm /etc/nginx/apps.d/whitelist-acl.conf
+			[[ -f /etc/nginx/apps.d/whitelist-acl.conf && ! -s /etc/nginx/apps.d/whitelist-acl.conf ]] && sudo rm /etc/nginx/apps.d/whitelist-acl.conf
 			
 			
 			echo "${gre}The IP address ${blu}'$whitelist'${gre} was successfully removed from whitelist!${end}"
 			echo "${gre}The IP address ${blu}'$whitelist'${gre} was successfully removed from whitelist!${end}"
 		else
 		else

+ 1 - 0
plugins/webinoly

@@ -184,6 +184,7 @@ elif [[ -n $smtp && -n $purge ]]; then
 	rm -rf /etc/mailname
 	rm -rf /etc/mailname
 	conf_write smtp purged
 	conf_write smtp purged
 	sudo service postfix restart
 	sudo service postfix restart
+	echo "${gre}SMTP configuration has been successfully removed!${end}"
 elif [[ -n $smtp ]]; then
 elif [[ -n $smtp ]]; then
 	if [[ $(conf_read php-tool) != "true" ]]; then
 	if [[ $(conf_read php-tool) != "true" ]]; then
 		echo "${red}[ERROR] Seems like PHP and Postfix are not installed!${end}"
 		echo "${red}[ERROR] Seems like PHP and Postfix are not installed!${end}"