diff --git a/docs/README.rst b/docs/README.rst index 7f9c3a3..0fc0e33 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -16,6 +16,31 @@ php-formula Formula to set up and configure php +.. list-table:: + :name: banner-breaking-changes-v1.0.0 + :header-rows: 1 + :widths: 1 + + * - WARNING: BREAKING CHANGES IN UPCOMING ``v1.0.0`` + * - This formula currently provides two methods for managing PHP; the old method + under ``php`` and the new method under ``php.ng``. + In upcoming `v1.0.0 `_, + the old method will be removed and ``php.ng`` will be promoted to ``php`` in its place. + + If you are not in a position to migrate, you will need to pin your repo to + the final release tag before + `v1.0.0 `_, + which is expected to be + `v0.37.1 `_. + + If you are currently using ``php.ng``, there is nothing to do until + `v1.0.0 `_ + is released. + + To migrate from the old ``php``, the first step is to convert to ``php.ng``, + before `v1.0.0 `_ + is released. + .. contents:: **Table of Contents** General notes diff --git a/php/adodb.sls b/php/adodb.sls index 96064e4..2cf3569 100644 --- a/php/adodb.sls +++ b/php/adodb.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-adodb: diff --git a/php/apc.sls b/php/apc.sls index 113461b..2a3d2ca 100644 --- a/php/apc.sls +++ b/php/apc.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-apc: diff --git a/php/apcu.sls b/php/apcu.sls index e0afc5a..76eb429 100644 --- a/php/apcu.sls +++ b/php/apcu.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-apcu: diff --git a/php/bcmath.sls b/php/bcmath.sls index 0f69c7a..bcfb84f 100644 --- a/php/bcmath.sls +++ b/php/bcmath.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-bcmath: diff --git a/php/cgi.sls b/php/cgi.sls index c136c05..ce53a5f 100644 --- a/php/cgi.sls +++ b/php/cgi.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-cgi: diff --git a/php/cli.sls b/php/cli.sls index 858c7da..b701710 100644 --- a/php/cli.sls +++ b/php/cli.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-cli: diff --git a/php/composer.sls b/php/composer.sls index 935508e..e4abc4c 100644 --- a/php/composer.sls +++ b/php/composer.sls @@ -11,6 +11,7 @@ {%- set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %} include: + - php.deprecated - php get-composer: diff --git a/php/curl.sls b/php/curl.sls index 01d4b85..e633d82 100644 --- a/php/curl.sls +++ b/php/curl.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-curl: diff --git a/php/deprecated.sls b/php/deprecated.sls new file mode 100644 index 0000000..16c5c66 --- /dev/null +++ b/php/deprecated.sls @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{#- Evaluating as `False` by default, using this method since `defaults.yaml` not available in this repo #} +{%- if not salt['config.get']('php').get('warning_messages', {}).get('v1.0.0', {}).get('mute_critical', False) %} +php-deprecated-in-v1.0.0-test-succeed: + test.succeed_without_changes: + - name: | + + + ################################################################################ + # # + # WARNING: BREAKING CHANGES IN UPCOMING VERSION `v1.0.0` # + # # + ################################################################################ + # # + # This formula currently provides two methods for managing PHP; the old method # + # under `php` and the new method under `php.ng`. In upcoming `v1.0.0`, the old # + # method will be removed and `php.ng` will be promoted to `php` in its place. # + # # + # If you are not in a position to migrate, you will need to pin your repo to # + # the final release tag before `v1.0.0`, which is expected to be `v0.37.1`. # + # # + # If you are currently using `php.ng`, there is nothing to do until `v1.0.0` # + # is released. # + # # + # To migrate from the old `php`, the first step is to convert to `php.ng`, # + # before `v1.0.0` is released. # + # # + # To prevent this message being displayed again, set the pillar/config value: # + # # + # ``` # + # php: # + # warning_messages: # + # v1.0.0: # + # mute_critical: True # + # ``` # + # # + ################################################################################ + # - failhard: True +{%- endif %} diff --git a/php/dev.sls b/php/dev.sls index 0d2c3d5..41e6c62 100644 --- a/php/dev.sls +++ b/php/dev.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-dev: diff --git a/php/fpm.sls b/php/fpm.sls index d714ce0..0777c29 100644 --- a/php/fpm.sls +++ b/php/fpm.sls @@ -1,5 +1,8 @@ {%- from "php/map.jinja" import php with context %} +include: + - php.deprecated + php-fpm: pkg.installed: - name: {{ php.fpm_pkg }} diff --git a/php/gd.sls b/php/gd.sls index 928b70c..8761e60 100644 --- a/php/gd.sls +++ b/php/gd.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-gd: diff --git a/php/imagick.sls b/php/imagick.sls index e9a1f1a..1c8cd58 100644 --- a/php/imagick.sls +++ b/php/imagick.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-imagick: diff --git a/php/imap.sls b/php/imap.sls index 8157e59..79649fa 100644 --- a/php/imap.sls +++ b/php/imap.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-imap: diff --git a/php/init.sls b/php/init.sls index 8f4f90c..ab84c03 100644 --- a/php/init.sls +++ b/php/init.sls @@ -1,5 +1,8 @@ {%- from "php/map.jinja" import php with context %} +include: + - php.deprecated + {%- if not 'ng' in salt['pillar.get']('php', {}) %} {%- if grains['os'] == "Ubuntu" %} diff --git a/php/intl.sls b/php/intl.sls index 261addc..5b594f4 100644 --- a/php/intl.sls +++ b/php/intl.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-intl: diff --git a/php/json.sls b/php/json.sls index 2ea5a6a..aff16ac 100644 --- a/php/json.sls +++ b/php/json.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-json: diff --git a/php/ldap.sls b/php/ldap.sls index 7714b87..8c4cab6 100644 --- a/php/ldap.sls +++ b/php/ldap.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-ldap: diff --git a/php/mail.sls b/php/mail.sls index 4efd48f..953622a 100644 --- a/php/mail.sls +++ b/php/mail.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mail: diff --git a/php/mbstring.sls b/php/mbstring.sls index cde4a27..b285467 100644 --- a/php/mbstring.sls +++ b/php/mbstring.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mbstring: diff --git a/php/mcrypt.sls b/php/mcrypt.sls index d20ea23..95fa37a 100644 --- a/php/mcrypt.sls +++ b/php/mcrypt.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mcrypt: diff --git a/php/memcache.sls b/php/memcache.sls index c259f97..f96571d 100644 --- a/php/memcache.sls +++ b/php/memcache.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-memcache: diff --git a/php/memcached.sls b/php/memcached.sls index ed9c4f6..a1d84cf 100644 --- a/php/memcached.sls +++ b/php/memcached.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-memcached: diff --git a/php/mongo.sls b/php/mongo.sls index 0616773..defaac4 100644 --- a/php/mongo.sls +++ b/php/mongo.sls @@ -3,6 +3,7 @@ {%- set version = salt['pillar.get']('php:mongo_version', none) %} include: + - php.deprecated - php - php.xml - php.dev diff --git a/php/mysql.sls b/php/mysql.sls index eaec44f..c117039 100644 --- a/php/mysql.sls +++ b/php/mysql.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mysql: diff --git a/php/mysqlnd.sls b/php/mysqlnd.sls index 40642ef..20351b6 100644 --- a/php/mysqlnd.sls +++ b/php/mysqlnd.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mysqlnd: diff --git a/php/ng/apache2/ini.sls b/php/ng/apache2/ini.sls index 8f01a8a..6e9bc39 100644 --- a/php/ng/apache2/ini.sls +++ b/php/ng/apache2/ini.sls @@ -5,5 +5,8 @@ {% set settings = php.ini.defaults %} {% do settings.update(php.apache2.ini.settings) %} +include: + - php.ng.deprecated + php_apache2_ini: {{ php_ini(php.lookup.apache2.ini, php.apache2.ini.opts, settings) }} diff --git a/php/ng/apache2/init.sls b/php/ng/apache2/init.sls index ce58788..f7b9419 100644 --- a/php/ng/apache2/init.sls +++ b/php/ng/apache2/init.sls @@ -1,5 +1,6 @@ {% if grains['os_family'] in ["Debian", "FreeBSD"] %} include: + - php.ng.deprecated - php.ng.apache2.install {% endif %} #END: os = Debian|FreeBSD {% if grains['os_family'] == "Debian" %} diff --git a/php/ng/apache2/install.sls b/php/ng/apache2/install.sls index 46c7da4..51e1500 100644 --- a/php/ng/apache2/install.sls +++ b/php/ng/apache2/install.sls @@ -1,5 +1,8 @@ {% from "php/ng/map.jinja" import php with context %} +include: + - php.ng.deprecated + {% set state = 'apache2' %} {% include "php/ng/installed.jinja" %} diff --git a/php/ng/cli/ini.sls b/php/ng/cli/ini.sls index 6844192..1d5c92d 100644 --- a/php/ng/cli/ini.sls +++ b/php/ng/cli/ini.sls @@ -2,6 +2,9 @@ {% from "php/ng/map.jinja" import php with context %} {% from "php/ng/ini.jinja" import php_ini %} +include: + - php.ng.deprecated + {% set settings = php.ini.defaults %} {% for key, value in php.cli.ini.settings.items() %} {% if settings[key] is defined %} diff --git a/php/ng/cli/init.sls b/php/ng/cli/init.sls index 06bc3e9..78cb5a3 100644 --- a/php/ng/cli/init.sls +++ b/php/ng/cli/init.sls @@ -1,6 +1,7 @@ # Installs php-cli and manages the associated php.ini include: + - php.ng.deprecated - php.ng.cli.install - php.ng.cli.ini diff --git a/php/ng/cli/install.sls b/php/ng/cli/install.sls index ee4d463..432e545 100644 --- a/php/ng/cli/install.sls +++ b/php/ng/cli/install.sls @@ -1,6 +1,9 @@ {% set state = 'cli' %} {% include "php/ng/installed.jinja" %} +include: + - php.ng.deprecated + {%- if salt['grains.get']('os_family') == "Debian" %} {% set current_php = salt['alternatives.show_current']('php') %} {% set phpng_version = salt['pillar.get']('php:ng:version', '7.0')|string %} diff --git a/php/ng/composer.sls b/php/ng/composer.sls index 8f6221d..b5776e6 100644 --- a/php/ng/composer.sls +++ b/php/ng/composer.sls @@ -11,6 +11,7 @@ {% set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %} include: + - php.ng.deprecated - php.ng {% if grains['os_family'] == 'FreeBSD' %} - php.ng.filter diff --git a/php/ng/deprecated.sls b/php/ng/deprecated.sls new file mode 100644 index 0000000..83f9fa5 --- /dev/null +++ b/php/ng/deprecated.sls @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{#- Evaluating as `False` by default, using this method since `defaults.yaml` not available in this repo #} +{%- if not salt['config.get']('php').get('warning_messages', {}).get('v1.0.0', {}).get('mute_upcoming', False) %} +php-deprecated-in-v1.0.0-test-succeed: + test.succeed_without_changes: + - name: | + + + ################################################################################ + # # + # WARNING: BREAKING CHANGES IN UPCOMING VERSION `v1.0.0` # + # # + ################################################################################ + # # + # This formula currently provides two methods for managing PHP; the old method # + # under `php` and the new method under `php.ng`. In upcoming `v1.0.0`, the old # + # method will be removed and `php.ng` will be promoted to `php` in its place. # + # # + # If you are not in a position to migrate, you will need to pin your repo to # + # the final release tag before `v1.0.0`, which is expected to be `v0.37.1`. # + # # + # If you are currently using `php.ng`, there is nothing to do until `v1.0.0` # + # is released. # + # # + # To migrate from the old `php`, the first step is to convert to `php.ng`, # + # before `v1.0.0` is released. # + # # + # To prevent this message being displayed again, set the pillar/config value: # + # # + # ``` # + # php: # + # warning_messages: # + # v1.0.0: # + # mute_upcoming: True # + # ``` # + # # + ################################################################################ +{%- endif %} diff --git a/php/ng/fpm/config.sls b/php/ng/fpm/config.sls index a91ff89..0c4d6d6 100644 --- a/php/ng/fpm/config.sls +++ b/php/ng/fpm/config.sls @@ -2,6 +2,9 @@ {% from 'php/ng/map.jinja' import php with context %} {% from "php/ng/ini.jinja" import php_ini %} +include: + - php.ng.deprecated + {% set ini_settings = php.ini.defaults %} {% for key, value in php.fpm.config.ini.settings.items() %} {% if ini_settings[key] is defined %} diff --git a/php/ng/fpm/init.sls b/php/ng/fpm/init.sls index 0087bc3..80b446a 100644 --- a/php/ng/fpm/init.sls +++ b/php/ng/fpm/init.sls @@ -1,6 +1,7 @@ # Meta-state to fully install php.fpm include: + - php.ng.deprecated - php.ng.fpm.config - php.ng.fpm.service - php.ng.fpm.pools diff --git a/php/ng/fpm/install.sls b/php/ng/fpm/install.sls index 6fda19e..72fa5c8 100644 --- a/php/ng/fpm/install.sls +++ b/php/ng/fpm/install.sls @@ -1,2 +1,5 @@ +include: + - php.ng.deprecated + {% set state = 'fpm' %} {% include "php/ng/installed.jinja" %} diff --git a/php/ng/fpm/pools.sls b/php/ng/fpm/pools.sls index cfc796b..b3d7454 100644 --- a/php/ng/fpm/pools.sls +++ b/php/ng/fpm/pools.sls @@ -10,6 +10,7 @@ {% endmacro %} include: + - php.ng.deprecated - php.ng.fpm.service - php.ng.fpm.pools_config diff --git a/php/ng/fpm/pools_config.sls b/php/ng/fpm/pools_config.sls index 625f303..e63ec2a 100644 --- a/php/ng/fpm/pools_config.sls +++ b/php/ng/fpm/pools_config.sls @@ -2,6 +2,9 @@ {% from 'php/ng/map.jinja' import php with context %} {% from "php/ng/macro.jinja" import sls_block, serialize %} +include: + - php.ng.deprecated + # Simple path concatenation. {% macro path_join(file, root) -%} {{ root ~ '/' ~ file }} diff --git a/php/ng/fpm/service.sls b/php/ng/fpm/service.sls index aa8cd2c..084a539 100644 --- a/php/ng/fpm/service.sls +++ b/php/ng/fpm/service.sls @@ -5,6 +5,7 @@ {% set service_function = {True:'running', False:'dead'}.get(php.fpm.service.enabled) %} include: + - php.ng.deprecated - php.ng.fpm.install php_fpm_service: diff --git a/php/ng/hhvm/config.sls b/php/ng/hhvm/config.sls index f257a6f..4f242e5 100644 --- a/php/ng/hhvm/config.sls +++ b/php/ng/hhvm/config.sls @@ -2,6 +2,9 @@ {% from "php/ng/map.jinja" import php with context %} {% from "php/ng/ini.jinja" import php_ini %} +include: + - php.ng.deprecated + {% set server_settings = php.lookup.hhvm.server %} {% do server_settings.update(php.hhvm.config.server.settings) %} diff --git a/php/ng/hhvm/init.sls b/php/ng/hhvm/init.sls index 080edb6..ba6576e 100644 --- a/php/ng/hhvm/init.sls +++ b/php/ng/hhvm/init.sls @@ -1,6 +1,7 @@ # Meta-state to fully install php.hhvm include: + - php.ng.deprecated - php.ng.hhvm.repo - php.ng.hhvm.config - php.ng.hhvm.service diff --git a/php/ng/hhvm/install.sls b/php/ng/hhvm/install.sls index 1c1b277..65761ee 100644 --- a/php/ng/hhvm/install.sls +++ b/php/ng/hhvm/install.sls @@ -1,2 +1,5 @@ +include: + - php.ng.deprecated + {% set state = 'hhvm' %} {% include "php/ng/installed.jinja" %} diff --git a/php/ng/hhvm/repo.sls b/php/ng/hhvm/repo.sls index fa790a0..8fd3841 100644 --- a/php/ng/hhvm/repo.sls +++ b/php/ng/hhvm/repo.sls @@ -2,6 +2,7 @@ {% from "php/ng/map.jinja" import php with context %} include: + - php.ng.deprecated - php.ng.hhvm.install diff --git a/php/ng/hhvm/service.sls b/php/ng/hhvm/service.sls index d7bcce9..458ad7c 100644 --- a/php/ng/hhvm/service.sls +++ b/php/ng/hhvm/service.sls @@ -5,6 +5,7 @@ {% set service_function = {True:'running', False:'dead'}.get(php.hhvm.service.enabled) %} include: + - php.ng.deprecated - php.ng.hhvm.install php_hhvm_service: @@ -15,5 +16,5 @@ php_hhvm_service: - require: - sls: php.ng.hhvm.install - watch: - - pkg: php_install_hhvm + - pkg: php_install_hhvm diff --git a/php/ng/installed.jinja b/php/ng/installed.jinja index 0033d31..9db803d 100644 --- a/php/ng/installed.jinja +++ b/php/ng/installed.jinja @@ -4,6 +4,8 @@ {% from "php/ng/map.jinja" import php with context %} {% from "php/ng/macro.jinja" import sls_block %} +include: + - php.ng.deprecated {% set pkginfo = php.lookup.pkgs.get(state) %} @@ -60,7 +62,7 @@ php_ppa_{{ state }}: - __env__: - LC_ALL: C.UTF-8 - onlyif: - - test ! -e /etc/apt/sources.list.d/ondrej-php.list + - test ! -e /etc/apt/sources.list.d/ondrej-php.list - require_in: - pkg: php_install_{{ state }} pkg.latest: diff --git a/php/ng/mdb2/init.sls b/php/ng/mdb2/init.sls index d39a780..138ace0 100644 --- a/php/ng/mdb2/init.sls +++ b/php/ng/mdb2/init.sls @@ -1,2 +1,5 @@ +include: + - php.ng.deprecated + {% set state = 'mdb2' %} {% include "php/ng/installed.jinja" %} diff --git a/php/ng/mdb2/mysql.sls b/php/ng/mdb2/mysql.sls index 83939e2..831515d 100644 --- a/php/ng/mdb2/mysql.sls +++ b/php/ng/mdb2/mysql.sls @@ -1,3 +1,6 @@ +include: + - php.ng.deprecated + {% set state = 'mdb2-driver-mysql' %} {% include "php/ng/installed.jinja" %} {% include "php/ng/mdb2/init.sls" %} diff --git a/php/ng/mdb2/pgsql.sls b/php/ng/mdb2/pgsql.sls index fed322a..9b9aba4 100644 --- a/php/ng/mdb2/pgsql.sls +++ b/php/ng/mdb2/pgsql.sls @@ -1,3 +1,6 @@ +include: + - php.ng.deprecated + {% set state = 'mdb2-driver-pgsql' %} {% include "php/ng/installed.jinja" %} {% include "php/ng/mdb2/init.sls" %} diff --git a/php/ng/suhosin.sls b/php/ng/suhosin.sls index 903a335..b4b9c2a 100644 --- a/php/ng/suhosin.sls +++ b/php/ng/suhosin.sls @@ -1,6 +1,7 @@ {% from "php/ng/map.jinja" import php with context %} include: + - php.ng.deprecated - php.ng - php.ng.dev diff --git a/php/ng/xcache/ini.sls b/php/ng/xcache/ini.sls index c497788..46b6551 100644 --- a/php/ng/xcache/ini.sls +++ b/php/ng/xcache/ini.sls @@ -2,6 +2,9 @@ {% from "php/ng/map.jinja" import php with context %} {% from "php/ng/ini.jinja" import php_ini %} +include: + - php.ng.deprecated + {% set settings = php.xcache.ini.defaults %} {% for key, value in php.xcache.ini.settings.items() %} {% if settings[key] is defined %} diff --git a/php/ng/xcache/init.sls b/php/ng/xcache/init.sls index fb6e07f..2214246 100644 --- a/php/ng/xcache/init.sls +++ b/php/ng/xcache/init.sls @@ -1,6 +1,7 @@ # Installs php-xcache and manages the associated xcache.ini include: + - php.ng.deprecated - php.ng.xcache.install - php.ng.xcache.ini diff --git a/php/ng/xcache/install.sls b/php/ng/xcache/install.sls index 82a7eb4..78caa75 100644 --- a/php/ng/xcache/install.sls +++ b/php/ng/xcache/install.sls @@ -1,2 +1,5 @@ +include: + - php.ng.deprecated + {% set state = 'xcache' %} {% include "php/ng/installed.jinja" %} diff --git a/php/oauth.sls b/php/oauth.sls index 347cb39..e77abaa 100644 --- a/php/oauth.sls +++ b/php/oauth.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-oauth: diff --git a/php/pear.sls b/php/pear.sls index f21619a..1a6d976 100644 --- a/php/pear.sls +++ b/php/pear.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-pear: diff --git a/php/pgsql.sls b/php/pgsql.sls index 9aa0835..70114eb 100644 --- a/php/pgsql.sls +++ b/php/pgsql.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-pgsql: diff --git a/php/readline.sls b/php/readline.sls index e761dd5..4fb8c78 100644 --- a/php/readline.sls +++ b/php/readline.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-readline: diff --git a/php/redis.sls b/php/redis.sls index d4608d5..b7a8f27 100644 --- a/php/redis.sls +++ b/php/redis.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-redis: diff --git a/php/soap.sls b/php/soap.sls index 3427451..89acf0d 100644 --- a/php/soap.sls +++ b/php/soap.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-soap: diff --git a/php/sqlite.sls b/php/sqlite.sls index d865d0a..758c468 100644 --- a/php/sqlite.sls +++ b/php/sqlite.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-sqlite: diff --git a/php/suhosin.sls b/php/suhosin.sls index 6c88ce8..a1682c3 100644 --- a/php/suhosin.sls +++ b/php/suhosin.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php - php.dev diff --git a/php/sybase.sls b/php/sybase.sls index f50bb69..a114b0b 100644 --- a/php/sybase.sls +++ b/php/sybase.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-sybase: diff --git a/php/xml.sls b/php/xml.sls index 47d39ec..80ed33a 100644 --- a/php/xml.sls +++ b/php/xml.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-xml: diff --git a/php/zip.sls b/php/zip.sls index 668fd2b..49c0fd1 100644 --- a/php/zip.sls +++ b/php/zip.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-zip: diff --git a/pillar.example b/pillar.example index 6023952..8385933 100644 --- a/pillar.example +++ b/pillar.example @@ -1,6 +1,11 @@ ## php.ng pillar examples php: + # Use the following values to mute deprecation warnings + warning_messages: # + v1.0.0: # + mute_critical: True # + mute_upcoming: True # # Use external repository instead the default (only Ubuntu family) use_external_repo: True # Set the external repository name (valid only if use_external_repo is not none) diff --git a/test/salt/pillar/debian.sls b/test/salt/pillar/debian.sls index e69de29..b6880f2 100644 --- a/test/salt/pillar/debian.sls +++ b/test/salt/pillar/debian.sls @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +php: {} diff --git a/test/salt/pillar/redhat.sls b/test/salt/pillar/redhat.sls index e69de29..b6880f2 100644 --- a/test/salt/pillar/redhat.sls +++ b/test/salt/pillar/redhat.sls @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +php: {} diff --git a/test/salt/pillar/suse.sls b/test/salt/pillar/suse.sls index e69de29..b6880f2 100644 --- a/test/salt/pillar/suse.sls +++ b/test/salt/pillar/suse.sls @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +php: {}