c74fc4f927 
								
							 
						 
						
							
							
								
								Add VM for the front-end ( #183 )  
							
							 
							
							... 
							
							
							
							For now, I created yet another deployment. Basically, this seems to tell me that we only ever use:
- one deployment per machine (when we change its configuration)
- one big deployment for all of them (eg. for nixpkgs updates or new contributor)
but that the current split into themes doesn't really work. I can discontinue it in another PR.
`fedi201` is accessible under `fedi201.abundos.eu`. Its configuration lives in `infra/fedi201/default.nix`. This Nix file is a NixOps4 resource module, not a NixOS configuration module; you probably want to add a `nixos.module` field to it where you put your NixOS configuration.
Reviewed-on: Fediversity/Fediversity#183 
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com> 
							
						 
						
							2025-02-24 14:49:53 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								e9a4185401 
								
							 
						 
						
							
							
								
								users: add kiara  
							
							 
							
							
							
						 
						
							2025-02-24 13:31:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								e6e0f49f40 
								
							 
						 
						
							
							
								
								Add a testing machine for Hans  
							
							 
							
							
							
						 
						
							2025-02-21 20:25:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								87772aa855 
								
							 
						 
						
							
							
								
								“Document” removal  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								cd1679afec 
								
							 
						 
						
							
							
								
								procolixVm -> fediversityVm 
							
							 
							
							
							
						 
						
							2025-02-21 20:24:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								3dc7f49a9c 
								
							 
						 
						
							
							
								
								Add the disko configuration to all VMs  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								b90fc3300a 
								
							 
						 
						
							
							
								
								Document semi-automated provisioning of VMs  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								46d20a76bc 
								
							 
						 
						
							
							
								
								Do not inject pre-made keys  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								f0224b06c7 
								
							 
						 
						
							
							
								
								Inject disko in VM configurations  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								722afdc5ea 
								
							 
						 
						
							
							
								
								Expose a NixOS configuration for each VM in infra  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								df78965bf4 
								
							 
						 
						
							
							
								
								Extract resource module from makeDeployments  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								280b10c214 
								
							 
						 
						
							
							
								
								Report Nix build errors nicely  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								57e6127a7a 
								
							 
						 
						
							
							
								
								Move provision.sh and remove.sh to infra/  
							
							 
							
							
							
						 
						
							2025-02-21 20:24:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								bf0a35de6c 
								
							 
						 
						
							
							
								
								makeInstaller -> makeInstallerIso 
							
							 
							
							
							
						 
						
							2025-02-21 20:24:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								a7c6ceb111 
								
							 
						 
						
							
							
								
								Export makeInstaller in the flake  
							
							 
							
							
							
						 
						
							2025-02-21 10:01:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								5cc86bff94 
								
							 
						 
						
							
							
								
								Move makeInstaller to infra/  
							
							 
							
							
							
						 
						
							2025-02-21 10:01:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								fb64d2b9c9 
								
							 
						 
						
							
							
								
								convert readmes from org to markdown  
							
							 
							
							
							
						 
						
							2025-02-19 20:23:48 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								488fbcc131 
								
							 
						 
						
							
							
								
								Exit Forgejo LTS  
							
							 
							
							
							
						 
						
							2025-02-18 16:44:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								0c56c89f74 
								
							 
						 
						
							
							
								
								Document adding a contributor  
							
							 
							
							
							
						 
						
							2025-02-04 12:45:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								0e6c96a2be 
								
							 
						 
						
							
							
								
								Document the procolixVm options  
							
							 
							
							
							
						 
						
							2025-01-31 17:23:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								4d00635e69 
								
							 
						 
						
							
							
								
								Move old procolix.vm options to new procolixVm ones  
							
							 
							
							
							
						 
						
							2025-01-31 17:15:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								eaad4daa39 
								
							 
						 
						
							
							
								
								Cleaner resource definition  
							
							 
							
							
							
						 
						
							2025-01-31 16:57:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								e0b4dd4d5b 
								
							 
						 
						
							
							
								
								Shorter name  
							
							 
							
							
							
						 
						
							2025-01-31 16:48:08 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								54194cd494 
								
							 
						 
						
							
							
								
								Share options between resource and config  
							
							 
							
							
							
						 
						
							2025-01-31 16:47:33 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								8cfc943297 
								
							 
						 
						
							
							
								
								Cleanup  
							
							 
							
							
							
						 
						
							2025-01-31 16:36:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								ba97ed26d0 
								
							 
						 
						
							
							
								
								Get rid of useless self and providers arguments  
							
							 
							
							
							
						 
						
							2025-01-31 16:34:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								564938e52d 
								
							 
						 
						
							
							
								
								Clean up handling of secrets in infra  
							
							 
							
							
							
						 
						
							2025-01-31 16:29:31 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								8fa7bd4df5 
								
							 
						 
						
							
							
								
								Add a default deployment containing everything  
							
							 
							
							
							
						 
						
							2025-01-31 15:24:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								9c85431a22 
								
							 
						 
						
							
							
								
								Move everything into common with better names  
							
							 
							
							
							
						 
						
							2025-01-31 15:22:28 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								dedd70dc0e 
								
							 
						 
						
							
							
								
								Make vm*/default.nix resources  
							
							 
							
							
							
						 
						
							2025-01-31 15:19:55 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								4f761bfc1f 
								
							 
						 
						
							
							
								
								Start building a procolixVm resource module  
							
							 
							
							
							
						 
						
							2025-01-31 15:08:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								1d05993127 
								
							 
						 
						
							
							
								
								Bump NixOps4  
							
							 
							
							... 
							
							
							
							in particular, follow the split of `nixops4-nixos` to its own
repository. 
							
						 
						
							2025-01-31 14:11:46 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								1f2ea73e69 
								
							 
						 
						
							
							
								
								Clean up resource definition  
							
							 
							
							
							
						 
						
							2025-01-31 14:03:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								232680c9bf 
								
							 
						 
						
							
							
								
								Document failure when running NixOps4 not from the repo's root  
							
							 
							
							
							
						 
						
							2025-01-31 12:15:27 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								d121cd6a5b 
								
							 
						 
						
							
							
								
								Remove vm02117  
							
							 
							
							... 
							
							
							
							Machine was running on the old supervisor and was decommissioned manually. 
							
						 
						
							2025-01-31 11:06:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								873a1c9177 
								
							 
						 
						
							
							
								
								Automatically git root access to all contributors  
							
							 
							
							
							
						 
						
							2025-01-31 10:59:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								5522595296 
								
							 
						 
						
							
							
								
								Factorise the deployment definition  
							
							 
							
							
							
						 
						
							2025-01-30 12:57:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								34eb7263cc 
								
							 
						 
						
							
							
								
								Factorise the resource definition  
							
							 
							
							
							
						 
						
							2025-01-30 09:53:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								d4e1760c70 
								
							 
						 
						
							
							
								
								vm02117 is not the web server anymore  
							
							 
							
							
							
						 
						
							2025-01-29 15:34:48 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								f475b1f56c 
								
							 
						 
						
							
							
								
								Move web server definition to infra  
							
							 
							
							
							
						 
						
							2025-01-29 15:34:48 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								49a98c6066 
								
							 
						 
						
							
							
								
								Make fedi300 a CI runner  
							
							 
							
							
							
						 
						
							2024-12-16 13:46:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								ba08f3cf49 
								
							 
						 
						
							
							
								
								Enter fedi300  
							
							 
							
							
							
						 
						
							2024-12-16 13:46:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								f1f0611bbc 
								
							 
						 
						
							
							
								
								Discontinue two old actions runners  
							
							 
							
							
							
						 
						
							2024-12-16 13:46:08 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								732760bc0c 
								
							 
						 
						
							
							
								
								Move Nix options to common  
							
							 
							
							
							
						 
						
							2024-12-16 12:57:02 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								a9f9d4f1a0 
								
							 
						 
						
							
							
								
								Enable mailing for Mediawiki  
							
							 
							
							
							
						 
						
							2024-12-13 13:17:01 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								21e8c962bf 
								
							 
						 
						
							
							
								
								s/x_fediversity/fediversity/  
							
							 
							
							
							
						 
						
							2024-12-13 12:37:25 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								9407af8ac8 
								
							 
						 
						
							
							
								
								Use secrets module to clean up configurations  
							
							 
							
							
							
						 
						
							2024-12-13 00:26:43 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								f753422295 
								
							 
						 
						
							
							
								
								Use shared keys attrset in infra/  
							
							 
							
							
							
						 
						
							2024-12-13 00:26:43 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								36b5351f0a 
								
							 
						 
						
							
							
								
								Handle Forgejo's secrets cleanly  
							
							 
							
							
							
						 
						
							2024-12-12 12:38:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
								
									
										
									
								
							
							
							
								
							
							
								32378d917d 
								
							 
						 
						
							
							
								
								Make token secret for actions runners  
							
							 
							
							
							
						 
						
							2024-12-12 12:38:20 +01:00