aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/florian
diff options
context:
space:
mode:
Diffstat (limited to 'modules/private/websites/florian')
-rw-r--r--modules/private/websites/florian/app/default.nix7
-rw-r--r--modules/private/websites/florian/app/tellesflorian.json14
2 files changed, 5 insertions, 16 deletions
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}