From 1016376bcffeec0c63e6e22082ff923c473de68b Mon Sep 17 00:00:00 2001
From: Ryan Hayle <rhayle@arcstone.com>
Date: Thu, 10 Dec 2015 20:54:17 -0600
Subject: [PATCH] Add repo manually (work-around for saltstack/salt#23543)

---
 php/ng/installed.jinja | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/php/ng/installed.jinja b/php/ng/installed.jinja
index d33e85d..9000752 100644
--- a/php/ng/installed.jinja
+++ b/php/ng/installed.jinja
@@ -26,13 +26,25 @@
 
 {% set ppa_name        = salt['pillar.get']('php:ppa_name', 'ondrej/php5') %}
 
+php_ppa_env_{{ state }}:
+    cmd.run:
+        - name: apt-add-repository -y ppa:{{ ppa_name }}
+        - env:
+            - LC_ALL: C.UTF-8
+
 php_ppa_{{ state }}:
     pkgrepo.managed:
         - ppa: {{ ppa_name }}
+        - require:
+            - cmd: php_ppa_env_{{ state }}
+        - require_in:
+            - pkg: php_install_{{ state }}
     pkg.latest:
         - name: {{ state }}
         - pkgs: {{ pkgs|json() }}
         - refresh: True
+        - onchanges:
+            - pkgrepo: php_ppa_{{ state }}
 {% endif %}
 {% endif %}