teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Rename flora6 to flora-6

Browse source 
This aligns with the coming changes in hostnames in the terraform
infrastructure.
This commit is contained in:
Benjamin Bädorf 2022-11-26 02:40:51 +01:00
parent 90bca8d0ba
commit 1f2d56e0c9
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
6 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
hosts/flora6/default.nix → hosts/flora-6/default.nix
View file

12
hosts/flora6/flora6.nix → hosts/flora-6/flora-6.nix
View file

@ -20,7 +20,7 @@ in
# # # # # #
# # # pub.solar options # # # pub.solar options
# # # # # #
pub-solar.core ={ pub-solar.core = {
disk-encryption-active = false; disk-encryption-active = false;
iso-options.enable = true; iso-options.enable = true;
lite = true; lite = true;
@ -100,11 +100,11 @@ in
rootUrl = "https://git.pub.solar"; rootUrl = "https://git.pub.solar";
settings = { settings = {
mailer = { mailer = {
ENABLED = true; ENABLED = true;
MAILER_TYPE = "smtp"; MAILER_TYPE = "smtp";
HOST = "mail.greenbaum.cloud:465"; HOST = "mail.greenbaum.cloud:465";
FROM = ''"pub.solar git server" <gitea@pub.solar>''; FROM = ''"pub.solar git server" <gitea@pub.solar>'';
USER = "admins@pub.solar"; USER = "admins@pub.solar";
}; };
"repository.signing" = { "repository.signing" = {
SIGNING_KEY = "default"; SIGNING_KEY = "default";

9
hosts/flora6/hardware-configuration.nix → hosts/flora-6/hardware-configuration.nix
View file

@ -12,18 +12,21 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-label/nixos"; {
device = "/dev/disk/by-label/nixos";
autoResize = true; autoResize = true;
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-label/boot"; {
device = "/dev/disk/by-label/boot";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/data" = fileSystems."/data" =
{ device = "/dev/disk/by-label/ephemeral0"; {
device = "/dev/disk/by-label/ephemeral0";
fsType = "ext4"; fsType = "ext4";
options = [ options = [
"defaults" "defaults"

6
hosts/flora-6/triton-vmtools.nix Normal file
View file

@ -0,0 +1,6 @@
{ pkgs, inputs, ... }:
{
environment.systemPackages = with pkgs; [
inputs.triton-vmtools.packages.${pkgs.system}.default
];
}

6
hosts/flora6/triton-vmtools.nix
View file

@ -1,6 +0,0 @@
{ pkgs, inputs, ... }:
{
environment.systemPackages = with pkgs; [
inputs.triton-vmtools.packages.${pkgs.system}.default
];
}

2
users/barkeeper/default.nix
View file

@ -15,7 +15,7 @@ in
description = "pub.solar infra user"; description = "pub.solar infra user";
password = "$6$pHMaL9DfxhvnLGy5$ka9bRU5p1lPTF0YHPZDM9Miq79iXuaXb6GLeALM1eX5djdsHYnpvVWjrmImWmcghGXsrDwpmXZPSJUU.gFpuA1"; password = "$6$pHMaL9DfxhvnLGy5$ka9bRU5p1lPTF0YHPZDM9Miq79iXuaXb6GLeALM1eX5djdsHYnpvVWjrmImWmcghGXsrDwpmXZPSJUU.gFpuA1";
fullName = "pub.solar infra barkeeper"; fullName = "pub.solar infra barkeeper";
email = "crew@pub.solar"; email = "admins@pub.solar";
gpgKeyId = ""; gpgKeyId = "";
publicKeys = [ publicKeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmiF8ndGhnx2YAWbPDq14fftAwcJ0xnjJIVTotI12OO4SPX/SwH5Yp8C8Kf002qN9FbFmaONzq3s8TYpej13JubhfsQywNuFKZuZvJeHzmOwxsANW86RVrWT0WZmYx9a/a1TF9rPQpibDVt60wX8yLdExaJc5F1SvIIuyz1kxYpz36wItfR6hcwoLGh1emFCmfCpebJmp3hsrMDTTtTW/YNhyeSZW74ckyvZyjCYtRCJ8uF0ZmOSKRdillv4Ztg8MsUubGn+vaMl6V6x/QuDuehEPoM/3wBx9o22nf+QVbk7S1PC8EdT/K5vskn4/pfR7mDCyQOq1hB4w4Oyn0dsfX pi@ssrtc" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmiF8ndGhnx2YAWbPDq14fftAwcJ0xnjJIVTotI12OO4SPX/SwH5Yp8C8Kf002qN9FbFmaONzq3s8TYpej13JubhfsQywNuFKZuZvJeHzmOwxsANW86RVrWT0WZmYx9a/a1TF9rPQpibDVt60wX8yLdExaJc5F1SvIIuyz1kxYpz36wItfR6hcwoLGh1emFCmfCpebJmp3hsrMDTTtTW/YNhyeSZW74ckyvZyjCYtRCJ8uF0ZmOSKRdillv4Ztg8MsUubGn+vaMl6V6x/QuDuehEPoM/3wBx9o22nf+QVbk7S1PC8EdT/K5vskn4/pfR7mDCyQOq1hB4w4Oyn0dsfX pi@ssrtc"