D1046.id2676.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1046.id2676.diff
View Options

	diff --git a/map.jinja b/map.jinja
	--- a/map.jinja
	+++ b/map.jinja
	@@ -40,14 +40,18 @@
	{% set packages = salt['grains.filter_by']({
	'Debian' : {
	'sphinx': 'python3-sphinx',
	+ 'varnish': 'varnish',
	},
	'RedHat': {
	'sphinx': 'python3-sphinx',
	+ 'varnish': 'varnish',
	},
	'Arch': {
	'sphinx': 'python-sphinx',
	+ 'varnish': 'varnish',
	},
	'FreeBSD' : {
	'sphinx': 'py27-sphinx',
	+ 'varnish': 'varnish5',
	},
	}, default='Debian') %}
	diff --git a/roles/webserver-varnish/init.sls b/roles/webserver-varnish/init.sls
	new file mode 100644
	--- /dev/null
	+++ b/roles/webserver-varnish/init.sls
	@@ -0,0 +1,16 @@
	+# -------------------------------------------------------------
	+# Salt — Varnish cache
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Project: Nasqueron
	+# License: Trivial work, not eligible to copyright
	+# -------------------------------------------------------------
	+
	+{% from "map.jinja" import packages with context %}
	+
	+# -------------------------------------------------------------
	+# Software
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+
	+varnish_software:
	+ pkg.installed:
	+ - name: {{ packages.varnish }}
	diff --git a/top.sls b/top.sls
	--- a/top.sls
	+++ b/top.sls
	@@ -21,6 +21,7 @@
	- roles/saltmaster/salt-wrapper
	'ysul.nasqueron.org':
	- roles/webserver-legacy
	+ - roles/webserver-varnish
	'dwellers.nasqueron.org':
	- roles/paas-docker/docker
	- roles/paas-lxc/lxc