Merge pull request #78 from aboe76/opensuse_support
Added opensuse support
This commit is contained in:
commit
3cdf007cec
@ -27,3 +27,24 @@ nginx_ppa_repo:
|
|||||||
- watch_in:
|
- watch_in:
|
||||||
- pkg: nginx_install
|
- pkg: nginx_install
|
||||||
{% endif %}
|
{% 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 %}
|
||||||
|
@ -24,9 +24,19 @@
|
|||||||
'vhost_enabled': '/etc/nginx/conf.d',
|
'vhost_enabled': '/etc/nginx/conf.d',
|
||||||
'vhost_use_symlink': False,
|
'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' ),
|
}, default='Debian' ),
|
||||||
'install_from_source': False,
|
'install_from_source': False,
|
||||||
'install_from_ppa': False,
|
'install_from_ppa': False,
|
||||||
|
'install_from_repo': False,
|
||||||
'ppa_version': 'stable',
|
'ppa_version': 'stable',
|
||||||
'package': {
|
'package': {
|
||||||
'opts': {},
|
'opts': {},
|
||||||
|
Loading…
Reference in New Issue
Block a user