From db343436f0e678ef3a97e6f8ac559ffa0507e422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 10 May 2020 19:10:05 +0200 Subject: Migrate mylibs to niv (work in progress) --- modules/private/websites/chloe/app/chloe.json | 14 -------------- modules/private/websites/chloe/app/default.nix | 9 ++++++--- .../websites/connexionswing/app/connexionswing.json | 14 -------------- modules/private/websites/connexionswing/app/default.nix | 7 +++++-- modules/private/websites/florian/app/default.nix | 7 +++++-- modules/private/websites/florian/app/tellesflorian.json | 14 -------------- modules/private/websites/isabelle/aten_app/aten.json | 14 -------------- modules/private/websites/isabelle/aten_app/default.nix | 13 ++++++++----- .../private/websites/isabelle/iridologie_app/default.nix | 10 +++++++--- .../websites/isabelle/iridologie_app/iridologie.json | 13 ------------- modules/private/websites/ludivine/app/default.nix | 7 +++++-- modules/private/websites/ludivine/app/ludivinecassal.json | 14 -------------- modules/private/websites/piedsjaloux/app/default.nix | 7 +++++-- modules/private/websites/piedsjaloux/app/piedsjaloux.json | 14 -------------- modules/private/websites/richie/production.nix | 8 ++++++-- modules/private/websites/richie/richie.json | 14 -------------- 16 files changed, 47 insertions(+), 132 deletions(-) delete mode 100644 modules/private/websites/chloe/app/chloe.json delete mode 100644 modules/private/websites/connexionswing/app/connexionswing.json delete mode 100644 modules/private/websites/florian/app/tellesflorian.json delete mode 100644 modules/private/websites/isabelle/aten_app/aten.json delete mode 100644 modules/private/websites/isabelle/iridologie_app/iridologie.json delete mode 100644 modules/private/websites/ludivine/app/ludivinecassal.json delete mode 100644 modules/private/websites/piedsjaloux/app/piedsjaloux.json delete mode 100644 modules/private/websites/richie/richie.json (limited to 'modules') 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 @@ -{ - "tag": "882f166-master", - "meta": { - "name": "chloe", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe", - "rev": "882f166999a59081ad896f26318e6a04db9f9f43", - "sha256": "131095y1bjnslipq90w9345cmgyk2bfiz5pfpkbg1jbj2ypl4haj", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/chloe_${environment}" -, spip, stdenv, mylibs, sassc }: +, spip, stdenv, sassc, sources }: let - siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./chloe.json // rec { + siteDir = stdenv.mkDerivation { + version = sources.websites-chloe-app.version; + pname = "chloe"; + src = sources.websites-chloe-app; buildPhase = '' make ''; @@ -10,7 +13,7 @@ let cp -a . $out ''; buildInputs = [ sassc ]; - }); + }; in spip.override { 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 @@ -{ - "tag": "ed58743-master", - "meta": { - "name": "connexionswing", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing", - "rev": "ed5874396d35766e0810a6d4e78e1a8f6b170835", - "sha256": "1cjjl24j5di7f9xagm3xk2y80jga6kf3q9zws185jkrwwp3xmfhf", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/connexionswing_${environment}" , secretsPath ? "/var/secrets/webapps/${environment}-connexionswing" -, composerEnv, fetchurl, fetchgit, mylibs }: +, composerEnv, fetchurl, fetchgit, sources }: let app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // - mylibs.fetchedGitPrivate ./connexionswing.json // rec { + pname = "connexionswing"; + name = "${pname}-${version}"; + version = sources.websites-connexionswing-app.version; + src = sources.websites-connexionswing-app; noDev = (environment == "prod"); preInstall = '' 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 @@ { environment ? "prod" , varDir ? "/var/lib/tellesflorian_${environment}" , secretsPath ? "/var/secrets/webapps/${environment}-tellesflorian" -, composerEnv, fetchurl, mylibs }: +, composerEnv, fetchurl, sources }: let app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl; } // - mylibs.fetchedGitPrivate ./tellesflorian.json // rec { + version = sources.websites-florian-app.version; + pname = "tellesflorian"; + name = "${pname}-${version}"; + src = sources.websites-florian-app; noDev = (environment == "prod"); preInstall = '' 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 @@ -{ - "tag": "1793d5c-master", - "meta": { - "name": "tellesflorian", - "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo", - "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919", - "sha256": "1zhxcrbglbjb6xfr8sfm4m2miabbkkb0a7543va3b5akrn6yk0cb", - "fetchSubmodules": true - } -} 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 @@ -{ - "tag": "b99537f-master", - "meta": { - "name": "aten", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten", - "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae", - "sha256": "15mlyik6zivxwry6zc906bqnivxhby27yr8kj4lg5n68pvb877dn", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/aten_${environment}" -, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea }: +, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }: let - packagesource = mylibs.fetchedGitPrivate ./aten.json; + packagesource = sources.websites-isabelle-aten; packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' - cat ${packagesource.src}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out + cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out ''; yarnModules = yarn2nix-moretea.mkYarnModules rec { name = "aten-yarn"; pname = name; version = "v1.0.0"; packageJSON = packagejson; - yarnLock = "${packagesource.src}/yarn.lock"; + yarnLock = "${packagesource}/yarn.lock"; yarnNix = ./yarn-packages.nix; pkgConfig = { node-sass = { @@ -30,8 +30,11 @@ let }; app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // - packagesource // rec { + version = packagesource.version; + pname = "aten"; + name = "${pname}-${version}"; + src = packagesource; noDev = (environment == "prod"); preInstall = '' 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 @@ { environment ? "prod" , varDir ? "/var/lib/iridologie_${environment}" -, spip, stdenv, mylibs, sassc }: +, spip, stdenv, sassc, sources }: let - siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./iridologie.json // rec { + siteDir = stdenv.mkDerivation rec { + version = sources.websites-isabelle-iridologie.version; + pname = "iridologie"; + name = "${pname}-${version}"; + src = sources.websites-isabelle-iridologie; installPhase = '' cp -a . $out ''; - }); + }; in spip.override { 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 @@ -{ - "tag": "2f2ec6b-master", - "meta": { - "name": "iridologie", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie", - "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/ludivinecassal_${environment}" , secretsPath ? "/var/secrets/webapps/${environment}-ludivinecassal" -, composerEnv, fetchurl, fetchgit, imagemagick, sass, ruby, mylibs }: +, composerEnv, fetchurl, fetchgit, imagemagick, sass, ruby, sources }: let app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // - mylibs.fetchedGitPrivate ./ludivinecassal.json // rec { + name = "${pname}-${version}"; + pname = "ludivinecassal"; + version = sources.websites-ludivine-app.version; + src = sources.websites-ludivine-app; noDev = (environment == "prod"); preInstall = '' 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 @@ -{ - "tag": "0dacc32-master", - "meta": { - "name": "ludivinecassal", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine", - "rev": "0dacc320ea052b69f79861c84bceaa89be53de60", - "sha256": "10khg1fq9ixly3xak591n3v0rv3f2hn91rd46d75yv3wjxaj1c2d", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/piedsjaloux_${environment}" , secretsPath ? "/var/secrets/webapps/${environment}-piedsjaloux" -, composerEnv, fetchurl, fetchgit, mylibs }: +, composerEnv, fetchurl, fetchgit, sources }: let app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // - mylibs.fetchedGitPrivate ./piedsjaloux.json // rec { + version = sources.websites-piedsjaloux-app.version; + pname = "piedsjaloux"; + name = "${pname}-${version}"; + src = sources.websites-piedsjaloux-app; noDev = (environment == "prod"); preInstall = '' 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 @@ -{ - "tag": "4ee4538-master", - "meta": { - "name": "piedsjaloux", - "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite", - "rev": "4ee45386ad9ec9c081234a2fbde66e5b0c3294be", - "sha256": "10a41chh4crn95z6lk6nhkx27089djkngypa9m76bg7ph508mvnq", - "fetchSubmodules": true - } -} 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 @@ let cfg = config.myServices.websites.richie.production; vardir = "/var/lib/richie_production"; - richieSrc = pkgs.stdenv.mkDerivation (pkgs.mylibs.fetchedGitPrivate ./richie.json // { + richieSrc = pkgs.stdenv.mkDerivation rec { + version = pkgs.sources.websites-richie-app.version; + pname = "richie"; + name = "${pname}-${version}"; + src = pkgs.sources.websites-richie-app; phases = "installPhase"; installPhase = '' cp -a $src $out @@ -12,7 +16,7 @@ let ln -sf ${vardir}/photos $out/ sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php ''; - }); + }; webappdir = config.services.websites.webappDirsPaths.richie_production; secretPath = config.secrets.fullPaths."websites/richie/production"; 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 @@ -{ - "tag": "11490d4-master", - "meta": { - "name": "richie", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie", - "rev": "11490d4591034deca7681aae8d9a22ca6cd8da4a", - "sha256": "1rlq5qkbaw9n7yxhyvvimrizwkpqlhhsc8mhipzxlwk1si81fci1", - "fetchSubmodules": true - } -} -- cgit v1.2.3