Remove useless relative symlinks

diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix
index e27688d26c23014713b1adb1666ffb5e120c072e..dc8d25fde495dd71b9b6ae756c10c90d714f212b 100644 (file)
--- a/nixops/modules/websites/aten/aten.nix
+++ b/nixops/modules/websites/aten/aten.nix
@@ -127,7 +127,7 @@ let
           ln -sf ${yarnModules}/node_modules .
           yarn run --offline encore production
           rm -rf var/{log,cache}
-          ln -sf ../../../../../../../${varDir}/{log,cache} var/
+          ln -sf ${varDir}/{log,cache} var/
           '';
         buildInputs = [ yarnModules yarn2nix yarn2nix.yarn ];
       });

diff --git a/nixops/modules/websites/chloe/chloe.nix b/nixops/modules/websites/chloe/chloe.nix
index 80e555479600aaa36b909760a1fc3474c8b783b7..7ad23fede7c3a3d9569a3faa37b33881cd2b6700 100644 (file)
--- a/nixops/modules/websites/chloe/chloe.nix
+++ b/nixops/modules/websites/chloe/chloe.nix
@@ -114,7 +114,7 @@ let
         rm -rf IMG local tmp config/remove.txt
         ln -sf ${../commons/spip/spip_mes_options.php} config/mes_options.php
         echo "Require all denied" > "config/.htaccess"
-        ln -sf ../../../../../${varDir}/{IMG,local} .
+        ln -sf ${varDir}/{IMG,local} .
       '';
       installPhase = ''
         cp -a . $out

diff --git a/nixops/modules/websites/connexionswing/connexionswing.nix b/nixops/modules/websites/connexionswing/connexionswing.nix
index 74a1ad0f81be9a9159f08d97770934aac936c064..8fbca2d8d6d703a8a1ad05be3966bf02b62a7dd4 100644 (file)
--- a/nixops/modules/websites/connexionswing/connexionswing.nix
+++ b/nixops/modules/websites/connexionswing/connexionswing.nix
@@ -168,8 +168,8 @@ let
           rm app/config/parameters.yml
           ln -sf ${configRoot} app/config/parameters.yml
           rm -rf var/{logs,cache}
-          ln -sf ../../../../../../${varDir}/var/{logs,cache} var/
-          ln -sf ../../../../../${varDir}/{medias,uploads} web/images/
+          ln -sf ${varDir}/var/{logs,cache} var/
+          ln -sf ${varDir}/{medias,uploads} web/images/
           '';
       });
     webRoot = "${webappDir}/web";

diff --git a/nixops/modules/websites/ludivine/ludivinecassal.nix b/nixops/modules/websites/ludivine/ludivinecassal.nix
index 3ffd335bace4875afd82c1d1c973f1d2b8b1c481..114c4ac2509d0eb7679ab3b07f7e2f4051dd5154 100644 (file)
--- a/nixops/modules/websites/ludivine/ludivinecassal.nix
+++ b/nixops/modules/websites/ludivine/ludivinecassal.nix
@@ -158,7 +158,7 @@ let
         #     bug in leapt.im (searches for data/../miniatures)
         postInstall = ''
           rm -rf var/{logs,cache,data,miniatures,tmp}
-          ln -sf ../../../../../../../${varDir}/{logs,cache,data,miniatures,tmp} var/
+          ln -sf ${varDir}/{logs,cache,data,miniatures,tmp} var/
           '';
         buildInputs = [ sass ];
       });

diff --git a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
index 4caf48a701ba5dff1de1d46a9f1025c85c368ab4..bb1726208fd67d65ba8c939d953ec834b9c29a99 100644 (file)
--- a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
+++ b/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
@@ -148,7 +148,7 @@ let
           rm app/config/parameters.yml
           ln -sf ${configRoot} app/config/parameters.yml
           rm -rf var/{logs,cache,data,miniatures,tmp}
-          ln -sf ../../../../../../../${varDir}/{logs,cache,data,miniatures,tmp} var/
+          ln -sf ${varDir}/{logs,cache,data,miniatures,tmp} var/
           '';
       });
     webRoot = "${webappDir}/web";

diff --git a/nixops/modules/websites/tellesflorian/tellesflorian.nix b/nixops/modules/websites/tellesflorian/tellesflorian.nix
index 47142c8d46e33757252d975e639daef94368326e..e42158199b003008bae19b774ef445add7c0e8cd 100644 (file)
--- a/nixops/modules/websites/tellesflorian/tellesflorian.nix
+++ b/nixops/modules/websites/tellesflorian/tellesflorian.nix
@@ -147,7 +147,7 @@ let
           rm app/config/parameters.yml
           ln -sf ${configRoot} app/config/parameters.yml
           rm -rf var/{logs,cache}
