From 0279b0b9863666369d1f045fcd87d73c4a37cb96 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien.malka@me.com>
Date: Sun, 2 Jan 2022 23:00:58 +0100
Subject: [PATCH] Updated filerun and fixed permissions

---
 modules/filerun/default.nix | 20 +++++++++++++++-----
 users/julien.nix            |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/filerun/default.nix b/modules/filerun/default.nix
index bb5aa20..57f693a 100644
--- a/modules/filerun/default.nix
+++ b/modules/filerun/default.nix
@@ -58,19 +58,29 @@ in
         '';
     };
 
+    
 
+  
+    users.users.filerun = {
+      isSystemUser = true;
+      uid = 250;
+    };
+    users.groups.filerun = {
+      gid = 350;
+    };
+    users.users.filerun.group = config.users.groups.filerun.name;
 
     virtualisation.oci-containers.containers."filerun" = {
-      image = "afian/filerun:libreoffice";
+      image = "filerun/filerun";
       environment = {
         "FR_DB_HOST" = "filerun-mariadb";
         "FR_DB_PORT" = "3306";
         "FR_DB_NAME" = "filerundb";
         "FR_DB_USER" = "filerun";
-        "APACHE_RUN_USER" = "filerunuser";
-        "APACHE_RUN_USER_ID" = "1000";
-        "APACHE_RUN_GROUP" = "hello";
-        "APACHE_RUN_GROUP_ID" = "100";
+        "APACHE_RUN_USER" = config.users.users.filerun.name;
+        "APACHE_RUN_USER_ID" = "250";
+        "APACHE_RUN_GROUP" = config.users.groups.filerun.name;
+        "APACHE_RUN_GROUP_ID" = "350"; 
       };
       environmentFiles = [
         /run/secrets/filerun
diff --git a/users/julien.nix b/users/julien.nix
index 76df441..d47bdfa 100644
--- a/users/julien.nix
+++ b/users/julien.nix
@@ -5,7 +5,7 @@
   users.users.julien = {
     isNormalUser = true;
     home = "/home/julien";
-    extraGroups = [ "wheel" config.users.groups.keys.name ];
+    extraGroups = [ "wheel" config.users.groups.keys.name config.users.groups.filerun.name ];
     shell = pkgs.fish;
     passwordFile = config.sops.secrets.user-julien-password.path;
     openssh.authorizedKeys.keyFiles = [