summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-29 00:38:22 +0200
committerlassulus <lassulus@lassul.us>2017-07-29 00:38:22 +0200
commit5ff77c7c64fe8eb94004a77718e70cfa14a3c9c4 (patch)
treeb9ceba038f1e54fe68dd3ff94b551535554cd0fa /makefu/2configs
parentc575f32d56b53ecbc1bcf28342f4eff683b7818c (diff)
parent17497235e84985f9b2ec4acda47f15a9fe68453e (diff)
Merge remote-tracking branch 'gum/master' into HEAD
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/deployment/owncloud.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index c6fb9c8e5..65ac5c184 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -140,10 +140,10 @@ in {
enable = false;
databases = [ "nextcloud" ];
};
-
- krebs.secret.files.mysql_rootPassword = {
- path = "${config.services.mysql.dataDir}/mysql_rootPassword";
- owner.name = "root";
- source-path = toString <secrets> + "/mysql_rootPassword";
- };
+ # dataDir is only defined after mysql is enabled
+ # krebs.secret.files.mysql_rootPassword = {
+ # path = "${config.services.mysql.dataDir}/mysql_rootPassword";
+ # owner.name = "root";
+ # source-path = toString <secrets> + "/mysql_rootPassword";
+ # };
}