Page MenuHomeDevCentral
Files F3768288

D1357.id3473.diff
No OneTemporary
Actions

D1357.id3473.diff
View Options

diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
--- a/KNOWN_ISSUES.md
+++ b/KNOWN_ISSUES.md
@@ -21,7 +21,10 @@
**Workaround**
-On FreeBSD, we currently install phpcs manually, and skip PEAR.
+On FreeBSD, we currently install composer and phpcs manually. We also skip PEAR.
+
+That forces to track explicitly Composer versions for hashes
+in roles/shellserver/userland-software/base.sls file.
### pefs-kmod and FreeBSD 11
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
@@ -196,9 +196,11 @@
{% endif %}
# PHP utilities
- - {{ packages.composer }}
+
{% if grains['os'] != 'FreeBSD' %}
# On FreeBSD, PEAR is still a PHP 5.6 package (last tested 2018-02-17).
+ # Same for Composer (last tested 2018-02-28)
+ - {{ packages.composer }}
- {{ packages.pear }}
- {{ packages.phpcs }}
{% endif %}
@@ -214,10 +216,25 @@
- {{ packages.tcltls }}
# -------------------------------------------------------------
-# Workaround : install phpcs on FreeBSD
+# Workaround : install composer and phpcs on FreeBSD
# -------------------------------------------------------------
{% if grains['os'] == 'FreeBSD' %}
+/opt/composer:
+ file.directory
+
+/opt/composer/composer.phar:
+ file.managed:
+ - source: https://raw.githubusercontent.com/composer/getcomposer.org/c1ad3667731e/web/download/1.6.3/composer.phar
+ - source_hash: 52cb7bbbaee720471e3b34c8ae6db53a38f0b759c06078a80080db739e4dcab6
+ - mode: 755
+
+{{ dirs.bin }}/composer:
+ file.symlink:
+ - target: /opt/composer/composer.phar
+ - require:
+ - file: /opt/composer/composer.phar
+
/opt/phpcs:
file.directory

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 07:22 (17 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2259518
Default Alt Text
D1357.id3473.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator