Remove non-Salted external apt sources

longview/init.sls

@@ -0,0 +1,8 @@
+longview:
+  pkgrepo.managed:
+    - name: 'deb http://apt-longview.linode.com/ trusty main'
+    - file: /etc/apt/sources.list.d/longview.list
+    - key_url: https://apt-longview.linode.com/linode.gpg
+    - require:
+      - file: /etc/apt/sources.list.d
+

top.sls

@@ -33,3 +33,4 @@ base:
     - buildbot.master
     - homu
     - nginx
+    - longview

ubuntu/init.sls

@@ -6,3 +6,18 @@
     - group: root
     - mode: 755
     - source: salt://{{ tpldir }}/files/policy-rc.d
+
+# Workaround for https://github.com/saltstack/salt/issues/26605
+# Clean the directory first, and require it in all pkgrepo states
+# which add repositories to the sources.list.d folder (instead of
+# the main /etc/apt/sources.list file)
+/etc/apt/sources.list.d:
+  file.directory:
+    - user: root
+    - group: root
+    - dir_mode: 755
+    - recurse:
+      - user
+      - group
+      - mode
+    - clean: True