steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix/os/devices/srv0.home-ch.stefanjunker.de: bump nixos 21.11 -> 22.05

Browse source
This commit is contained in:
steveej 2022-10-30 16:11:21 +01:00
parent 46ef6bd0a6
commit dc761a5271
8 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nix/os/containers/backup-target.nix
View file

@ -4,6 +4,8 @@
, sshPort ? containerBackupCfg.portInt
}: {
config = { config, pkgs, lib, ... }: {
system.stateVersion = "21.11"; # Did you read the comment?
imports = [
../profiles/containers/configuration.nix
];
@ -26,10 +28,7 @@
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDNI3H0BRSYOZ/MbTs9J80doJwSd1HymFOP5quNt0J48vxZ5FPVrT2FHpQiNrCcYbCKRsU4X8AiGUHiXC0PapQQ3JDkqp6WZoqBNDx6BI7RadyH1TqVQPlou3pQmCAogzfBInruR53YTDmQqXiPwfM0okPOXgiBNjDfZXOX4+CyUfkmZZwASoicTInqWGkn1sFnh4tyXIkgWflg0njlVmfkVvH71+evvKLYHtoNpVXazkQ0SXbyuW5f3mSta7TNkpC3HbBm+4n+WxYGySrlRLWQhTo+aoWUKk9h5zvECDNpwRtbqzt+bA9nKrdg180ceu8hruwvWNiC6PPA2GW9Z1+VKROviGu1C3dliE/pPCBtK+ZoRVv2CGE+pmAuQsB9Nif9tk5tY6HJhuLNxKYiMfQkiLsDYv6KdZXUIVK/4BIDkZuQNnjhdOQBLnea0ANOhutA9gnjxnsd3UT6ovfazg5gud7n3u4yBtzjTkRrqWZ63eM1NmUVOgMWHQ715pV+hJfOFGqzRBEe3g/p3bWNgpROBYJbG1H8l9DN7emG4FGWsb1HeNFwQ5lS0Zsezb7qzahr4vSmHNugVw7w8ONt5dPbPI9wQnWvkkuHH76P/NYy6OC6lHrN1rXyA1okqdPr06YAZnCot+Pqdgn/ijxgp06J3dtkhin+Q7PoQbGff3ERIw== bkp"
];
packages = with pkgs; [
btrfsProgs
# btrbk
];
packages = with pkgs; [ btrfs-progs ];
isSystemUser = true;
};

2
nix/os/containers/backup.nix
View file

@ -11,6 +11,8 @@ let
in {
config = { pkgs, ... }: {
system.stateVersion = "20.03"; # Did you read the comment?
imports = [
../profiles/containers/configuration.nix
];

11
nix/os/containers/mailserver.nix
View file

@ -7,9 +7,12 @@
let
passwords = import ../../variables/passwords.crypt.nix;
in {
in
{
config = { pkgs, ... }: {
system.stateVersion = "21.11"; # Did you read the comment?
imports = [
../profiles/containers/configuration.nix
../profiles/common/user.nix
@ -70,7 +73,7 @@ in {
serviceConfig.RestartSec = 600;
serviceConfig.Restart = "always";
description = "Getmail service";
path = [ ];
path = [ pkgs.getmail6 ];
script = let
rc = pkgs.writeText "mailATstefanjunker.de.getmail.rc" ''
[options]
@ -91,7 +94,7 @@ in {
path = ${pkgs.dovecot}/libexec/dovecot/dovecot-lda
'';
in ''
${pkgs.getmail}/bin/getmail --rcfile=${rc} --idle=INBOX
getmail --rcfile=${rc} --idle=INBOX
'';
};
@ -101,7 +104,7 @@ in {
serviceConfig.User = "steveej";
serviceConfig.Group = "dovecot2";
description = "Getmail service";
path = [ pkgs.getmail ];
path = [ pkgs.getmail6 ];
serviceConfig.RestartSec = 1000;
serviceConfig.Restart = "always";
script = let

2
nix/os/containers/syncthing.nix
View file

@ -7,6 +7,8 @@
{
config = { config, pkgs, ... }: {
system.stateVersion = "20.05"; # Did you read the comment?
imports = [
../profiles/containers/configuration.nix
];

13
nix/os/containers/webserver.nix
View file

@ -6,8 +6,11 @@
let
passwords = import ../../variables/passwords.crypt.nix;
in {
in
{
config = { config, pkgs, lib, ... }: {
system.stateVersion = "22.05"; # Did you read the comment?
imports = [
../profiles/containers/configuration.nix
];
@ -102,7 +105,7 @@ in {
services.mysql = {
enable = true;
package = pkgs.mariadb;
package = pkgs.mariadb_104;
};
services.hedgedoc = {
@ -113,7 +116,7 @@ in {
protocolUseSSL = true;
db = {
dialect = "sqlite";
storage = "/var/lib/codimd/db.codimd.sqlite";
storage = "/var/lib/hedgedoc/db.hedgedoc.sqlite";
};
allowAnonymous = false;
@ -149,8 +152,8 @@ in {
isReadOnly = false;
};
"/var/lib/codimd" = {
hostPath = "/var/lib/container-volumes/webserver/var-lib-codimd";
"/var/lib/hedgedoc" = {
hostPath = "/var/lib/container-volumes/webserver/var-lib-hedgedoc";
isReadOnly = false;
};
};