New structure for new Ubuntu PPA and other fixes

README.rst

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

VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

php/adodb.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-adodb:
   pkg.installed:

php/apc.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-apc:
   pkg.installed:

php/apcu.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-apcu:
   pkg.installed:

php/bcmath.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-bcmath:
   pkg.installed:

php/cgi.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-cgi:
   pkg.installed:

php/cli.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-cli:
   pkg.installed:

php/composer.sls

@@ -1,13 +1,14 @@
-{% 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

php/curl.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-curl:
   pkg.installed:

php/dev.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-dev:
   pkg.installed:

php/fpm.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-fpm:
   pkg.installed:

php/gd.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-gd:
   pkg.installed:

php/imagick.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-imagick:
   pkg.installed:

php/imap.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-imap:
   pkg.installed:

php/init.sls

@@ -1,26 +1,30 @@
-{% 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') %}
+php_from_ppa:
+  pkgrepo.managed:
+    - ppa: {{ external_repo_name }}
+    - env:
+      - LC_ALL: "C.UTF-8"
+    - require_in:
+      - pkg: php_from_ppa
+  pkg.latest:
+    - name: {{ php.php_pkg }}
+    - refresh: True
 
-php54:
-    pkgrepo.managed:
-        - ppa: {{ ppa_name }}
-    pkg.latest:
-        - name: php5
-        - refresh: True
+    {%- endif %}
 
-{% endif %}
-{% endif %}
+  {%- endif %}
 
 php:
   pkg.installed:
     - name: {{ php.php_pkg }}
 
-{% endif %}
+{%- endif %}

php/intl.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-intl:
   pkg.installed:

php/json.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-json:
   pkg.installed:

php/ldap.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-ldap:
   pkg.installed:

php/mail.sls

@@ -1,4 +1,7 @@
-{% from "php/map.jinja" import php with context %}
+{%- from "php/map.jinja" import php with context %}
+
+include:
+  - php
 
 php-mail:
   pkg.installed: