From 3c8d7f8706433ce0f995f3bf37fdfd348fb9e173 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 21 Feb 2019 22:08:57 +0100
Subject: [PATCH] Remove useless relative symlinks

---
 nixops/modules/websites/aten/aten.nix                  |  2 +-
 nixops/modules/websites/chloe/chloe.nix                |  2 +-
 .../modules/websites/connexionswing/connexionswing.nix |  4 ++--
 nixops/modules/websites/ludivine/ludivinecassal.nix    |  2 +-
 nixops/modules/websites/piedsjaloux/piedsjaloux.nix    |  2 +-
 .../modules/websites/tellesflorian/tellesflorian.nix   |  2 +-
 nixops/modules/websites/tools/cloud/nextcloud.nix      |  2 +-
 nixops/modules/websites/tools/diaspora/diaspora.nix    | 10 +++++-----
 nixops/modules/websites/tools/mastodon/mastodon.nix    |  2 +-
 .../modules/websites/tools/mediagoblin/mediagoblin.nix |  2 +-
 nixops/modules/websites/tools/tools/dokuwiki.nix       |  4 ++--
 nixops/modules/websites/tools/tools/rompr.nix          |  4 ++--
 nixops/modules/websites/tools/tools/shaarli.nix        |  2 +-
 nixops/modules/websites/tools/tools/ttrss.nix          |  2 +-
 nixops/modules/websites/tools/tools/wallabag.nix       |  6 +++---
 15 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix
index e27688d..dc8d25f 100644
--- 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 80e5554..7ad23fe 100644
--- 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 74a1ad0..8fbca2d 100644
--- 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 3ffd335..114c4ac 100644
--- 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 4caf48a..bb17262 100644
--- 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 47142c8..e421581 100644
--- 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 d9e0be0..2e52828 100644
--- 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 74be4fe..778fe26 100644
--- 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 5f0104c..ef7ef57 100644
--- 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 cad6225..45bc432 100644
--- 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 ad1497f..2f4e8c1 100644
--- 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 baee2eb..ca93bea 100644
--- 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 a43d677..0f6b460 100644
--- 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 c66b99d..1239b9d 100644
--- 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 cd38e19..a4ce1e0 100644
--- 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 = ''
-- 
2.41.0