瀏覽代碼

Merge pull request #195 from vexxhost/master

Dropped ppa and updated to official repos for ubuntu
tags/v0.57.0
Forrest 9 年之前
父節點
當前提交
46346e935f
共有 2 個檔案被更改,包括 6 行新增2 行删除
  1. +3
    -1
      salt/pkgrepo/ubuntu/absent.sls
  2. +3
    -1
      salt/pkgrepo/ubuntu/init.sls

+ 3
- 1
salt/pkgrepo/ubuntu/absent.sls 查看文件

@@ -1,3 +1,5 @@
drop-saltstack-pkgrepo:
pkgrepo.absent:
- ppa: saltstack/salt
- name: deb http://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest {{ grains['lsb_distrib_codename'] }} main
- file: /etc/apt/sources.list.d/saltstack.list
- key_url: https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest/SALTSTACK-GPG-KEY.pub

+ 3
- 1
salt/pkgrepo/ubuntu/init.sls 查看文件

@@ -1,3 +1,5 @@
saltstack-pkgrepo:
pkgrepo.managed:
- ppa: saltstack/salt
- name: deb http://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest {{ grains['lsb_distrib_codename'] }} main
- file: /etc/apt/sources.list.d/saltstack.list
- key_url: https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest/SALTSTACK-GPG-KEY.pub

Loading…
取消
儲存