fix: minor corrections, also fix luatex dependencies
This commit is contained in:
parent
74ad8dbe26
commit
5015dba5e3
@ -1,7 +1,7 @@
|
|||||||
HealthReport: Instanz-Zustand
|
HealthReport: Instanz-Zustand
|
||||||
HealthMatchingClusterConfig: Cluster-geteilte Konfiguration ist aktuell
|
HealthMatchingClusterConfig: Cluster-geteilte Konfiguration ist aktuell
|
||||||
HealthHTTPReachable: Cluster kann an der erwarteten URL über HTTP erreicht werden
|
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
|
HealthSMTPConnect: SMTP-Server kann erreicht werden
|
||||||
HealthWidgetMemcached: Memcached-Server liefert Widgets korrekt aus
|
HealthWidgetMemcached: Memcached-Server liefert Widgets korrekt aus
|
||||||
HealthActiveJobExecutors: Anteil der job-workers, die neue Befehle annehmen
|
HealthActiveJobExecutors: Anteil der job-workers, die neue Befehle annehmen
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
HealthReport: Health report
|
HealthReport: Health report
|
||||||
HealthMatchingClusterConfig: Cluster config matches
|
HealthMatchingClusterConfig: Cluster config matches
|
||||||
HealthHTTPReachable: Cluster can be reached under the expected URL via HTTP
|
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
|
HealthSMTPConnect: SMTP server is reachable
|
||||||
HealthWidgetMemcached: Memcached server is serving widgets correctly
|
HealthWidgetMemcached: Memcached server is serving widgets correctly
|
||||||
HealthActiveJobExecutors: Proportion of job workers accepting new jobs
|
HealthActiveJobExecutors: Proportion of job workers accepting new jobs
|
||||||
|
|||||||
@ -20,17 +20,19 @@ let
|
|||||||
|
|
||||||
contents = with final; [
|
contents = with final; [
|
||||||
uniworx.uniworx.components.exes.uniworx
|
uniworx.uniworx.components.exes.uniworx
|
||||||
prev.dockerTools.binSh findutils coreutils
|
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!
|
|
||||||
iana-etc
|
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
|
unixtools.netstat htop gnugrep
|
||||||
] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ];
|
] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ];
|
||||||
|
|
||||||
@ -48,6 +50,9 @@ let
|
|||||||
mkdir -p /var/log
|
mkdir -p /var/log
|
||||||
install -d -g uniworx -o uniworx -m 0755 /var/log/uniworx
|
install -d -g uniworx -o uniworx -m 0755 /var/log/uniworx
|
||||||
|
|
||||||
|
# just to see how to create directories here
|
||||||
|
mkdir -p /testdir
|
||||||
|
|
||||||
${optionalString isDemo ''
|
${optionalString isDemo ''
|
||||||
install -d -g uniworx -o uniworx -m 0750 /var/lib/postgres
|
install -d -g uniworx -o uniworx -m 0750 /var/lib/postgres
|
||||||
|
|
||||||
|
|||||||
@ -74,9 +74,13 @@ in pkgs.mkShell {
|
|||||||
++ (with pkgs;
|
++ (with pkgs;
|
||||||
[ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client
|
[ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client
|
||||||
gup skopeo
|
gup skopeo
|
||||||
|
# texlive.combined.scheme-medium
|
||||||
# texlive.combined.scheme-small
|
# texlive.combined.scheme-small
|
||||||
(texlive.combine {
|
(texlive.combine {
|
||||||
inherit (texlive) scheme-basic xcolor unicode-math;
|
inherit (texlive) scheme-basic xcolor
|
||||||
|
# lualatex
|
||||||
|
luatexbase unicode-math lualatex-math selnolig
|
||||||
|
;
|
||||||
})
|
})
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@ -289,7 +289,7 @@ getAdminTestPdfR = do
|
|||||||
P.makePDF "lualatex" texopts P.writeLaTeX writeropts doc -- unicode-math.sty not found
|
P.makePDF "lualatex" texopts P.writeLaTeX writeropts doc -- unicode-math.sty not found
|
||||||
case content of
|
case content of
|
||||||
Right (Right bs) -> do
|
Right (Right bs) -> do
|
||||||
liftIO $ L.writeFile "generated.pdf" bs
|
liftIO $ L.writeFile "/tmp/generated.pdf" bs
|
||||||
now <- liftIO getCurrentTime
|
now <- liftIO getCurrentTime
|
||||||
sendByteStringAsFile "demoPDF.pdf" (L.toStrict bs) now
|
sendByteStringAsFile "demoPDF.pdf" (L.toStrict bs) now
|
||||||
-- sendResponse (typePDF, toContent bs)
|
-- sendResponse (typePDF, toContent bs)
|
||||||
|
|||||||
Reference in New Issue
Block a user