D2117.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2117.diff
View Options

	diff --git a/map.jinja b/map.jinja
	--- a/map.jinja
	+++ b/map.jinja
	@@ -82,7 +82,7 @@
	{% set packages_prefixes = salt['grains.filter_by']({
	'Debian': {
	'pecl': 'php-',
	- 'php': 'php7.2-',
	+ 'php': 'php7.3-',
	'python2': '',
	'python3': 'python3-',
	'rubygem': '',
	@@ -94,8 +94,8 @@
	'rubygem': 'rubygem-',
	},
	'FreeBSD' : {
	- 'pecl': 'php72-pecl-',
	- 'php': 'php72-',
	+ 'pecl': 'php74-pecl-',
	+ 'php': 'php74-',
	'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
	@@ -118,9 +118,12 @@
	{% if grains['os_family'] == 'Debian' %}
	- php7.0
	- php7.1
	+ - php7.2
	{% elif grains['os'] == 'FreeBSD' %}
	- php70
	- php71
	+ - php72
	+ - php73
	{% endif %}

	languages:
	@@ -129,9 +132,9 @@
	- python3
	- {{ packages.tcl }}
	{% if grains['os_family'] == 'Debian' %}
	- - php7.2
	+ - php7.3
	{% elif grains['os'] == 'FreeBSD' %}
	- - php72
	+ - php74
	{% endif %}

	# -------------------------------------------------------------