瀏覽代碼

apt: We ain't have no Wheezy no more.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 7 年之前
父節點
當前提交
c65568d53e
共有 1 個文件被更改,包括 2 次插入14 次删除
  1. 2 14
      apt/init.sls

+ 2 - 14
apt/init.sls

@@ -17,20 +17,9 @@ python-apt:
   pkg.installed
 
 ffpb-repo:
-  pkgrepo.managed:
-    - comments:
-      - "# FFPB APT repo"
-    - human_name: FFPB repository
-    - name: deb http://apt.paderborn.freifunk.net/ wheezy main contrib non-free
-    - dist: wheezy
-    - file: /etc/apt/sources.list.d/freifunk.list
-    - keyserver: keys.gnupg.net
-    - keyid: 40FC1CE2
-    - require:
-      - pkg: python-apt
-
+  file.absent:
+    - name: /etc/apt/sources.list.d/freifunk.list
 
-{% if grains['oscodename'] == 'jessie' %}
 ffho-repo-jessie:
   pkgrepo.managed:
     - comments:
@@ -43,7 +32,6 @@ ffho-repo-jessie:
     - keyid: 40FC1CE2
     - require:
       - pkg: python-apt
-{% endif %}
 
 apt-neoraider:
   pkgrepo.managed: