From a275ee24517715b9bb60cf52384296b196819395 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Sun, 8 Mar 2015 21:23:26 +0100 Subject: [PATCH] Added opensuse support Needed to add repo management because opensuse doesn't have nginx in default repo --- nginx/ng/install.sls | 21 +++++++++++++++++++++ nginx/ng/map.jinja | 10 ++++++++++ 2 files changed, 31 insertions(+) diff --git a/nginx/ng/install.sls b/nginx/ng/install.sls index d80184f..1e638ff 100644 --- a/nginx/ng/install.sls +++ b/nginx/ng/install.sls @@ -27,3 +27,24 @@ nginx_ppa_repo: - watch_in: - pkg: nginx_install {% endif %} + +{% if salt['grains.get']('os_family') == 'Suse' %} +nginx_zypp_repo: + pkgrepo: + {%- if nginx.install_from_repo %} + - managed + {%- else %} + - absent + {%- endif %} + - name: server_http + - humanname: server_http + - baseurl: 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/' + - enabled: True + - autorefresh: True + - gpgcheck: True + - gpgkey: 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/repodata/repomd.xml.key' + - require_in: + - pkg: nginx_install + - watch_in: + - pkg: nginx_install +{% endif %} diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja index 8efb954..1bceebd 100644 --- a/nginx/ng/map.jinja +++ b/nginx/ng/map.jinja @@ -24,9 +24,19 @@ 'vhost_enabled': '/etc/nginx/conf.d', 'vhost_use_symlink': False, }, + 'Suse': { + 'package': 'nginx', + 'service': 'nginx', + 'webuser': 'nginx', + 'conf_file': '/etc/nginx/nginx.conf', + 'vhost_available': '/etc/nginx/conf.d', + 'vhost_enabled': '/etc/nginx/conf.d', + 'vhost_use_symlink': False, + }, }, default='Debian' ), 'install_from_source': False, 'install_from_ppa': False, + 'install_from_repo': False, 'ppa_version': 'stable', 'package': { 'opts': {},