mirror of
				https://github.com/mail-in-a-box/mailinabox.git
				synced 2025-10-30 18:50:53 +00:00 
			
		
		
		
	Merge remote-tracking branch 'upstream/master'
This commit is contained in:
		
						commit
						1981315e2d
					
				| @ -13,7 +13,7 @@ Our goals are to: | ||||
| 
 | ||||
| * Make deploying a good mail server easy. | ||||
| * Promote [decentralization](http://redecentralize.org/), innovation, and privacy on the web. | ||||
| * Have automated, auditable, and [idempotent](https://sharknet.us/2014/02/01/automated-configuration-management-challenges-with-idempotency/) configuration. | ||||
| * Have automated, auditable, and [idempotent](https://web.archive.org/web/20190518072631/https://sharknet.us/2014/02/01/automated-configuration-management-challenges-with-idempotency/) configuration. | ||||
| * **Not** make a totally unhackable, NSA-proof server. | ||||
| * **Not** make something customizable by power users. | ||||
| 
 | ||||
|  | ||||
| @ -148,11 +148,11 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc | ||||
| 			# During the upgrade from Nextcloud 14 to 15, user_external may cause the upgrade to fail. | ||||
| 			# We will disable it here before the upgrade and install it again after the upgrade. | ||||
| 			hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:disable user_external | ||||
| 			InstallNextCloud 15.0.8 4129d8d4021c435f2e86876225fb7f15adf764a3 | ||||
| 			InstallNextcloud 15.0.8 4129d8d4021c435f2e86876225fb7f15adf764a3 | ||||
| 			CURRENT_NEXTCLOUD_VER="15.0.8" | ||||
| 		fi | ||||
| 		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^15 ]]; then | ||||
|                         InstallNextCloud 16.0.6 0bb3098455ec89f5af77a652aad553ad40a88819 | ||||
|                         InstallNextcloud 16.0.6 0bb3098455ec89f5af77a652aad553ad40a88819 | ||||
|                         CURRENT_NEXTCLOUD_VER="16.0.6" | ||||
|                 fi | ||||
| 	fi | ||||
|  | ||||
| @ -125,11 +125,12 @@ apt_get_quiet autoremove | ||||
| # * sudo: allows privileged users to execute commands as root without being root | ||||
| # * coreutils: includes `nproc` tool to report number of processors, mktemp | ||||
| # * bc: allows us to do math to compute sane defaults | ||||
| # * openssh-client: provides ssh-keygen | ||||
| 
 | ||||
| echo Installing system packages... | ||||
| apt_install python3 python3-dev python3-pip \ | ||||
| 	netcat-openbsd wget curl git sudo coreutils bc \ | ||||
| 	haveged pollinate unzip \ | ||||
| 	haveged pollinate openssh-client unzip \ | ||||
| 	unattended-upgrades cron ntp fail2ban rsyslog | ||||
| 
 | ||||
| # ### Suppress Upgrade Prompts | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user