diff --git a/messages/uniworx/categories/health/de-de-formal.msg b/messages/uniworx/categories/health/de-de-formal.msg index b510d0b47..171ed30c3 100644 --- a/messages/uniworx/categories/health/de-de-formal.msg +++ b/messages/uniworx/categories/health/de-de-formal.msg @@ -1,7 +1,7 @@ HealthReport: Instanz-Zustand HealthMatchingClusterConfig: Cluster-geteilte Konfiguration ist aktuell HealthHTTPReachable: Cluster kann an der erwarteten URL über HTTP erreicht werden -HealthLDAPAdmins: Anteil der Administrator:innen, die im LDAP-Verzeichnis gefunden werden können +HealthLDAPAdmins: Anteil der Administrator:innen mit LDAP Authentifizierung, welche tatsächlich im LDAP-Verzeichnis gefunden werden können HealthSMTPConnect: SMTP-Server kann erreicht werden HealthWidgetMemcached: Memcached-Server liefert Widgets korrekt aus HealthActiveJobExecutors: Anteil der job-workers, die neue Befehle annehmen diff --git a/messages/uniworx/categories/health/en-eu.msg b/messages/uniworx/categories/health/en-eu.msg index 22e5fdd64..10a93ce88 100644 --- a/messages/uniworx/categories/health/en-eu.msg +++ b/messages/uniworx/categories/health/en-eu.msg @@ -1,7 +1,7 @@ HealthReport: Health report HealthMatchingClusterConfig: Cluster config matches HealthHTTPReachable: Cluster can be reached under the expected URL via HTTP -HealthLDAPAdmins: Proportion of administrators that were found in the LDAP directory +HealthLDAPAdmins: Proportion of administrators with LDAP authentication that were acutally found in the LDAP directory HealthSMTPConnect: SMTP server is reachable HealthWidgetMemcached: Memcached server is serving widgets correctly HealthActiveJobExecutors: Proportion of job workers accepting new jobs diff --git a/nix/docker/default.nix b/nix/docker/default.nix index da4a81d90..cc8897469 100644 --- a/nix/docker/default.nix +++ b/nix/docker/default.nix @@ -20,17 +20,19 @@ let contents = with final; [ uniworx.uniworx.components.exes.uniworx - prev.dockerTools.binSh findutils coreutils - cups # needed for interface with print center - #texlive.combined.scheme-medium # Causes container to be too large! However, might be needed by the pandoc library to produce PDFs, but nix ought to include the necessary parts already - #texlive.combined.scheme-basic # for PDFLaTeX for pandoc PDF creation - (texlive.combine { - inherit (texlive) scheme-basic xcolor unicode-math; - }) - # pandoc # just for manual testing within the pod, remove for production, since we use the library instead! - curl wget netcat # just for manual testing within the pod, remove for production! - openldap # just for manual testing within the pod, remove for production! + prev.dockerTools.binSh findutils coreutils iana-etc + # for PDFLaTeX for pandoc PDF creation + cups # needed for interface with print center + #texlive.combined.scheme-medium # too large for container in LMU build environment. + (texlive.combine { + inherit (texlive) scheme-basic xcolor + # lualatex + luatexbase unicode-math lualatex-math selnolig + ; + }) + # just for manual testing within the pod, may be removef for production? + curl wget netcat openldap unixtools.netstat htop gnugrep ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ]; @@ -48,6 +50,9 @@ let mkdir -p /var/log install -d -g uniworx -o uniworx -m 0755 /var/log/uniworx + # just to see how to create directories here + mkdir -p /testdir + ${optionalString isDemo '' install -d -g uniworx -o uniworx -m 0750 /var/lib/postgres diff --git a/shell.nix b/shell.nix index 119972679..f34fe2909 100644 --- a/shell.nix +++ b/shell.nix @@ -74,9 +74,13 @@ in pkgs.mkShell { ++ (with pkgs; [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client gup skopeo + # texlive.combined.scheme-medium # texlive.combined.scheme-small (texlive.combine { - inherit (texlive) scheme-basic xcolor unicode-math; + inherit (texlive) scheme-basic xcolor + # lualatex + luatexbase unicode-math lualatex-math selnolig + ; }) ] ) diff --git a/src/Handler/Admin/Test.hs b/src/Handler/Admin/Test.hs index 014700130..4c9695be0 100644 --- a/src/Handler/Admin/Test.hs +++ b/src/Handler/Admin/Test.hs @@ -289,7 +289,7 @@ getAdminTestPdfR = do P.makePDF "lualatex" texopts P.writeLaTeX writeropts doc -- unicode-math.sty not found case content of Right (Right bs) -> do - liftIO $ L.writeFile "generated.pdf" bs + liftIO $ L.writeFile "/tmp/generated.pdf" bs now <- liftIO getCurrentTime sendByteStringAsFile "demoPDF.pdf" (L.toStrict bs) now -- sendResponse (typePDF, toContent bs)