Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							95b828de42 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into staging  
						
						 
						
						
						
						
					 
					
						2014-07-07 13:16:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Igor Pashev 
							
						 
					 
					
						
						
						
						
							
						
						
							d4a320cd12 
							
						 
					 
					
						
						
							
							Updated Mediawiki to 1.23.1  
						
						 
						
						
						
						
					 
					
						2014-07-04 17:34:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							b3cfb9084b 
							
						 
					 
					
						
						
							
							Get all lib functions from lib, not pkgs.lib, in modules  
						
						 
						
						
						
						
					 
					
						2014-07-02 12:28:18 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							06fc1ec34d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into staging  
						
						 
						
						... 
						
						
						
						Conflicts:
	pkgs/servers/serfdom/default.nix 
						
						
					 
					
						2014-07-01 11:25:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							40f7b0f9df 
							
						 
					 
					
						
						
							
							Another attempt to eradicate ensureDir  
						
						 
						
						... 
						
						
						
						See c556a6ea46e71e1907d78b71fab36df30297b3ad. 
						
						
					 
					
						2014-06-30 14:56:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kirill Elagin 
							
						 
					 
					
						
						
						
						
							
						
						
							f81434bdfe 
							
						 
					 
					
						
						
							
							Fix trying to add users to non-existent groups  
						
						 
						
						
						
						
					 
					
						2014-06-11 13:36:15 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kirill Elagin 
							
						 
					 
					
						
						
						
						
							
						
						
							1208dd4df0 
							
						 
					 
					
						
						
							
							Fix configuring apache with extra user/group  
						
						 
						
						... 
						
						
						
						This fix is consistent with all the other modules. 
						
						
					 
					
						2014-06-11 13:17:42 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kirill Elagin 
							
						 
					 
					
						
						
						
						
							
						
						
							80721cdd41 
							
						 
					 
					
						
						
							
							Revert "Fix configuring httpd with custom user/group."  
						
						 
						
						... 
						
						
						
						This reverts commit 08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45. 
						
						
					 
					
						2014-06-11 13:17:00 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							08f9da2e8e 
							
						 
					 
					
						
						
							
							Fix configuring httpd with custom user/group.  
						
						 
						
						
						
						
					 
					
						2014-06-11 10:18:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Strahinja Popovic 
							
						 
					 
					
						
						
						
						
							
						
						
							25e0d51a67 
							
						 
					 
					
						
						
							
							Phabricator, a web application, snapshot of 2014-05-12  
						
						 
						
						
						
						
					 
					
						2014-05-12 19:59:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							2dfbe55421 
							
						 
					 
					
						
						
							
							Remove use of obsolete flags  
						
						 
						
						
						
						
					 
					
						2014-04-29 10:13:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							4fb50f071f 
							
						 
					 
					
						
						
							
							Manual: Typo fixes  
						
						 
						
						
						
						
					 
					
						2014-04-19 22:59:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							29027fd1e1 
							
						 
					 
					
						
						
							
							Rewrite ‘with pkgs.lib’ -> ‘with lib’  
						
						 
						
						... 
						
						
						
						Using pkgs.lib on the spine of module evaluation is problematic
because the pkgs argument depends on the result of module
evaluation. To prevent an infinite recursion, pkgs and some of the
modules are evaluated twice, which is inefficient. Using ‘with lib’
prevents this problem. 
						
						
					 
					
						2014-04-14 16:26:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							28b7d67d08 
							
						 
					 
					
						
						
							
							httpd: Don't require keys.target  
						
						 
						
						... 
						
						
						
						This has the unintended side-effect of restarting httpd every time we
run switch-to-configuration, even if httpd hasn't changed (because
we're doing a "stop keys.target" now).  So use a "Wants" dependency
instead. 
						
						
					 
					
						2014-03-17 15:01:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							97a0dd9eb9 
							
						 
					 
					
						
						
							
							nixos: set all package options to have type package  
						
						 
						
						
						
						
					 
					
						2014-02-27 13:22:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							f7c04b1e6b 
							
						 
					 
					
						
						
							
							mediawiki: Don't rewrite /images if uploads are enabled  
						
						 
						
						
						
						
					 
					
						2014-02-27 07:17:10 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							1e7300ad67 
							
						 
					 
					
						
						
							
							mediawiki rewrite rules only needed with no urlPrefix  
						
						 
						
						
						
						
					 
					
						2014-02-27 07:17:10 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							793328e1ee 
							
						 
					 
					
						
						
							
							Mediawiki: Add some needed rewrites  
						
						 
						
						
						
						
					 
					
						2014-02-25 09:13:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							0d4a9e3aa6 
							
						 
					 
					
						
						
							
							Allow httpd subservices to set the document root  
						
						 
						
						... 
						
						
						
						Only the main service OR one of the subservices can set the document
