Updates from master

alfresco/tools.sls

@@ -51,7 +51,7 @@ swftools:
 
 libreoffice:
   pkgrepo.managed:
-    - ppa: libreoffice/libreoffice-5-4
+    - ppa: libreoffice/libreoffice-6-3
   pkg.installed:
     - pkgs:
       - libreoffice

lorikeet/init.sls

-{% set lorikeet_version = salt['pillar.get']('lorikeet:version', '0.6.2') %}
+{% set lorikeet_version = salt['pillar.get']('lorikeet:version', '0.11.2') %}
 {% set hsperf_version = salt['pillar.get']('hsperf:version', '0.1.1') %}
 
 openssl:

onlyoffice/init.sls

@@ -116,9 +116,13 @@ stop_{{ apache.pkg }}:
 
 onlyoffice-documentserver:
   pkg.installed:
+    - sources:
+      - onlyoffice-documentserver: https://repo.parashift.com.au/module/onlyoffice/documentserver/5.3.4/debian.deb
     - require:
       - pkgrepo: onlyoffice-repo
       - postgres_database: onlyoffice
+    - unless: test -d /var/www/onlyoffice/documentserver
+ 
 
 onlyoffice:
   postgres_user.present:

sslproxy/init.sls

@@ -38,6 +38,7 @@
     - watch_in:
       - service: {{apache.pkg}}
 
+{% if pillar['alfresco'] is defined %}
 {% for site in ['ssl-redirect','ssl-alfresco'] %}
 
 {{apache.etc.site}}/{{site}}.conf:
@@ -67,6 +68,8 @@ enable_site_{{site}}:
 {% endfor %}
 {% endif %}
 
+{% endif %}
+
 {% if salt['grains.get']('os_family') == "RedHat" %}
 
 mod_ssl:
@@ -102,7 +105,7 @@ disable_default_site:
     - watch_in:
       - service: apache2
 
-{% for mod in ['ssl', 'rewrite', 'proxy', 'proxy_http', 'expires', 'proxy_wstunnel'] %}
+{% for mod in ['ssl', 'rewrite', 'proxy', 'proxy_http', 'expires', 'proxy_wstunnel', 'headers'] %}
 
 enable_mod_{{mod}}:
   cmd.run:

tomcat/init.sls

@@ -31,6 +31,8 @@ systemctl daemon-reload:
     - watch:
       - file: create_tomcat7_service
       - file: /etc/init.d/tomcat7
+    - require_in:
+      - service: tomcat7_service
 
 {% else %}
 
@@ -52,8 +54,10 @@ systemctl daemon-reload:
       - require:
         - pkg: purge_tomcat7
 
-authbind:
-   pkg.installed
+curl:
+   pkg.installed:
+    - require_in:
+       - cmd: download_tomcat7
 
 purge_tomcat7:
    pkg.purged:
@@ -80,6 +84,7 @@ create_tomcat7_dir:
     - require:
       - user: tomcat7_user
 
+
 download_tomcat7:
   cmd.run:
     - name: curl http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.59/bin/apache-tomcat-7.0.59.tar.gz | tar xvzf - -C /var/lib/tomcat7 --strip-components=1 --exclude='*/webapps/examples' && chown -R tomcat7:tomcat7 /var/lib/tomcat7