-          ln -sf ../../../../../../${varDir}/var/{logs,cache,sessions} var/
+          ln -sf ${varDir}/var/{logs,cache,sessions} var/
           '';
       });
     webRoot = "${webappDir}/web";

diff --git a/nixops/modules/websites/tools/cloud/nextcloud.nix b/nixops/modules/websites/tools/cloud/nextcloud.nix
index d9e0be07731973da148418c2c575d90f62cee4f7..2e528283a38004e881615257000f0f591def84f8 100644 (file)
--- a/nixops/modules/websites/tools/cloud/nextcloud.nix
+++ b/nixops/modules/websites/tools/cloud/nextcloud.nix
@@ -188,7 +188,7 @@ let
         mkdir -p $out/
         cp -R . $out/
         rm -r $out/config
-        ln -sf ../../../../../${varDir}/config $out/config
+        ln -sf ${varDir}/config $out/config
         ${builtins.concatStringsSep "\n" (
           lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/apps/${name}") apps
         )}

diff --git a/nixops/modules/websites/tools/diaspora/diaspora.nix b/nixops/modules/websites/tools/diaspora/diaspora.nix
index 74be4fe998b19445a80b99962d672759cd201fde..778fe267f415e494914b4d6ffc8bcbd59c757c6b 100644 (file)
--- a/nixops/modules/websites/tools/diaspora/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora/diaspora.nix
@@ -137,13 +137,13 @@ let
         ln -s ${database_config} config/database.yml
         ln -s ${config} config/diaspora.yml
         ln -s ${secret_token} config/initializers/secret_token.rb
-        ln -sf ../../../../../../${varDir}/schedule.yml config/schedule.yml
-        ln -sf ../../../../../../${varDir}/oidc_key.pem config/oidc_key.pem
-        ln -sf ../../../../../../${varDir}/uploads public/uploads
+        ln -sf ${varDir}/schedule.yml config/schedule.yml
+        ln -sf ${varDir}/oidc_key.pem config/oidc_key.pem
+        ln -sf ${varDir}/uploads public/uploads
         RAILS_ENV=production ${gems}/bin/rake assets:precompile
         rm -rf tmp log
-        ln -sf ../../../../../${varDir}/tmp tmp
-        ln -sf ../../../../../${varDir}/log log
+        ln -sf ${varDir}/tmp tmp
+        ln -sf ${varDir}/log log
         '';
       propagatedBuildInputs = [ gems pkgs.nodejs pkgs.which pkgs.git ];
     };

diff --git a/nixops/modules/websites/tools/mastodon/mastodon.nix b/nixops/modules/websites/tools/mastodon/mastodon.nix
index 5f0104c5da7a7b0e16f909ba1c80ee0b93bf2a57..ef7ef576dfc70367ba6e957b44ffa658277280f5 100644 (file)
--- a/nixops/modules/websites/tools/mastodon/mastodon.nix
+++ b/nixops/modules/websites/tools/mastodon/mastodon.nix
@@ -119,7 +119,7 @@ let
         sed -i -e 's@^end$@  config.action_mailer.sendmail_settings = { location: ENV.fetch("SENDMAIL_LOCATION", "/usr/sbin/sendmail") }\nend@' config/environments/production.rb
         RAILS_ENV=production ${gems}/bin/rails assets:precompile
         rm -rf tmp/cache
-        ln -sf ../../../../../../../${varDir}/tmp/cache tmp
+        ln -sf ${varDir}/tmp/cache tmp
         '';
       buildInputs = [ gems gems.ruby pkgs.nodejs pkgs.yarn ];
     };

diff --git a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix
index cad6225166a32a4859c24bf9e00f911f502f69dc..45bc432f2bcdccf289247ba76f8cdb3c94594a99 100644 (file)
--- a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix
+++ b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix
@@ -282,7 +282,7 @@ in
           find . -type f -exec sed -i "s|$mediagoblin|$out|g" {} \;
           ln -s ${paste_local} ./paste_local.ini
           ln -s ${mediagoblin_local} ./mediagoblin_local.ini
-          ln -sf ../../../../../${varDir} ./user_dev
+          ln -sf ${varDir} ./user_dev
           '';
       };
   }