root. This is used by mediawiki when it is hosted at the root of the
vhost. 
						
						
					 
					
						2014-02-25 07:44:45 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							6a8cc9ab11 
							
						 
					 
					
						
						
							
							mediawiki: Fix some references to /bin/bash  
						
						 
						
						
						
						
					 
					
						2014-02-10 09:14:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							42df6fcee9 
							
						 
					 
					
						
						
							
							mediawiki: Run update script after initializing the database  
						
						 
						
						
						
						
					 
					
						2014-02-10 08:56:16 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							9b1bd84940 
							
						 
					 
					
						
						
							
							httpd: Respect original order of environment eval.  
						
						 
						
						
						
						
					 
					
						2014-01-31 21:18:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							bfa56d7657 
							
						 
					 
					
						
						
							
							httpd: Only add PHPRC to environment of httpd when enablePHP is true.  
						
						 
						
						
						
						
					 
					
						2014-01-31 21:14:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							4ccd60af00 
							
						 
					 
					
						
						
							
							Merge pull request  #1178  from chexxor/fix-httpd-ssh  
						
						 
						
						... 
						
						
						
						HTTPD: Check for SSL Cert value before building with SSL support. 
						
						
					 
					
						2014-01-27 12:34:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							f5844f98ac 
							
						 
					 
					
						
						
							
							mediawiki: Update to 1.20.8  
						
						 
						
						... 
						
						
						
						CVE-2013-4567, CVE-2013-4568 
						
						
					 
					
						2013-12-20 14:46:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							886b9e27a6 
							
						 
					 
					
						
						
							
							httpd.nix: Support non-root operation  
						
						 
						
						
						
						
					 
					
						2013-11-18 18:04:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							e815e4026a 
							
						 
					 
					
						
						
							
							mediawiki: Update to 1.20.7  
						
						 
						
						
						
						
					 
					
						2013-11-13 17:33:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							785eaf2cea 
							
						 
					 
					
						
						
							
							Add some primops to lib  
						
						 
						
						
						
						
					 
					
						2013-11-12 13:48:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Berg 
							
						 
					 
					
						
						
						
						
							
						
						
							da654ed9a0 
							
						 
					 
					
						
						
							
							Check empty stringfor globalRedirect. It breaks RedirectPermanent.  
						
						 
						
						
						
						
					 
					
						2013-11-11 15:18:46 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Berg 
							
						 
					 
					
						
						
						
						
							
						
						
							df5f491893 
							
						 
					 
					
						
						
							
							Add HTTPD SSH assertion to check null cert/key.  
						
						 
						
						
						
						
					 
					
						2013-11-11 12:08:36 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Berg 
							
						 
					 
					
						
						
						
						
							
						
						
							0427e7fbf2 
							
						 
					 
					
						
						
							
							Check for SSL Cert value before building with SSL support.  
						
						 
						
						
						
						
					 
					
						2013-11-06 11:20:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							be5d3a59dd 
							
						 
					 
					
						
						
							
							Clean up some option examples  
						
						 
						
						
						
						
					 
					
						2013-10-30 18:47:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							985f1f2d8a 
							
						 
					 
					
						
						
							
							Give types to the Apache httpd options  
						
						 
						
						
						
						
					 
					
						2013-10-29 14:03:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							98ae32286f 
							
						 
					 
					
						
						
							
							Fix evaluation error in the tomcat test  
						
						 
						
						
						
						
					 
					
						2013-10-29 01:26:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							738a6c173a 
							
						 
					 
					
						
						
							
							Don't copy Nix expressions to the store while processing Apache subservices  
						
						 
						
						
						
						
					 
					
						2013-10-29 01:20:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							c9dad37f01 
							
						 
					 
					
						
						
							
							Remove obsolete function addDefaultOptionValues  
						
						 
						
						
						
						
					 
					
						2013-10-28 22:45:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							f8a9eb9f00 
							
						 
					 
					
						
						
							
							Implement services.httpd.virtualHosts using the module system  
						
						 
						
						
						
						
					 
					
						2013-10-28 22:45:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							5c1f8cbc70 
							
						 
					 
					
						
						
							
							Move all of NixOS to nixos/ in preparation of the repository merge  
						
						 
						
						
						
						
					 
					
						2013-10-10 13:28:20 +02:00