Browse Source

fastd: Drop redundant APT definition and use the one within the APT state.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 7 years ago
parent
commit
df7fe1e1fa
1 changed files with 2 additions and 11 deletions
  1. 2 11
      fastd/init.sls

+ 2 - 11
fastd/init.sls

@@ -7,28 +7,19 @@
 {% set device_no = salt['pillar.get']('nodes:' ~ grains['id'] ~ ':id', -1) %}
 
 include:
+  - apt
   - network.interfaces
 {% if 'fastd_peers' in salt['pillar.get']('nodes:' ~ grains['id'] ~ ':roles', []) %}
   - fastd.peers
 {% endif %}
 
 
-fastd-repo:
-  pkgrepo.managed:
-    - human_name: Neoraiders fastd repository
-    - name: deb http://repo.universe-factory.net/debian/ sid main
-    - dist: sid
-    - file: /etc/apt/sources.list.d/fastd.list
-    - keyserver: keyserver.ubuntu.com
-    - keyid: CB201D9C
 
-
-# Install fastd (after fastd-repo and the network are configured)
+# Install fastd
 fastd:
   pkg.installed:
     - name: fastd
     - require:
-      - pkgrepo: fastd-repo
       - sls: network.interfaces
   service.dead:
     - enable: False