Merge pull request #1057 from solita/feature/ae-2042-et-sign-in-windows

Feature/ae 2042 et sign in windows

docker/docker-compose.yml

@@ -25,7 +25,7 @@ services:
  mpollux:
  image: nginx
  ports:
- - 127.0.0.1:53952:443
+ - 127.0.0.1:53952:8443
  volumes:
  - type: bind
  source: ./mpollux/api

docker/mpollux/conf.d/default.conf

@@ -1,6 +1,6 @@
 server {
- listen 443 ssl;
- listen [::]:443;
+ listen 8443 ssl;
+ listen [::]:8443;
  server_name localhost;
 
  ssl_certificate /keys/localhost.crt;

etp-backend/src/main/clj/solita/common/libreoffice.clj

@@ -43,10 +43,19 @@
  "--headless"
  args)))
 
-(defn run-with-args [& args]
- (let [tmpdir (make-tmpdir)]
- (try
- (populate-tmpdir tmpdir)
- (exec-libreoffice tmpdir args)
- (finally (rm-path tmpdir)))))
+(defn exec-libreoffice-on-windows [args]
+ ;; On windows, it seems to be difficult to get the UserInstallation parameter
+ ;; to work at all. Because this is strictcly a development situation, we
+ ;; ignore the usual need of having a per-process configuration. Instead, we
+ ;; expect the developer to not run multiple PDF generaion operations
+ ;; concurrently
+ (apply shell/sh "C:\\Program Files\\LibreOffice\\program\\soffice.bin" "--headless" args))
 
+(defn run-with-args [& args]
+ (if (-> "os.name" System/getProperty (.startsWith "Windows "))
+ (exec-libreoffice-on-windows args)
+ (let [tmpdir (make-tmpdir)]
+ (try
+ (populate-tmpdir tmpdir)
+ (exec-libreoffice tmpdir args)
+ (finally (println (str 'rm-path tmpdir)))))))