Page MenuHomeDevCentral
Files F3748044

D1086.diff
No OneTemporary
Actions

D1086.diff
View Options

diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -56,6 +56,7 @@
{% set packages_prefixes = salt['grains.filter_by']({
'Debian': {
+ 'php': 'php7.1-',
'python2': '',
'python3': 'python3-',
},
@@ -64,6 +65,7 @@
'python3': 'python3-',
},
'FreeBSD' : {
+ 'php': 'php71-',
'python2': 'py27-',
'python3': 'py36-',
'rubygem': 'rubygem-',
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,7 +6,7 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-{% from "map.jinja" import packages with context %}
+{% from "map.jinja" import packages, packages_prefixes with context %}
# -------------------------------------------------------------
# Shells
@@ -88,9 +88,6 @@
- valgrind
- {{ packages.cppunit }}
- {{ packages.ag }}
- {% if grains['os_family'] == 'Debian' %}
- - php7.1-curl
- {% endif %}
{% if grains['os'] != 'FreeBSD' %}
- arcanist
- clang
@@ -141,6 +138,25 @@
pkg:
- installed
- pkgs:
+ # PHP
+ - {{ packages_prefixes.php }}bcmath
+ - {{ packages_prefixes.php }}curl
+ - {{ packages_prefixes.php }}dom
+ - {{ packages_prefixes.php }}gd
+ - {{ packages_prefixes.php }}intl
+ - {{ packages_prefixes.php }}json
+ - {{ packages_prefixes.php }}mbstring
+ - {{ packages_prefixes.php }}mysqli
+ - {{ packages_prefixes.php }}pcntl
+ - {{ packages_prefixes.php }}phar
+ - {{ packages_prefixes.php }}pdo
+ - {{ packages_prefixes.php }}pdo_mysql
+ - {{ packages_prefixes.php }}pdo_sqlite
+ - {{ packages_prefixes.php }}simplexml
+ - {{ packages_prefixes.php }}soap
+ - {{ packages_prefixes.php }}wddx
+ - {{ packages_prefixes.php }}xsl
+ # TCL
- tcllib
- {{ packages.tcltls }}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 06:25 (21 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2248806
Default Alt Text
D1086.diff (2 KB)

Event Timeline

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