Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F24336352
D3952.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Referenced Files
None
Subscribers
None
D3952.diff
View Options
diff --git a/pillar/paas/alkane/hervil/main.sls b/pillar/paas/alkane/hervil/main.sls
--- a/pillar/paas/alkane/hervil/main.sls
+++ b/pillar/paas/alkane/hervil/main.sls
@@ -21,6 +21,9 @@
- admin.mail
- mail
+php:
+ version: php83
+
php_fpm_instances:
# PHP current version, generally installed as package/port
prod:
diff --git a/pillar/paas/alkane/web-001/main.sls b/pillar/paas/alkane/web-001/main.sls
--- a/pillar/paas/alkane/web-001/main.sls
+++ b/pillar/paas/alkane/web-001/main.sls
@@ -66,6 +66,9 @@
# Username must be unique and use max 31 characters.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+php:
+ version: php82
+
php_fpm_instances:
# PHP current version, generally installed as package/port
prod:
diff --git a/roles/webserver-alkane/alkane/init.sls b/roles/webserver-alkane/alkane/init.sls
--- a/roles/webserver-alkane/alkane/init.sls
+++ b/roles/webserver-alkane/alkane/init.sls
@@ -35,7 +35,11 @@
recipes_dependencies:
pkg.installed:
- pkgs:
+ {% if grains["os"] == "FreeBSD" %}
+ - {{ pillar["php"]["version"] }}-composer
+ {% else %}
- {{ packages.composer }}
+ {% endif %}
- jq
- yarn
diff --git a/roles/webserver-alkane/php/php.sls b/roles/webserver-alkane/php/php.sls
--- a/roles/webserver-alkane/php/php.sls
+++ b/roles/webserver-alkane/php/php.sls
@@ -5,7 +5,7 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-{% from "map.jinja" import dirs, packages, packages_prefixes with context %}
+{% from "map.jinja" import dirs with context %}
{% set is_devserver = salt['node.has_role']('devserver') %}
@@ -24,54 +24,56 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% if not is_devserver %}
+{% if grains["os"] == "FreeBSD" %}
php_software:
pkg.installed:
- pkgs:
- - php83
+ - {{ pillar["php"]["version"] }}
# PHP extensions
- - {{ packages_prefixes.php }}bcmath
- - {{ packages_prefixes.php }}curl
- - {{ packages_prefixes.php }}gd
- - {{ packages_prefixes.php }}intl
- - {{ packages_prefixes.php }}mbstring
- - {{ packages_prefixes.php }}soap
- - {{ packages_prefixes.php }}xml
- - {{ packages_prefixes.php }}xsl
+ - {{ pillar["php"]["version"] }}-bcmath
+ - {{ pillar["php"]["version"] }}-curl
+ - {{ pillar["php"]["version"] }}-gd
+ - {{ pillar["php"]["version"] }}-intl
+ - {{ pillar["php"]["version"] }}-mbstring
+ - {{ pillar["php"]["version"] }}-soap
+ - {{ pillar["php"]["version"] }}-xml
+ - {{ pillar["php"]["version"] }}-xsl
- - {{ packages_prefixes.php }}calendar
- - {{ packages_prefixes.php }}ctype
- - {{ packages_prefixes.php }}dom
- - {{ packages_prefixes.php }}fileinfo
- - {{ packages_prefixes.php }}filter
- - {{ packages_prefixes.php }}gettext
- - {{ packages_prefixes.php }}iconv
- - {{ packages_prefixes.php }}mysqli
- - {{ packages_prefixes.php }}pcntl
- - {{ packages_prefixes.php }}pdo
- - {{ packages_prefixes.php }}phar
- - {{ packages_prefixes.php }}session
- - {{ packages_prefixes.php }}simplexml
- - {{ packages_prefixes.php }}sodium
- - {{ packages_prefixes.php }}sockets
- - {{ packages_prefixes.php }}tokenizer
- - {{ packages_prefixes.php }}xmlreader
- - {{ packages_prefixes.php }}xmlwriter
- - {{ packages_prefixes.php }}zip
- - {{ packages_prefixes.php }}zlib
+ - {{ pillar["php"]["version"] }}-calendar
+ - {{ pillar["php"]["version"] }}-ctype
+ - {{ pillar["php"]["version"] }}-dom
+ - {{ pillar["php"]["version"] }}-fileinfo
+ - {{ pillar["php"]["version"] }}-filter
+ - {{ pillar["php"]["version"] }}-gettext
+ - {{ pillar["php"]["version"] }}-iconv
+ - {{ pillar["php"]["version"] }}-mysqli
+ - {{ pillar["php"]["version"] }}-pcntl
+ - {{ pillar["php"]["version"] }}-pdo
+ - {{ pillar["php"]["version"] }}-phar
+ - {{ pillar["php"]["version"] }}-session
+ - {{ pillar["php"]["version"] }}-simplexml
+ - {{ pillar["php"]["version"] }}-sodium
+ - {{ pillar["php"]["version"] }}-sockets
+ - {{ pillar["php"]["version"] }}-tokenizer
+ - {{ pillar["php"]["version"] }}-xmlreader
+ - {{ pillar["php"]["version"] }}-xmlwriter
+ - {{ pillar["php"]["version"] }}-zip
+ - {{ pillar["php"]["version"] }}-zlib
- - {{ packages_prefixes.php }}pdo_mysql
- - {{ packages_prefixes.php }}pdo_pgsql
- - {{ packages_prefixes.php }}pdo_sqlite
+ - {{ pillar["php"]["version"] }}-pdo_mysql
+ - {{ pillar["php"]["version"] }}-pdo_pgsql
+ - {{ pillar["php"]["version"] }}-pdo_sqlite
# PECL extensions
- - {{ packages_prefixes.pecl }}yaml
+ - {{ pillar["php"]["version"] }}-pecl-yaml
# PHP utilities
- - {{ packages.composer }}
+ - {{ pillar["php"]["version"] }}-composer
{% endif %}
+{% endif %}
# -------------------------------------------------------------
# PHP global configuration
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Feb 15, 17:21 (21 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3452173
Default Alt Text
D3952.diff (5 KB)
Attached To
Mode
D3952: Avoid deployment wheel between PHP 8.2 and PHP 8.3 deployment
Attached
Detach File
Event Timeline
Log In to Comment