saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add warning message for ng states

Browse Source
This commit is contained in:
nb 2019-07-28 16:05:22 +11:00
parent 8e7471e837
commit d45bae83d8
28 changed files with 98 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
php/ng/apache2/ini.sls
View File

@ -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) }}

1
php/ng/apache2/init.sls
View File

@ -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" %}

3
php/ng/apache2/install.sls
View File

@ -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" %}

3
php/ng/cli/ini.sls
View File

@ -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 %}

1
php/ng/cli/init.sls
View File

@ -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

3
php/ng/cli/install.sls
View File

@ -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 %}

1
php/ng/composer.sls
View File

@ -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

40
php/ng/deprecated.sls Normal file
View File

@ -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 %}

3
php/ng/fpm/config.sls
View File

@ -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 %}

1
php/ng/fpm/init.sls
View File

@ -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

3
php/ng/fpm/install.sls
View File

@ -1,2 +1,5 @@
include:
- php.ng.deprecated
{% set state = 'fpm' %}
{% include "php/ng/installed.jinja" %}

1
php/ng/fpm/pools.sls
View File

@ -10,6 +10,7 @@
{% endmacro %}
include:
- php.ng.deprecated
- php.ng.fpm.service
- php.ng.fpm.pools_config

3
php/ng/fpm/pools_config.sls
View File

@ -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 }}

1
php/ng/fpm/service.sls
View File

@ -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:

3
php/ng/hhvm/config.sls
View File

@ -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) %}

1
php/ng/hhvm/init.sls
View File

@ -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

3
php/ng/hhvm/install.sls
View File

@ -1,2 +1,5 @@
include:
- php.ng.deprecated
{% set state = 'hhvm' %}
{% include "php/ng/installed.jinja" %}

1
php/ng/hhvm/repo.sls
View File

@ -2,6 +2,7 @@
{% from "php/ng/map.jinja" import php with context %}
include:
- php.ng.deprecated
- php.ng.hhvm.install

3
php/ng/hhvm/service.sls
View File

@ -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

4
php/ng/installed.jinja
View File

@ -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:

3
php/ng/mdb2/init.sls
View File

@ -1,2 +1,5 @@
include:
- php.ng.deprecated
{% set state = 'mdb2' %}
{% include "php/ng/installed.jinja" %}

3
php/ng/mdb2/mysql.sls
View File

@ -1,3 +1,6 @@
include:
- php.ng.deprecated
{% set state = 'mdb2-driver-mysql' %}
{% include "php/ng/installed.jinja" %}
{% include "php/ng/mdb2/init.sls" %}

3
php/ng/mdb2/pgsql.sls
View File

@ -1,3 +1,6 @@
include:
- php.ng.deprecated
{% set state = 'mdb2-driver-pgsql' %}
{% include "php/ng/installed.jinja" %}
{% include "php/ng/mdb2/init.sls" %}

1
php/ng/suhosin.sls
View File

@ -1,6 +1,7 @@
{% from "php/ng/map.jinja" import php with context %}
include:
- php.ng.deprecated
- php.ng
- php.ng.dev

3
php/ng/xcache/ini.sls
View File

@ -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 %}

1
php/ng/xcache/init.sls
View File

@ -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

3
php/ng/xcache/install.sls
View File

@ -1,2 +1,5 @@
include:
- php.ng.deprecated
{% set state = 'xcache' %}
{% include "php/ng/installed.jinja" %}

1
pillar.example
View File

@ -5,6 +5,7 @@ php:
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)