Page MenuHomeDevCentral
Files F12945079

No OneTemporary
Actions

View Options

diff --git a/map.jinja b/map.jinja
index 53c395b..3a95b5c 100644
--- a/map.jinja
+++ b/map.jinja
@@ -1,53 +1,57 @@
{% set dirs = salt['grains.filter_by']({
'Debian': {
'etc': '/etc',
'bin': '/usr/bin',
'include': '/usr/include',
'lib': '/usr/lib',
'man': '/usr/share/man',
},
'FreeBSD' : {
'etc': '/usr/local/etc',
'bin': '/usr/local/bin',
'include': '/usr/local/include',
'lib': '/usr/local/lib',
'man': '/usr/local/man',
},
}, default='Debian') %}
{% set services = salt['grains.filter_by']({
'Debian': {
'manager': 'systemd',
},
'FreeBSD' : {
'manager': 'rc',
},
}, default='Debian') %}
{% set shells = salt['grains.filter_by']({
'Debian': {
'bash': '/bin/bash',
'fish': '/usr/bin/fish',
'tcsh': '/usr/bin/tcsh',
},
'FreeBSD' : {
'bash': '/usr/local/bin/bash',
'fish': '/usr/local/bin/fish',
'tcsh': '/bin/tcsh',
},
}, default='Debian') %}
{% 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
index 0000000..09bd61d
--- /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
index 64fbe80..c9348d6 100644
--- a/top.sls
+++ b/top.sls
@@ -1,33 +1,34 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
base:
'*':
- roles/core/rc
- roles/core/hostname
- roles/core/network
- roles/core/motd
- roles/core/rsyslog
- roles/core/salt
- roles/core/sshd
- roles/core/letsencrypt
'local':
- roles/saltmaster/sudo
- roles/saltmaster/salt-wrapper
'ysul.nasqueron.org':
- roles/webserver-legacy
+ - roles/webserver-varnish
'dwellers.nasqueron.org':
- roles/paas-docker/docker
- roles/paas-lxc/lxc
'eglide':
- roles/shellserver/users
- roles/shellserver/userland-software
- roles/shellserver/eglide-website
- roles/shellserver/vhosts
- roles/shellserver/web-hosting
- roles/shellserver/odderon

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 18, 17:27 (1 d, 12 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3176630
Default Alt Text
(3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator