Browse Source

Separate NGINX install from source and package states

susefix
George Robinson 8 years ago
parent
commit
5c68f12801
5 changed files with 80 additions and 69 deletions
  1. +3
    -2
      nginx/ng/config.sls
  2. +1
    -0
      nginx/ng/map.jinja
  3. +2
    -64
      nginx/ng/pkg.sls
  4. +12
    -3
      nginx/ng/service.sls
  5. +62
    -0
      nginx/ng/src.sls

+ 3
- 2
nginx/ng/config.sls View File

{% from 'nginx/ng/map.jinja' import nginx, sls_block with context %} {% from 'nginx/ng/map.jinja' import nginx, sls_block with context %}


{% if nginx.install_from_source %} {% if nginx.install_from_source %}
/var/log/nginx:
file.directory
nginx_log_directory:
file.directory:
- name: /var/log/nginx
{% endif %} {% endif %}


nginx_config: nginx_config:

+ 1
- 0
nginx/ng/map.jinja View File

'source_hash': '8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d', 'source_hash': '8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d',
'source': { 'source': {
'opts': {}, 'opts': {},
'modules': {}
}, },
'package': { 'package': {
'opts': {}, 'opts': {},

nginx/ng/install.sls → nginx/ng/pkg.sls View File

# nginx.ng.install
# nginx.ng.pkg
# #
# Manages installation of nginx.
# Manages installation of nginx from pkg.


{% from 'nginx/ng/map.jinja' import nginx, sls_block with context %} {% from 'nginx/ng/map.jinja' import nginx, sls_block with context %}


{% if nginx.install_from_source %}
nginx_build_dep:
{% if salt['grains.get']('os_family') == 'Debian' %}
cmd.run:
- name: apt-get -y build-dep nginx
{% elif salt['grains.get']('os_family') == 'RedHat' %}
cmd.run:
- name: yum-builddep -y nginx
{% else %}
## install build deps for other distros
{% endif %}

nginx_download:
archive.extracted:
- name: /tmp/
- source: http://nginx.org/download/nginx-{{ nginx.source_version }}.tar.gz
- source_hash: sha256={{ nginx.source_hash }}
- archive_format: tar
- if_missing: /usr/sbin/nginx-{{ nginx.source_version }}
- require:
- cmd: nginx_build_dep
- onchanges:
- cmd: nginx_build_dep

nginx_configure:
cmd.run:
- name: ./configure --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf {{ nginx.source.opts | join(' ') }}
- cwd: /tmp/nginx-{{ nginx.source_version }}
- require:
- archive: nginx_download
- onchanges:
- archive: nginx_download

nginx_compile:
cmd.run:
- name: make
- cwd: /tmp/nginx-{{ nginx.source_version }}
- require:
- cmd: nginx_configure
{% endif %}

nginx_install: nginx_install:
{% if nginx.install_from_source %}
cmd.run:
- name: make install
- cwd: /tmp/nginx-{{ nginx.source_version }}
- require:
- cmd: nginx_compile
- onchanges:
- cmd: nginx_compile
{% else %}
pkg.installed: pkg.installed:
{{ sls_block(nginx.package.opts) }} {{ sls_block(nginx.package.opts) }}
- name: {{ nginx.lookup.package }} - name: {{ nginx.lookup.package }}
{% endif %}

{% if nginx.install_from_source %}
nginx_link:
file.copy:
- name: /usr/sbin/nginx-{{ nginx.source_version }}
- source: /usr/sbin/nginx
- require:
- cmd: nginx_install
- onchanges:
- cmd: nginx_install
{% endif %}


{% if salt['grains.get']('os_family') == 'Debian' %} {% if salt['grains.get']('os_family') == 'Debian' %}
{%- if nginx.install_from_repo %} {%- if nginx.install_from_repo %}

+ 12
- 3
nginx/ng/service.sls View File

{% set service_function = {True:'running', False:'dead'}.get(nginx.service.enable) %} {% set service_function = {True:'running', False:'dead'}.get(nginx.service.enable) %}


include: include:
- nginx.ng.install
{% if nginx.install_from_source %}
- nginx.ng.src
{% else %}
- nginx.ng.pkg
{% endif %}


{% if nginx.install_from_source %} {% if nginx.install_from_source %}
/lib/systemd/system/nginx.service:
nginx_systemd_service_file:
file.managed: file.managed:
- name: /lib/systemd/system/nginx.service
- source: salt://nginx/ng/files/nginx.service - source: salt://nginx/ng/files/nginx.service
{% endif %} {% endif %}
- name: {{ nginx.lookup.service }} - name: {{ nginx.lookup.service }}
- enable: {{ nginx.service.enable }} - enable: {{ nginx.service.enable }}
- require: - require:
- sls: nginx.ng.install
{% if nginx.install_from_source %}
- sls: nginx.ng.src
{% else %}
- sls: nginx.ng.pkg
{% endif %}
- watch: - watch:
{% if nginx.install_from_source %} {% if nginx.install_from_source %}
- cmd: nginx_install - cmd: nginx_install

+ 62
- 0
nginx/ng/src.sls View File

# nginx.ng.src
#
# Manages installation of nginx from source.

{% from 'nginx/ng/map.jinja' import nginx, sls_block with context %}

nginx_build_dep:
{% if salt['grains.get']('os_family') == 'Debian' %}
cmd.run:
- name: apt-get -y build-dep nginx
{% elif salt['grains.get']('os_family') == 'RedHat' %}
cmd.run:
- name: yum-builddep -y nginx
{% else %}
## install build deps for other distros
{% endif %}

nginx_download:
archive.extracted:
- name: /tmp/
- source: http://nginx.org/download/nginx-{{ nginx.source_version }}.tar.gz
- source_hash: sha256={{ nginx.source_hash }}
- archive_format: tar
- if_missing: /usr/sbin/nginx-{{ nginx.source_version }}
- require:
- cmd: nginx_build_dep
- onchanges:
- cmd: nginx_build_dep

nginx_configure:
cmd.run:
- name: ./configure --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf {{ nginx.source.opts | join(' ') }}
- cwd: /tmp/nginx-{{ nginx.source_version }}
- require:
- archive: nginx_download
- onchanges:
- archive: nginx_download

nginx_compile:
cmd.run:
- name: make
- cwd: /tmp/nginx-{{ nginx.source_version }}
- require:
- cmd: nginx_configure

nginx_install:
cmd.run:
- name: make install
- cwd: /tmp/nginx-{{ nginx.source_version }}
- require:
- cmd: nginx_compile
- onchanges:
- cmd: nginx_compile

nginx_link:
file.copy:
- name: /usr/sbin/nginx-{{ nginx.source_version }}
- source: /usr/sbin/nginx
- require:
- cmd: nginx_install
- onchanges:
- cmd: nginx_install

Loading…
Cancel
Save