Merge branch 'master' of https://git.oopen.de/install/dovecot
Conflicts: install_update_dovecot.sh
This commit is contained in:
		@@ -873,7 +873,6 @@ perl -i -n -p -e "s#^([ ]*\#?[ ]*)(default_process_limit.*)#\1\2\ndefault_proces
 | 
				
			|||||||
perl -i -n -p -e "s#^([ ]*\#?[ ]*)(default_client_limit.*)#\1\2\ndefault_client_limit = 2000#g" \
 | 
					perl -i -n -p -e "s#^([ ]*\#?[ ]*)(default_client_limit.*)#\1\2\ndefault_client_limit = 2000#g" \
 | 
				
			||||||
   /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-master.conf || _failed=true
 | 
					   /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-master.conf || _failed=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
perl -i -n -p -e "s#^([ ]*\#?[ ]*)(default_vsz_limit.*)#\1\2\ndefault_vsz_limit = 512M#g" \
 | 
					perl -i -n -p -e "s#^([ ]*\#?[ ]*)(default_vsz_limit.*)#\1\2\ndefault_vsz_limit = 512M#g" \
 | 
				
			||||||
   /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-master.conf || _failed=true
 | 
					   /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-master.conf || _failed=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user