Page MenuHomeDevCentral
Files F4078095

D1059.id2715.diff
No OneTemporary
Actions

D1059.id2715.diff
View Options

diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -39,19 +39,47 @@
{% set packages = salt['grains.filter_by']({
'Debian' : {
+ 'ag': 'silversearcher-ag',
+ 'aspell-fr': 'aspell-fr',
+ 'certbot': 'certbot',
+ 'cppunit': 'libcppunit-dev',
+ 'emacs': 'emacs-nox',
+ 'mariadb': 'mariadb-server',
'sphinx': 'python3-sphinx',
+ 'tcltls': 'tcl-tls',
'varnish': 'varnish',
},
'RedHat': {
+ 'ag': 'the_silver_searcher',
+ 'aspell-fr': 'aspell-fr',
+ 'certbot': 'python2-certbot',
+ 'cppunit': 'cppunit-devel',
+ 'emacs': 'emacs-nox',
+ 'mariadb': 'mariadb-server',
'sphinx': 'python3-sphinx',
+ 'tcltls': 'tcltls',
'varnish': 'varnish',
},
'Arch': {
+ 'ag': 'the_silver_searcher',
+ 'aspell-fr': 'aspell-fr',
+ 'certbot': 'certbot',
+ 'cppunit': 'cppunit',
+ 'emacs': 'emacs-nox',
+ 'mariadb': 'mariadb',
'sphinx': 'python-sphinx',
+ 'tcltls': 'tcltls',
'varnish': 'varnish',
},
'FreeBSD' : {
+ 'ag': 'the_silver_searcher',
+ 'aspell-fr': 'fr-aspell',
+ 'certbot': 'py27-certbot',
+ 'cppunit': 'cppunit',
+ 'emacs': 'emacs-nox11',
+ 'mariadb': 'mariadb101-server',
'sphinx': 'py27-sphinx',
+ 'tcltls': 'tcltls',
'varnish': 'varnish5',
},
}, default='Debian') %}
diff --git a/roles/core/letsencrypt/software.sls b/roles/core/letsencrypt/software.sls
--- a/roles/core/letsencrypt/software.sls
+++ b/roles/core/letsencrypt/software.sls
@@ -7,7 +7,7 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-{% from "map.jinja" import dirs with context %}
+{% from "map.jinja" import dirs, packages with context %}
# -------------------------------------------------------------
# Software
@@ -15,12 +15,7 @@
letsencrypt_software:
pkg.installed:
- {% if grains['os'] == 'FreeBSD' %}
- - name: py27-certbot
- {% else %}
- - name: certbot
- {% endif %}
-
+ - name: {{ packages.certbot }}
# -------------------------------------------------------------
# Working directory
diff --git a/roles/shellserver/database/mysql.sls b/roles/shellserver/database/mysql.sls
--- a/roles/shellserver/database/mysql.sls
+++ b/roles/shellserver/database/mysql.sls
@@ -6,7 +6,7 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-{% from "map.jinja" import dirs with context %}
+{% from "map.jinja" import dirs, packages with context %}
# -------------------------------------------------------------
# Software
@@ -16,11 +16,7 @@
pkg:
- installed
- pkgs:
- {% if grains['os_family'] == 'Debian' %}
- - mariadb-server
- {% elif grains['os'] == 'FreeBSD' %}
- - mariadb101-server
- {% endif %}
+ - {{ packages.mariadb }}
full_text_search_stopwords_file:
file.managed:
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -6,6 +6,8 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+{% from "map.jinja" import packages with context %}
+
# -------------------------------------------------------------
# Shells
# -------------------------------------------------------------
@@ -34,12 +36,7 @@
- vim
- nano
- joe
- {% if grains['os_family'] == 'Debian' %}
- - emacs-nox
- {% elif grains['os'] == 'FreeBSD' %}
- - emacs-nox11
- {% endif %}
-
+ - {{ packages.emacs }}
# -------------------------------------------------------------
# General UNIX utilities
@@ -84,15 +81,12 @@
- strace
- cmake
- valgrind
+ - {{ packages.cppunit }}
+ - {{ packages.ag }}
{% if grains['os_family'] == 'Debian' %}
- php7.1-curl
- - libcppunit-dev
- - silversearcher-ag
{% endif %}
- {% if grains['os'] == 'FreeBSD' %}
- - cppunit
- - the_silver_searcher
- {% else %}
+ {% if grains['os'] != 'FreeBSD' %}
- clang
- llvm
{% endif %}
@@ -141,11 +135,7 @@
- installed
- pkgs:
- tcllib
- {% if grains['os_family'] == 'Debian' %}
- - tcl-tls
- {% elif grains['os'] == 'FreeBSD' %}
- - tcltls
- {% endif %}
+ - {{ packages.tcltls }}
# -------------------------------------------------------------
# Spelling and language utilities
@@ -156,8 +146,4 @@
- installed
- pkgs:
- verbiste
- {% if grains['os_family'] == 'Debian' %}
- - aspell-fr
- {% elif grains['os'] == 'FreeBSD' %}
- - fr-aspell
- {% endif %}
+ - {{ packages['aspell-fr'] }}

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 1, 01:31 (20 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2388515
Default Alt Text
D1059.id2715.diff (4 KB)

Event Timeline

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