Merge pull request #38 from Seldaek/master

Fix ppa support in php.ng, fixes #36

php/ng/installed.jinja

@@ -20,6 +20,22 @@
     {% do pkgs.append(pkginfo) %}
 {% endif %}
 
+{% if grains['os_family']=="Debian" and (state == 'cli' or state == 'fpm' or state == 'php') %}
+{% set use_ppa        = salt['pillar.get']('php:use_ppa', none) %}
+{% if use_ppa is not none %}
+
+{% set ppa_name        = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %}
+
+php_ppa_{{ state }}:
+    pkgrepo.managed:
+        - ppa: {{ ppa_name }}
+    pkg.latest:
+        - name: {{ state }}
+        - pkgs: {{ pkgs|json() }}
+        - refresh: True
+{% endif %}
+{% endif %}
+
 php_install_{{ state }}:
   pkg.installed:
     - name: {{ state }}

php/ng/map.jinja

@@ -20,7 +20,7 @@
                 'mysqlnd': 'php5-mysqlnd',
                 'pear': 'php-pear',
                 'soap': 'php-soap',
-            		'sqlite': 'php5-sqlite',
+                'sqlite': 'php5-sqlite',
                 'xml': 'php5-xmlrpc',
                 'redis': 'php5-redis',
                 'imagick': 'php5-imagick',
@@ -70,7 +70,7 @@
                 'mysqlnd': 'php-mysqlnd',
                 'pear': 'php-pear',
                 'soap': 'php-soap',
-            		'sqlite': 'php5-sqlite',
+                'sqlite': 'php5-sqlite',
                 'xml': 'php-xml',
                 'redis': 'php-redis',
                 'imagick': 'php-imagick',