SelfPrivacy/selfprivacy-nixos-config
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git synced 2024-12-02 03:16:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request 'master' (#26) from master into api-redis

Browse source 
Reviewed-on: https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/pulls/26
This commit is contained in:
Inex Code 2023-03-20 17:27:48 +02:00
parent d8f0922b8a c8c69957b5
commit d8ebbcd1cf
7 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/api-module.nix
View file

@ -76,7 +76,7 @@ in
PYTHONUNBUFFERED = "1"; PYTHONUNBUFFERED = "1";
ENABLE_SWAGGER = (if cfg.enableSwagger then "1" else "0"); ENABLE_SWAGGER = (if cfg.enableSwagger then "1" else "0");
B2_BUCKET = cfg.b2Bucket; B2_BUCKET = cfg.b2Bucket;
PYTHONPATH = pkgs.selfprivacy-graphql-api.pythonPath + ":${pkgs.selfprivacy-graphql-api}/lib/python3.9/site-packages/"; PYTHONPATH = pkgs.selfprivacy-graphql-api.pythonPath + ":${pkgs.selfprivacy-graphql-api}/lib/python3.10/site-packages/";
} // config.networking.proxy.envVars; } // config.networking.proxy.envVars;
path = [ path = [
"/var/" "/var/"
@ -98,7 +98,7 @@ in
wantedBy = [ "network-online.target" ]; wantedBy = [ "network-online.target" ];
serviceConfig = { serviceConfig = {
User = "root"; User = "root";
ExecStart = "${pkgs.python39Packages.huey}/bin/huey_consumer.py selfprivacy_api.task_registry.huey"; ExecStart = "${pkgs.python310Packages.huey}/bin/huey_consumer.py selfprivacy_api.task_registry.huey";
Restart = "always"; Restart = "always";
RestartSec = "5"; RestartSec = "5";
}; };

3
configuration.nix
View file

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
url-overlay = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo/archive/redis.tar.gz"; url-overlay = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo/archive/22-11.tar.gz";
nix-overlay = (import (builtins.fetchTarball url-overlay)); nix-overlay = (import (builtins.fetchTarball url-overlay));
in in
{ {
@ -89,6 +89,7 @@ in
allowReboot = config.services.userdata.autoUpgrade.allowReboot; allowReboot = config.services.userdata.autoUpgrade.allowReboot;
channel = "https://channel.selfprivacy.org/nixos-selfpricacy"; channel = "https://channel.selfprivacy.org/nixos-selfpricacy";
}; };
system.stateVersion = config.services.userdata.stateVersion;
nix = { nix = {
optimise.automatic = true; optimise.automatic = true;
gc = { gc = {

12
git/gitea.nix
View file

@ -13,10 +13,6 @@ in
gitea = { gitea = {
enable = cfg.gitea.enable; enable = cfg.gitea.enable;
stateDir = "/var/lib/gitea"; stateDir = "/var/lib/gitea";
log = {
rootPath = "/var/lib/gitea/log";
level = "Warn";
};
user = "gitea"; user = "gitea";
database = { database = {
type = "sqlite3"; type = "sqlite3";
@ -40,7 +36,6 @@ in
rootUrl = "https://git.${cfg.domain}/"; rootUrl = "https://git.${cfg.domain}/";
httpAddress = "0.0.0.0"; httpAddress = "0.0.0.0";
httpPort = 3000; httpPort = 3000;
cookieSecure = true;
settings = { settings = {
mailer = { mailer = {
ENABLED = false; ENABLED = false;
@ -58,6 +53,13 @@ in
repository = { repository = {
FORCE_PRIVATE = false; FORCE_PRIVATE = false;
}; };
session = {
COOKIE_SECURE = true;
};
log = {
ROOT_PATH = "/var/lib/gitea/log";
LEVEL = "Warn";
};
}; };
}; };
}; };

4
mailserver/system/mailserver.nix
View file

@ -6,10 +6,10 @@ in
imports = [ imports = [
(builtins.fetchTarball { (builtins.fetchTarball {
# Pick a commit from the branch you are interested in # Pick a commit from the branch you are interested in
url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/f535d812/nixos-mailserver-f535d812.tar.gz"; url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/6d0d9fb9/nixos-mailserver-6d0d9fb9.tar.gz";
# And set its hash # And set its hash
sha256 = "sha256:0csx2i8p7gbis0n5aqpm57z5f9cd8n9yabq04bg1h4mkfcf7mpl6"; sha256 = "sha256:0h35al73p15z9v8zb6hi5nq987sfl5wp4rm5c8947nlzlnsjl61x";
}) })
]; ];

2
nextcloud/nextcloud.nix
View file

@ -11,7 +11,7 @@ in
}; };
services.nextcloud = { services.nextcloud = {
enable = cfg.nextcloud.enable; enable = cfg.nextcloud.enable;
package = pkgs.nextcloud24; package = pkgs.nextcloud25;
hostName = "cloud.${cfg.domain}"; hostName = "cloud.${cfg.domain}";
# Use HTTPS for links # Use HTTPS for links

7
variables-module.nix
View file

@ -41,6 +41,13 @@ in
type = types.nullOr types.bool; type = types.nullOr types.bool;
}; };
}; };
stateVersion = mkOption {
description = ''
State version of the server
'';
type = types.str;
default = "22.11";
};
######################## ########################
# Server admin options # # Server admin options #
######################## ########################

1
variables.nix
View file

@ -7,6 +7,7 @@ in
hostname = lib.attrsets.attrByPath [ "hostname" ] null jsonData; hostname = lib.attrsets.attrByPath [ "hostname" ] null jsonData;
domain = lib.attrsets.attrByPath [ "domain" ] null jsonData; domain = lib.attrsets.attrByPath [ "domain" ] null jsonData;
timezone = lib.attrsets.attrByPath [ "timezone" ] "Europe/Uzhgorod" jsonData; timezone = lib.attrsets.attrByPath [ "timezone" ] "Europe/Uzhgorod" jsonData;
stateVersion = lib.attrsets.attrByPath [ "stateVersion" ] "22.05" jsonData;
autoUpgrade = { autoUpgrade = {
enable = lib.attrsets.attrByPath [ "autoUpgrade" "enable" ] true jsonData; enable = lib.attrsets.attrByPath [ "autoUpgrade" "enable" ] true jsonData;
allowReboot = lib.attrsets.attrByPath [ "autoUpgrade" "allowReboot" ] true jsonData; allowReboot = lib.attrsets.attrByPath [ "autoUpgrade" "allowReboot" ] true jsonData;