Page MenuHomeDevCentral
Files F3716138

D1320.diff
No OneTemporary
Actions

D1320.diff
View Options

diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -85,6 +85,7 @@
'composer': 'composer',
'cppunit': 'libcppunit-dev',
'emacs': 'emacs-nox',
+ 'exiftool': 'libimage-exiftool-perl',
'imagemagick': 'imagemagick',
'librabbitmq': 'librabbitmq-dev',
'mariadb': 'mariadb-server',
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
@@ -163,20 +163,13 @@
- {{ packages_prefixes.php }}ctype
- {{ packages_prefixes.php }}curl
- {{ packages_prefixes.php }}dom
- - {{ packages_prefixes.php }}filter
- {{ packages_prefixes.php }}gd
- - {{ packages_prefixes.php }}hash
- {{ packages_prefixes.php }}intl
- {{ packages_prefixes.php }}json
- {{ packages_prefixes.php }}mbstring
- {{ packages_prefixes.php }}mysqli
- - {{ packages_prefixes.php }}openssl
- - {{ packages_prefixes.php }}pcntl
- {{ packages_prefixes.php }}pdo
- - {{ packages_prefixes.php }}pdo_mysql
- - {{ packages_prefixes.php }}pdo_sqlite
- {{ packages_prefixes.php }}phar
- - {{ packages_prefixes.php }}session
- {{ packages_prefixes.php }}simplexml
- {{ packages_prefixes.php }}soap
- {{ packages_prefixes.php }}tokenizer
@@ -184,10 +177,28 @@
- {{ packages_prefixes.php }}xml
- {{ packages_prefixes.php }}xmlwriter
- {{ packages_prefixes.php }}xsl
- - {{ packages_prefixes.php }}zlib
- {{ packages.composer }}
- {{ packages.pear }}
- {{ packages.phpcs }}
+ {% if grains['os_family'] == 'Debian' %}
+ # On Debian, these PDO extensions doesn't follow regular names
+ # but are installed if you require the legacy extension name.
+ - {{ packages_prefixes.php }}mysql
+ - {{ packages_prefixes.php }}sqlite3
+ {% else %}
+ # On Debian, these extensions are now shipped by default:
+ - {{ packages_prefixes.php }}filter
+ - {{ packages_prefixes.php }}hash
+ - {{ packages_prefixes.php }}openssl
+ - {{ packages_prefixes.php }}pcntl
+ - {{ packages_prefixes.php }}session
+ - {{ packages_prefixes.php }}zlib
+
+ # On Debian, these PDO extensions doesn't follow regular names:
+ - {{ packages_prefixes.php }}pdo_mysql
+ - {{ packages_prefixes.php }}pdo_sqlite
+ {% endif %}
+
# TCL
- tcllib
- {{ packages.tcltls }}

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 6, 12:44 (17 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2231865
Default Alt Text
D1320.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