From d7fe26bf1429b04d003cd2b07bba4460ed40c4e9 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 1 Apr 2021 12:25:36 +0200 Subject: no nextcloud. --- ymir.nix | 58 +--------------------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/ymir.nix b/ymir.nix index 6aa26054..216a3a07 100644 --- a/ymir.nix +++ b/ymir.nix @@ -7,7 +7,7 @@ let luaPosix = pkgs.callPackage ./custom/luaPosix.nix {}; luaSha2 = pkgs.callPackage ./custom/luaSha2.nix {}; myDomains = [ "dirty-haskell.org" "www.dirty-haskell.org" "lists.dirty-haskell.org" "l.dirty-haskell.org" - "cloud.141.li" "online.141.li" "o.141.li" "ftp.141.li" "files.141.li" "f.141.li" "ymir.141.li" "141.li" "www.141.li" "lists.141.li" "l.141.li" "rpg.141.li" "odin.141.li" + "online.141.li" "o.141.li" "ftp.141.li" "files.141.li" "f.141.li" "ymir.141.li" "141.li" "www.141.li" "lists.141.li" "l.141.li" "rpg.141.li" "odin.141.li" "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li" "online.yggdrasil.li" "o.yggdrasil.li" "ftp.yggdrasil.li" "files.yggdrasil.li" "f.yggdrasil.li" "ymir.yggdrasil.li" "git.yggdrasil.li" "www.yggdrasil.li" "yggdrasil.li" "lists.yggdrasil.li" "l.yggdrasil.li" "rpg.yggdrasil.li" "odin.yggdrasil.li" "online.praseodym.org" "o.praseodym.org" "ftp.praseodym.org" "files.praseodym.org" "f.praseodym.org" "ymir.praseodym.org" "praseodym.org" "www.praseodym.org" "lists.praseodym.org" "l.praseodym.org" "rpg.praseodym.org" @@ -1159,60 +1159,4 @@ in rec { }; services.qemuGuest.enable = true; - - services.nextcloud = { - enable = true; - package = pkgs.nextcloud20; - hostName = "cloud.141.li"; - config = { - dbtype = "pgsql"; - dbuser = "nextcloud"; - dbhost = "/run/postgresql"; - dbname = "nextcloud"; - adminpassFile = "/etc/nextcloud-admin-pass"; - adminuser = "root"; - }; - }; - - services.postgresql = { - enable = true; - package = pkgs.postgresql_13; - ensureDatabases = [ "nextcloud" ]; - ensureUsers = [ - { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - ]; - }; - - services.nginx.virtualHosts."cloud.141.li" = { - forceSSL = true; - useACMEHost = "yggdrasil.li"; - acmeRoot = security.acme.certs."yggdrasil.li".webroot; - }; - - systemd.services."nextcloud-setup" = { - requires = ["postgresql.service"]; - after = ["postgresql.service"]; - }; - - systemd.services."nextcloud-send-event-reminders" = - let cfg = config.services.nextcloud; - fpm = config.services.phpfpm.pools.nextcloud; - in { environment = { - inherit (fpm.phpEnv) NEXTCLOUD_CONFIG_DIR; - }; - serviceConfig.Type = "oneshot"; - serviceConfig.User = "nextcloud"; - serviceConfig.ExecStart = "${fpm.phpPackage}/bin/php -f ${cfg.package}/cron.php"; - }; - systemd.timers."nextcloud-send-event-reminders" = { - wantedBy = [ "timers.target" ]; - timerConfig.OnBootSec = "5m"; - timerConfig.OnUnitActiveSec = "30s"; - timerConfig.Unit = "nextcloud-send-event-reminders.service"; - }; - systemd.timers."nextcloud-cron" = { - timerConfig.OnUnitActiveSec = lib.mkForce "5m"; - }; } -- cgit v1.2.3