From 717a298b70d525c8d5364f9c2407322704cfad7d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 2 Jan 2016 19:13:50 +0000
Subject: [PATCH] Simplify configuration for official Ubuntu PPA

---
 git/defaults.yaml | 1 +
 git/pkgrepo.sls   | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/git/defaults.yaml b/git/defaults.yaml
index 3437155..69f3ca1 100644
--- a/git/defaults.yaml
+++ b/git/defaults.yaml
@@ -2,6 +2,7 @@ git:
   git: git
   install_from_source: False
   install_pkgrepo: False
+  ubuntu_git_ppa: ppa:git-core/ppa
   source_install:
     remove_system_package: False
     version: 1.8.4.2
diff --git a/git/pkgrepo.sls b/git/pkgrepo.sls
index 6ee30f8..06ba3cc 100644
--- a/git/pkgrepo.sls
+++ b/git/pkgrepo.sls
@@ -3,12 +3,7 @@
 {%- if grains['os'] == 'Ubuntu' %}
 git_ppa_repo:
   pkgrepo.managed:
-    - humanname: git-ppa-{{ grains['oscodename'] }}
-    - name: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ grains['oscodename'] }} main
-    - file: /etc/apt/sources.list.d/git-{{ grains['oscodename'] }}.list
-    - dist: {{ grains['oscodename'] }}
-    - keyid: E1DF1F24
-    - keyserver: keyserver.ubuntu.com
+    - name: {{ git_settings.ubuntu_git_ppa }}
 {%- if git_settings.install_pkgrepo %}
     - require_in:
       - pkg: git