h
This commit is contained in:
parent
540ac42eac
commit
98f576b2c3
5 changed files with 111 additions and 75 deletions
|
|
@ -21,73 +21,83 @@
|
|||
};
|
||||
};
|
||||
config = {
|
||||
services = {
|
||||
nextcloud = {
|
||||
enable = config.server.cloud.nextcloud.enable;
|
||||
configureRedis = true;
|
||||
package = pkgs.nextcloud33;
|
||||
hostName = "nextcloud-net";
|
||||
config = {
|
||||
dbtype = "pgsql";
|
||||
dbuser = "nextcloud";
|
||||
dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
|
||||
dbname = "nextcloud";
|
||||
adminpassFile = "/home/marty/secrets/nextcloud";
|
||||
adminuser = "admin";
|
||||
};
|
||||
settings = {
|
||||
trusted_proxies = [
|
||||
"localhost"
|
||||
"127.0.0.1"
|
||||
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
|
||||
config.networking.hostName
|
||||
];
|
||||
trusted_domains = [
|
||||
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
|
||||
config.networking.hostName
|
||||
];
|
||||
skeletondirectory = "";
|
||||
preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
|
||||
log_type = "file";
|
||||
logfile = "nextcloud.log";
|
||||
loglevel = 0;
|
||||
};
|
||||
};
|
||||
postgresql = {
|
||||
enable = true;
|
||||
ensureDatabases = [ "nextcloud" ];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "nextcloud";
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
nginx = {
|
||||
virtualHosts = {
|
||||
"nextcloud-net".listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = config.server.cloud.nextcloud.port;
|
||||
}
|
||||
];
|
||||
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}" =
|
||||
if config.server.cloud.nextcloud.public then
|
||||
services =
|
||||
if config.server.cloud.nextcloud.enable then
|
||||
{
|
||||
nextcloud = {
|
||||
enable = true;
|
||||
configureRedis = true;
|
||||
package = pkgs.nextcloud33;
|
||||
hostName = "nextcloud-net";
|
||||
config = {
|
||||
dbtype = "pgsql";
|
||||
dbuser = "nextcloud";
|
||||
dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
|
||||
dbname = "nextcloud";
|
||||
adminpassFile = "/home/marty/secrets/nextcloud";
|
||||
adminuser = "admin";
|
||||
};
|
||||
settings = {
|
||||
trusted_proxies = [
|
||||
"localhost"
|
||||
"127.0.0.1"
|
||||
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
|
||||
config.networking.hostName
|
||||
];
|
||||
trusted_domains = [
|
||||
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
|
||||
config.networking.hostName
|
||||
];
|
||||
skeletondirectory = "";
|
||||
preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
|
||||
log_type = "file";
|
||||
logfile = "nextcloud.log";
|
||||
loglevel = 0;
|
||||
};
|
||||
};
|
||||
postgresql = {
|
||||
enable = true;
|
||||
ensureDatabases = [ "nextcloud" ];
|
||||
ensureUsers = [
|
||||
{
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString config.server.cloud.nextcloud.port}";
|
||||
};
|
||||
name = "nextcloud";
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
};
|
||||
};
|
||||
systemd.services."nextcloud-setup" = {
|
||||
requires = [ "postgresql.service" ];
|
||||
after = [ "postgresql.service" ];
|
||||
};
|
||||
];
|
||||
};
|
||||
nginx = {
|
||||
virtualHosts = {
|
||||
"nextcloud-net".listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = config.server.cloud.nextcloud.port;
|
||||
}
|
||||
];
|
||||
"${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}" =
|
||||
if config.server.cloud.nextcloud.public then
|
||||
{
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString config.server.cloud.nextcloud.port}";
|
||||
};
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
};
|
||||
}
|
||||
else
|
||||
{ };
|
||||
systemd =
|
||||
if config.server.cloud.nextcloud.enable then
|
||||
{
|
||||
services."nextcloud-setup" = {
|
||||
requires = [ "postgresql.service" ];
|
||||
after = [ "postgresql.service" ];
|
||||
};
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
domain = ${config.server.misc.lauti.subdomain}.${config.networking.domain};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
server.misc.lauti = {
|
||||
|
|
@ -14,6 +16,10 @@
|
|||
description = "lauti port";
|
||||
};
|
||||
public = lib.mkEnableOption "make lauti public";
|
||||
domain = lib.mkOption {
|
||||
default = "";
|
||||
description = "lauti domain";
|
||||
};
|
||||
subdomain = lib.mkOption {
|
||||
default = "lauti";
|
||||
description = "lauti subdomain";
|
||||
|
|
@ -26,7 +32,7 @@
|
|||
enable = config.server.misc.lauti.enable;
|
||||
settings = {
|
||||
LAUTI_ADMIN_EMAIL = "lauti@${config.networking.domain}";
|
||||
LAUTI_BASE_URL = "https://${config.server.misc.lauti.subdomain}.${config.networking.domain}";
|
||||
LAUTI_BASE_URL = "https://${domain}";
|
||||
LAUTI_OSM_TILE_CACHE_DIR = "/var/lib/lauti/osm";
|
||||
LAUTI_OSM_TILE_SERVER = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
|
||||
LAUTI_TIMEZONE = "Europe/Berlin";
|
||||
|
|
@ -36,7 +42,7 @@
|
|||
};
|
||||
nginx = {
|
||||
virtualHosts = {
|
||||
"${config.server.misc.lauti.subdomain}.${config.networking.domain}" =
|
||||
"${domain}" =
|
||||
if config.server.misc.lauti.public then
|
||||
{
|
||||
enableACME = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue