aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-02-21 22:08:57 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-02-21 22:08:57 +0100
commit3c8d7f8706433ce0f995f3bf37fdfd348fb9e173 (patch)
tree7001eb43d827c3fcb323b18999f9527fdbc177dc
parent7636abc6bfcdca34d4b90a144365235012275339 (diff)
downloadNix-3c8d7f8706433ce0f995f3bf37fdfd348fb9e173.tar.gz
Nix-3c8d7f8706433ce0f995f3bf37fdfd348fb9e173.tar.zst
Nix-3c8d7f8706433ce0f995f3bf37fdfd348fb9e173.zip
Remove useless relative symlinks
-rw-r--r--nixops/modules/websites/aten/aten.nix2
-rw-r--r--nixops/modules/websites/chloe/chloe.nix2
-rw-r--r--nixops/modules/websites/connexionswing/connexionswing.nix4
-rw-r--r--nixops/modules/websites/ludivine/ludivinecassal.nix2
-rw-r--r--nixops/modules/websites/piedsjaloux/piedsjaloux.nix2
-rw-r--r--nixops/modules/websites/tellesflorian/tellesflorian.nix2
-rw-r--r--nixops/modules/websites/tools/cloud/nextcloud.nix2
-rw-r--r--nixops/modules/websites/tools/diaspora/diaspora.nix10
-rw-r--r--nixops/modules/websites/tools/mastodon/mastodon.nix2
-rw-r--r--nixops/modules/websites/tools/mediagoblin/mediagoblin.nix2
-rw-r--r--nixops/modules/websites/tools/tools/dokuwiki.nix4
-rw-r--r--nixops/modules/websites/tools/tools/rompr.nix4
-rw-r--r--nixops/modules/websites/tools/tools/shaarli.nix2
-rw-r--r--nixops/modules/websites/tools/tools/ttrss.nix2
-rw-r--r--nixops/modules/websites/tools/tools/wallabag.nix6
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
127 ln -sf ${yarnModules}/node_modules . 127 ln -sf ${yarnModules}/node_modules .
128 yarn run --offline encore production 128 yarn run --offline encore production
129 rm -rf var/{log,cache} 129 rm -rf var/{log,cache}
130 ln -sf ../../../../../../../${varDir}/{log,cache} var/ 130 ln -sf ${varDir}/{log,cache} var/
131 ''; 131 '';
132 buildInputs = [ yarnModules yarn2nix yarn2nix.yarn ]; 132 buildInputs = [ yarnModules yarn2nix yarn2nix.yarn ];
133 }); 133 });
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
114 rm -rf IMG local tmp config/remove.txt 114 rm -rf IMG local tmp config/remove.txt
115 ln -sf ${../commons/spip/spip_mes_options.php} config/mes_options.php 115 ln -sf ${../commons/spip/spip_mes_options.php} config/mes_options.php
116 echo "Require all denied" > "config/.htaccess" 116 echo "Require all denied" > "config/.htaccess"
117 ln -sf ../../../../../${varDir}/{IMG,local} . 117 ln -sf ${varDir}/{IMG,local} .
118 ''; 118 '';
119 installPhase = '' 119 installPhase = ''
120 cp -a . $out 120 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
168 rm app/config/parameters.yml 168 rm app/config/parameters.yml
169 ln -sf ${configRoot} app/config/parameters.yml 169 ln -sf ${configRoot} app/config/parameters.yml
170 rm -rf var/{logs,cache} 170 rm -rf var/{logs,cache}
171 ln -sf ../../../../../../${varDir}/var/{logs,cache} var/ 171 ln -sf ${varDir}/var/{logs,cache} var/
172 ln -sf ../../../../../${varDir}/{medias,uploads} web/images/ 172 ln -sf ${varDir}/{medias,uploads} web/images/
173 ''; 173 '';
174 }); 174 });
175 webRoot = "${webappDir}/web"; 175 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
158 # bug in leapt.im (searches for data/../miniatures) 158 # bug in leapt.im (searches for data/../miniatures)
159 postInstall = '' 159 postInstall = ''
160 rm -rf var/{logs,cache,data,miniatures,tmp} 160 rm -rf var/{logs,cache,data,miniatures,tmp}
161 ln -sf ../../../../../../../${varDir}/{logs,cache,data,miniatures,tmp} var/ 161 ln -sf ${varDir}/{logs,cache,data,miniatures,tmp} var/
162 ''; 162 '';
163 buildInputs = [ sass ]; 163 buildInputs = [ sass ];
164 }); 164 });
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
148 rm app/config/parameters.yml 148 rm app/config/parameters.yml
149 ln -sf ${configRoot} app/config/parameters.yml 149 ln -sf ${configRoot} app/config/parameters.yml
150 rm -rf var/{logs,cache,data,miniatures,tmp} 150 rm -rf var/{logs,cache,data,miniatures,tmp}
151 ln -sf ../../../../../../../${varDir}/{logs,cache,data,miniatures,tmp} var/ 151 ln -sf ${varDir}/{logs,cache,data,miniatures,tmp} var/
152 ''; 152 '';
153 }); 153 });
154 webRoot = "${webappDir}/web"; 154 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
147 rm app/config/parameters.yml 147 rm app/config/parameters.yml
148 ln -sf ${configRoot} app/config/parameters.yml 148 ln -sf ${configRoot} app/config/parameters.yml
149 rm -rf var/{logs,cache} 149 rm -rf var/{logs,cache}
150 ln -sf ../../../../../../${varDir}/var/{logs,cache,sessions} var/ 150 ln -sf ${varDir}/var/{logs,cache,sessions} var/
151 ''; 151 '';
152 }); 152 });
153 webRoot = "${webappDir}/web"; 153 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
188 mkdir -p $out/ 188 mkdir -p $out/
189 cp -R . $out/ 189 cp -R . $out/
190 rm -r $out/config 190 rm -r $out/config
191 ln -sf ../../../../../${varDir}/config $out/config 191 ln -sf ${varDir}/config $out/config
192 ${builtins.concatStringsSep "\n" ( 192 ${builtins.concatStringsSep "\n" (
193 lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/apps/${name}") apps 193 lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/apps/${name}") apps
194 )} 194 )}
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
137 ln -s ${database_config} config/database.yml 137 ln -s ${database_config} config/database.yml
138 ln -s ${config} config/diaspora.yml 138 ln -s ${config} config/diaspora.yml
139 ln -s ${secret_token} config/initializers/secret_token.rb 139 ln -s ${secret_token} config/initializers/secret_token.rb
140 ln -sf ../../../../../../${varDir}/schedule.yml config/schedule.yml 140 ln -sf ${varDir}/schedule.yml config/schedule.yml
141 ln -sf ../../../../../../${varDir}/oidc_key.pem config/oidc_key.pem 141 ln -sf ${varDir}/oidc_key.pem config/oidc_key.pem
142 ln -sf ../../../../../../${varDir}/uploads public/uploads 142 ln -sf ${varDir}/uploads public/uploads
143 RAILS_ENV=production ${gems}/bin/rake assets:precompile 143 RAILS_ENV=production ${gems}/bin/rake assets:precompile
144 rm -rf tmp log 144 rm -rf tmp log
145 ln -sf ../../../../../${varDir}/tmp tmp 145 ln -sf ${varDir}/tmp tmp
146 ln -sf ../../../../../${varDir}/log log 146 ln -sf ${varDir}/log log
147 ''; 147 '';
148 propagatedBuildInputs = [ gems pkgs.nodejs pkgs.which pkgs.git ]; 148 propagatedBuildInputs = [ gems pkgs.nodejs pkgs.which pkgs.git ];
149 }; 149 };
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
119 sed -i -e 's@^end$@ config.action_mailer.sendmail_settings = { location: ENV.fetch("SENDMAIL_LOCATION", "/usr/sbin/sendmail") }\nend@' config/environments/production.rb 119 sed -i -e 's@^end$@ config.action_mailer.sendmail_settings = { location: ENV.fetch("SENDMAIL_LOCATION", "/usr/sbin/sendmail") }\nend@' config/environments/production.rb
120 RAILS_ENV=production ${gems}/bin/rails assets:precompile 120 RAILS_ENV=production ${gems}/bin/rails assets:precompile
121 rm -rf tmp/cache 121 rm -rf tmp/cache
122 ln -sf ../../../../../../../${varDir}/tmp/cache tmp 122 ln -sf ${varDir}/tmp/cache tmp
123 ''; 123 '';
124 buildInputs = [ gems gems.ruby pkgs.nodejs pkgs.yarn ]; 124 buildInputs = [ gems gems.ruby pkgs.nodejs pkgs.yarn ];
125 }; 125 };
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
282 find . -type f -exec sed -i "s|$mediagoblin|$out|g" {} \; 282 find . -type f -exec sed -i "s|$mediagoblin|$out|g" {} \;
283 ln -s ${paste_local} ./paste_local.ini 283 ln -s ${paste_local} ./paste_local.ini
284 ln -s ${mediagoblin_local} ./mediagoblin_local.ini 284 ln -s ${mediagoblin_local} ./mediagoblin_local.ini
285 ln -sf ../../../../../${varDir} ./user_dev 285 ln -sf ${varDir} ./user_dev
286 ''; 286 '';
287 }; 287 };
288 } 288 }
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
48 installPhase = '' 48 installPhase = ''
49 cp -a . $out 49 cp -a . $out
50 cp ${preload} $out/inc/preload.php 50 cp ${preload} $out/inc/preload.php
51 ln -sf ../../../../../${varDir}/{conf,data} $out/ 51 ln -sf ${varDir}/{conf,data} $out/
52 ln -sf ../../../../../${varDir}/conf/.htaccess $out/ 52 ln -sf ${varDir}/conf/.htaccess $out/
53 ${builtins.concatStringsSep "\n" ( 53 ${builtins.concatStringsSep "\n" (
54 lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/lib/plugins/${name}") plugins 54 lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/lib/plugins/${name}") plugins
55 )} 55 )}
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
10 webRoot = stdenv.mkDerivation (fetchedGithub ./rompr.json // rec { 10 webRoot = stdenv.mkDerivation (fetchedGithub ./rompr.json // rec {
11 installPhase = '' 11 installPhase = ''
12 cp -a . $out 12 cp -a . $out
13 ln -sf ../../../../../../${varDir}/prefs $out/prefs 13 ln -sf ${varDir}/prefs $out/prefs
14 ln -sf ../../../../../../${varDir}/albumart $out/albumart 14 ln -sf ${varDir}/albumart $out/albumart
15 ''; 15 '';
16 }); 16 });
17 apache = rec { 17 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
17 17
18 installPhase = '' 18 installPhase = ''
19 rm -r {cache,pagecache,tmp,data}/ 19 rm -r {cache,pagecache,tmp,data}/
20 ln -sf ../../../..${varDir}/{cache,pagecache,tmp,data} . 20 ln -sf ${varDir}/{cache,pagecache,tmp,data} .
21 mkdir -p $doc/share/doc 21 mkdir -p $doc/share/doc
22 mv doc/ $doc/share/doc/shaarli 22 mv doc/ $doc/share/doc/shaarli
23 mkdir $out/ 23 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
118 webRoot = stdenv.mkDerivation (fetchedGit ./tt-rss.json // rec { 118 webRoot = stdenv.mkDerivation (fetchedGit ./tt-rss.json // rec {
119 buildPhase = '' 119 buildPhase = ''
120 rm -rf lock feed-icons cache 120 rm -rf lock feed-icons cache
121 ln -sf ../../../../../${varDir}/{lock,feed-icons,cache} . 121 ln -sf ${varDir}/{lock,feed-icons,cache} .
122 ''; 122 '';
123 installPhase = '' 123 installPhase = ''
124 cp -a . $out 124 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
105 postInstall = '' 105 postInstall = ''
106 rm -rf web/assets var/{cache,logs,sessions} app/config/parameters.yml data 106 rm -rf web/assets var/{cache,logs,sessions} app/config/parameters.yml data
107 ln -sf ${parameters} app/config/parameters.yml 107 ln -sf ${parameters} app/config/parameters.yml
108 ln -sf ../../../../../../${varDir}/var/{cache,logs,sessions} var 108 ln -sf ${varDir}/var/{cache,logs,sessions} var
109 ln -sf ../../../../../${varDir}/data data 109 ln -sf ${varDir}/data data
110 ln -sf ../../../../../../${varDir}/assets web/assets 110 ln -sf ${varDir}/assets web/assets
111 ''; 111 '';
112 }; 112 };
113 activationScript = '' 113 activationScript = ''