D1362.id3483.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1362.id3483.diff
View Options

	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/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 %}

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