nix/os/devices/srv0.home-ch.stefanjunker.de: bump nixos 21.11 -> 22.05
This commit is contained in:
parent
46ef6bd0a6
commit
aae3fd4090
8 changed files with 31 additions and 18 deletions
|
@ -4,6 +4,8 @@
|
||||||
, sshPort ? containerBackupCfg.portInt
|
, sshPort ? containerBackupCfg.portInt
|
||||||
}: {
|
}: {
|
||||||
config = { config, pkgs, lib, ... }: {
|
config = { config, pkgs, lib, ... }: {
|
||||||
|
system.stateVersion = "21.11"; # Did you read the comment?
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../profiles/containers/configuration.nix
|
../profiles/containers/configuration.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -11,6 +11,8 @@ let
|
||||||
|
|
||||||
in {
|
in {
|
||||||
config = { pkgs, ... }: {
|
config = { pkgs, ... }: {
|
||||||
|
system.stateVersion = "20.03"; # Did you read the comment?
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../profiles/containers/configuration.nix
|
../profiles/containers/configuration.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -7,9 +7,12 @@
|
||||||
let
|
let
|
||||||
passwords = import ../../variables/passwords.crypt.nix;
|
passwords = import ../../variables/passwords.crypt.nix;
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
|
|
||||||
config = { pkgs, ... }: {
|
config = { pkgs, ... }: {
|
||||||
|
system.stateVersion = "21.11"; # Did you read the comment?
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../profiles/containers/configuration.nix
|
../profiles/containers/configuration.nix
|
||||||
../profiles/common/user.nix
|
../profiles/common/user.nix
|
||||||
|
@ -70,7 +73,7 @@ in {
|
||||||
serviceConfig.RestartSec = 600;
|
serviceConfig.RestartSec = 600;
|
||||||
serviceConfig.Restart = "always";
|
serviceConfig.Restart = "always";
|
||||||
description = "Getmail service";
|
description = "Getmail service";
|
||||||
path = [ ];
|
path = [ pkgs.getmail6 ];
|
||||||
script = let
|
script = let
|
||||||
rc = pkgs.writeText "mailATstefanjunker.de.getmail.rc" ''
|
rc = pkgs.writeText "mailATstefanjunker.de.getmail.rc" ''
|
||||||
[options]
|
[options]
|
||||||
|
@ -91,7 +94,7 @@ in {
|
||||||
path = ${pkgs.dovecot}/libexec/dovecot/dovecot-lda
|
path = ${pkgs.dovecot}/libexec/dovecot/dovecot-lda
|
||||||
'';
|
'';
|
||||||
in ''
|
in ''
|
||||||
${pkgs.getmail}/bin/getmail --rcfile=${rc} --idle=INBOX
|
getmail --rcfile=${rc} --idle=INBOX
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -101,7 +104,7 @@ in {
|
||||||
serviceConfig.User = "steveej";
|
serviceConfig.User = "steveej";
|
||||||
serviceConfig.Group = "dovecot2";
|
serviceConfig.Group = "dovecot2";
|
||||||
description = "Getmail service";
|
description = "Getmail service";
|
||||||
path = [ pkgs.getmail ];
|
path = [ pkgs.getmail6 ];
|
||||||
serviceConfig.RestartSec = 1000;
|
serviceConfig.RestartSec = 1000;
|
||||||
serviceConfig.Restart = "always";
|
serviceConfig.Restart = "always";
|
||||||
script = let
|
script = let
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
{
|
{
|
||||||
|
|
||||||
config = { config, pkgs, ... }: {
|
config = { config, pkgs, ... }: {
|
||||||
|
system.stateVersion = "20.05"; # Did you read the comment?
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../profiles/containers/configuration.nix
|
../profiles/containers/configuration.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -6,8 +6,11 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
passwords = import ../../variables/passwords.crypt.nix;
|
passwords = import ../../variables/passwords.crypt.nix;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = { config, pkgs, lib, ... }: {
|
config = { config, pkgs, lib, ... }: {
|
||||||
|
system.stateVersion = "22.05"; # Did you read the comment?
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
../profiles/containers/configuration.nix
|
../profiles/containers/configuration.nix
|
||||||
];
|
];
|
||||||
|
@ -102,7 +105,7 @@ in {
|
||||||
|
|
||||||
services.mysql = {
|
services.mysql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.mariadb;
|
package = pkgs.mariadb_104;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.hedgedoc = {
|
services.hedgedoc = {
|
||||||
|
@ -113,7 +116,7 @@ in {
|
||||||
protocolUseSSL = true;
|
protocolUseSSL = true;
|
||||||
db = {
|
db = {
|
||||||
dialect = "sqlite";
|
dialect = "sqlite";
|
||||||
storage = "/var/lib/codimd/db.codimd.sqlite";
|
storage = "/var/lib/hedgedoc/db.hedgedoc.sqlite";
|
||||||
};
|
};
|
||||||
|
|
||||||
allowAnonymous = false;
|
allowAnonymous = false;
|
||||||
|
@ -149,8 +152,8 @@ in {
|
||||||
isReadOnly = false;
|
isReadOnly = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
"/var/lib/codimd" = {
|
"/var/lib/hedgedoc" = {
|
||||||
hostPath = "/var/lib/container-volumes/webserver/var-lib-codimd";
|
hostPath = "/var/lib/container-volumes/webserver/var-lib-hedgedoc";
|
||||||
isReadOnly = false;
|
isReadOnly = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
let
|
let
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
url = "https://github.com/NixOS/nixpkgs/";
|
url = "https://github.com/NixOS/nixpkgs/";
|
||||||
ref = "nixos-21.11";
|
ref = "nixos-22.05";
|
||||||
rev = "feea25c58657fa81d16e0e51f80e1a02ef4cbd49";
|
rev = "040c6d8374d090f46ab0e99f1f7c27a4529ecffd";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -12,11 +12,11 @@ in
|
||||||
"nixpkgs-master" = {
|
"nixpkgs-master" = {
|
||||||
url = "https://github.com/NixOS/nixpkgs/";
|
url = "https://github.com/NixOS/nixpkgs/";
|
||||||
ref = "master";
|
ref = "master";
|
||||||
rev = "78f6f779627c89823d8402aac658418ef188be1c";
|
rev = "5527a41eb304aa7c77efeefbda0e17ca105a4c8c";
|
||||||
};
|
};
|
||||||
"home-manager-module" = {
|
"home-manager-module" = {
|
||||||
url = "https://github.com/nix-community/home-manager";
|
url = "https://github.com/nix-community/home-manager";
|
||||||
ref = "release-21.11";
|
ref = "release-22.05";
|
||||||
rev = "d14adb99f3fb562ec74ad18c032efc154b438034";
|
rev = "b81e128fc053ab3159d7b464d9b7dedc9d6a6891";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
let
|
let
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
url = "https://github.com/NixOS/nixpkgs/";
|
url = "https://github.com/NixOS/nixpkgs/";
|
||||||
ref = "nixos-21.11";
|
ref = "nixos-22.05";
|
||||||
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
|
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ in
|
||||||
};
|
};
|
||||||
"home-manager-module" = {
|
"home-manager-module" = {
|
||||||
url = "https://github.com/nix-community/home-manager";
|
url = "https://github.com/nix-community/home-manager";
|
||||||
ref = "release-21.11";
|
ref = "release-22.05";
|
||||||
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
|
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,4 +2,5 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
networking.hostName = "steveej-rmvbl-sdep0"; # Define your hostname.
|
networking.hostName = "steveej-rmvbl-sdep0"; # Define your hostname.
|
||||||
|
system.stateVersion = "21.05";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue