Page MenuHomeDevCentral
Files F3716723

D1362.id3484.diff
No OneTemporary
Actions

D1362.id3484.diff
View Options

diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
--- a/KNOWN_ISSUES.md
+++ b/KNOWN_ISSUES.md
@@ -13,10 +13,10 @@
## Role: devserver
-### PHP 5.6 <> PHP 7.1 roulette
+### PHP 5.6 <> PHP 7.x roulette
On FreeBSD, PEAR and composer pull PHP 5.6. As such, they will be skipped when
-the state installs PHP 7.1. But if you run again the state, if will downgrade
+the state installs PHP 7.x. But if you run again the state, if will downgrade
to PHP 5.6.
**Workaround**
diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -64,7 +64,7 @@
{% set packages_prefixes = salt['grains.filter_by']({
'Debian': {
- 'php': 'php7.1-',
+ 'php': 'php7.2-',
'python2': '',
'python3': 'python3-',
},
@@ -73,7 +73,7 @@
'python3': 'python3-',
},
'FreeBSD' : {
- 'php': 'php71-',
+ 'php': 'php72-',
'python2': 'py27-',
'python3': 'py36-',
'rubygem': 'rubygem-',
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -46,7 +46,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
php_fpm_instances:
- # PHP 7.1, generally installed as package/port
+ # PHP 7.2, generally installed as package/port
prod:
command: /usr/local/sbin/php-fpm
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
@@ -133,8 +133,10 @@
- pkgs:
{% if grains['os_family'] == 'Debian' %}
- php7.0
+ - php7.0
{% elif grains['os'] == 'FreeBSD' %}
- php70
+ - php71
{% endif %}
languages:
@@ -144,10 +146,10 @@
- python3
{% if grains['os_family'] == 'Debian' %}
- tcl8.6-dev
- - php7.1
+ - php7.2
{% elif grains['os'] == 'FreeBSD' %}
- tcl86
- - php71
+ - php72
{% endif %}
# -------------------------------------------------------------

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 6, 19:32 (20 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2232190
Default Alt Text
D1362.id3484.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