Move mailserver config to mailserver.nix and remove block that is not needed anymore
This commit is contained in:
		
					parent
					
						
							
								5dcbb4e2dc
							
						
					
				
			
			
				commit
				
					
						10a84a0863
					
				
			
		
					 2 changed files with 3 additions and 11 deletions
				
			
		|  | @ -18,10 +18,8 @@ | ||||||
|     ]; |     ]; | ||||||
| 
 | 
 | ||||||
|   # Configuration options for the mailserver |   # Configuration options for the mailserver | ||||||
|   variables = { |   # MOVED to mailserver.nix | ||||||
|     mailAdmin = "postmaster@mail.hamburg.freifunk.net"; | 
 | ||||||
|     useSSL = true; |  | ||||||
|   }; |  | ||||||
|   # Use the GRUB 2 boot loader. |   # Use the GRUB 2 boot loader. | ||||||
|   boot.loader.grub.enable = true; |   boot.loader.grub.enable = true; | ||||||
|   boot.loader.grub.version = 2; |   boot.loader.grub.version = 2; | ||||||
|  |  | ||||||
|  | @ -20,13 +20,7 @@ in | ||||||
|   networking.domain = "hamburg.freifunk.net"; |   networking.domain = "hamburg.freifunk.net"; | ||||||
|   services.mymailserver = { |   services.mymailserver = { | ||||||
|     enable = true; |     enable = true; | ||||||
|     adminAddress = "kontakt@hamburg.freifunk.net"; |     adminAddress = "postmaster@mail.hamburg.freifunk.net"; | ||||||
|     mailFQDN = "mail2.hamburg.freifunk.net"; |     mailFQDN = "mail2.hamburg.freifunk.net"; | ||||||
|   }; |   }; | ||||||
|   users.groups."${config.variables.vmailGroup}" = { gid = config.variables.vmailGID; }; |  | ||||||
|   users.users."${config.variables.vmailUser}" = { |  | ||||||
|     uid = config.variables.vmailUID; |  | ||||||
|     group = config.variables.vmailGroup; |  | ||||||
|     hashedPassword = "!"; |  | ||||||
|   }; |  | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Daniel Frank
				Daniel Frank