feat(ds-fr): Use imagemagick and make things work
This commit is contained in:
parent
5662181bd7
commit
d2f68277e0
|
@ -176,6 +176,7 @@ in {
|
|||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" "ds-fr-setup.service" ];
|
||||
requires = [ "ds-fr-setup.service" ];
|
||||
path = [ pkgs.imagemagick ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${ds-fr}/bin/ds-fr rails server";
|
||||
|
@ -395,6 +396,5 @@ in {
|
|||
};
|
||||
|
||||
users.groups.${cfg.group} = { };
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
, dataDir ? "/var/lib/ds-fr", initialDeploymentDate ? "17941030" }:
|
||||
|
||||
|
@ -96,7 +96,6 @@ in stdenv.mkDerivation {
|
|||
./patches/smtp_settings.patch
|
||||
./patches/garage.patch
|
||||
./patches/secrets-fc.patch
|
||||
./patches/uninterlace_png.patch
|
||||
];
|
||||
|
||||
postPatch = builtins.concatStringsSep "\n"
|
||||
|
|
|
@ -29,6 +29,4 @@ builtins.map (id:
|
|||
"0a5a24fdf887b2117217ca04eb6c8484f53a459b"
|
||||
# modifs diverses vers version DN
|
||||
"4eb57682c0dd8468a439bd88302222fc24f38044"
|
||||
# Merge branch 'main' of git.dgnum.eu:DGNum/demarches-normaliennes
|
||||
"1c527f28df1beadfb116eedec572555c0fb3b950"
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue