summary refs log tree commit diff stats
Commit message (Collapse)AuthorAge
* Fix: Resolve merge conflictsene2023-01-21
|
* Merge branch 'server1' into server1_userssils2023-01-20
|\
| * Merge pull request 'Remove ssh from the config file and make it's keys ↵sils2023-01-20
| |\ | | | | | | | | | | | | | | | | | | persistent' (#9) from server1_ssh into server1 Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/9 Reviewed-by: sils <sils@sils.li>
| | * Revert "Fix: revert changes in configuration.nix"sils2023-01-20
| | | | | | | | | | | | This reverts commit 5a137ce8b8f4b1dcfee03d001938c0fa25df842f.
| | * Merge branch 'server1' into server1_sshsils2023-01-20
| | |\ | | |/ | |/|
| | * Fix: revert changes in configuration.nixsils2023-01-20
| | | | | | | | | | | | resolve conflicts with target branch
| | * Sec: Persistent ssh host keysene2023-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I changed the valid ssh-host-keys from both rsa and ed25519 to only ed25519 and moved them to `/srv/ssh` to make them persistent. In addition to that, I also increased the rounds for the ed25519 key to 1000. This fixes the ssh-host-key issue introduced by pull request #5. Fixes: #5
* | | Merge branch 'server1' into server1_userssils2023-01-20
|\| |
| * | Merge pull request 'server1_rust-motd' (#11) from server1_rust-motd into server1sils2023-01-20
| |\ \ | | |/ | |/| | | | | | | Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/11 Reviewed-by: sils <sils@sils.li>
| | * Merge branch 'server1' into server1_rust-motdene2023-01-17
| | |\ | | |/ | |/|
| | * Fix: Changed setting namesene2023-01-17
| | | | | | | | | | | | | | | The names of the settings in the GitHub repository are outdated, this commit changes the setting name to the real ones.
| | * Fix: changed to TOML configene2023-01-17
| | | | | | | | | | | | This module generates a TOML config from a nix set.
| | * Fix: typo in programs fieldene2023-01-17
| | |
| | * Feat: Added a nice motd through rust-motdene2023-01-17
| | | | | | | | | | | | I'm not sure if this is really helpful
* | | Feat: User configuration, with secure passwordsene2023-01-19
|/ / | | | | | | | | | | | | The passwords will be stored in a specific password file, which because it isn't part of this repository is secure. Refs: #9
* | Merge pull request 'Feat: Added /boot as persistent subvolume' (#10) from ↵sils2023-01-17
|\ \ | |/ |/| | | | | | | | | server1_boot into server1 Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/10 Reviewed-by: sils <sils@sils.li>
| * Feat: Added /boot as persistent subvolumeene2023-01-17
|/ | | | Co-authored-by: sils <sils@sils.li>
* Merge pull request 'Fix: Import pkgs and improve security' (#8) from ↵ene2023-01-15
|\ | | | | | | | | | | | | server1_minecraft into server1 Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/8 Reviewed-by: ene <ene@sils.li>
| * Merge branch 'server1_minecraft' of ↵sils2023-01-15
| |\ | | | | | | | | | https://git.sils.li/vhack.eu/nixos-server into server1_minecraft
| | * Fix: Import pkgssils2023-01-15
| |/ |/|
* | Merge pull request 'Fix: Import Minecraft Configuration' (#7) from ↵ene2023-01-15
|\ \ | | | | | | | | | | | | | | | | | | server1_minecraft into server1 Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/7 Reviewed-by: ene <ene@sils.li>
| * \ Merge branch 'server1' into server1_minecraftsils2023-01-15
| |\ \ | |/ / |/| |
* | | Merge pull request 'Service: Run a basic Minecraft Server' (#6) from ↵ene2023-01-15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | server1_minecraft into server1 Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/6 Reviewed-by: ene <ene@sils.li>
| | | * Sec: Add minecraft groupsils2023-01-15
| | | |
| | | * Fix: Import pkgssils2023-01-15
| | |/
| | * Fix: Import Minecraft Configurationsils2023-01-15
| |/
| * Service: Run a basic Minecraft Serversils2023-01-15
|/
* Merge pull request 'New filesystemlayout' (#5) from server1_fslayout into ↵ene2023-01-14
|\ | | | | | | | | | | | | server1 Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/5 Reviewed-by: ene <ene@sils.li>
| * Feat: Switch to inpersistent temproot.sils2023-01-14
| | | | | | | | | | Having persistence as opt-in has several advantages, for instance better reproduceability.
| * Feat: Separate nix from rootsils2023-01-14
| | | | | | | | Another step towards temproot
| * Feat: Switch root into subvolumesils2023-01-14
|/ | | | This enables further changes like temproot.
* Merge pull request 'Feat: Added support for btrfs' (#4) from btrfs into server1ene2023-01-14
|\ | | | | | | | | Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/4 Reviewed-by: ene <ene@sils.li>
| * Feat: Added support for btrfsene2023-01-14
|/
* Merge pull request 'Format: First formatting with Alejandra' (#2) from ↵sils2023-01-08
|\ | | | | | | | | | | | | ene/nixos-server:server1 into server1 Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/2 Reviewed-by: sils <sils@sils.li>
| * Feat: Some security for sshene2023-01-07
| | | | | | | | | | Yes, root login is in itself a bad thing, but reducing the attack surface somewhat should be a good first step to a bright future.
| * Format: First formatting with Alejandraene2023-01-07
|/ | | | | | | | | This marks the beginning of a clean git commit history. This is because of two changes: * Usage of conventional-commits (https://www.conventionalcommits.org/en/v1.0.0/). * Consistent formatting of the code base to reduce diff footprints. The choice of Alejandra as auto-formatter is obviously not final.
* some people lose keyssils2023-01-07
|
* modularize packagessils2023-01-06
|
* Initial CommitSystem administrator2023-01-06