DGNum/infrastructure
13
6
Fork 3
Code Issues 20 Pull requests 8 Projects 1 Releases Packages Wiki Activity Actions

feat(ds-fr): Use imagemagick and make things work

Browse source
This commit is contained in:
Tom Hubrecht 2023-12-01 14:04:20 +01:00
parent 5662181bd7
commit d2f68277e0
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
machines/compute01/ds-fr/module.nix
View file

@ -176,6 +176,7 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" "ds-fr-setup.service" ]; after = [ "network.target" "ds-fr-setup.service" ];
requires = [ "ds-fr-setup.service" ]; requires = [ "ds-fr-setup.service" ];
path = [ pkgs.imagemagick ];
serviceConfig = { serviceConfig = {
ExecStart = "${ds-fr}/bin/ds-fr rails server"; ExecStart = "${ds-fr}/bin/ds-fr rails server";
@ -395,6 +396,5 @@ in {
}; };
users.groups.${cfg.group} = { }; users.groups.${cfg.group} = { };
}; };
} }

3
machines/compute01/ds-fr/package/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, git, fetchYarnDeps, yarn, fixup_yarn_lock { lib, stdenv, fetchFromGitHub, git, fetchYarnDeps, yarn, fixup_yarn_lock, imagemagick
, nodejs, ruby_3_2, bundlerEnv, logDir ? "/var/log/ds-fr" , nodejs, ruby_3_2, bundlerEnv, logDir ? "/var/log/ds-fr"
, dataDir ? "/var/lib/ds-fr", initialDeploymentDate ? "17941030" }: , dataDir ? "/var/lib/ds-fr", initialDeploymentDate ? "17941030" }:
@ -96,7 +96,6 @@ in stdenv.mkDerivation {
./patches/smtp_settings.patch ./patches/smtp_settings.patch
./patches/garage.patch ./patches/garage.patch
./patches/secrets-fc.patch ./patches/secrets-fc.patch
./patches/uninterlace_png.patch
]; ];
postPatch = builtins.concatStringsSep "\n" postPatch = builtins.concatStringsSep "\n"

2
machines/compute01/ds-fr/package/dgnum.nix
View file

@ -29,6 +29,4 @@ builtins.map (id:
"0a5a24fdf887b2117217ca04eb6c8484f53a459b" "0a5a24fdf887b2117217ca04eb6c8484f53a459b"
# modifs diverses vers version DN # modifs diverses vers version DN
"4eb57682c0dd8468a439bd88302222fc24f38044" "4eb57682c0dd8468a439bd88302222fc24f38044"
# Merge branch 'main' of git.dgnum.eu:DGNum/demarches-normaliennes
"1c527f28df1beadfb116eedec572555c0fb3b950"
] ]