Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Simplify configuration for official Ubuntu PPA #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify configuration for official Ubuntu PPA #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions git/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions git/pkgrepo.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down