1
0
Fork 0
Commit graph

669 commits

Author SHA1 Message Date
4ae3fc27be
Have the provisioning script grab options from the flake 2025-02-25 11:36:55 +01:00
4fda719992
Expose VM options in the flake 2025-02-25 11:36:55 +01:00
10874c995e
Split sections in options 2025-02-25 11:36:55 +01:00
af4a0a0784
Add options for sockets, cores and memory 2025-02-25 11:36:55 +01:00
71d1c612a4
Get rid of fedi300
It has been off for a long while now. We will just add a VM again if
there is one ever.
2025-02-25 11:36:54 +01:00
0813eca20c
Add options for Proxmox and Proxmox VM id 2025-02-25 11:36:54 +01:00
1677c9f8d7 Remove environment.systemPackages from VMs ()
Closes 

Co-authored-by: kiara Grouwstra <kiara@procolix.eu>
Reviewed-on: 
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:54:28 +01:00
c74fc4f927 Add VM for the front-end ()
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: 
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
a6cf01e720
Add a testing machine for Hans () 2025-02-21 20:25:40 +01:00
e6e0f49f40
Add a testing machine for Hans 2025-02-21 20:25:20 +01:00
10ac403db5
Rekey secrets for Hans 2025-02-21 20:25:20 +01:00
d9a67c0db3
Upgrade automated provisioning of Proxmox VMs () 2025-02-21 20:24:50 +01:00
0bea2d0bb1
Mark deployment/ as deprecated 2025-02-21 20:24:41 +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
7c639fc131
Support empty strings in removeTrailingWhitespace 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
398dc05ad5
Rename provisioning host keys to match nixosConfiguration entries 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
f8ec8e7d93
Decouple id and name 2025-02-21 20:24:40 +01:00
d77b04ec18
Apply makeInstallerIso to conf in provision.sh 2025-02-21 20:24:40 +01:00
bf0a35de6c
makeInstaller -> makeInstallerIso 2025-02-21 20:24:40 +01:00
9e95287715
Make API URL an argument of the provisioning script 2025-02-21 20:24:40 +01:00
5c7ac44387
Clean up services and put Garage on a different machine () 2025-02-21 20:24:14 +01:00
2ee563f5d9
Fix Pixelfed 2025-02-21 17:52:50 +01:00
cd83536e2f
Allow Garage and services to run on different machines 2025-02-21 17:52:50 +01:00
1eeaa04df6
Introduce fediversity.garage.enable 2025-02-21 17:52:50 +01:00
a5d226ed22
Get rid of fediversity.enable 2025-02-21 17:52:50 +01:00
78a85b27ff
Put the S3 secrets into files
...but not everywhere, there remains some FIXMEs where ultimately the
secrets do get into the store.
2025-02-21 17:52:50 +01:00
8c5bf79ba2
Share options that can be shared 2025-02-21 17:52:50 +01:00
b547912794
Make access and secret keys parameters 2025-02-21 17:52:50 +01:00
1965e83e5d
Same treatment for Pixelfed 2025-02-21 17:52:50 +01:00
a1cfcf1d71
Same treatment for Peertube 2025-02-21 17:52:50 +01:00
ca6642c8d4
Same treatment for Mastodon 2025-02-21 17:52:50 +01:00
f4babe38a8
Consolidate Garage options
- `fediversity.internal.garage` -> `fediversity.garage`
- all in the same place
2025-02-21 17:52:50 +01:00
d9188427ed
services.garage -> fediversity.garage
for the options that are ours; we want to avoid clashes if possible
2025-02-21 17:52:50 +01:00
b68a821b77
Searate Garage config and options 2025-02-21 17:52:50 +01:00
ff03d12dc1
Move Garage configuration to own directory 2025-02-21 17:52:49 +01:00
237c56791f
Basic services README 2025-02-21 17:52:49 +01:00
3a881979f9
Move old services README to a HACKING file 2025-02-21 17:52:49 +01:00
df5ee32d68
Various improvements around deployment and the provisioning script () 2025-02-21 17:52:06 +01:00
Hans van Zijst
7df5aa27c7 Added Hans' SSH key ()
Added my ssh key, and added a bit of contact info to the Matrix documentation.

Reviewed-on: 
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Hans van Zijst <hans@procolix.com>
Co-committed-by: Hans van Zijst <hans@procolix.com>
2025-02-21 17:19:02 +01:00
c6fb52915a
More clean up of the deployment flake
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
2025-02-21 10:01:06 +01:00