Skip to content
Snippets Groups Projects
Commit 1e3e3032 authored by sc250024's avatar sc250024 Committed by Forrest
Browse files

New structure for new Ubuntu PPA and other fixes (#113)

* Initial commit for new branch

* Quick change to base test files

* Updated map.jinja, added `php` dependency for all subformulas

* Fixing mongo module and map.jinja needed OpenSSL dev libraries

* Should be final changes needed for Mongo module

* Updating Suhosin package since many distros don't have package in their
repos anymore

* Generalizing suhosin module, and updating pillar.example for new PPA

* Adding addtional logic for RedHat based families to Suhosin

* Initial commit of NG refactored map.jinja file

* Deleting FFMpeg state file since the module is quite old, and has been
replaced by using a Composer library. See
https://github.com/PHP-FFMpeg/PHP-FFMpeg for details

* Updating NG formulas for new definitions

* Removing 'twig' as a state since it can be installed via Composer

* Changes to installed.jinja to set correct PHP path based on version

* NG Composer and NG Suhosin changes

* Version bump and deleting README for deleted states

* Finished refactor of NG map.jinja file

* Adding trailing commas (forgot them earler)

* Adding changes list, and modifying map file for missing definitions when
using Ubuntu 16.04 and NOT using a PPA

* Changes needed after performing testing on RHEL 7

* Changes needed for Ubuntu Trusty without using PPA

* Removing testing files; keep on local

* Map changes needed after testing Debian Jessie

* Changed needed for Debian Wheezy

* Adding more pkgs for Arch Linux support

* More ArchLinux support

* Stupid tabs

* Removing extra line breaks, and using the general "use_external_repo" in
the future if DotDeb (Debian) or Webtactic (RedHat)

* Accoutning for Precise `phpenmod` and others
parent 371fc1f3
Branches
No related tags found
No related merge requests found
......@@ -515,11 +515,6 @@ Installs the php-tidy package.
Installs the php-tcpdf package.
``php.ng.twig``
--------------
Installs the php-twig package.
``php.ng.cache-lite``
--------------
......@@ -529,9 +524,3 @@ Installs the php-cache-lite package.
--------------
Installs the php-console-table package.
``php.ng.ffmpeg``
--------------
Installs the php-ffmpeg package and ffmpeg.
0.0.4
0.1.0
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-adodb:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-apc:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-apcu:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-bcmath:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-cgi:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-cli:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{% set install_file = php.local_bin + '/' + php.composer_bin %}
{%- from "php/map.jinja" import php with context %}
{% if not salt['config.get']('sudo_user') %}
{% set salt_user = salt['config.get']('user', 'root') %}
{% else %}
{% set salt_user = salt['config.get']('sudo_user', 'root') %}
{% endif %}
{%- set install_file = php.local_bin + '/' + php.composer_bin %}
{% set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %}
{%- if not salt['config.get']('sudo_user') %}
{%- set salt_user = salt['config.get']('user', 'root') %}
{%- else %}
{%- set salt_user = salt['config.get']('sudo_user', 'root') %}
{%- endif %}
{%- set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %}
include:
- php
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-curl:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-dev:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-fpm:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-gd:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-imagick:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-imap:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
{% if not 'ng' in salt['pillar.get']('php', {}) %}
{%- if not 'ng' in salt['pillar.get']('php', {}) %}
{% if grains['os_family']=="Debian" %}
{% set use_ppa = salt['pillar.get']('php:use_ppa', none) %}
{%- if grains['os'] == "Ubuntu" %}
{%- set use_external_repo = salt['pillar.get']('php:use_external_repo', False) %}
{% if use_ppa is not none %}
{%- if use_external_repo %}
{%- set external_repo_name = salt['pillar.get']('php:external_repo_name', 'ondrej/php') %}
{% set ppa_name = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %}
php54:
php_from_ppa:
pkgrepo.managed:
- ppa: {{ ppa_name }}
- ppa: {{ external_repo_name }}
- env:
- LC_ALL: "C.UTF-8"
- require_in:
- pkg: php_from_ppa
pkg.latest:
- name: php5
- name: {{ php.php_pkg }}
- refresh: True
{% endif %}
{% endif %}
{%- endif %}
{%- endif %}
php:
pkg.installed:
- name: {{ php.php_pkg }}
{% endif %}
{%- endif %}
\ No newline at end of file
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-intl:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-json:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-ldap:
pkg.installed:
......
{% from "php/map.jinja" import php with context %}
{%- from "php/map.jinja" import php with context %}
include:
- php
php-mail:
pkg.installed:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment