1 files changed, 12 insertions, 14 deletions

diff --git a/modules/by-name/et/etesync/module.nix b/modules/vhack/et/etesync/module.nix
index 0f6c565..4dc8575 100644
--- a/modules/by-name/et/etesync/module.nix
+++ b/modules/vhack/et/etesync/module.nix
@@ -9,6 +9,10 @@ in {
     enable = lib.mkEnableOption ''
       a secure, end-to-end encrypted, and privacy respecting sync for your contacts, calendars, tasks and notes.
     '';
+    secretFile = lib.mkOption {
+      type = lib.types.path;
+      description = "The age encrypted globale etebase secretfile passed to agenix";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -25,13 +29,13 @@ in {
     };
 
     age.secrets.etebase-server = {
-      file = ./secret_file.age;
+      file = cfg.secretFile;
       mode = "700";
       owner = "etebase-server";
       group = "etebase-server";
     };
 
-    environment.persistence."/srv".directories = [
+    vhack.persist.directories = [
       {
         directory = "/var/lib/etebase-server";
         user = "etebase-server";
@@ -41,26 +45,14 @@ in {
     ];
 
     services.nginx = {
-      enable = true;
-      recommendedTlsSettings = true;
-      recommendedOptimisation = true;
-      recommendedGzipSettings = true;
-      recommendedProxySettings = true;
-
       virtualHosts = {
         "etebase.vhack.eu" = {
-          enableACME = true;
-          forceSSL = true;
-
           locations = {
             # TODO: Maybe fix permissions to use pregenerated static files which would
             # improve performance.
             #"/static" = {
             #  root = config.services.etebase-server.settings.global.static_root;
             #};
-            "/" = {
-              proxyPass = "http://127.0.0.1:${builtins.toString config.services.etebase-server.port}";
-            };
           };
           serverAliases = [
             "dav.vhack.eu"
@@ -68,5 +60,11 @@ in {
         };
       };
     };
+    vhack.anubis.instances."etebase.vhack.eu".target = "http://127.0.0.1:${builtins.toString config.services.etebase-server.port}";
+
+    users = {
+      users.etebase-server.uid = config.vhack.constants.ids.uids.etebase-server;
+      groups.etebase-server.gid = config.vhack.constants.ids.gids.etebase-server;
+    };
   };
 }