aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-10 19:10:05 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-11 16:38:15 +0200
commitdb343436f0e678ef3a97e6f8ac559ffa0507e422 (patch)
tree882fd0a0fa2fa41fac62a929a93aba09f5eea4d5 /modules
parent34c7b88e16d1768b1b9a0cfa6dd21ea5d9b1b308 (diff)
downloadNix-db343436f0e678ef3a97e6f8ac559ffa0507e422.tar.gz
Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.tar.zst
Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.zip
Migrate mylibs to niv (work in progress)
Diffstat (limited to 'modules')
-rw-r--r--modules/private/websites/chloe/app/chloe.json14
-rw-r--r--modules/private/websites/chloe/app/default.nix9
-rw-r--r--modules/private/websites/connexionswing/app/connexionswing.json14
-rw-r--r--modules/private/websites/connexionswing/app/default.nix7
-rw-r--r--modules/private/websites/florian/app/default.nix7
-rw-r--r--modules/private/websites/florian/app/tellesflorian.json14
-rw-r--r--modules/private/websites/isabelle/aten_app/aten.json14
-rw-r--r--modules/private/websites/isabelle/aten_app/default.nix13
-rw-r--r--modules/private/websites/isabelle/iridologie_app/default.nix10
-rw-r--r--modules/private/websites/isabelle/iridologie_app/iridologie.json13
-rw-r--r--modules/private/websites/ludivine/app/default.nix7
-rw-r--r--modules/private/websites/ludivine/app/ludivinecassal.json14
-rw-r--r--modules/private/websites/piedsjaloux/app/default.nix7
-rw-r--r--modules/private/websites/piedsjaloux/app/piedsjaloux.json14
-rw-r--r--modules/private/websites/richie/production.nix8
-rw-r--r--modules/private/websites/richie/richie.json14
16 files changed, 47 insertions, 132 deletions
diff --git a/modules/private/websites/chloe/app/chloe.json b/modules/private/websites/chloe/app/chloe.json
deleted file mode 100644
index d0021b6..0000000
--- a/modules/private/websites/chloe/app/chloe.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "882f166-master",
3 "meta": {
4 "name": "chloe",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
10 "rev": "882f166999a59081ad896f26318e6a04db9f9f43",
11 "sha256": "131095y1bjnslipq90w9345cmgyk2bfiz5pfpkbg1jbj2ypl4haj",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/chloe/app/default.nix b/modules/private/websites/chloe/app/default.nix
index 92a5e42..d23e3e0 100644
--- a/modules/private/websites/chloe/app/default.nix
+++ b/modules/private/websites/chloe/app/default.nix
@@ -1,8 +1,11 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/chloe_${environment}" 2, varDir ? "/var/lib/chloe_${environment}"
3, spip, stdenv, mylibs, sassc }: 3, spip, stdenv, sassc, sources }:
4let 4let
5 siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./chloe.json // rec { 5 siteDir = stdenv.mkDerivation {
6 version = sources.websites-chloe-app.version;
7 pname = "chloe";
8 src = sources.websites-chloe-app;
6 buildPhase = '' 9 buildPhase = ''
7 make 10 make
8 ''; 11 '';
@@ -10,7 +13,7 @@ let
10 cp -a . $out 13 cp -a . $out
11 ''; 14 '';
12 buildInputs = [ sassc ]; 15 buildInputs = [ sassc ];
13 }); 16 };
14in 17in
15spip.override { 18spip.override {
16 ldap = true; 19 ldap = true;
diff --git a/modules/private/websites/connexionswing/app/connexionswing.json b/modules/private/websites/connexionswing/app/connexionswing.json
deleted file mode 100644
index 7d792ae..0000000
--- a/modules/private/websites/connexionswing/app/connexionswing.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "ed58743-master",
3 "meta": {
4 "name": "connexionswing",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing",
10 "rev": "ed5874396d35766e0810a6d4e78e1a8f6b170835",
11 "sha256": "1cjjl24j5di7f9xagm3xk2y80jga6kf3q9zws185jkrwwp3xmfhf",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/connexionswing/app/default.nix b/modules/private/websites/connexionswing/app/default.nix
index 37ce42d..31e88db 100644
--- a/modules/private/websites/connexionswing/app/default.nix
+++ b/modules/private/websites/connexionswing/app/default.nix
@@ -1,12 +1,15 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/connexionswing_${environment}" 2, varDir ? "/var/lib/connexionswing_${environment}"
3, secretsPath ? "/var/secrets/webapps/${environment}-connexionswing" 3, secretsPath ? "/var/secrets/webapps/${environment}-connexionswing"
4, composerEnv, fetchurl, fetchgit, mylibs }: 4, composerEnv, fetchurl, fetchgit, sources }:
5let 5let
6 app = composerEnv.buildPackage ( 6 app = composerEnv.buildPackage (
7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // 7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
8 mylibs.fetchedGitPrivate ./connexionswing.json //
9 rec { 8 rec {
9 pname = "connexionswing";
10 name = "${pname}-${version}";
11 version = sources.websites-connexionswing-app.version;
12 src = sources.websites-connexionswing-app;
10 noDev = (environment == "prod"); 13 noDev = (environment == "prod");
11 preInstall = '' 14 preInstall = ''
12 export SYMFONY_ENV="${environment}" 15 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/florian/app/default.nix b/modules/private/websites/florian/app/default.nix
index b31e12d..2ef0e86 100644
--- a/modules/private/websites/florian/app/default.nix
+++ b/modules/private/websites/florian/app/default.nix
@@ -1,12 +1,15 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/tellesflorian_${environment}" 2, varDir ? "/var/lib/tellesflorian_${environment}"
3, secretsPath ? "/var/secrets/webapps/${environment}-tellesflorian" 3, secretsPath ? "/var/secrets/webapps/${environment}-tellesflorian"
4, composerEnv, fetchurl, mylibs }: 4, composerEnv, fetchurl, sources }:
5let 5let
6 app = composerEnv.buildPackage ( 6 app = composerEnv.buildPackage (
7 import ./php-packages.nix { inherit composerEnv fetchurl; } // 7 import ./php-packages.nix { inherit composerEnv fetchurl; } //
8 mylibs.fetchedGitPrivate ./tellesflorian.json //
9 rec { 8 rec {
9 version = sources.websites-florian-app.version;
10 pname = "tellesflorian";
11 name = "${pname}-${version}";
12 src = sources.websites-florian-app;
10 noDev = (environment == "prod"); 13 noDev = (environment == "prod");
11 preInstall = '' 14 preInstall = ''
12 export SYMFONY_ENV="${environment}" 15 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/florian/app/tellesflorian.json b/modules/private/websites/florian/app/tellesflorian.json
deleted file mode 100644
index 693336d..0000000
--- a/modules/private/websites/florian/app/tellesflorian.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "1793d5c-master",
3 "meta": {
4 "name": "tellesflorian",
5 "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
10 "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919",
11 "sha256": "1zhxcrbglbjb6xfr8sfm4m2miabbkkb0a7543va3b5akrn6yk0cb",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/isabelle/aten_app/aten.json b/modules/private/websites/isabelle/aten_app/aten.json
deleted file mode 100644
index 10a315a..0000000
--- a/modules/private/websites/isabelle/aten_app/aten.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "b99537f-master",
3 "meta": {
4 "name": "aten",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
10 "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae",
11 "sha256": "15mlyik6zivxwry6zc906bqnivxhby27yr8kj4lg5n68pvb877dn",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix
index ba98394..30d10ba 100644
--- a/modules/private/websites/isabelle/aten_app/default.nix
+++ b/modules/private/websites/isabelle/aten_app/default.nix
@@ -1,17 +1,17 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/aten_${environment}" 2, varDir ? "/var/lib/aten_${environment}"
3, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea }: 3, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }:
4let 4let
5 packagesource = mylibs.fetchedGitPrivate ./aten.json; 5 packagesource = sources.websites-isabelle-aten;
6 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 6 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
7 cat ${packagesource.src}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out 7 cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out
8 ''; 8 '';
9 yarnModules = yarn2nix-moretea.mkYarnModules rec { 9 yarnModules = yarn2nix-moretea.mkYarnModules rec {
10 name = "aten-yarn"; 10 name = "aten-yarn";
11 pname = name; 11 pname = name;
12 version = "v1.0.0"; 12 version = "v1.0.0";
13 packageJSON = packagejson; 13 packageJSON = packagejson;
14 yarnLock = "${packagesource.src}/yarn.lock"; 14 yarnLock = "${packagesource}/yarn.lock";
15 yarnNix = ./yarn-packages.nix; 15 yarnNix = ./yarn-packages.nix;
16 pkgConfig = { 16 pkgConfig = {
17 node-sass = { 17 node-sass = {
@@ -30,8 +30,11 @@ let
30 }; 30 };
31 app = composerEnv.buildPackage ( 31 app = composerEnv.buildPackage (
32 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // 32 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
33 packagesource //
34 rec { 33 rec {
34 version = packagesource.version;
35 pname = "aten";
36 name = "${pname}-${version}";
37 src = packagesource;
35 noDev = (environment == "prod"); 38 noDev = (environment == "prod");
36 preInstall = '' 39 preInstall = ''
37 export SYMFONY_ENV="${environment}" 40 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/isabelle/iridologie_app/default.nix b/modules/private/websites/isabelle/iridologie_app/default.nix
index 604d250..edb7eef 100644
--- a/modules/private/websites/isabelle/iridologie_app/default.nix
+++ b/modules/private/websites/isabelle/iridologie_app/default.nix
@@ -1,12 +1,16 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/iridologie_${environment}" 2, varDir ? "/var/lib/iridologie_${environment}"
3, spip, stdenv, mylibs, sassc }: 3, spip, stdenv, sassc, sources }:
4let 4let
5 siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./iridologie.json // rec { 5 siteDir = stdenv.mkDerivation rec {
6 version = sources.websites-isabelle-iridologie.version;
7 pname = "iridologie";
8 name = "${pname}-${version}";
9 src = sources.websites-isabelle-iridologie;
6 installPhase = '' 10 installPhase = ''
7 cp -a . $out 11 cp -a . $out
8 ''; 12 '';
9 }); 13 };
10in 14in
11spip.override { 15spip.override {
12 ldap = true; 16 ldap = true;
diff --git a/modules/private/websites/isabelle/iridologie_app/iridologie.json b/modules/private/websites/isabelle/iridologie_app/iridologie.json
deleted file mode 100644
index 5cc7f91..0000000
--- a/modules/private/websites/isabelle/iridologie_app/iridologie.json
+++ /dev/null
@@ -1,13 +0,0 @@
1{
2 "tag": "2f2ec6b-master",
3 "meta": {
4 "name": "iridologie",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
10 "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2",
11 "fetchSubmodules": true
12 }
13}
diff --git a/modules/private/websites/ludivine/app/default.nix b/modules/private/websites/ludivine/app/default.nix
index 05be0b1..6e751b0 100644
--- a/modules/private/websites/ludivine/app/default.nix
+++ b/modules/private/websites/ludivine/app/default.nix
@@ -1,12 +1,15 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/ludivinecassal_${environment}" 2, varDir ? "/var/lib/ludivinecassal_${environment}"
3, secretsPath ? "/var/secrets/webapps/${environment}-ludivinecassal" 3, secretsPath ? "/var/secrets/webapps/${environment}-ludivinecassal"
4, composerEnv, fetchurl, fetchgit, imagemagick, sass, ruby, mylibs }: 4, composerEnv, fetchurl, fetchgit, imagemagick, sass, ruby, sources }:
5let 5let
6 app = composerEnv.buildPackage ( 6 app = composerEnv.buildPackage (
7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // 7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
8 mylibs.fetchedGitPrivate ./ludivinecassal.json //
9 rec { 8 rec {
9 name = "${pname}-${version}";
10 pname = "ludivinecassal";
11 version = sources.websites-ludivine-app.version;
12 src = sources.websites-ludivine-app;
10 noDev = (environment == "prod"); 13 noDev = (environment == "prod");
11 preInstall = '' 14 preInstall = ''
12 export SYMFONY_ENV="${environment}" 15 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/ludivine/app/ludivinecassal.json b/modules/private/websites/ludivine/app/ludivinecassal.json
deleted file mode 100644
index f0d23c3..0000000
--- a/modules/private/websites/ludivine/app/ludivinecassal.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "0dacc32-master",
3 "meta": {
4 "name": "ludivinecassal",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine",
10 "rev": "0dacc320ea052b69f79861c84bceaa89be53de60",
11 "sha256": "10khg1fq9ixly3xak591n3v0rv3f2hn91rd46d75yv3wjxaj1c2d",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/piedsjaloux/app/default.nix b/modules/private/websites/piedsjaloux/app/default.nix
index 726d93c..a3d48bd 100644
--- a/modules/private/websites/piedsjaloux/app/default.nix
+++ b/modules/private/websites/piedsjaloux/app/default.nix
@@ -1,12 +1,15 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/piedsjaloux_${environment}" 2, varDir ? "/var/lib/piedsjaloux_${environment}"
3, secretsPath ? "/var/secrets/webapps/${environment}-piedsjaloux" 3, secretsPath ? "/var/secrets/webapps/${environment}-piedsjaloux"
4, composerEnv, fetchurl, fetchgit, mylibs }: 4, composerEnv, fetchurl, fetchgit, sources }:
5let 5let
6 app = composerEnv.buildPackage ( 6 app = composerEnv.buildPackage (
7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // 7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
8 mylibs.fetchedGitPrivate ./piedsjaloux.json //
9 rec { 8 rec {
9 version = sources.websites-piedsjaloux-app.version;
10 pname = "piedsjaloux";
11 name = "${pname}-${version}";
12 src = sources.websites-piedsjaloux-app;
10 noDev = (environment == "prod"); 13 noDev = (environment == "prod");
11 preInstall = '' 14 preInstall = ''
12 export SYMFONY_ENV="${environment}" 15 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/piedsjaloux/app/piedsjaloux.json b/modules/private/websites/piedsjaloux/app/piedsjaloux.json
deleted file mode 100644
index dc2c083..0000000
--- a/modules/private/websites/piedsjaloux/app/piedsjaloux.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "4ee4538-master",
3 "meta": {
4 "name": "piedsjaloux",
5 "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
10 "rev": "4ee45386ad9ec9c081234a2fbde66e5b0c3294be",
11 "sha256": "10a41chh4crn95z6lk6nhkx27089djkngypa9m76bg7ph508mvnq",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/richie/production.nix b/modules/private/websites/richie/production.nix
index d7da458..a6957af 100644
--- a/modules/private/websites/richie/production.nix
+++ b/modules/private/websites/richie/production.nix
@@ -2,7 +2,11 @@
2let 2let
3 cfg = config.myServices.websites.richie.production; 3 cfg = config.myServices.websites.richie.production;
4 vardir = "/var/lib/richie_production"; 4 vardir = "/var/lib/richie_production";
5 richieSrc = pkgs.stdenv.mkDerivation (pkgs.mylibs.fetchedGitPrivate ./richie.json // { 5 richieSrc = pkgs.stdenv.mkDerivation rec {
6 version = pkgs.sources.websites-richie-app.version;
7 pname = "richie";
8 name = "${pname}-${version}";
9 src = pkgs.sources.websites-richie-app;
6 phases = "installPhase"; 10 phases = "installPhase";
7 installPhase = '' 11 installPhase = ''
8 cp -a $src $out 12 cp -a $src $out
@@ -12,7 +16,7 @@ let
12 ln -sf ${vardir}/photos $out/ 16 ln -sf ${vardir}/photos $out/
13 sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php 17 sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php
14 ''; 18 '';
15 }); 19 };
16 webappdir = config.services.websites.webappDirsPaths.richie_production; 20 webappdir = config.services.websites.webappDirsPaths.richie_production;
17 secretPath = config.secrets.fullPaths."websites/richie/production"; 21 secretPath = config.secrets.fullPaths."websites/richie/production";
18 apacheUser = config.services.httpd.Prod.user; 22 apacheUser = config.services.httpd.Prod.user;
diff --git a/modules/private/websites/richie/richie.json b/modules/private/websites/richie/richie.json
deleted file mode 100644
index f51d8c1..0000000
--- a/modules/private/websites/richie/richie.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "11490d4-master",
3 "meta": {
4 "name": "richie",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
10 "rev": "11490d4591034deca7681aae8d9a22ca6cd8da4a",
11 "sha256": "1rlq5qkbaw9n7yxhyvvimrizwkpqlhhsc8mhipzxlwk1si81fci1",
12 "fetchSubmodules": true
13 }
14}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 11:52:27 +0000