Commit 714dd288 authored by root's avatar root

Fixes for karaf

parent b02ae895
......@@ -14,8 +14,8 @@ extract_karaf:
archive.extracted:
- name: /opt/
- archive_format: tar
- source: http://archive.apache.org/dist/karaf/{{karaf_version}}/apache-karaf-{{karaf_version}}.tar.gz
- source_hash: http://archive.apache.org/dist/karaf/{{karaf_version}}/apache-karaf-{{karaf_version}}.tar.gz.sha1
- source: {{download_url}}/module/apache/karaf/{{karaf_version}}/repo.tgz
- source_hash: {{download_url}}/module/apache/karaf/{{karaf_version}}/repo.md5
- unless: test -d /opt/apache-karaf-{{karaf_version}}
- if_missing: /opt/apache-karaf-{{karaf_version}}
......
......@@ -28,8 +28,9 @@ install_libreoffice:
ls | grep -vE 'gnome|kde' | xargs yum install -y
- unless: rpm -qa | grep libreoffice6.1
/usr/lib/libreoffice:
libreoffice_symlink:
file.symlink:
- name: /usr/lib/libreoffice
- target: /opt/libreoffice6.1
- require:
- cmd: install_libreoffice
......@@ -42,8 +43,9 @@ libreoffice.repo:
- name: ppa:libreoffice/libreoffice-5-4
- dist: {{ grains['oscodename'] }}
libreoffice:
libreoffice_pkg:
pkg.installed:
- name: libreoffice
- fromrepo: {{ grains['oscodename'] }}
- version: '1:5.4.6~rc2-0ubuntu0*'
- require_in:
......
......@@ -61,6 +61,18 @@ nginx_repo:
{% endif %}
- gpgcheck: 0
{% if grains['os'] == "RedHat" and grains['osmajorrelease'] == 7 %}
rhel-7-server-optional-rpms:
pkgrepo.managed:
- humanname: "Red Hat Enterprise Linux 7 Server - Optional (RPMs)"
- mirrorlist: https://cdn.redhat.com/content/dist/rhel/server/7/$releasever/$basearch/optional/os
- gpgcheck: 1
- gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
- enabled: 1
- require_in:
- pkg: onlyoffice-documentserver
{% endif %}
{% endif %}
{% if salt['grains.get']('os_family') == "Debian" %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment