Remove minio
This commit is contained in:
parent
8561e6863d
commit
3e8dae05d1
|
@ -85,7 +85,7 @@ in
|
||||||
# instance-inject-mastodon-version = true;
|
# instance-inject-mastodon-version = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.services.gotosocial.requires = mkAfter [ "minio.service" "postgresql.service" ];
|
systemd.services.gotosocial.requires = mkAfter [ "postgresql.service" ];
|
||||||
systemd.services.gotosocial.after = mkAfter [ "minio.service" "postgresql.service" ];
|
systemd.services.gotosocial.after = mkAfter [ "postgresql.service" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,8 @@
|
||||||
./outline.nix
|
./outline.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
system.stateVersion = "21.11";
|
||||||
|
|
||||||
common.linux.enable = false; # Don't enable the "common linux" module, this is a special machine.
|
common.linux.enable = false; # Don't enable the "common linux" module, this is a special machine.
|
||||||
|
|
||||||
# Personal user
|
# Personal user
|
||||||
|
@ -197,18 +199,6 @@
|
||||||
envFile = config.sops.secrets.gts-env.path;
|
envFile = config.sops.secrets.gts-env.path;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Minio
|
|
||||||
sops.secrets.minio-credentials = { };
|
|
||||||
services.minio = {
|
|
||||||
enable = true;
|
|
||||||
listenAddress = ":61929";
|
|
||||||
consoleAddress = ":62929";
|
|
||||||
rootCredentialsFile = config.sops.secrets.minio-credentials.path;
|
|
||||||
dataDir = lib.mkForce [ "/mnt/data/minio" ];
|
|
||||||
};
|
|
||||||
cloud.traefik.hosts.minio = { host = "s3.dtth.ch"; port = 61929; };
|
|
||||||
system.stateVersion = "21.11";
|
|
||||||
|
|
||||||
# ntfy
|
# ntfy
|
||||||
cloud.traefik.hosts.ntfy-sh = { host = "ntfy.nkagami.me"; port = 11161; noCloudflare = true; };
|
cloud.traefik.hosts.ntfy-sh = { host = "ntfy.nkagami.me"; port = 11161; noCloudflare = true; };
|
||||||
services.ntfy-sh = {
|
services.ntfy-sh = {
|
||||||
|
|
|
@ -1,67 +0,0 @@
|
||||||
{ lib, pkgs, config, ... }:
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
user = "nextcloud";
|
|
||||||
host = "cloud.dtth.ch";
|
|
||||||
port = 61155;
|
|
||||||
|
|
||||||
secrets = config.sops.secrets;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
sops.secrets."nextcloud/admin-password" = { owner = user; };
|
|
||||||
sops.secrets."nextcloud/minio-secret-key" = { owner = user; key = "minio-secret-key"; };
|
|
||||||
# database
|
|
||||||
cloud.postgresql.databases = [ user ];
|
|
||||||
# traefik
|
|
||||||
cloud.traefik.hosts.nextcloud = {
|
|
||||||
inherit port host;
|
|
||||||
};
|
|
||||||
systemd.services.nextcloud.requires = [ "postgresql.service" ];
|
|
||||||
services.nextcloud = {
|
|
||||||
enable = true;
|
|
||||||
hostName = host;
|
|
||||||
package = pkgs.nextcloud26;
|
|
||||||
enableBrokenCiphersForSSE = false;
|
|
||||||
|
|
||||||
home = "/mnt/data/nextcloud";
|
|
||||||
https = true;
|
|
||||||
database.createLocally = false;
|
|
||||||
|
|
||||||
extraApps = with pkgs.nextcloud26Packages.apps; {
|
|
||||||
inherit calendar contacts deck forms groupfolders news tasks;
|
|
||||||
sociallogin = pkgs.fetchNextcloudApp rec {
|
|
||||||
url = "https://github.com/zorn-v/nextcloud-social-login/releases/download/v5.4.3/release.tar.gz";
|
|
||||||
sha256 = "sha256-ZKwtF9j9WFIk3MZgng9DmN00A73S2Rb4qbehL9adaZo=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
# Database
|
|
||||||
dbtype = "pgsql";
|
|
||||||
dbname = user;
|
|
||||||
dbuser = user;
|
|
||||||
dbhost = "/run/postgresql";
|
|
||||||
# User
|
|
||||||
adminuser = "nki";
|
|
||||||
adminpassFile = secrets."nextcloud/admin-password".path;
|
|
||||||
# General
|
|
||||||
overwriteProtocol = "https";
|
|
||||||
defaultPhoneRegion = "VN";
|
|
||||||
|
|
||||||
objectstore.s3 = {
|
|
||||||
enable = true;
|
|
||||||
bucket = "nextcloud-dtth";
|
|
||||||
autocreate = true;
|
|
||||||
key = "minio";
|
|
||||||
secretFile = config.sops.secrets."nextcloud/minio-secret-key".path;
|
|
||||||
hostname = "s3.dtth.ch";
|
|
||||||
port = 443;
|
|
||||||
useSsl = true;
|
|
||||||
usePathStyle = true;
|
|
||||||
region = "us-east-1";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts.${host}.listen = [{ inherit port; addr = "127.0.0.1"; }];
|
|
||||||
}
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue