forked from fediversity/fediversity
		
	Enter fedi300
This commit is contained in:
		
							parent
							
								
									f1f0611bbc
								
							
						
					
					
						commit
						ba08f3cf49
					
				
					 4 changed files with 59 additions and 6 deletions
				
			
		|  | @ -26,9 +26,10 @@ These machines are hosted on the Procolix Proxmox instance, to which | |||
| non-Procolix members of the project do not have access. They host our stable | ||||
| infrastructure. | ||||
| 
 | ||||
| | Machine | Description            | Deployment | | ||||
| |---------+------------------------+------------| | ||||
| | vm02116 | Forgejo                | ~git~      | | ||||
| | vm02179 | /unused/               | ~other~    | | ||||
| | vm02186 | /unused/               | ~other~    | | ||||
| | vm02187 | Wiki                   | ~web~      | | ||||
| | Machine | Proxmox     | Description            | Deployment | | ||||
| |---------+-------------+------------------------+------------| | ||||
| | vm02116 | Procolix    | Forgejo                | ~git~      | | ||||
| | vm02179 | Procolix    | /unused/               | ~other~    | | ||||
| | vm02186 | Procolix    | /unused/               | ~other~    | | ||||
| | vm02187 | Procolix    | Wiki                   | ~web~      | | ||||
| | fedi300 | Fediversity | Forgejo actions runner | ~git~      | | ||||
|  |  | |||
							
								
								
									
										33
									
								
								infra/fedi300/default.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								infra/fedi300/default.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,33 @@ | |||
| { lib, ... }: | ||||
| 
 | ||||
| { | ||||
|   imports = [ | ||||
|     ../common | ||||
|   ]; | ||||
| 
 | ||||
|   procolix.vm = { | ||||
|     name = "fedi300"; | ||||
|     ip4 = "95.215.187.30"; | ||||
|     ip6 = "2a00:51c0:12:1305::30"; | ||||
|   }; | ||||
| 
 | ||||
|   ## FIXME: We should just have an option under `procolix.vm` to distinguish | ||||
|   ## between Procolix VMs and Fediversity ones. | ||||
|   networking.domain = lib.mkForce "fediversity.eu"; | ||||
|   networking.defaultGateway.address = lib.mkForce "95.215.187.1"; | ||||
|   networking.defaultGateway6.address = lib.mkForce "2a00:51c0:13:1305::1"; | ||||
| 
 | ||||
|   fileSystems."/" = { | ||||
|     device = "/dev/disk/by-uuid/cbcfaf6b-39bd-4328-9f53-dea8a9d32ecc"; | ||||
|     fsType = "ext4"; | ||||
|   }; | ||||
| 
 | ||||
|   fileSystems."/boot" = { | ||||
|     device = "/dev/disk/by-uuid/1A4E-07F4"; | ||||
|     fsType = "vfat"; | ||||
|     options = [ | ||||
|       "fmask=0022" | ||||
|       "dmask=0022" | ||||
|     ]; | ||||
|   }; | ||||
| } | ||||
|  | @ -24,6 +24,24 @@ | |||
|             ]; | ||||
|           }; | ||||
|         }; | ||||
| 
 | ||||
|         fedi300 = { | ||||
|           type = providers.local.exec; | ||||
|           imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ]; | ||||
|           ssh = { | ||||
|             host = "95.215.187.30"; | ||||
|             opts = ""; | ||||
|             hostPublicKey = self.keys.systems.fedi300; | ||||
|           }; | ||||
|           nixpkgs = inputs.nixpkgs; | ||||
|           nixos.module = { | ||||
|             imports = [ | ||||
|               ./fedi300 | ||||
|               self.nixosModules.ageSecrets | ||||
|               { fediversity.hostPublicKey = self.keys.systems.fedi300; } | ||||
|             ]; | ||||
|           }; | ||||
|         }; | ||||
|       }; | ||||
|     }; | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										1
									
								
								keys/systems/fedi300.pub
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keys/systems/fedi300.pub
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | |||
| ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGFH/Kvye5It8FojdjpsuyZQiU0kxj2wq7Zq/+61vxNn | ||||
		Loading…
	
	Add table
		
		Reference in a new issue