X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fwebapps%2Fdiaspora.nix;h=65599b73b228e43333cb13773cd3d33c0b894368;hp=226633202792a24bb08345a1d07436754a223803;hb=2a5cde8d47d5c887067176555596cf8feb5c4d8b;hpb=81b9ff8980a9a235b8915b5779ebc1d2a738a9a3

diff --git a/modules/webapps/diaspora.nix b/modules/webapps/diaspora.nix
index 2266332..65599b7 100644
--- a/modules/webapps/diaspora.nix
+++ b/modules/webapps/diaspora.nix
@@ -141,6 +141,11 @@ in
       path = [ cfg.workdir.gems pkgs.nodejs cfg.workdir.gems.ruby pkgs.curl pkgs.which pkgs.gawk ];
 
       preStart = ''
+        install -m 0755 -d ${cfg.dataDir}/uploads ${cfg.dataDir}/tmp ${cfg.dataDir}/log
+        install -m 0700 -d ${cfg.dataDir}/tmp/pids
+        if [ ! -f ${cfg.dataDir}/schedule.yml ]; then
+          echo "{}" > ${cfg.dataDir}/schedule.yml
+        fi
         ./bin/bundle exec rails db:migrate
       '';
 
@@ -162,18 +167,5 @@ in
 
       unitConfig.RequiresMountsFor = cfg.dataDir;
     };
-
-    system.activationScripts.diaspora = {
-      deps = [ "users" ];
-      text = ''
-      install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}/uploads \
-        ${cfg.dataDir}/tmp ${cfg.dataDir}/log
-      install -m 0700 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}/tmp/pids
-      if [ ! -f ${cfg.dataDir}/schedule.yml ]; then
-        echo "{}" | $wrapperDir/sudo -u ${cfg.user} tee ${cfg.dataDir}/schedule.yml
-      fi
-      '';
-    };
-
   };
 }