diff --git a/nixops/modules/websites/tools/tools/dokuwiki.nix b/nixops/modules/websites/tools/tools/dokuwiki.nix
index ad1497f16179291a44145b80d9afdfb388c7adc8..2f4e8c11e0cc7d56844f31f38c88f446b0d9911f 100644 (file)
--- a/nixops/modules/websites/tools/tools/dokuwiki.nix
+++ b/nixops/modules/websites/tools/tools/dokuwiki.nix
@@ -48,8 +48,8 @@ let
       installPhase = ''
         cp -a . $out
         cp ${preload} $out/inc/preload.php
-        ln -sf ../../../../../${varDir}/{conf,data} $out/
-        ln -sf ../../../../../${varDir}/conf/.htaccess $out/
+        ln -sf ${varDir}/{conf,data} $out/
+        ln -sf ${varDir}/conf/.htaccess $out/
         ${builtins.concatStringsSep "\n" (
           lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/lib/plugins/${name}") plugins
         )}

diff --git a/nixops/modules/websites/tools/tools/rompr.nix b/nixops/modules/websites/tools/tools/rompr.nix
index baee2eb683068e021f7ca83fc3230a4c6c2c28c7..ca93bead97777411d86b60df0d2e6c0260cee6f4 100644 (file)
--- a/nixops/modules/websites/tools/tools/rompr.nix
+++ b/nixops/modules/websites/tools/tools/rompr.nix
@@ -10,8 +10,8 @@ let
     webRoot = stdenv.mkDerivation (fetchedGithub ./rompr.json // rec {
       installPhase = ''
         cp -a . $out
-        ln -sf ../../../../../../${varDir}/prefs $out/prefs
-        ln -sf ../../../../../../${varDir}/albumart $out/albumart
+        ln -sf ${varDir}/prefs $out/prefs
+        ln -sf ${varDir}/albumart $out/albumart
       '';
     });
     apache = rec {

diff --git a/nixops/modules/websites/tools/tools/shaarli.nix b/nixops/modules/websites/tools/tools/shaarli.nix
index a43d677c9c4ab39bbff274164777761b977c8e52..0f6b4605de1d595d8d3d9f6acb8b0a4d45ad1aac 100644 (file)
--- a/nixops/modules/websites/tools/tools/shaarli.nix
+++ b/nixops/modules/websites/tools/tools/shaarli.nix
@@ -17,7 +17,7 @@ let
 
     installPhase = ''
       rm -r {cache,pagecache,tmp,data}/
-      ln -sf ../../../..${varDir}/{cache,pagecache,tmp,data} .
+      ln -sf ${varDir}/{cache,pagecache,tmp,data} .
       mkdir -p $doc/share/doc
       mv doc/ $doc/share/doc/shaarli
       mkdir $out/

diff --git a/nixops/modules/websites/tools/tools/ttrss.nix b/nixops/modules/websites/tools/tools/ttrss.nix
index c66b99d2780619b3b1c3fdddb7f08157f49ffaaf..1239b9dc5efba65e4094558b0ec2420629046380 100644 (file)
--- a/nixops/modules/websites/tools/tools/ttrss.nix
+++ b/nixops/modules/websites/tools/tools/ttrss.nix
@@ -118,7 +118,7 @@ let
     webRoot = stdenv.mkDerivation (fetchedGit ./tt-rss.json // rec {
       buildPhase = ''
         rm -rf lock feed-icons cache
-        ln -sf ../../../../../${varDir}/{lock,feed-icons,cache} .
+        ln -sf ${varDir}/{lock,feed-icons,cache} .
       '';
       installPhase = ''
         cp -a . $out

diff --git a/nixops/modules/websites/tools/tools/wallabag.nix b/nixops/modules/websites/tools/tools/wallabag.nix
index cd38e19a474f5006ef781daeadd4429d9624a8ee..a4ce1e079fec7d9d9566b1fb9a62d9ddb8cae5f8 100644 (file)
--- a/nixops/modules/websites/tools/tools/wallabag.nix
+++ b/nixops/modules/websites/tools/tools/wallabag.nix
@@ -105,9 +105,9 @@ let
       postInstall = ''
         rm -rf web/assets var/{cache,logs,sessions} app/config/parameters.yml data
         ln -sf ${parameters} app/config/parameters.yml
-        ln -sf ../../../../../../${varDir}/var/{cache,logs,sessions} var
-        ln -sf ../../../../../${varDir}/data data
-        ln -sf ../../../../../../${varDir}/assets web/assets
+        ln -sf ${varDir}/var/{cache,logs,sessions} var
+        ln -sf ${varDir}/data data
+        ln -sf ${varDir}/assets web/assets
       '';
     };
     activationScript = ''