diff --git a/configs/workhorse/mysql.nix b/configs/workhorse/mysql.nix index 954aeeb..727df98 100644 --- a/configs/workhorse/mysql.nix +++ b/configs/workhorse/mysql.nix @@ -12,7 +12,7 @@ services.mysqlBackup = { enable = true; databases = [ "property" ]; - user = "admin"; + #user = "admin"; }; backup.dirs = [ config.services.mysqlBackup.location ]; diff --git a/configs/workhorse/nextcloud.nix b/configs/workhorse/nextcloud.nix index a490e0d..023db6e 100644 --- a/configs/workhorse/nextcloud.nix +++ b/configs/workhorse/nextcloud.nix @@ -175,6 +175,9 @@ in { ''; }; + # in php + services.phpfpm.phpPackage = pkgs.php73; + # nextcloud setup services.nextcloud = { enable = true; @@ -194,20 +197,27 @@ in { #logLevel = 0; https = true; config = { - adminpassFile = toString ; + adminpassFile = + toString config.krops.userKeys."nextcloud_root".target; overwriteProtocol = "https"; trustedProxies = [ "195.201.134.247" hostAddress ]; dbtype = "mysql"; - dbpassFile = toString config.krops.userKeys."nextcloud".target; + dbpassFile = + toString config.krops.userKeys."nextcloud_database".target; dbport = 3306; }; }; # provide password file for database with proper rights - krops.userKeys."nextcloud" = { + krops.userKeys."nextcloud_database" = { user = "nextcloud"; source = toString ; - requiredBy = [ "nginx.service" ]; + requiredBy = [ "nginx.service" "nextcloud-setup.service" ]; + }; + krops.userKeys."nextcloud_root" = { + user = "nextcloud"; + source = toString ; + requiredBy = [ "nginx.service" "nextcloud-setup.service" ]; }; environment.systemPackages = [ pkgs.smbclient ]; @@ -238,10 +248,7 @@ in { recommendedProxySettings = true; virtualHosts = { "nextcloud.workhorse.private" = { - serverAliases = [ - "nextcloud.ingolf-wagner.de" - # "nextcloud.gaykraft.com" - ]; + serverAliases = [ "nextcloud.ingolf-wagner.de" ]; locations."/" = { proxyPass = "http://${containerAddress}"; extraConfig = '' diff --git a/shell.nix b/shell.nix index 2f22da5..7323ff3 100644 --- a/shell.nix +++ b/shell.nix @@ -96,7 +96,7 @@ let #kops-lib.file = toString ~/dev/krops-lib; krops-lib.git = { url = "https://git.ingolf-wagner.de/nix-modules/krops.git"; - ref = "1.0.2"; + ref = "1.0.3"; }; #cluster-module.file = toString ~/dev/cluster-module;