Page MenuHomeDevCentral
Files F3767419

No OneTemporary
Actions

View Options

diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
index 48b5e74..3857471 100644
--- a/KNOWN_ISSUES.md
+++ b/KNOWN_ISSUES.md
@@ -1,43 +1,43 @@
# Known issues
Bugs are documented on **DevCentral**, our Phabricator instance.
Issues specific to the Salt configuration are located at
https://devcentral.nasqueron.org/project/view/67/
More general servers issues are located are
https://devcentral.nasqueron.org/tag/servers/
This file documents the issues where the Salt states are generally correct
but where some situations can be troublesome, with the workaround to apply.
## Role: devserver
### PHP 5.6 <> PHP 7.1 roulette
On FreeBSD, PEAR and composer pull PHP 5.6. As such, they will be skipped when
the state installs PHP 7.1. But if you run again the state, if will downgrade
to PHP 5.6.
**Workaround**
-Run one again the state to restore PHP 7.1 (and deinstall composer and PEAR).
+On FreeBSD, we currently install phpcs manually, and skip PEAR.
### pefs-kmod and FreeBSD 11
The pefs-kmod binary package is compiled against a version incompatible
with FreeBSD 11.1. See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221076
**Workaround**
Install pefs-kmod through ports (that requires /usr/src),
load the module, then require the module to be autoloaded
on boot.
```
$ cd /usr/ports/sysutils/pefs-kmod
$ make build deinstall reinstall
$ kldload pefs
$ grep -q pefs_load /boot/loader.conf || cat >> /boot/loader.conf
pefs_load="YES"
```
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
index 928af3a..f67c5b3 100644
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -1,227 +1,254 @@
# -------------------------------------------------------------
# Salt — Provision base software
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-09
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-{% from "map.jinja" import packages, packages_prefixes with context %}
+{% from "map.jinja" import dirs, packages, packages_prefixes with context %}
# -------------------------------------------------------------
# Shells
# -------------------------------------------------------------
shells:
pkg:
- installed
- pkgs:
- bash
- fish
- zsh
{% if grains['os'] != 'FreeBSD' %}
- tcsh
{% endif %}
/usr/local/share/zsh/site-functions/_pm:
file.managed:
# At commit 683d331 - 2017-11-05
- source: https://raw.githubusercontent.com/Angelmmiguel/pm/master/zsh/_pm
- source_hash: deea33968be713cdbd8385d3a72df2dd09c444e42499531893133f009f0ce0ea
# -------------------------------------------------------------
# Editors
#
# Disclaimer: We don't caution the views of Richard Stallman
# or the Church of Emacs positions.
# See http://geekfeminism.wikia.com/wiki/EMACS_virgins_joke
# -------------------------------------------------------------
editors:
pkg:
- installed
- pkgs:
- vim
- nano
- joe
- {{ packages.emacs }}
# -------------------------------------------------------------
# General UNIX utilities
# -------------------------------------------------------------
utilities:
pkg:
- installed
- pkgs:
- mosh
- cmatrix
- figlet
- grc
- nmap
- toilet
- tmux
- tree
- unrar
- whois
- woof
{% if grains['os_family'] == 'Debian' %}
- bsdmainutils
- sockstat
- dnsutils
- sysvbanner
- toilet-fonts
{% endif %}
{% if grains['os'] == 'FreeBSD' %}
- figlet-fonts
- bind-tools
- sudo
- coreutils
- gsed
- wget
{% endif %}
utilities_www:
pkg:
- installed
- pkgs:
- links
- w3m
- lynx
# -------------------------------------------------------------
# Development
# -------------------------------------------------------------
dev:
pkg:
- installed
- pkgs:
- autoconf
- automake
- git
- colordiff
- cmake
- valgrind
- jq
- {{ packages.cppunit }}
- {{ packages.ag }}
{% if grains['os'] == 'FreeBSD' %}
- hub
{% else %}
- arcanist
- clang
- llvm
- strace
{% endif %}
{% if grains['os_family'] == 'Debian' %}
dev_popular_libs:
pkg:
- installed
- pkgs:
- libssl-dev
{% endif %}
# -------------------------------------------------------------
# Languages
# -------------------------------------------------------------
languages_removed:
pkg:
- removed
- pkgs:
{% if grains['os_family'] == 'Debian' %}
- php7.0
{% elif grains['os'] == 'FreeBSD' %}
- php70
{% endif %}
languages:
pkg:
- installed
- pkgs:
- python3
{% if grains['os_family'] == 'Debian' %}
- tcl8.6-dev
- php7.1
{% elif grains['os'] == 'FreeBSD' %}
- tcl86
- php71
{% endif %}
# -------------------------------------------------------------
# De facto standard libraries for languages
# -------------------------------------------------------------
languages_libs:
pkg:
- installed
- pkgs:
- # PHP
+ # PHP extensions
- {{ packages_prefixes.php }}bcmath
- {{ packages_prefixes.php }}ctype
- {{ packages_prefixes.php }}curl
- {{ packages_prefixes.php }}dom
- {{ packages_prefixes.php }}gd
- {{ packages_prefixes.php }}intl
- {{ packages_prefixes.php }}json
- {{ packages_prefixes.php }}mbstring
- {{ packages_prefixes.php }}mysqli
- {{ packages_prefixes.php }}pdo
- {{ packages_prefixes.php }}phar
- {{ packages_prefixes.php }}simplexml
- {{ packages_prefixes.php }}soap
- {{ packages_prefixes.php }}tokenizer
- {{ packages_prefixes.php }}wddx
- {{ packages_prefixes.php }}xml
- {{ packages_prefixes.php }}xmlwriter
- {{ packages_prefixes.php }}xsl
- - {{ packages.composer }}
- - {{ packages.pear }}
- - {{ packages.phpcs }}
{% if grains['os_family'] == 'Debian' %}
# On Debian, these PDO extensions doesn't follow regular names
# but are installed if you require the legacy extension name.
- {{ packages_prefixes.php }}mysql
- {{ packages_prefixes.php }}sqlite3
{% else %}
# On Debian, these extensions are now shipped by default:
- {{ packages_prefixes.php }}filter
- {{ packages_prefixes.php }}hash
- {{ packages_prefixes.php }}openssl
- {{ packages_prefixes.php }}pcntl
- {{ packages_prefixes.php }}session
- {{ packages_prefixes.php }}zlib
-
# On Debian, these PDO extensions doesn't follow regular names:
- {{ packages_prefixes.php }}pdo_mysql
- {{ packages_prefixes.php }}pdo_sqlite
{% endif %}
+ # PHP utilities
+ - {{ packages.composer }}
+ {% if grains['os'] != 'FreeBSD' %}
+ # On FreeBSD, PEAR is still a PHP 5.6 package (last tested 2018-02-17).
+ - {{ packages.pear }}
+ - {{ packages.phpcs }}
+ {% endif %}
+
# TCL
- tcllib
- {{ packages.tcltls }}
+# -------------------------------------------------------------
+# Workaround : install phpcs on FreeBSD
+# -------------------------------------------------------------
+
+{% if grains['os'] == 'FreeBSD' %}
+/opt/phpcs:
+ file.directory
+
+{% for command in ['phpcs', 'phpcbf'] %}
+/opt/phpcs/{{ command }}:
+ file.managed:
+ - source: https://squizlabs.github.io/PHP_CodeSniffer/{{ command }}.phar
+ - skip_verify: True
+ - mode: 755
+
+{{ dirs.bin }}/{{ command }}:
+ file.symlink:
+ - target: /opt/phpcs/{{ command }}
+ - require:
+ - file: /opt/phpcs/{{ command }}
+{% endfor %}
+{% endif %}
+
# -------------------------------------------------------------
# Spelling and language utilities
# -------------------------------------------------------------
spelling:
pkg:
- installed
- pkgs:
- {{ packages.verbiste }}
- {{ packages['aspell-fr'] }}
- {{ packages['aspell-en'] }}
# -------------------------------------------------------------
# Media utilities
# -------------------------------------------------------------
media:
pkg:
- installed
- pkgs:
- {{ packages.exiftool }}
- {{ packages.imagemagick }}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Nov 25, 00:05 (13 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2257664
Default Alt Text
(8 KB)

Event Timeline

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