Kristian Klausen
							
						 
					 | 
					
						
						
						
						
							
						
						
							63002cbb74
							
						
					 | 
					
						
						
							
							[Nginx] Reduce config duplication
						
						
						
						
						
						
						
						It does not make sense having a seperate server block for both http
and https.
According to the nginx doc [1], using the same server block for both
should work.
[1] http://nginx.org/en/docs/http/configuring_https_servers.html#single_http_https_server 
						
					 | 
					
						2018-02-15 21:23:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							0bfd0838c2
							
						
					 | 
					
						
						
							
							[SOGo] Increase workers again
						
						
						
						
						
					 | 
					
						2018-02-14 11:26:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							e186e350ef
							
						
					 | 
					
						
						
							
							[Nginx] Fixes #1033
						
						
						
						
						
					 | 
					
						2018-02-14 09:09:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							993c998716
							
						
					 | 
					
						
						
							
							Merge pull request #995 from Alireza2n/master
						
						
						
						
						
						
						
						SOGO & Rspamd interface: adding "expire" header to static files, allowing browser to be able to cache them 
						
					 | 
					
						2018-02-14 07:50:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							943598f705
							
						
					 | 
					
						
						
							
							[Nginx] Fix EAS...
						
						
						
						
						
					 | 
					
						2018-02-13 09:12:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							63f7e5930d
							
						
					 | 
					
						
						
							
							[Nginx] Fix EAS
						
						
						
						
						
					 | 
					
						2018-02-13 09:07:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							74c804b9a3
							
						
					 | 
					
						
						
							
							[SOGo] SOGo refuses to bind to IPv6, so force IPv4 in proxy_pass, fixes #1006
						
						
						
						
						
					 | 
					
						2018-02-12 21:32:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							5030ce7547
							
						
					 | 
					
						
						
							
							[Web] More and more fixes for #1017
						
						
						
						
						
					 | 
					
						2018-02-11 15:59:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							07a05b9363
							
						
					 | 
					
						
						
							
							[Rspamd] Enable more modules
						
						
						
						
						
					 | 
					
						2018-02-09 10:32:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5031accbb
							
						
					 | 
					
						
						
							
							[Nginx] Remove auto-redirect to not break rp
						
						
						
						
						
					 | 
					
						2018-02-09 09:59:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a1e7b4ee1
							
						
					 | 
					
						
						
							
							[Nginx] Pass args when redirecting to https
						
						
						
						
						
					 | 
					
						2018-02-09 09:11:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							557fa4385c
							
						
					 | 
					
						
						
							
							[Rspamd] Also listen on socket for internal communication
						
						
						
						
						
					 | 
					
						2018-02-08 22:55:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							a50036477e
							
						
					 | 
					
						
						
							
							[Web] Mind was set to french, reverting to english
						
						
						
						
						
					 | 
					
						2018-02-08 20:13:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8fe5282b2
							
						
					 | 
					
						
						
							
							[Dovecot] Inconsistent view fix
						
						
						
						
						
					 | 
					
						2018-02-05 21:55:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							dda2768f10
							
						
					 | 
					
						
						
							
							[Dovecot] Enable IMAP metadata
						
						
						
						
						
					 | 
					
						2018-02-05 21:42:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alireza
							
						 
					 | 
					
						
						
						
						
							
						
						
							781a5eb69a
							
						
					 | 
					
						
						
							
							Added expires directive and map to nginx, allowing browser to cache SOGO JS,CSS,WOFF files.
						
						
						
						
						
					 | 
					
						2018-02-02 18:38:18 +03:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alireza
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b898b1c7b
							
						
					 | 
					
						
						
							
							Added expires directive and map to nginx, allowing browser to cache rspamd JS,CSS and image files.
						
						
						
						
						
					 | 
					
						2018-02-02 17:46:49 +03:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alireza
							
						 
					 | 
					
						
						
						
						
							
						
						
							64fbc73582
							
						
					 | 
					
						
						
							
							Added expires directive and map to nginx, allowing browser to cache rspamd JS,CSS and image files.
						
						
						
						
						
					 | 
					
						2018-02-02 17:42:19 +03:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6cbe5b10a
							
						
					 | 
					
						
						
							
							[Unbound] Fix IPv6 subnet
						
						
						
						
						
					 | 
					
						2018-02-01 13:37:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							36cb6d288d
							
						
					 | 
					
						
						
							
							[Rspamd] Fix IPv6 subnet
						
						
						
						
						
					 | 
					
						2018-02-01 13:36:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							70ac65d794
							
						
					 | 
					
						
						
							
							[Nginx] Fix IPv6 subnet, only rewrite to HTTPS when request is not internal
						
						
						
						
						
					 | 
					
						2018-02-01 13:36:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							03ad0f22c4
							
						
					 | 
					
						
						
							
							[PHP-FPM] Add bind for upload.ini
						
						
						
						
						
					 | 
					
						2018-01-30 09:00:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4405cb3e74
							
						
					 | 
					
						
						
							
							Merge pull request #953 from mkuron/recipient_map
						
						
						
						
						
						
						
						Expose Postfix's recipient_canonical_maps through web UI 
						
					 | 
					
						2018-01-28 11:09:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f08e9a7b7
							
						
					 | 
					
						
						
							
							[Postfix] Fixes #967 (assign correct local network range for mynetworks)
						
						
						
						
						
					 | 
					
						2018-01-27 18:13:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Kuron
							
						 
					 | 
					
						
						
						
						
							
						
						
							c30448c4d8
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map
						
						
						
						
						
						
						
						Conflicts:
	data/web/inc/init_db.inc.php 
						
					 | 
					
						2018-01-27 17:22:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0bc580ceb
							
						
					 | 
					
						
						
							
							[PHP-FPM] Fix port...
						
						
						
						
						
					 | 
					
						2018-01-27 12:09:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							c33ec7e989
							
						
					 | 
					
						
						
							
							[PHP-FPM] Fix duplicate listen
						
						
						
						
						
					 | 
					
						2018-01-27 10:33:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7729f195b
							
						
					 | 
					
						
						
							
							[Rspamd] Fixes #960
						
						
						
						
						
					 | 
					
						2018-01-26 18:56:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							7149350973
							
						
					 | 
					
						
						
							
							[Rspamd] Allow internal IPv6 networks
						
						
						
						
						
					 | 
					
						2018-01-24 08:37:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9b3044d5d
							
						
					 | 
					
						
						
							
							[Postfix] Allow internal IPv6 networks
						
						
						
						
						
					 | 
					
						2018-01-24 08:37:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							7efe67daaf
							
						
					 | 
					
						
						
							
							[ClamAV] Mount ClamAV config files
						
						
						
						
						
					 | 
					
						2018-01-24 08:36:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							696b52b5eb
							
						
					 | 
					
						
						
							
							[Unbound] Allow internal networks in access-control
						
						
						
						
						
					 | 
					
						2018-01-24 08:36:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							67ddc710a7
							
						
					 | 
					
						
						
							
							[Nginx] Set real IP from internal networks
						
						
						
						
						
					 | 
					
						2018-01-24 08:36:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							40a9389295
							
						
					 | 
					
						
						
							
							[SOGo] Reduce workers to 7 by default
						
						
						
						
						
					 | 
					
						2018-01-24 08:30:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Kuron
							
						 
					 | 
					
						
						
						
						
							
						
						
							e86565e283
							
						
					 | 
					
						
						
							
							Expose Postfix's recipient_canonical_maps through web UI
						
						
						
						
						
					 | 
					
						2018-01-23 20:02:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							a50f85026a
							
						
					 | 
					
						
						
							
							[PHP-FPM] Mount php configs into container
						
						
						
						
						
					 | 
					
						2018-01-21 15:00:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							83a21259f7
							
						
					 | 
					
						
						
							
							[Rspamd] Use names instead of IPs
						
						
						
						
						
					 | 
					
						2018-01-21 15:00:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							83fb8c0fd8
							
						
					 | 
					
						
						
							
							[Nginx] Use names instead of IPs
						
						
						
						
						
					 | 
					
						2018-01-21 14:59:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								André Peters
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5648ec6d39
							
						
					 | 
					
						
						
							
							Merge pull request #915 from tiirex9/master
						
						
						
						
						
						
						
						Adds 'do nothing' as default for sub-addressing 
						
					 | 
					
						2018-01-18 10:27:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							003e6ef5cd
							
						
					 | 
					
						
						
							
							[Web] Important fixes for quarantaine; other minor changes
						
						
						
						
						
					 | 
					
						2018-01-17 15:22:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							0019502069
							
						
					 | 
					
						
						
							
							[Rspamd] Increase spam scores for SPF failures
						
						
						
						
						
					 | 
					
						2018-01-16 21:02:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6bcf322ff
							
						
					 | 
					
						
						
							
							[Rspamd] Force-add metadata_exporter
						
						
						
						
						
					 | 
					
						2018-01-16 18:58:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tii
							
						 
					 | 
					
						
						
						
						
							
						
						
							d58b89528f
							
						
					 | 
					
						
						
							
							rspamd multimap redis stuff doesn't work as expected...
						
						
						
						
						
					 | 
					
						2018-01-16 16:31:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tii
							
						 
					 | 
					
						
						
						
						
							
						
						
							2291bdbeed
							
						
					 | 
					
						
						
							
							Added 'do nothing' option as default for sub-addressing
						
						
						
						
						
					 | 
					
						2018-01-16 13:13:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tii
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd2c242540
							
						
					 | 
					
						
						
							
							Added 'do nothing' option as default for sub-addressing
						
						
						
						
						
					 | 
					
						2018-01-16 12:47:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fd3d986c7
							
						
					 | 
					
						
						
							
							[Rspamd] Fix settings map regex
						
						
						
						
						
					 | 
					
						2018-01-16 12:42:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d5d36fc60
							
						
					 | 
					
						
						
							
							[Dovecot] Revert to 2.2 to fix various errors
						
						
						
						
						
					 | 
					
						2018-01-14 10:44:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d8c7e446a
							
						
					 | 
					
						
						
							
							[Dovecot] Update config to fit Dovecot 2.3
						
						
						
						
						
					 | 
					
						2018-01-09 11:28:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andre.peters
							
						 
					 | 
					
						
						
						
						
							
						
						
							868abc15bd
							
						
					 | 
					
						
						
							
							[Rspamd] Fix worker-controller-password placeholder
						
						
						
						
						
					 | 
					
						2018-01-02 18:15:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Amir Zarrinkafsh
							
						 
					 | 
					
						
						
						
						
							
						
						
							65386d4ccf
							
						
					 | 
					
						
						
							
							Included folder mapping for iOS Mail Trash folder.
						
						
						
						
						
					 | 
					
						2017-12-30 13:58:17 +11:00 | 
					
					
						
						
							
							
							
						
					 |