mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git
synced 2024-10-31 22:27:19 +00:00
Merge pull request 'system-configuration' (#4) from system-configuration into master
Reviewed-on: https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/pulls/4
This commit is contained in:
commit
1c1f353ea2
|
@ -43,6 +43,12 @@ in
|
||||||
B2 account key
|
B2 account key
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
b2Bucket = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = ''
|
||||||
|
B2 bucket
|
||||||
|
'';
|
||||||
|
};
|
||||||
resticPassword = mkOption {
|
resticPassword = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
description = ''
|
description = ''
|
||||||
|
@ -62,6 +68,7 @@ in
|
||||||
ENABLE_SWAGGER = (if cfg.enableSwagger then "1" else "0");
|
ENABLE_SWAGGER = (if cfg.enableSwagger then "1" else "0");
|
||||||
B2_ACCOUNT_ID = cfg.b2AccountId;
|
B2_ACCOUNT_ID = cfg.b2AccountId;
|
||||||
B2_ACCOUNT_KEY = cfg.b2AccountKey;
|
B2_ACCOUNT_KEY = cfg.b2AccountKey;
|
||||||
|
B2_BUCKET = cfg.b2Bucket;
|
||||||
RESTIC_PASSWORD = cfg.resticPassword;
|
RESTIC_PASSWORD = cfg.resticPassword;
|
||||||
} // config.networking.proxy.envVars;
|
} // config.networking.proxy.envVars;
|
||||||
path = [ "/var/" "/var/dkim/" pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild pkgs.restic pkgs.mkpasswd ];
|
path = [ "/var/" "/var/dkim/" pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild pkgs.restic pkgs.mkpasswd ];
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
enableSwagger = config.services.userdata.api.enableSwagger;
|
enableSwagger = config.services.userdata.api.enableSwagger;
|
||||||
b2AccountId = config.services.userdata.backblaze.accountId;
|
b2AccountId = config.services.userdata.backblaze.accountId;
|
||||||
b2AccountKey = config.services.userdata.backblaze.accountKey;
|
b2AccountKey = config.services.userdata.backblaze.accountKey;
|
||||||
|
b2Bucket = config.services.userdata.backblaze.bucket;
|
||||||
resticPassword = config.services.userdata.resticPassword;
|
resticPassword = config.services.userdata.resticPassword;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -59,8 +59,8 @@ in
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
DOMAIN = config.services.userdata.domain;
|
DOMAIN = config.services.userdata.domain;
|
||||||
};
|
};
|
||||||
system.autoUpgrade.enable = true;
|
system.autoUpgrade.enable = config.services.userdata.autoUpgrade.enable;
|
||||||
system.autoUpgrade.allowReboot = false;
|
system.autoUpgrade.allowReboot = config.services.userdata.autoUpgrade.allowReboot;
|
||||||
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05-small;
|
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05-small;
|
||||||
nix = {
|
nix = {
|
||||||
optimise.automatic = true;
|
optimise.automatic = true;
|
||||||
|
|
19
files.nix
19
files.nix
|
@ -14,17 +14,24 @@ in
|
||||||
CLOUDFLARE_DNS_API_TOKEN=${cfg.cloudflare.apiKey}
|
CLOUDFLARE_DNS_API_TOKEN=${cfg.cloudflare.apiKey}
|
||||||
CLOUDFLARE_ZONE_API_TOKEN=${cfg.cloudflare.apiKey}
|
CLOUDFLARE_ZONE_API_TOKEN=${cfg.cloudflare.apiKey}
|
||||||
'';
|
'';
|
||||||
|
rcloneConfig = builtins.replaceStrings [ "\n" "\"" "\\" ] [ "\\n" "\\\"" "\\\\" ] ''
|
||||||
|
[backblaze]
|
||||||
|
type = b2
|
||||||
|
account = ${cfg.backblaze.accountId}
|
||||||
|
key = ${cfg.backblaze.accountKey}
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
[
|
[
|
||||||
(if cfg.bitwarden.enable then "d /var/lib/bitwarden 0777 bitwarden_rs bitwarden_rs -" else "")
|
(if cfg.bitwarden.enable then "d /var/lib/bitwarden 0777 bitwarden_rs bitwarden_rs -" else "")
|
||||||
(if cfg.bitwarden.enable then "d /var/lib/bitwarden/backup 0777 bitwarden_rs bitwarden_rs -" else "")
|
(if cfg.bitwarden.enable then "d /var/lib/bitwarden/backup 0777 bitwarden_rs bitwarden_rs -" else "")
|
||||||
(if cfg.pleroma.enable then "d /var/lib/pleroma 0600 pleroma pleroma - -" else "")
|
(if cfg.pleroma.enable then "d /var/lib/pleroma 0600 pleroma pleroma - -" else "")
|
||||||
"d /var/lib/restic 0600 restic - - -"
|
"d /var/lib/restic 0600 restic - - -"
|
||||||
"f /var/lib/restic/pass 0400 restic - - ${resticPass}"
|
"f+ /var/lib/restic/pass 0400 restic - - ${resticPass}"
|
||||||
(if cfg.pleroma.enable then "f /var/lib/pleroma/secrets.exs 0755 pleroma pleroma - -" else "")
|
"f+ /root/.config/rclone/rclone.conf 0400 root root - ${rcloneConfig}"
|
||||||
"f /var/domain 0444 selfprivacy-api selfprivacy-api - ${domain}"
|
(if cfg.pleroma.enable then "f+ /var/lib/pleroma/secrets.exs 0755 pleroma pleroma - -" else "")
|
||||||
(if cfg.nextcloud.enable then "f /var/lib/nextcloud/db-pass 0440 nextcloud nextcloud - ${nextcloudDBPass}" else "")
|
"f+ /var/domain 0444 selfprivacy-api selfprivacy-api - ${domain}"
|
||||||
(if cfg.nextcloud.enable then "f /var/lib/nextcloud/admin-pass 0440 nextcloud nextcloud - ${nextcloudAdminPass}" else "")
|
(if cfg.nextcloud.enable then "f+ /var/lib/nextcloud/db-pass 0440 nextcloud nextcloud - ${nextcloudDBPass}" else "")
|
||||||
"f /var/lib/cloudflare/Credentials.ini 0440 nginx acmerecievers - ${cloudflareCredentials}"
|
(if cfg.nextcloud.enable then "f+ /var/lib/nextcloud/admin-pass 0440 nextcloud nextcloud - ${nextcloudAdminPass}" else "")
|
||||||
|
"f+ /var/lib/cloudflare/Credentials.ini 0440 nginx acmerecievers - ${cloudflareCredentials}"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ in
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
# Further forces Nextcloud to use HTTPS
|
# Further forces Nextcloud to use HTTPS
|
||||||
overwriteProtocol = "http";
|
overwriteProtocol = "https";
|
||||||
|
|
||||||
# Nextcloud PostegreSQL database configuration, recommended over using SQLite
|
# Nextcloud PostegreSQL database configuration, recommended over using SQLite
|
||||||
dbtype = "sqlite";
|
dbtype = "sqlite";
|
||||||
|
|
|
@ -15,9 +15,9 @@ in
|
||||||
group = "pleroma";
|
group = "pleroma";
|
||||||
configs = [
|
configs = [
|
||||||
(builtins.replaceStrings
|
(builtins.replaceStrings
|
||||||
[ "$DOMAIN" "$LUSER" "$DB_PASSWORD" ]
|
[ "$DOMAIN" "$LUSER" "$DB_PASSWORD" ]
|
||||||
[ cfg.domain cfg.username cfg.databasePassword ]
|
[ cfg.domain cfg.username cfg.databasePassword ]
|
||||||
(builtins.readFile ./config.exs))
|
(builtins.readFile ./config.exs))
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
postgresql = {
|
postgresql = {
|
||||||
|
|
|
@ -3,6 +3,17 @@
|
||||||
"$id": "https://git.selfprivacy.org/inex/selfprivacy-nixos-config/raw/branch/master/userdata/schema.json",
|
"$id": "https://git.selfprivacy.org/inex/selfprivacy-nixos-config/raw/branch/master/userdata/schema.json",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
"autoUpgrade": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"enable": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"allowReboot": {
|
||||||
|
"type": "boolean"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"hostname": {
|
"hostname": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
@ -15,6 +26,12 @@
|
||||||
"hashedMasterPassword": {
|
"hashedMasterPassword": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
"sshKeys": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
|
|
@ -9,6 +9,7 @@ in
|
||||||
"${cfg.username}" = {
|
"${cfg.username}" = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
hashedPassword = cfg.hashedMasterPassword;
|
hashedPassword = cfg.hashedMasterPassword;
|
||||||
|
openssh.authorizedKeys.keys = cfg.sshKeys;
|
||||||
};
|
};
|
||||||
} // builtins.listToAttrs (builtins.map
|
} // builtins.listToAttrs (builtins.map
|
||||||
(user: {
|
(user: {
|
||||||
|
@ -16,6 +17,7 @@ in
|
||||||
value = {
|
value = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
hashedPassword = user.hashedPassword;
|
hashedPassword = user.hashedPassword;
|
||||||
|
openssh.authorizedKeys.keys = user.sshKeys;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
cfg.users);
|
cfg.users);
|
||||||
|
|
|
@ -15,6 +15,7 @@ in
|
||||||
default = true;
|
default = true;
|
||||||
type = types.nullOr types.bool;
|
type = types.nullOr types.bool;
|
||||||
};
|
};
|
||||||
|
# General server options
|
||||||
hostname = mkOption {
|
hostname = mkOption {
|
||||||
description = "The hostname of the server.";
|
description = "The hostname of the server.";
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
|
@ -25,6 +26,28 @@ in
|
||||||
'';
|
'';
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
};
|
};
|
||||||
|
timezone = mkOption {
|
||||||
|
description = ''
|
||||||
|
Timezone used by the server
|
||||||
|
'';
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = "Europe/Uzhgorod";
|
||||||
|
};
|
||||||
|
autoUpgrade = {
|
||||||
|
enable = mkOption {
|
||||||
|
description = "Enable auto-upgrade of the server.";
|
||||||
|
default = true;
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
};
|
||||||
|
allowReboot = mkOption {
|
||||||
|
description = "Allow the server to reboot during the upgrade.";
|
||||||
|
default = false;
|
||||||
|
type = types.nullOr types.bool;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
########################
|
||||||
|
# Server admin options #
|
||||||
|
########################
|
||||||
username = mkOption {
|
username = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
Username that was defined at the initial setup process
|
Username that was defined at the initial setup process
|
||||||
|
@ -37,6 +60,16 @@ in
|
||||||
'';
|
'';
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
};
|
};
|
||||||
|
sshKeys = mkOption {
|
||||||
|
description = ''
|
||||||
|
SSH keys of the user that was defined at the initial setup process
|
||||||
|
'';
|
||||||
|
type = types.nullOr (types.listOf types.str);
|
||||||
|
default = [ ];
|
||||||
|
};
|
||||||
|
###############
|
||||||
|
# API options #
|
||||||
|
###############
|
||||||
api = {
|
api = {
|
||||||
token = mkOption {
|
token = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
|
@ -52,6 +85,9 @@ in
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
#############
|
||||||
|
# Secrets #
|
||||||
|
#############
|
||||||
backblaze = {
|
backblaze = {
|
||||||
bucket = mkOption {
|
bucket = mkOption {
|
||||||
description = "Bucket name used for userdata backups";
|
description = "Bucket name used for userdata backups";
|
||||||
|
@ -72,6 +108,9 @@ in
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
##############
|
||||||
|
# Services #
|
||||||
|
##############
|
||||||
databasePassword = mkOption {
|
databasePassword = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
Password for the database
|
Password for the database
|
||||||
|
@ -126,12 +165,18 @@ in
|
||||||
type = types.nullOr types.bool;
|
type = types.nullOr types.bool;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
#############
|
||||||
|
# Backups #
|
||||||
|
#############
|
||||||
resticPassword = mkOption {
|
resticPassword = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
Password for the restic
|
Password for the restic
|
||||||
'';
|
'';
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
};
|
};
|
||||||
|
#########
|
||||||
|
# SSH #
|
||||||
|
#########
|
||||||
ssh = {
|
ssh = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
default = true;
|
default = true;
|
||||||
|
@ -142,7 +187,7 @@ in
|
||||||
Root SSH Keys
|
Root SSH Keys
|
||||||
'';
|
'';
|
||||||
type = types.nullOr (types.listOf types.str);
|
type = types.nullOr (types.listOf types.str);
|
||||||
default = [""];
|
default = [ "" ];
|
||||||
};
|
};
|
||||||
passwordAuthentication = mkOption {
|
passwordAuthentication = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
|
@ -152,19 +197,15 @@ in
|
||||||
type = types.nullOr types.bool;
|
type = types.nullOr types.bool;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
timezone = mkOption {
|
###########
|
||||||
description = ''
|
# Users #
|
||||||
Timezone used by the server
|
###########
|
||||||
'';
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = "Europe/Uzhgorod";
|
|
||||||
};
|
|
||||||
users = mkOption {
|
users = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
Users that will be created on the server
|
Users that will be created on the server
|
||||||
'';
|
'';
|
||||||
type = types.nullOr (types.listOf (types.attrsOf types.anything));
|
type = types.nullOr (types.listOf (types.attrsOf types.anything));
|
||||||
default = [];
|
default = [ ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue