diff options
Diffstat (limited to 'modules/private/websites/ludivine')
-rw-r--r-- | modules/private/websites/ludivine/app/default.nix | 7 | ||||
-rw-r--r-- | modules/private/websites/ludivine/app/ludivinecassal.json | 14 |
2 files changed, 5 insertions, 16 deletions
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 }: |
5 | let | 5 | let |
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 | } | ||