aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock18
-rw-r--r--tharos/nextcloud.nix8
2 files changed, 11 insertions, 15 deletions
diff --git a/flake.lock b/flake.lock
index 6e47eb8..e3cba81 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1780290312,
- "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
+ "lastModified": 1792526520,
+ "narHash": "sha256-3hSJlv8mUVnZPMWK2+CM7a9O+nR6Z4mCh27NfLCmTPc=",
"owner": "nix-community",
"repo": "disko",
- "rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
+ "rev": "cedd626e11b635470fa6f9fdb8ad79b0075dd7f9",
"type": "github"
},
"original": {
@@ -27,11 +27,11 @@
]
},
"locked": {
- "lastModified": 1778716662,
- "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+ "lastModified": 1790898470,
+ "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+ "rev": "024633cd702b10285db5cb19b40ad48d2399ba60",
"type": "github"
},
"original": {
@@ -42,11 +42,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1780751787,
- "narHash": "sha256-nWR7F46SyrLvN8Ot39XJDpVCswekGakXlOD4KsTYKW0=",
+ "lastModified": 1792925778,
+ "narHash": "sha256-aCg6fAHZszDX68IsLPUm/NQ7ZVXMHk74bjHAIr8K5dM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "00fa9a692bafc08a86061886f888b843bf7fbdb0",
+ "rev": "acc2ec71996e90e6e011fa14979b13cdc070ec79",
"type": "github"
},
"original": {
diff --git a/tharos/nextcloud.nix b/tharos/nextcloud.nix
index 303688d..d838a9a 100644
--- a/tharos/nextcloud.nix
+++ b/tharos/nextcloud.nix
@@ -16,7 +16,7 @@
{
services.nextcloud = {
enable = true;
- package = pkgs.nextcloud32;
+ package = pkgs.nextcloud33;
hostName = "nextcloud.${self.domain}";
database.createLocally = true;
config.dbtype = "pgsql";
@@ -56,16 +56,13 @@
/*
Vor erstmaligem Anwenden der Konfiguration:
- echo $PASSWORT | ssh tharos 'sudo install -m 600 /dev/stdin /var/lib/nextcloud/initialrootpassword'
cat $SECRETS | ssh tharos 'sudo install -m 600 -o nextcloud -g nextcloud /dev/stdin /var/lib/nextcloud/secrets.json'
- Die Dateien bleiben auf dem System!
- Das einmalige Root-Passwort wird nicht wieder verwendet.
+ Die Datei bleibt auf dem System!
Besser wäre natürlich zentralisiertes Management von geheimen Daten.
*/
secretFile = "/var/lib/nextcloud/secrets.json";
- config.adminpassFile = "/var/lib/nextcloud/initialrootpassword";
};
services.nginx.virtualHosts.${nextcloud} = {
listen = [
@@ -95,7 +92,6 @@
systemd.tmpfiles.rules = [
"f /var/lib/nextcloud/secrets.json 0600 nextcloud nextcloud - {}"
- "f /var/lib/nextcloud/initialrootpassword 0600 nextcloud nextcloud - root"
];
services.caddy.virtualHosts = {