libreoffice/files/libreoffice_restart

 {% if grains['os_family'] == 'RedHat' or grains['oscodename'] != 'trusty' %}
-*/5 * * * * root java -jar /usr/lib/libreoffice/oocheck.jar || systemctl restart libreoffice
+*/5 * * * * root java -jar /usr/lib/libreoffice/oocheck.jar > /dev/null 2>&1 || systemctl restart libreoffice
 {% else %}
-*/5 * * * * root java -jar /usr/lib/libreoffice/oocheck.jar || service libreoffice restart
+*/5 * * * * root java -jar /usr/lib/libreoffice/oocheck.jar > /dev/null 2>&1 || service libreoffice restart
 {% endif %}

libreoffice/init.sls

@@ -37,17 +37,17 @@ libreoffice_symlink:
     - require_in:
       - file: /usr/lib/libreoffice/oocheck.jar
 {% else %}
+
 libreoffice.repo:
   pkgrepo.managed:
-    - humanname: LibreOffice 5.4 PPA
-    - name: ppa:libreoffice/libreoffice-5-4
+    - humanname: LibreOffice 6.3 PPA
+    - name: ppa:libreoffice/libreoffice-6-3
     - dist: {{ grains['oscodename'] }}
 
 libreoffice_pkg:
   pkg.installed:
     - name: libreoffice
     - fromrepo: {{ grains['oscodename'] }}
-    - version: '1:5.4.6~rc2-0ubuntu0*'
     - require_in:
       - file: /usr/lib/libreoffice/oocheck.jar
 {% endif %}

sslproxy/files/intermediate.cert

 -----BEGIN CERTIFICATE-----
-{{cert.intermediate_ca|replace("\\n", "")|wordwrap(64)}}
+{{pillar['sslproxy']['intermediate_ca']|replace("\\n", "")|wordwrap(64)}}
 -----END CERTIFICATE-----

sslproxy/files/server.cert

 -----BEGIN CERTIFICATE-----
-{{cert.cert|replace("\\n", "")|wordwrap(64)}}
+{{pillar['sslproxy']['cert'] |replace("\\n", "")|wordwrap(64)}}
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-{{cert.key|replace("\\n", "")|wordwrap(64)}}
+{{pillar['sslproxy']['key'] |replace("\\n", "")|wordwrap(64)}}
 -----END RSA PRIVATE KEY-----

sslproxy/init.sls

@@ -14,8 +14,6 @@
 {% else %}
     - source: salt://sslproxy/files/server.cert
     - template: jinja
-    - context:
-        cert: {{ pillar['sslproxy'] }}
 {% endif %}
     - require:
         - pkg: {{apache.pkg}}
@@ -25,13 +23,11 @@
 
 {{apache.etc.dir}}/intermediate.cert:
   file.managed:
-{% if pillar['sslproxy']['cert_url'] is defined %}
+{% if pillar['sslproxy']['intermediate_url'] is defined %}
     - source: {{ pillar['sslproxy']['intermediate_url'] }}
 {% else %}
     - source: salt://sslproxy/files/intermediate.cert
     - template: jinja
-    - context:
-        cert: {{ pillar['sslproxy'] }}
 {% endif %}
     - require:
         - pkg: {{apache.pkg}}

tomcat/init.sls

@@ -3,7 +3,7 @@
 include:
   - java
 
-{% if salt['grains.get']('os_family') == "RedHat" or salt['grains.get']('osrelease') == "16.04" %}
+{% if salt['grains.get']('os_family') == "RedHat" or salt['grains.get']('osrelease') != "14.04" %}
 
 /etc/init.d/tomcat7:
   file.absent