Browse Source

bird: Don't use bird upstream repository no more (Wheezy/Jessie special handling)

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 5 years ago
parent
commit
6808fb85a7
1 changed files with 0 additions and 14 deletions
  1. 0 14
      bird/init.sls

+ 0 - 14
bird/init.sls

@@ -8,26 +8,12 @@ include:
   - network.interfaces
 
 bird-repo:
-{% if grains.oscodename in ['jessie', 'wheezy'] %}
-  pkgrepo.managed:
-    - comments: "# Official bird repo"
-    - human_name: Official bird repository
-    - name: "deb http://bird.network.cz/debian/ {{ grains['oscodename'] }} main"
-    - dist: {{ grains['oscodename'] }}
-    - file: /etc/apt/sources.list.d/bird.list
-    - key_url: salt://bird/bird_apt.key
-{% else %}
   file.absent:
     - name: /etc/apt/sources.list.d/bird.list
-{% endif %}
 
 bird-pkg:
   pkg.installed:
     - name: bird
-{% if grains.oscodename in ['jessie', 'wheezy'] %}
-    - require:
-      - pkgrepo: bird-repo
-{% endif %}
 
 # Make sure both services are enabled
 bird: