From a18536bbca1c5fffdc3d5b210dbeb2aa4091df43 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Mon, 1 Jun 2020 14:40:54 +0200
Subject: [PATCH] Fix the systemd unit exit code and the ini java options.

---
 tasks/main.yml                  | 3 ++-
 templates/openrefine.service.j2 | 7 +++++--
 templates/refine.ini.j2         | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index cdb46aa..daf9e5c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,6 +11,7 @@
     with_items:
       - '{{ openrefine_data_dir }}'
       - '{{ openrefine_log_dir }}'
+      - '{{ openrefine_user_home }}/.local/share/google/refine/cachedir'
 
   - name: Download openrefine
     unarchive: remote_src=yes src={{ openrefine_download_url }} dest={{ openrefine_user_home }}
@@ -55,7 +56,7 @@
     with_items: '{{ openrefine_extensions }}'
 
   - name: Download and unpack the openrefine modules
-    unarchive: src={{ item.url }} remote_src=yes dest={{ openrefine_user_home }}/{{ openrefine_distribution_prefix }}-{{ openrefine_version }}/webapp/extensions/{{ item.name }}
+    unarchive: src={{ item.url }} remote_src=yes dest={{ openrefine_user_home }}/{{ openrefine_distribution_prefix }}-{{ openrefine_version }}/webapp/extensions/{{ item.name }} owner=root group=root
     with_items: '{{ openrefine_extensions }}'
     args:
       creates: '{{ openrefine_user_home }}/{{ openrefine_distribution_prefix }}-{{ openrefine_version }}/webapp/extensions/{{ item.name }}/module'
diff --git a/templates/openrefine.service.j2 b/templates/openrefine.service.j2
index abe6c8f..b7caadc 100644
--- a/templates/openrefine.service.j2
+++ b/templates/openrefine.service.j2
@@ -7,12 +7,15 @@ Documentation=https://openrefine.org/
 WorkingDirectory={{ openrefine_base_dir }}
 User={{ openrefine_user }}
 Group={{ openrefine_user }}
-ExecStart={{ openrefine_base_dir }}/refine -i {{ openrefine_listen_ip }}
+ExecStart={{ openrefine_base_dir }}/refine
 NoNewPrivileges=yes
-Type=forking
+Type=simple
 TimeoutStopSec=3600s
 Restart=on-failure
 RestartSec=10
+SuccessExitStatus=143
+StandardOutput=journal
+StandardError=journal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/templates/refine.ini.j2 b/templates/refine.ini.j2
index d64e04f..018cd81 100644
--- a/templates/refine.ini.j2
+++ b/templates/refine.ini.j2
@@ -3,13 +3,15 @@
 
 no_proxy="localhost,127.0.0.1"
 REFINE_PORT={{ openrefine_http_port }}
-#REFINE_HOST=127.0.0.1
+REFINE_HOST={{ openrefine_listen_ip }}
 #REFINE_WEBAPP=main\webapp
 
 # Memory and max form size allocations
 #REFINE_MAX_FORM_CONTENT_SIZE=1048576
 REFINE_MEMORY={{ openrefine_memory }}
 
+REFINE_DATA_DIR={{ openrefine_data_dir }}
+
 # Set initial java heap space (default: 256M) for better performance with large datasets
 REFINE_MIN_MEMORY={{ openrefine_memory }}
 
@@ -19,7 +21,8 @@ REFINE_MIN_MEMORY={{ openrefine_memory }}
 #JAVA_OPTIONS=-XX:+UseParallelGC -verbose:gc -Drefine.headless=true
 #JAVA_OPTIONS=-Drefine.data_dir=C:\Users\user\AppData\Roaming\OpenRefine
 JAVA_HOME={{ jdk_java_home }}
-JAVA_OPTIONS="-server -Djava.awt.headless=true -Dfile.encoding=UTF-8"
+#JAVA_OPTIONS=-Djava.awt.headless=true\ -server\ -Dfile.encoding=UTF-8
+JAVA_OPTIONS=-server
 
 # Uncomment to increase autosave period to 60 mins (default: 5 minutes) for better performance of long-lasting transformations
 #REFINE_AUTOSAVE_PERIOD=60