Skip to content

Commit de7dafa

Browse files
committed
removed items from php and added if condition in salt-minion
1 parent 521a42b commit de7dafa

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

pillars/php/init.sls

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Configuration for php-formula
22
#
33
# https://cheatsheetseries.owasp.org/cheatsheets/PHP_Configuration_Cheat_Sheet.html
4-
{%- set php_versions = {"bookworm": "8.2", "bullseye": "7.4", "buster": "7.3",
5-
"stretch": "7.0"} %}
4+
{%- set php_versions = {"bookworm": "8.2", "bullseye": "7.4"} %}
65
php:
76
use_external_repo: False
87
version: {{ php_versions[grains.oscodename] }}

pillars/salt/init.sls

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
salt:
2-
minion_target_version: 3006.3+ds-1
1+
{% if grains['osmajorrelease'] > 11 %}
2+
salt:
3+
minion_target_version: 3006.4+ds-1
4+
{% else %}
5+
salt:
6+
minion_target_version: 3005.2+ds-1
7+
{% endif %}

0 commit comments

Comments
 (0)