Commit Graph

238 Commits

Author SHA1 Message Date
Imran Iqbal
1def34c368 style(libtofs.jinja): use Black-inspired Jinja formatting [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/237
2020-07-19 23:28:01 +01:00
sylvainfaivre
393d69eb0f fix(map.jinja): fix pid file location for debian
The PID file location for Debian changed recently
see https://www.patreon.com/posts/february-updates-34189046
and https://github.com/oerdnj/deb.sury.org/issues/1334
2020-02-27 10:39:17 +01:00
Imran Iqbal
dca51de154 fix(libtofs): “files_switch” mess up the variable exported by “map.jinja” [skip ci]
* Checked using https://github.com/myii/ssf-formula/pull/131
2020-02-14 19:10:31 +00:00
Javier Bértoli
8b69034c5b feat(odbc): add odbc module support 2019-12-09 12:29:35 -03:00
Mark Gomersbach
39b1307671 fix(map.jinja): fix useflags regex (gentoo)
* fix(map.jinja): fix useflags regex

When using version inside useflag, the sls_block macro with ebuildpkg regex result in a range error.
Replacing the version argument with uses seem to work as escapes don't really work there.

fix(map.jinja): replace all problematic lines
fix(map.jinja): update available targets

```
----------
          ID: php_install_imagick_dev-php-pecl-imagick
    Function: pkg.installed
        Name: dev-php/pecl-imagick
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib64/python3.6/site-packages/salt/state.py", line 1933, in call
                  **cdata['kwargs'])
                File "/usr/lib64/python3.6/site-packages/salt/loader.py", line 1951, in wrapper
                  return f(*args, **kwargs)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 1563, in installed
                  **kwargs)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 651, in _find_install_targets
                  for name, version in desired.items()
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 652, in <listcomp>
                  if not (name in cur_pkgs and (version is None or _fulfills_version_string(cur_pkgs[name], version)))
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 216, in _fulfills_version_string
                  fullfills_all = fullfills_all and _fulfills_version_spec([installed_version], operator, version_string, ignore_epoch=ignore_epoch)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 234, in _fulfills_version_spec
                  if (oper == '==' and fnmatch.fnmatch(ver, desired_version)) \
                File "/usr/lib64/python3.6/fnmatch.py", line 36, in fnmatch
                  return fnmatchcase(name, pat)
                File "/usr/lib64/python3.6/fnmatch.py", line 70, in fnmatchcase
                  match = _compile_pattern(pat)
                File "/usr/lib64/python3.6/fnmatch.py", line 46, in _compile_pattern
                  return re.compile(res).match
                File "/usr/lib64/python3.6/re.py", line 233, in compile
                  return _compile(pattern, flags)
                File "/usr/lib64/python3.6/re.py", line 301, in _compile
                  p = sre_compile.compile(pattern, flags)
                File "/usr/lib64/python3.6/sre_compile.py", line 562, in compile
                  p = sre_parse.parse(p, flags)
                File "/usr/lib64/python3.6/sre_parse.py", line 855, in parse
                  p = _parse_sub(source, pattern, flags & SRE_FLAG_VERBOSE, 0)
                File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub
                  not nested and not items))
                File "/usr/lib64/python3.6/sre_parse.py", line 765, in _parse
                  p = _parse_sub(source, state, sub_verbose, nested + 1)
                File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub
                  not nested and not items))
                File "/usr/lib64/python3.6/sre_parse.py", line 553, in _parse
                  raise source.error(msg, len(this) + 1 + len(that))
              sre_constants.error: bad character range 7-3 at position 20
     Started: 14:28:26.927898
    Duration: 6321.149 ms
     Changes:
```

* Use single-quoting

Signed-off-by: Mark Gomersbach <markgomersbach@gmail.com>
2019-12-02 21:54:41 +00:00
Imran Iqbal
01f5ede277
fix(map.jinja): fix salt-lint errors
```bash
Examining php/map.jinja of type state
[204] Lines should be no longer that 160 chars
php/map.jinja:25
                            'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev', 'pkg-config', 'libsslcommon2-dev', 'gcc', 'make', 'autoconf', 'libc-dev', 'pkg-config'],

[204] Lines should be no longer that 160 chars
php/map.jinja:191
                            'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',

[204] Lines should be no longer that 160 chars
php/map.jinja:192
                                'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',

[204] Lines should be no longer that 160 chars
php/map.jinja:520
                            'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',

[204] Lines should be no longer that 160 chars
php/map.jinja:521
                                'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',

[204] Lines should be no longer that 160 chars
php/map.jinja:896
                            'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',

[204] Lines should be no longer that 160 chars
php/map.jinja:897
                                'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',

[204] Lines should be no longer that 160 chars
php/map.jinja:1270
                            'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',

[204] Lines should be no longer that 160 chars
php/map.jinja:1271
                                'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',

[204] Lines should be no longer that 160 chars
php/map.jinja:1644
                            'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',

[204] Lines should be no longer that 160 chars
php/map.jinja:1645
                                'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',

[204] Lines should be no longer that 160 chars
php/map.jinja:2035
                            'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',

[204] Lines should be no longer that 160 chars
php/map.jinja:2036
                                'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',

[204] Lines should be no longer that 160 chars
php/map.jinja:2206
                            'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev', 'pkg-config', 'libsslcommon2-dev', 'gcc', 'make', 'autoconf', 'libc-dev', 'pkg-config'],

[204] Lines should be no longer that 160 chars
php/map.jinja:2375
                            'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',

[204] Lines should be no longer that 160 chars
php/map.jinja:2376
                                'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',
```
2019-10-09 16:07:50 +01:00
Imran Iqbal
b4d994cc09
fix(repo.sls): fix salt-lint errors
```bash
Examining php/hhvm/repo.sls of type state
[206] Jinja variables should have spaces before and after: {{ var_name }}
php/hhvm/repo.sls:12
    - name: deb http://dl.hhvm.com/{{ salt['grains.get']('os')|lower }} {{ salt['grains.get']('oscodename')}} main
```
2019-10-09 16:07:50 +01:00
Imran Iqbal
4e48a7adbb
fix(composer.sls): fix salt-lint errors
```bash
Examining php/composer.sls of type state
[210] Numbers that start with `0` should always be encapsulated in quotation marks
php/composer.sls:27
    - mode: 0755
```
2019-10-09 16:07:49 +01:00
sticky-note
8e79a3595c
feat(tofs): implementation for all file.managed
- Implementation of libtofs on ini macro, pools_config and apache2 mod_php.conf
+ Introduction of tplroot on modified files
+ `{%-` consistency when possible
2019-09-13 10:59:05 +01:00
Nicolas Rodriguez
496ec28dae fix(xdebug): fix xdebug package name 2019-09-04 22:46:11 +02:00
Nicolas Rodriguez
b13bed2a48 test(ubuntu): fix tests on Ubuntu distro 2019-09-04 02:58:06 +02:00
Nicolas Rodriguez
d4772f92fa fix(fpm): be sure to restart all Php instances in case of multi-versions 2019-09-04 01:08:56 +02:00
Nicolas Rodriguez
3c9efc713d feat(repo): add repo pattern so we can set distro repo during tests 2019-09-04 01:04:43 +02:00
Nicolas Rodriguez
d26c4f8057 refactor(macro): extract file_requisites macro 2019-09-04 00:35:10 +02:00
Nicolas Rodriguez
378b5b1d37 fix(pillar): fix pillar.get still looking under 'ng' namespace 2019-08-27 00:05:26 +02:00
sticky-note
f1b71d00ae feat(ng): promote NG formula
BREAKING CHANGES: users must adapt their pillar. See `docs.REAME.rst`
2019-08-20 13:01:49 +11:00
semantic-release-bot
ea39203a4c chore(release): 0.40.1 [skip ci]
## [0.40.1](https://github.com/saltstack-formulas/php-formula/compare/v0.40.0...v0.40.1) (2019-08-17)

### Bug Fixes

* **map:** fix missing value for php.lookup.fpm.user in multi-php mode ([f91d942](https://github.com/saltstack-formulas/php-formula/commit/f91d942))
2019-08-17 10:36:02 +00:00
Imran Iqbal
313722b264
Merge pull request #191 from philpep/fix-multiphp-rendering
Fix missing value for php.lookup.fpm.user in multi-php mode
2019-08-17 11:26:54 +01:00
semantic-release-bot
a9c7fb5c3f chore(release): 0.40.0 [skip ci]
# [0.40.0](https://github.com/saltstack-formulas/php-formula/compare/v0.39.2...v0.40.0) (2019-08-17)

### Features

* **yamllint:** include for this repo and apply rules throughout ([571cc4b](https://github.com/saltstack-formulas/php-formula/commit/571cc4b))
2019-08-17 09:11:15 +00:00
Philippe Pepiot
f91d942cfb fix(map): fix missing value for php.lookup.fpm.user in multi-php mode
This fixes the rendering issue:

[CRITICAL] Rendering SLS 'base:php.ng.fpm.config' failed: Jinja variable 'dict object' has no attribute 'user'

When using multiple php versions, this is issued by "{{ php.lookup.fpm.user }}" from php/ng/fpm/config.sls

Add default users in group in the relevant 'fpm' dict from map.jinja
(this is to set owner and group to 'pool.d' directory).
2019-08-14 15:53:23 +02:00
semantic-release-bot
83ff9d966c chore(release): 0.39.2 [skip ci]
## [0.39.2](https://github.com/saltstack-formulas/php-formula/compare/v0.39.1...v0.39.2) (2019-08-13)

### Bug Fixes

* **tests:** fix package name for debian ([4f75eac](https://github.com/saltstack-formulas/php-formula/commit/4f75eac))
2019-08-13 22:40:56 +00:00
semantic-release-bot
7e30f926b5 chore(release): 0.39.1 [skip ci]
## [0.39.1](https://github.com/saltstack-formulas/php-formula/compare/v0.39.0...v0.39.1) (2019-08-12)

### Bug Fixes

* **installed.jinja:** remove `include` to prevent conflicting IDs ([cb11784](https://github.com/saltstack-formulas/php-formula/commit/cb11784)), closes [#188](https://github.com/saltstack-formulas/php-formula/issues/188)
2019-08-12 12:28:13 +00:00
Imran Iqbal
cb11784768
fix(installed.jinja): remove include to prevent conflicting IDs
* Ends up with two `include:` lists when rendered
* Close #188
2019-08-09 19:07:10 +01:00
semantic-release-bot
39b4584d66 chore(release): 0.39.0 [skip ci]
# [0.39.0](https://github.com/saltstack-formulas/php-formula/compare/v0.38.1...v0.39.0) (2019-08-07)

### Bug Fixes

* **php/ng:** don't iterate on string, make sure list is not string ([dbb542c](https://github.com/saltstack-formulas/php-formula/commit/dbb542c))

### Documentation

* **pillar.example:** add example for alternatives with multiversion ([23a6ec1](https://github.com/saltstack-formulas/php-formula/commit/23a6ec1))
* **pillar.example:** example of versions ([a98aa7e](https://github.com/saltstack-formulas/php-formula/commit/a98aa7e))

### Features

* **php/ng:** support for php cli multiversion ([bb4a077](https://github.com/saltstack-formulas/php-formula/commit/bb4a077))
* **php/ng:** support the use of a list of php versions ([b303239](https://github.com/saltstack-formulas/php-formula/commit/b303239)), closes [#138](https://github.com/saltstack-formulas/php-formula/issues/138)

### Styles

* **pillar.example:** add line break ([38fe58f](https://github.com/saltstack-formulas/php-formula/commit/38fe58f))
2019-08-07 09:46:53 +00:00
Imran Iqbal
ef25eb93ca
Merge pull request #167 from arthurlogilab/multiphp
[php/ng] support the use of a list of php versions
2019-08-07 10:20:29 +01:00
semantic-release-bot
d530e817d1 chore(release): 0.38.1 [skip ci]
## [0.38.1](https://github.com/saltstack-formulas/php-formula/compare/v0.38.0...v0.38.1) (2019-08-03)

### Bug Fixes

* update deprecation version number in `semantic-release` run ([a87fb91](https://github.com/saltstack-formulas/php-formula/commit/a87fb91)), closes [/github.com/saltstack-formulas/php-formula/pull/175#issuecomment-517492613](https://github.com//github.com/saltstack-formulas/php-formula/pull/175/issues/issuecomment-517492613) [/github.com/saltstack-formulas/php-formula/pull/185#issuecomment-517603898](https://github.com//github.com/saltstack-formulas/php-formula/pull/185/issues/issuecomment-517603898)
2019-08-03 20:35:57 +00:00
Sergio Cambra
a09ef9270e feat(map): add xmlrpc package for xml module, as it was done for SUSE 2019-08-02 00:04:30 +01:00
nb
d45bae83d8 fix: add warning message for ng states 2019-07-28 17:45:40 +11:00
Imran Iqbal
8e7471e837
fix: allow muting deprecation warning via. pillar/config entry 2019-07-25 22:27:36 +01:00
Imran Iqbal
e97eeae766
fix: change message to warn about upcoming deprecation 2019-07-25 12:28:29 +01:00
nb
d03338176c fix: warn formula users ng states will be promoted in v1.0.0 2019-07-24 15:15:33 +11:00
Simon Schneider
bb4a077d84 feat(php/ng): support for php cli multiversion 2019-07-10 16:52:37 +02:00
Arthur Lutz
dbb542c4fb fix(php/ng): don't iterate on string, make sure list is not string 2019-07-10 16:52:21 +02:00
Arthur Lutz
b3032391dd feat(php/ng): support the use of a list of php versions
Related to #138
2019-07-10 16:52:03 +02:00
nb
e2d7b4b588 fix(mods): fixup for #181 2019-07-09 15:42:15 +11:00
nb
3f6c0bc894 feat(mods): added some mods support for FreeBSD 2019-07-01 17:19:01 +11:00
Simon Schneider
758ae882f6
feat: add 'bz2' and 'dba' module support 2019-06-29 19:41:32 +01:00
Adrien "ze" Urban
0e431473cd php/ng/modules: use ~ operator
Convert module to string before appending it to the base path to search for
existing modules...
2019-04-11 10:41:25 +02:00
Adrien "ze" Urban
a126bf658b php.ng.modules: install modules... 2019-04-03 14:31:33 +02:00
Niels Abspoel
14bb2b3f28
Merge pull request #170 from n-rodriguez/master
Fix "Invalidly formatted 'pkgs' parameter." error with php-readline
2019-04-02 19:56:47 +02:00
Niels Abspoel
936bca4a19
Merge pull request #171 from ze42/fix_pool_dependency
fpm: don't extend pool-dependency if no pool
2019-04-02 19:54:35 +02:00
Niels Abspoel
e0b922a28b
Merge pull request #168 from pawelrosada/master
Fix Backward compatibility problem
2019-04-02 19:51:16 +02:00
Adrien "ze" Urban
e18b2be86d fpm: don't extend pool-dependency if no pool 2019-04-02 11:58:05 +02:00
Nicolas Rodriguez
afbc88b056 Fix "Invalidly formatted 'pkgs' parameter." error with php-readline 2019-04-02 00:21:01 +02:00
Paweł Rosada
0c923245e6
Fix Backward compatibility problem 2019-03-27 05:51:38 +01:00
Niels Abspoel
4a0dfac0b0
Merge pull request #166 from pawelrosada/master
Add enablerepo option to php-salt-formula
2019-03-26 20:17:48 +01:00
Niels Abspoel
75431aff13
Merge pull request #164 from Seldaek/patch-2
Remove env from ppa definition
2019-03-25 20:43:34 +01:00
Paweł Rosada
6965059af4
Remove copy of php_install_{{ state }} 2019-03-25 08:22:28 +01:00
Paweł Rosada
77b1b3520f
Add missing php_install_ 2019-03-25 08:20:33 +01:00
Paweł Rosada
324ebd84af
Add enablerepo option to php-salt-formula 2019-03-25 08:15:05 +01:00