From 198929b844b9aeeb2d6c815ca3e89143d3fb02cd Mon Sep 17 00:00:00 2001
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Mon, 6 Jul 2015 13:28:25 +0100
Subject: [global] Fix vim tags typo in all python source files

Fix the syntax of the vim modeline used to enable the required
editing mode in all python sources files.

The desired options are:

  et   - expand tabs (convert tab chars to spaces)
  ts=4 - set tabstop to 4 characters
  sw=4 - set shiftwidth to 4 characters

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
(edits for commit message, modeline compatibility & options)
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 __run__.py                          | 2 +-
 example_plugins/example.py          | 2 +-
 setup.py                            | 2 +-
 sos/archive.py                      | 2 +-
 sos/plugins/__init__.py             | 2 +-
 sos/plugins/abrt.py                 | 2 +-
 sos/plugins/acpid.py                | 2 +-
 sos/plugins/anaconda.py             | 2 +-
 sos/plugins/anacron.py              | 2 +-
 sos/plugins/apache.py               | 2 +-
 sos/plugins/apparmor.py             | 2 +-
 sos/plugins/apport.py               | 2 +-
 sos/plugins/apt.py                  | 2 +-
 sos/plugins/ata.py                  | 2 +-
 sos/plugins/auditd.py               | 2 +-
 sos/plugins/autofs.py               | 2 +-
 sos/plugins/azure.py                | 2 +-
 sos/plugins/block.py                | 2 +-
 sos/plugins/boot.py                 | 2 +-
 sos/plugins/ceph.py                 | 2 +-
 sos/plugins/cgroups.py              | 2 +-
 sos/plugins/cluster.py              | 2 +-
 sos/plugins/cobbler.py              | 2 +-
 sos/plugins/corosync.py             | 2 +-
 sos/plugins/cron.py                 | 2 +-
 sos/plugins/cs.py                   | 2 +-
 sos/plugins/ctdb.py                 | 2 +-
 sos/plugins/cups.py                 | 2 +-
 sos/plugins/dbus.py                 | 2 +-
 sos/plugins/devicemapper.py         | 2 +-
 sos/plugins/dhcp.py                 | 2 +-
 sos/plugins/distupgrade.py          | 2 +-
 sos/plugins/dmraid.py               | 2 +-
 sos/plugins/docker.py               | 2 +-
 sos/plugins/dovecot.py              | 2 +-
 sos/plugins/dpkg.py                 | 2 +-
 sos/plugins/ds.py                   | 2 +-
 sos/plugins/fcoe.py                 | 2 +-
 sos/plugins/filesys.py              | 2 +-
 sos/plugins/firewalld.py            | 2 +-
 sos/plugins/foreman.py              | 2 +-
 sos/plugins/gdm.py                  | 2 +-
 sos/plugins/general.py              | 2 +-
 sos/plugins/gluster.py              | 2 +-
 sos/plugins/grub.py                 | 2 +-
 sos/plugins/grub2.py                | 2 +-
 sos/plugins/haproxy.py              | 2 +-
 sos/plugins/hardware.py             | 2 +-
 sos/plugins/hpasm.py                | 2 +-
 sos/plugins/hts.py                  | 2 +-
 sos/plugins/i18n.py                 | 2 +-
 sos/plugins/infiniband.py           | 2 +-
 sos/plugins/ipa.py                  | 2 +-
 sos/plugins/ipsec.py                | 2 +-
 sos/plugins/ipvs.py                 | 2 +-
 sos/plugins/iscsi.py                | 2 +-
 sos/plugins/iscsitarget.py          | 2 +-
 sos/plugins/java.py                 | 2 +-
 sos/plugins/juju.py                 | 2 +-
 sos/plugins/kdump.py                | 2 +-
 sos/plugins/keepalived.py           | 2 +-
 sos/plugins/kernel.py               | 2 +-
 sos/plugins/kernelrt.py             | 2 +-
 sos/plugins/keyutils.py             | 2 +-
 sos/plugins/kpatch.py               | 2 +-
 sos/plugins/krb5.py                 | 2 +-
 sos/plugins/kvm.py                  | 2 +-
 sos/plugins/landscape.py            | 2 +-
 sos/plugins/ldap.py                 | 2 +-
 sos/plugins/libraries.py            | 2 +-
 sos/plugins/libvirt.py              | 2 +-
 sos/plugins/lightdm.py              | 2 +-
 sos/plugins/lilo.py                 | 2 +-
 sos/plugins/logrotate.py            | 2 +-
 sos/plugins/logs.py                 | 2 +-
 sos/plugins/lsbrelease.py           | 2 +-
 sos/plugins/lvm2.py                 | 2 +-
 sos/plugins/maas.py                 | 2 +-
 sos/plugins/manageiq.py             | 2 +-
 sos/plugins/md.py                   | 2 +-
 sos/plugins/megacli.py              | 2 +-
 sos/plugins/memory.py               | 2 +-
 sos/plugins/mongodb.py              | 2 +-
 sos/plugins/mpt.py                  | 2 +-
 sos/plugins/mrggrid.py              | 2 +-
 sos/plugins/mrgmessg.py             | 2 +-
 sos/plugins/multipath.py            | 2 +-
 sos/plugins/mysql.py                | 2 +-
 sos/plugins/named.py                | 2 +-
 sos/plugins/navicli.py              | 2 +-
 sos/plugins/networking.py           | 2 +-
 sos/plugins/nfs.py                  | 2 +-
 sos/plugins/nfsserver.py            | 2 +-
 sos/plugins/nis.py                  | 2 +-
 sos/plugins/nscd.py                 | 2 +-
 sos/plugins/ntp.py                  | 2 +-
 sos/plugins/numa.py                 | 2 +-
 sos/plugins/oddjob.py               | 2 +-
 sos/plugins/openhpi.py              | 2 +-
 sos/plugins/openshift.py            | 2 +-
 sos/plugins/openssl.py              | 2 +-
 sos/plugins/openstack_ceilometer.py | 2 +-
 sos/plugins/openstack_cinder.py     | 2 +-
 sos/plugins/openstack_glance.py     | 2 +-
 sos/plugins/openstack_heat.py       | 2 +-
 sos/plugins/openstack_horizon.py    | 2 +-
 sos/plugins/openstack_keystone.py   | 2 +-
 sos/plugins/openstack_neutron.py    | 2 +-
 sos/plugins/openstack_nova.py       | 2 +-
 sos/plugins/openstack_swift.py      | 2 +-
 sos/plugins/openstack_trove.py      | 2 +-
 sos/plugins/openswan.py             | 2 +-
 sos/plugins/openvswitch.py          | 2 +-
 sos/plugins/pam.py                  | 2 +-
 sos/plugins/pci.py                  | 2 +-
 sos/plugins/pcp.py                  | 2 +-
 sos/plugins/postfix.py              | 2 +-
 sos/plugins/postgresql.py           | 2 +-
 sos/plugins/powerpath.py            | 2 +-
 sos/plugins/powerpc.py              | 2 +-
 sos/plugins/ppp.py                  | 2 +-
 sos/plugins/procenv.py              | 2 +-
 sos/plugins/process.py              | 2 +-
 sos/plugins/processor.py            | 2 +-
 sos/plugins/psacct.py               | 2 +-
 sos/plugins/pxe.py                  | 2 +-
 sos/plugins/python.py               | 2 +-
 sos/plugins/qpid.py                 | 2 +-
 sos/plugins/quagga.py               | 2 +-
 sos/plugins/rabbitmq.py             | 2 +-
 sos/plugins/radius.py               | 2 +-
 sos/plugins/rhui.py                 | 2 +-
 sos/plugins/rpm.py                  | 2 +-
 sos/plugins/s390.py                 | 2 +-
 sos/plugins/samba.py                | 2 +-
 sos/plugins/sanlock.py              | 2 +-
 sos/plugins/sar.py                  | 2 +-
 sos/plugins/satellite.py            | 2 +-
 sos/plugins/scsi.py                 | 2 +-
 sos/plugins/selinux.py              | 2 +-
 sos/plugins/sendmail.py             | 2 +-
 sos/plugins/smartcard.py            | 2 +-
 sos/plugins/snmp.py                 | 2 +-
 sos/plugins/soundcard.py            | 2 +-
 sos/plugins/squid.py                | 2 +-
 sos/plugins/ssh.py                  | 2 +-
 sos/plugins/ssmtp.py                | 2 +-
 sos/plugins/sssd.py                 | 2 +-
 sos/plugins/startup.py              | 2 +-
 sos/plugins/sunrpc.py               | 2 +-
 sos/plugins/symcli.py               | 2 +-
 sos/plugins/system.py               | 2 +-
 sos/plugins/systemd.py              | 2 +-
 sos/plugins/systemtap.py            | 2 +-
 sos/plugins/sysvipc.py              | 2 +-
 sos/plugins/targetcli.py            | 2 +-
 sos/plugins/teamd.py                | 2 +-
 sos/plugins/tftpserver.py           | 2 +-
 sos/plugins/tomcat.py               | 2 +-
 sos/plugins/tuned.py                | 2 +-
 sos/plugins/udev.py                 | 2 +-
 sos/plugins/unity.py                | 2 +-
 sos/plugins/upstart.py              | 2 +-
 sos/plugins/usb.py                  | 2 +-
 sos/plugins/veritas.py              | 2 +-
 sos/plugins/vmware.py               | 2 +-
 sos/plugins/vsftpd.py               | 2 +-
 sos/plugins/x11.py                  | 2 +-
 sos/plugins/xen.py                  | 2 +-
 sos/plugins/xfs.py                  | 2 +-
 sos/plugins/xinetd.py               | 2 +-
 sos/plugins/yum.py                  | 2 +-
 sos/policies/__init__.py            | 2 +-
 sos/policies/debian.py              | 2 +-
 sos/policies/osx.py                 | 2 +-
 sos/policies/redhat.py              | 2 +-
 sos/policies/ubuntu.py              | 2 +-
 sos/reporting.py                    | 2 +-
 sos/sosreport.py                    | 2 +-
 sos/utilities.py                    | 2 +-
 tests/archive_tests.py              | 2 +-
 tests/importer_tests.py             | 2 +-
 tests/option_tests.py               | 2 +-
 tests/plugin_tests.py               | 2 +-
 tests/policy_tests.py               | 2 +-
 tests/report_tests.py               | 2 +-
 tests/sosreport_pexpect.py          | 2 +-
 tests/test_exe.py                   | 2 +-
 tests/utilities_tests.py            | 2 +-
 189 files changed, 189 insertions(+), 189 deletions(-)
---
 __run__.py                          | 2 +-
 example_plugins/example.py          | 2 +-
 setup.py                            | 2 +-
 sos/archive.py                      | 2 +-
 sos/plugins/__init__.py             | 2 +-
 sos/plugins/abrt.py                 | 2 +-
 sos/plugins/acpid.py                | 2 +-
 sos/plugins/anaconda.py             | 2 +-
 sos/plugins/anacron.py              | 2 +-
 sos/plugins/apache.py               | 2 +-
 sos/plugins/apparmor.py             | 2 +-
 sos/plugins/apport.py               | 2 +-
 sos/plugins/apt.py                  | 2 +-
 sos/plugins/ata.py                  | 2 +-
 sos/plugins/auditd.py               | 2 +-
 sos/plugins/autofs.py               | 2 +-
 sos/plugins/azure.py                | 2 +-
 sos/plugins/block.py                | 2 +-
 sos/plugins/boot.py                 | 2 +-
 sos/plugins/ceph.py                 | 2 +-
 sos/plugins/cgroups.py              | 2 +-
 sos/plugins/cluster.py              | 2 +-
 sos/plugins/cobbler.py              | 2 +-
 sos/plugins/corosync.py             | 2 +-
 sos/plugins/cron.py                 | 2 +-
 sos/plugins/cs.py                   | 2 +-
 sos/plugins/ctdb.py                 | 2 +-
 sos/plugins/cups.py                 | 2 +-
 sos/plugins/dbus.py                 | 2 +-
 sos/plugins/devicemapper.py         | 2 +-
 sos/plugins/dhcp.py                 | 2 +-
 sos/plugins/distupgrade.py          | 2 +-
 sos/plugins/dmraid.py               | 2 +-
 sos/plugins/docker.py               | 2 +-
 sos/plugins/dovecot.py              | 2 +-
 sos/plugins/dpkg.py                 | 2 +-
 sos/plugins/ds.py                   | 2 +-
 sos/plugins/fcoe.py                 | 2 +-
 sos/plugins/filesys.py              | 2 +-
 sos/plugins/firewalld.py            | 2 +-
 sos/plugins/foreman.py              | 2 +-
 sos/plugins/gdm.py                  | 2 +-
 sos/plugins/general.py              | 2 +-
 sos/plugins/gluster.py              | 2 +-
 sos/plugins/grub.py                 | 2 +-
 sos/plugins/grub2.py                | 2 +-
 sos/plugins/haproxy.py              | 2 +-
 sos/plugins/hardware.py             | 2 +-
 sos/plugins/hpasm.py                | 2 +-
 sos/plugins/hts.py                  | 2 +-
 sos/plugins/i18n.py                 | 2 +-
 sos/plugins/infiniband.py           | 2 +-
 sos/plugins/ipa.py                  | 2 +-
 sos/plugins/ipsec.py                | 2 +-
 sos/plugins/ipvs.py                 | 2 +-
 sos/plugins/iscsi.py                | 2 +-
 sos/plugins/iscsitarget.py          | 2 +-
 sos/plugins/java.py                 | 2 +-
 sos/plugins/juju.py                 | 2 +-
 sos/plugins/kdump.py                | 2 +-
 sos/plugins/keepalived.py           | 2 +-
 sos/plugins/kernel.py               | 2 +-
 sos/plugins/kernelrt.py             | 2 +-
 sos/plugins/keyutils.py             | 2 +-
 sos/plugins/kpatch.py               | 2 +-
 sos/plugins/krb5.py                 | 2 +-
 sos/plugins/kvm.py                  | 2 +-
 sos/plugins/landscape.py            | 2 +-
 sos/plugins/ldap.py                 | 2 +-
 sos/plugins/libraries.py            | 2 +-
 sos/plugins/libvirt.py              | 2 +-
 sos/plugins/lightdm.py              | 2 +-
 sos/plugins/lilo.py                 | 2 +-
 sos/plugins/logrotate.py            | 2 +-
 sos/plugins/logs.py                 | 2 +-
 sos/plugins/lsbrelease.py           | 2 +-
 sos/plugins/lvm2.py                 | 2 +-
 sos/plugins/maas.py                 | 2 +-
 sos/plugins/manageiq.py             | 2 +-
 sos/plugins/md.py                   | 2 +-
 sos/plugins/megacli.py              | 2 +-
 sos/plugins/memory.py               | 2 +-
 sos/plugins/mongodb.py              | 2 +-
 sos/plugins/mpt.py                  | 2 +-
 sos/plugins/mrggrid.py              | 2 +-
 sos/plugins/mrgmessg.py             | 2 +-
 sos/plugins/multipath.py            | 2 +-
 sos/plugins/mysql.py                | 2 +-
 sos/plugins/named.py                | 2 +-
 sos/plugins/navicli.py              | 2 +-
 sos/plugins/networking.py           | 2 +-
 sos/plugins/nfs.py                  | 2 +-
 sos/plugins/nfsserver.py            | 2 +-
 sos/plugins/nis.py                  | 2 +-
 sos/plugins/nscd.py                 | 2 +-
 sos/plugins/ntp.py                  | 2 +-
 sos/plugins/numa.py                 | 2 +-
 sos/plugins/oddjob.py               | 2 +-
 sos/plugins/openhpi.py              | 2 +-
 sos/plugins/openshift.py            | 2 +-
 sos/plugins/openssl.py              | 2 +-
 sos/plugins/openstack_ceilometer.py | 2 +-
 sos/plugins/openstack_cinder.py     | 2 +-
 sos/plugins/openstack_glance.py     | 2 +-
 sos/plugins/openstack_heat.py       | 2 +-
 sos/plugins/openstack_horizon.py    | 2 +-
 sos/plugins/openstack_keystone.py   | 2 +-
 sos/plugins/openstack_neutron.py    | 2 +-
 sos/plugins/openstack_nova.py       | 2 +-
 sos/plugins/openstack_swift.py      | 2 +-
 sos/plugins/openstack_trove.py      | 2 +-
 sos/plugins/openswan.py             | 2 +-
 sos/plugins/openvswitch.py          | 2 +-
 sos/plugins/pam.py                  | 2 +-
 sos/plugins/pci.py                  | 2 +-
 sos/plugins/pcp.py                  | 2 +-
 sos/plugins/postfix.py              | 2 +-
 sos/plugins/postgresql.py           | 2 +-
 sos/plugins/powerpath.py            | 2 +-
 sos/plugins/powerpc.py              | 2 +-
 sos/plugins/ppp.py                  | 2 +-
 sos/plugins/procenv.py              | 2 +-
 sos/plugins/process.py              | 2 +-
 sos/plugins/processor.py            | 2 +-
 sos/plugins/psacct.py               | 2 +-
 sos/plugins/pxe.py                  | 2 +-
 sos/plugins/python.py               | 2 +-
 sos/plugins/qpid.py                 | 2 +-
 sos/plugins/quagga.py               | 2 +-
 sos/plugins/rabbitmq.py             | 2 +-
 sos/plugins/radius.py               | 2 +-
 sos/plugins/rhui.py                 | 2 +-
 sos/plugins/rpm.py                  | 2 +-
 sos/plugins/s390.py                 | 2 +-
 sos/plugins/samba.py                | 2 +-
 sos/plugins/sanlock.py              | 2 +-
 sos/plugins/sar.py                  | 2 +-
 sos/plugins/satellite.py            | 2 +-
 sos/plugins/scsi.py                 | 2 +-
 sos/plugins/selinux.py              | 2 +-
 sos/plugins/sendmail.py             | 2 +-
 sos/plugins/smartcard.py            | 2 +-
 sos/plugins/snmp.py                 | 2 +-
 sos/plugins/soundcard.py            | 2 +-
 sos/plugins/squid.py                | 2 +-
 sos/plugins/ssh.py                  | 2 +-
 sos/plugins/ssmtp.py                | 2 +-
 sos/plugins/sssd.py                 | 2 +-
 sos/plugins/startup.py              | 2 +-
 sos/plugins/sunrpc.py               | 2 +-
 sos/plugins/symcli.py               | 2 +-
 sos/plugins/system.py               | 2 +-
 sos/plugins/systemd.py              | 2 +-
 sos/plugins/systemtap.py            | 2 +-
 sos/plugins/sysvipc.py              | 2 +-
 sos/plugins/targetcli.py            | 2 +-
 sos/plugins/teamd.py                | 2 +-
 sos/plugins/tftpserver.py           | 2 +-
 sos/plugins/tomcat.py               | 2 +-
 sos/plugins/tuned.py                | 2 +-
 sos/plugins/udev.py                 | 2 +-
 sos/plugins/unity.py                | 2 +-
 sos/plugins/upstart.py              | 2 +-
 sos/plugins/usb.py                  | 2 +-
 sos/plugins/veritas.py              | 2 +-
 sos/plugins/vmware.py               | 2 +-
 sos/plugins/vsftpd.py               | 2 +-
 sos/plugins/x11.py                  | 2 +-
 sos/plugins/xen.py                  | 2 +-
 sos/plugins/xfs.py                  | 2 +-
 sos/plugins/xinetd.py               | 2 +-
 sos/plugins/yum.py                  | 2 +-
 sos/policies/__init__.py            | 2 +-
 sos/policies/debian.py              | 2 +-
 sos/policies/osx.py                 | 2 +-
 sos/policies/redhat.py              | 2 +-
 sos/policies/ubuntu.py              | 2 +-
 sos/reporting.py                    | 2 +-
 sos/sosreport.py                    | 2 +-
 sos/utilities.py                    | 2 +-
 tests/archive_tests.py              | 2 +-
 tests/importer_tests.py             | 2 +-
 tests/option_tests.py               | 2 +-
 tests/plugin_tests.py               | 2 +-
 tests/policy_tests.py               | 2 +-
 tests/report_tests.py               | 2 +-
 tests/sosreport_pexpect.py          | 2 +-
 tests/test_exe.py                   | 2 +-
 tests/utilities_tests.py            | 2 +-
 189 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/__run__.py b/__run__.py
index 0f46807f..33cef9fe 100755
--- a/__run__.py
+++ b/__run__.py
@@ -16,4 +16,4 @@ import sys
 
 main(sys.argv[1:])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/example_plugins/example.py b/example_plugins/example.py
index 31e8c78a..aeb39c71 100755
--- a/example_plugins/example.py
+++ b/example_plugins/example.py
@@ -56,4 +56,4 @@ class example(Plugin, RedHatPlugin):
         self.collectExtOutput("/bin/ps -ef")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/setup.py b/setup.py
index 2064db3f..d194d3d3 100644
--- a/setup.py
+++ b/setup.py
@@ -71,4 +71,4 @@ setup(name='sosreport',
      )
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/archive.py b/sos/archive.py
index 6ef46a9d..10fa7609 100644
--- a/sos/archive.py
+++ b/sos/archive.py
@@ -414,4 +414,4 @@ class TarFileArchive(FileCacheArchive):
                 last_error = e
         raise last_error
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py
index 21e01867..413ee739 100644
--- a/sos/plugins/__init__.py
+++ b/sos/plugins/__init__.py
@@ -791,4 +791,4 @@ def import_plugin(name, superclasses=None):
         superclasses = (Plugin,)
     return import_module(plugin_fqname, superclasses)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py
index c3aa2d8e..276fc8e3 100644
--- a/sos/plugins/abrt.py
+++ b/sos/plugins/abrt.py
@@ -46,4 +46,4 @@ class Abrt(Plugin, RedHatPlugin):
         if self.get_option('backtraces'):
             self.do_backtraces()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/acpid.py b/sos/plugins/acpid.py
index 7808b39b..69d5c759 100644
--- a/sos/plugins/acpid.py
+++ b/sos/plugins/acpid.py
@@ -33,4 +33,4 @@ class DebianAcpid(Acpid, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec([
             "/etc/acpi/events/powerbtn*"])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py
index aea3300e..4b767a53 100644
--- a/sos/plugins/anaconda.py
+++ b/sos/plugins/anaconda.py
@@ -58,4 +58,4 @@ class Anaconda(Plugin, RedHatPlugin):
             r"\1********"
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/anacron.py b/sos/plugins/anacron.py
index 92ae1c58..3556b04d 100644
--- a/sos/plugins/anacron.py
+++ b/sos/plugins/anacron.py
@@ -25,4 +25,4 @@ class Anacron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     # just look for the configuration file which is common
     files = ('/etc/anacrontab',)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py
index 551b0624..26deb595 100644
--- a/sos/plugins/apache.py
+++ b/sos/plugins/apache.py
@@ -65,4 +65,4 @@ class DebianApache(Apache, DebianPlugin, UbuntuPlugin):
         if self.get_option("log"):
             self.add_copy_spec("/var/log/apache2/*")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/apparmor.py b/sos/plugins/apparmor.py
index 360f58b8..6f81c050 100644
--- a/sos/plugins/apparmor.py
+++ b/sos/plugins/apparmor.py
@@ -36,4 +36,4 @@ class Apparmor(Plugin, UbuntuPlugin):
             "ls -alh /etc/apparmor.d/libvirt",
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/apport.py b/sos/plugins/apport.py
index 47f6595c..a6b9ac49 100644
--- a/sos/plugins/apport.py
+++ b/sos/plugins/apport.py
@@ -41,4 +41,4 @@ class Apport(Plugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("ls -alh /var/crash/")
         self.add_cmd_output("bash -c 'grep -B 50 -m 1 ProcMaps /var/crash/*'")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/apt.py b/sos/plugins/apt.py
index bd0b3365..452a420b 100644
--- a/sos/plugins/apt.py
+++ b/sos/plugins/apt.py
@@ -45,4 +45,4 @@ class Apt(Plugin, DebianPlugin, UbuntuPlugin):
             suggest_filename="apt-cache_policy_details"
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ata.py b/sos/plugins/ata.py
index 454969f1..a93d1099 100644
--- a/sos/plugins/ata.py
+++ b/sos/plugins/ata.py
@@ -39,4 +39,4 @@ class Ata(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
                     ])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py
index 7173f6a8..2d26b304 100644
--- a/sos/plugins/auditd.py
+++ b/sos/plugins/auditd.py
@@ -38,4 +38,4 @@ class Auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         else:
             self.add_copy_spec("/var/log/audit")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index 3b678671..6769c7ee 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -68,4 +68,4 @@ class DebianAutofs(Autofs, DebianPlugin, UbuntuPlugin):
         super(DebianAutofs, self).setup()
         self.add_cmd_output("dpkg-query -s autofs")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/azure.py b/sos/plugins/azure.py
index bcf4f196..b61f7b63 100644
--- a/sos/plugins/azure.py
+++ b/sos/plugins/azure.py
@@ -34,4 +34,4 @@ class Azure(Plugin, UbuntuPlugin):
             "/sys/module/hv_storvsc/parameters/storvsc_ringbuffer_size"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/block.py b/sos/plugins/block.py
index aaacd192..6375d61a 100644
--- a/sos/plugins/block.py
+++ b/sos/plugins/block.py
@@ -51,4 +51,4 @@ class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                     "fdisk -l %s" % disk_path
                 ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/boot.py b/sos/plugins/boot.py
index 71737421..8acf571f 100644
--- a/sos/plugins/boot.py
+++ b/sos/plugins/boot.py
@@ -47,4 +47,4 @@ class Boot(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                 self.add_cmd_output("lsinitrd %s" % image)
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
index e9db4c6b..6ccb930d 100644
--- a/sos/plugins/ceph.py
+++ b/sos/plugins/ceph.py
@@ -61,4 +61,4 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
         self.add_forbidden_path("/var/lib/ceph/*/*keyring")
         self.add_forbidden_path("/var/lib/ceph/*keyring")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/cgroups.py b/sos/plugins/cgroups.py
index 25d89509..b7cb6c64 100644
--- a/sos/plugins/cgroups.py
+++ b/sos/plugins/cgroups.py
@@ -43,4 +43,4 @@ class RedHatCgroups(Cgroups, RedHatPlugin):
             "/etc/cgrules.conf"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 084c0307..ea5dbae7 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -174,4 +174,4 @@ class Cluster(Plugin, RedHatPlugin):
 
         return
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/cobbler.py b/sos/plugins/cobbler.py
index 90d3150d..d60ad6b6 100644
--- a/sos/plugins/cobbler.py
+++ b/sos/plugins/cobbler.py
@@ -47,4 +47,4 @@ class DebianCobbler(Cobbler, DebianPlugin, UbuntuPlugin):
         ])
         self.add_forbidden_path("/var/lib/cobbler/isos")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py
index 27642a0e..3e213a01 100644
--- a/sos/plugins/corosync.py
+++ b/sos/plugins/corosync.py
@@ -62,4 +62,4 @@ class DebianCorosync(Corosync, DebianPlugin, UbuntuPlugin):
 
     files = ('/usr/sbin/corosync',)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/cron.py b/sos/plugins/cron.py
index 337c6256..86d3043e 100644
--- a/sos/plugins/cron.py
+++ b/sos/plugins/cron.py
@@ -37,4 +37,4 @@ class Cron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("crontab -l -u root",
                             suggest_filename="root_crontab")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/cs.py b/sos/plugins/cs.py
index 2ca4e5ba..76412a07 100644
--- a/sos/plugins/cs.py
+++ b/sos/plugins/cs.py
@@ -97,4 +97,4 @@ class CertificateSystem(Plugin, RedHatPlugin):
                 "/var/log/pki-*/system"
             ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ctdb.py b/sos/plugins/ctdb.py
index e1bd78e5..4f1c4caf 100644
--- a/sos/plugins/ctdb.py
+++ b/sos/plugins/ctdb.py
@@ -48,4 +48,4 @@ class RedHatCtdb(Ctdb, RedHatPlugin):
         super(RedHatCtdb, self).setup()
         self.add_copy_spec("/etc/sysconfig/ctdb")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/cups.py b/sos/plugins/cups.py
index deae3b4e..ada3d7f1 100644
--- a/sos/plugins/cups.py
+++ b/sos/plugins/cups.py
@@ -48,4 +48,4 @@ class Cups(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "lpstat -d"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/dbus.py b/sos/plugins/dbus.py
index 2e6a99ee..29acdcc9 100644
--- a/sos/plugins/dbus.py
+++ b/sos/plugins/dbus.py
@@ -28,4 +28,4 @@ class Dbus(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py
index ba99525c..f2f2db7c 100644
--- a/sos/plugins/devicemapper.py
+++ b/sos/plugins/devicemapper.py
@@ -30,4 +30,4 @@ class DeviceMapper(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "dmsetup ls --tree"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py
index 84e96d22..6a5d9654 100644
--- a/sos/plugins/dhcp.py
+++ b/sos/plugins/dhcp.py
@@ -48,4 +48,4 @@ class UbuntuDhcp(Dhcp, UbuntuPlugin):
             "/etc/udhcpd.conf"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/distupgrade.py b/sos/plugins/distupgrade.py
index 09c77800..7e6419f3 100644
--- a/sos/plugins/distupgrade.py
+++ b/sos/plugins/distupgrade.py
@@ -54,4 +54,4 @@ class RedHatDistUpgrade(DistUpgrade, RedHatPlugin):
             r"/home/******** path redacted ********"
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/dmraid.py b/sos/plugins/dmraid.py
index b7e2d0d2..b7c0b421 100644
--- a/sos/plugins/dmraid.py
+++ b/sos/plugins/dmraid.py
@@ -41,4 +41,4 @@ class Dmraid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             metadata_path = self.get_cmd_output_path("metadata")
             self.add_cmd_output("dmraid -rD", runat=metadata_path)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
index ef4ede02..3e5bd4af 100644
--- a/sos/plugins/docker.py
+++ b/sos/plugins/docker.py
@@ -77,4 +77,4 @@ class UbuntuDocker(Docker, UbuntuPlugin):
             "/etc/default/docker.io"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/dovecot.py b/sos/plugins/dovecot.py
index b7e97720..509c8abe 100644
--- a/sos/plugins/dovecot.py
+++ b/sos/plugins/dovecot.py
@@ -45,4 +45,4 @@ class DebianDovecot(Dovecot, DebianPlugin, UbuntuPlugin):
 
     files = ('/etc/dovecot/README',)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/dpkg.py b/sos/plugins/dpkg.py
index 5327dbf8..8d3afb0a 100644
--- a/sos/plugins/dpkg.py
+++ b/sos/plugins/dpkg.py
@@ -39,4 +39,4 @@ class Dpkg(Plugin, DebianPlugin, UbuntuPlugin):
         else:
             self.add_copy_spec("/var/log/dpkg.log*")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ds.py b/sos/plugins/ds.py
index 2413e43b..c763c091 100644
--- a/sos/plugins/ds.py
+++ b/sos/plugins/ds.py
@@ -72,4 +72,4 @@ class DirectoryServer(Plugin, RedHatPlugin):
                 "/opt/redhat-ds/slapd-*/logs"
             ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/fcoe.py b/sos/plugins/fcoe.py
index 6b847b4c..728a8d85 100644
--- a/sos/plugins/fcoe.py
+++ b/sos/plugins/fcoe.py
@@ -36,4 +36,4 @@ class fcoe(Plugin, RedHatPlugin):
         # interfaces's config files
         self.add_copy_spec("/etc/fcoe")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index fab9dd3d..7b6a9ff1 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -60,4 +60,4 @@ class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             r"\1********"
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/firewalld.py b/sos/plugins/firewalld.py
index 31e83376..98d011b2 100644
--- a/sos/plugins/firewalld.py
+++ b/sos/plugins/firewalld.py
@@ -40,4 +40,4 @@ class FirewallD(Plugin, RedHatPlugin):
             "firewall-cmd --permanent --list-all-zones"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py
index e50cbdfe..9d1cbada 100644
--- a/sos/plugins/foreman.py
+++ b/sos/plugins/foreman.py
@@ -30,4 +30,4 @@ class Foreman(Plugin, RedHatPlugin):
         path = self.get_cmd_output_path(name="foreman-debug")
         self.add_cmd_output("%s -g -q -a -d %s" % (cmd, path))
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/gdm.py b/sos/plugins/gdm.py
index 6222cea7..cd4c4b3f 100644
--- a/sos/plugins/gdm.py
+++ b/sos/plugins/gdm.py
@@ -29,4 +29,4 @@ class Gdm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "systemctl status gdm.service"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index 341d2682..7218247a 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -65,4 +65,4 @@ class DebianGeneral(General, DebianPlugin):
             "/etc/debian_version"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
index 1a313959..5aa2d43b 100644
--- a/sos/plugins/gluster.py
+++ b/sos/plugins/gluster.py
@@ -113,4 +113,4 @@ class Gluster(Plugin, RedHatPlugin):
 
         self.add_cmd_output("gluster volume status")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/grub.py b/sos/plugins/grub.py
index 18e7b4d1..d0e5b861 100644
--- a/sos/plugins/grub.py
+++ b/sos/plugins/grub.py
@@ -39,4 +39,4 @@ class Grub(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             r"\1\2********"
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/grub2.py b/sos/plugins/grub2.py
index 08700dd8..d3214946 100644
--- a/sos/plugins/grub2.py
+++ b/sos/plugins/grub2.py
@@ -69,4 +69,4 @@ class Grub2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             passwd_pbkdf2_sub
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/haproxy.py b/sos/plugins/haproxy.py
index f2975a5a..ba398838 100644
--- a/sos/plugins/haproxy.py
+++ b/sos/plugins/haproxy.py
@@ -31,4 +31,4 @@ class HAProxy(Plugin, RedHatPlugin, DebianPlugin):
 
         self.add_copy_spec("/var/log/haproxy.log")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index 92c347b4..c506b755 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -35,4 +35,4 @@ class Hardware(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("dmidecode", root_symlink="dmidecode")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/hpasm.py b/sos/plugins/hpasm.py
index 4d70887e..e1fbc982 100644
--- a/sos/plugins/hpasm.py
+++ b/sos/plugins/hpasm.py
@@ -32,4 +32,4 @@ class Hpasm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "hpasmcli -s 'show server'"
         ], timeout=0)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/hts.py b/sos/plugins/hts.py
index b8e4d41a..1573c95d 100644
--- a/sos/plugins/hts.py
+++ b/sos/plugins/hts.py
@@ -28,4 +28,4 @@ class HardwareTestSuite(Plugin, RedHatPlugin):
             "/var/hts"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py
index 5326e2ca..24bdc1bb 100644
--- a/sos/plugins/i18n.py
+++ b/sos/plugins/i18n.py
@@ -29,4 +29,4 @@ class I18n(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         self.add_cmd_output("locale")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py
index 687b8d65..e56c232c 100644
--- a/sos/plugins/infiniband.py
+++ b/sos/plugins/infiniband.py
@@ -48,4 +48,4 @@ class Infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
 
         return
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py
index d563665b..dae78234 100644
--- a/sos/plugins/ipa.py
+++ b/sos/plugins/ipa.py
@@ -92,4 +92,4 @@ class Ipa(Plugin, RedHatPlugin):
         self.do_file_sub("/etc/named.conf", match, subst)
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ipsec.py b/sos/plugins/ipsec.py
index 644109d7..70c96af2 100644
--- a/sos/plugins/ipsec.py
+++ b/sos/plugins/ipsec.py
@@ -45,4 +45,4 @@ class DebianIPSec(IPSec, DebianPlugin, UbuntuPlugin):
             "/etc/default/setkey"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ipvs.py b/sos/plugins/ipvs.py
index 2a4c57fe..479d54fd 100644
--- a/sos/plugins/ipvs.py
+++ b/sos/plugins/ipvs.py
@@ -31,4 +31,4 @@ class Ipvs(Plugin, RedHatPlugin, DebianPlugin):
             "ipvsadm -Lc"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py
index 064b2f4d..d9f55867 100644
--- a/sos/plugins/iscsi.py
+++ b/sos/plugins/iscsi.py
@@ -42,4 +42,4 @@ class RedHatIscsi(Iscsi, RedHatPlugin):
             "iscsiadm -m node --op=show"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/iscsitarget.py b/sos/plugins/iscsitarget.py
index f9cf2235..f2dfec38 100644
--- a/sos/plugins/iscsitarget.py
+++ b/sos/plugins/iscsitarget.py
@@ -48,4 +48,4 @@ class DebianIscsiTarget(IscsiTarget, DebianPlugin, UbuntuPlugin):
             "/etc/default/iscsitarget"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/java.py b/sos/plugins/java.py
index fe45d94a..fabfaa7f 100644
--- a/sos/plugins/java.py
+++ b/sos/plugins/java.py
@@ -29,4 +29,4 @@ class Java(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         self.add_cmd_output("readlink -f /usr/bin/java")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/juju.py b/sos/plugins/juju.py
index b9e052f7..98edadcd 100644
--- a/sos/plugins/juju.py
+++ b/sos/plugins/juju.py
@@ -96,4 +96,4 @@ class Juju(Plugin, UbuntuPlugin):
                                 suggest_filename="juju-env-bundle.yaml")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index 6e64ba01..6fbdb7c1 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -51,4 +51,4 @@ class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):
             "/etc/default/kdump-tools"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/keepalived.py b/sos/plugins/keepalived.py
index 20e89bad..f2cb2ed8 100644
--- a/sos/plugins/keepalived.py
+++ b/sos/plugins/keepalived.py
@@ -31,4 +31,4 @@ class Keepalived(Plugin, RedHatPlugin):
             "/etc/sysconfig/keepalived"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index 97300e26..28c5955a 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -84,4 +84,4 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/var/log/dmesg"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/kernelrt.py b/sos/plugins/kernelrt.py
index 7358ead5..52f8e173 100644
--- a/sos/plugins/kernelrt.py
+++ b/sos/plugins/kernelrt.py
@@ -43,4 +43,4 @@ class KernelRT(Plugin, RedHatPlugin):
         # 0.10.4-5.
         self.add_cmd_output('tuna -CP')
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/keyutils.py b/sos/plugins/keyutils.py
index 35625552..381084ca 100644
--- a/sos/plugins/keyutils.py
+++ b/sos/plugins/keyutils.py
@@ -32,4 +32,4 @@ class Keyutils(Plugin, RedHatPlugin):
         ])
         self.add_cmd_output("keyctl show")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/kpatch.py b/sos/plugins/kpatch.py
index 6ef557e8..2f50d3f7 100644
--- a/sos/plugins/kpatch.py
+++ b/sos/plugins/kpatch.py
@@ -37,4 +37,4 @@ class Kpatch(Plugin, RedHatPlugin):
             self.add_cmd_output("kpatch info " + module)
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/krb5.py b/sos/plugins/krb5.py
index d9c0c238..97a11bb4 100644
--- a/sos/plugins/krb5.py
+++ b/sos/plugins/krb5.py
@@ -29,4 +29,4 @@ class Krb5(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("klist -ket /etc/krb5.keytab")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/kvm.py b/sos/plugins/kvm.py
index cb2b85f8..ab6587c8 100644
--- a/sos/plugins/kvm.py
+++ b/sos/plugins/kvm.py
@@ -54,4 +54,4 @@ class Kvm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             self.call_ext_prog("umount %s" % self.debugfs_path)
             self._log_error("could not unmount %s" % self.debugfs_path)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py
index 9c74c8cb..bdda2505 100644
--- a/sos/plugins/landscape.py
+++ b/sos/plugins/landscape.py
@@ -79,4 +79,4 @@ class Landscape(Plugin, UbuntuPlugin):
             r"secret-token = [********]"
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py
index 1fb62bb2..0d188409 100644
--- a/sos/plugins/ldap.py
+++ b/sos/plugins/ldap.py
@@ -101,4 +101,4 @@ class DebianLdap(Ldap, DebianPlugin, UbuntuPlugin):
             r"\1********"
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py
index 2d0f4335..1a233529 100644
--- a/sos/plugins/libraries.py
+++ b/sos/plugins/libraries.py
@@ -32,4 +32,4 @@ class Libraries(Plugin, RedHatPlugin, UbuntuPlugin):
             self.add_cmd_output("ldconfig -v -N -X")
         self.add_cmd_output("ldconfig -p -N -X")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py
index 0b31d311..aaf862bc 100644
--- a/sos/plugins/libvirt.py
+++ b/sos/plugins/libvirt.py
@@ -70,4 +70,4 @@ class Libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
                     r"\1******\3"
                 )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/lightdm.py b/sos/plugins/lightdm.py
index 191e4e7e..d8c768ac 100644
--- a/sos/plugins/lightdm.py
+++ b/sos/plugins/lightdm.py
@@ -44,4 +44,4 @@ class LightDm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         else:
             self.add_copy_spec("/var/log/lightdm")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/lilo.py b/sos/plugins/lilo.py
index 3c4e37c9..398b5052 100644
--- a/sos/plugins/lilo.py
+++ b/sos/plugins/lilo.py
@@ -27,4 +27,4 @@ class Lilo(Plugin, RedHatPlugin, UbuntuPlugin):
         self.add_copy_spec("/etc/lilo.conf")
         self.add_cmd_output("lilo -q")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/logrotate.py b/sos/plugins/logrotate.py
index 3777026a..562518c4 100644
--- a/sos/plugins/logrotate.py
+++ b/sos/plugins/logrotate.py
@@ -30,4 +30,4 @@ class LogRotate(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/var/lib/logrotate.status"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py
index 3dc83054..2f86acc6 100644
--- a/sos/plugins/logs.py
+++ b/sos/plugins/logs.py
@@ -107,4 +107,4 @@ class DebianLogs(Logs, DebianPlugin, UbuntuPlugin):
         else:
             self.add_copy_spec("/var/log/")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py
index 3f3bf40e..ed6c868f 100644
--- a/sos/plugins/lsbrelease.py
+++ b/sos/plugins/lsbrelease.py
@@ -30,4 +30,4 @@ class LsbRelease(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             root_symlink="lsb-release")
         self.add_copy_spec("/etc/lsb-release*")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/lvm2.py b/sos/plugins/lvm2.py
index f215cfb9..dd10fa75 100644
--- a/sos/plugins/lvm2.py
+++ b/sos/plugins/lvm2.py
@@ -74,4 +74,4 @@ class Lvm2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         elif self.get_option('lvmdump-am'):
             self.do_lvmdump(metadata=True)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/maas.py b/sos/plugins/maas.py
index 051f4115..b45e36c1 100644
--- a/sos/plugins/maas.py
+++ b/sos/plugins/maas.py
@@ -71,4 +71,4 @@ class Maas(Plugin, UbuntuPlugin):
                 self._log_error(
                     "Cannot login into MAAS remote API with provided creds.")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/manageiq.py b/sos/plugins/manageiq.py
index 0fca8e18..19a58d32 100644
--- a/sos/plugins/manageiq.py
+++ b/sos/plugins/manageiq.py
@@ -113,4 +113,4 @@ class ManageIQ(Plugin, RedHatPlugin):
             os.path.join(self.miq_log_dir, x) for x in self.miq_log_files
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/md.py b/sos/plugins/md.py
index 6c2ba4a5..f0526361 100644
--- a/sos/plugins/md.py
+++ b/sos/plugins/md.py
@@ -31,4 +31,4 @@ class Md(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/megacli.py b/sos/plugins/megacli.py
index 37a72fe7..c9fef000 100644
--- a/sos/plugins/megacli.py
+++ b/sos/plugins/megacli.py
@@ -43,4 +43,4 @@ class MegaCLI(Plugin, RedHatPlugin):
             "MegaCli64 -ShowSummary -a0"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py
index 1b27ebab..4c418964 100644
--- a/sos/plugins/memory.py
+++ b/sos/plugins/memory.py
@@ -39,4 +39,4 @@ class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "swapon --show"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/mongodb.py b/sos/plugins/mongodb.py
index 95661971..d45db189 100644
--- a/sos/plugins/mongodb.py
+++ b/sos/plugins/mongodb.py
@@ -47,4 +47,4 @@ class RedHatMongoDb(MongoDb, RedHatPlugin):
         super(RedHatMongoDb, self).setup()
         self.add_copy_spec("/etc/sysconfig/mongodb")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/mpt.py b/sos/plugins/mpt.py
index bb158ccc..53dbd5af 100644
--- a/sos/plugins/mpt.py
+++ b/sos/plugins/mpt.py
@@ -27,4 +27,4 @@ class Mpt(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_copy_spec("/proc/mpt")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/mrggrid.py b/sos/plugins/mrggrid.py
index a5e535d7..fab89c07 100644
--- a/sos/plugins/mrggrid.py
+++ b/sos/plugins/mrggrid.py
@@ -28,4 +28,4 @@ class MrgGrid(Plugin, RedHatPlugin):
             "condor_status"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/mrgmessg.py b/sos/plugins/mrgmessg.py
index 3e77bbe5..d1561ddb 100644
--- a/sos/plugins/mrgmessg.py
+++ b/sos/plugins/mrgmessg.py
@@ -29,4 +29,4 @@ class MrgMessg(Plugin, RedHatPlugin):
             "/var/rhm"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/multipath.py b/sos/plugins/multipath.py
index e6b88020..22fe16c3 100644
--- a/sos/plugins/multipath.py
+++ b/sos/plugins/multipath.py
@@ -33,4 +33,4 @@ class Multipath(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
index aa8e9b9e..0da4da99 100644
--- a/sos/plugins/mysql.py
+++ b/sos/plugins/mysql.py
@@ -109,4 +109,4 @@ class DebianMysql(Mysql, DebianPlugin, UbuntuPlugin):
         super(DebianMysql, self).setup()
         self.add_copy_spec("/etc/mysql/conf.d/mysql*")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index 2360db4c..1c8de72b 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -85,4 +85,4 @@ class DebianNamed(Named, DebianPlugin, UbuntuPlugin):
         return
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/navicli.py b/sos/plugins/navicli.py
index 3ee7d509..f6f0e874 100644
--- a/sos/plugins/navicli.py
+++ b/sos/plugins/navicli.py
@@ -92,4 +92,4 @@ class Navicli(Plugin, RedHatPlugin):
                       SP_address)
                 self.get_navicli_SP_info(SP_address)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index 550fe1c4..f2b06a62 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -240,4 +240,4 @@ class UbuntuNetworking(Networking, UbuntuPlugin, DebianPlugin):
             self.add_cmd_output("/usr/sbin/traceroute -n %s" % self.trace_host)
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/nfs.py b/sos/plugins/nfs.py
index 94eef65f..4b424099 100644
--- a/sos/plugins/nfs.py
+++ b/sos/plugins/nfs.py
@@ -32,4 +32,4 @@ class Nfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         return
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py
index 0aef76f3..df073429 100644
--- a/sos/plugins/nfsserver.py
+++ b/sos/plugins/nfsserver.py
@@ -58,4 +58,4 @@ class NfsServer(Plugin, RedHatPlugin):
         ])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/nis.py b/sos/plugins/nis.py
index e22770c7..77786c97 100644
--- a/sos/plugins/nis.py
+++ b/sos/plugins/nis.py
@@ -31,4 +31,4 @@ class Nis(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         self.add_cmd_output("domainname")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/nscd.py b/sos/plugins/nscd.py
index e35d372f..499bbdae 100644
--- a/sos/plugins/nscd.py
+++ b/sos/plugins/nscd.py
@@ -37,4 +37,4 @@ class Nscd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                 self.add_copy_spec_limit(f[1],
                                          sizelimit=self.get_option("log_size"))
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py
index 401b5df6..0e39b9d0 100644
--- a/sos/plugins/ntp.py
+++ b/sos/plugins/ntp.py
@@ -48,4 +48,4 @@ class DebianNtp(Ntp, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec('/etc/default/ntp')
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/numa.py b/sos/plugins/numa.py
index 00cf042d..e06a32ee 100644
--- a/sos/plugins/numa.py
+++ b/sos/plugins/numa.py
@@ -42,4 +42,4 @@ class Numa(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "numactl --hardware",
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/oddjob.py b/sos/plugins/oddjob.py
index ae48b4b0..380687e2 100644
--- a/sos/plugins/oddjob.py
+++ b/sos/plugins/oddjob.py
@@ -34,4 +34,4 @@ class Oddjob(Plugin, RedHatPlugin):
             "/etc/dbus-1/system.d/oddjob.conf"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openhpi.py b/sos/plugins/openhpi.py
index 48740af5..1dbb0160 100644
--- a/sos/plugins/openhpi.py
+++ b/sos/plugins/openhpi.py
@@ -33,4 +33,4 @@ class OpenHPI(Plugin, RedHatPlugin):
                          r'(\s*[Pp]ass.*\s*=\s*).*', r'\1********')
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openshift.py b/sos/plugins/openshift.py
index f557de7a..75386cdc 100644
--- a/sos/plugins/openshift.py
+++ b/sos/plugins/openshift.py
@@ -148,4 +148,4 @@ class Openshift(Plugin, RedHatPlugin):
                          r"(BIND_KEYVALUE\s*=\s*)(.*)",
                          r"\1********")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openssl.py b/sos/plugins/openssl.py
index 30bf3a5a..f3b9ffc5 100644
--- a/sos/plugins/openssl.py
+++ b/sos/plugins/openssl.py
@@ -62,4 +62,4 @@ class DebianOpenSSL(OpenSSL, DebianPlugin, UbuntuPlugin):
         super(DebianOpenSSL, self).setup()
         self.add_copy_spec("/etc/ssl/openssl.cnf")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py
index d9d66a5c..7c110579 100644
--- a/sos/plugins/openstack_ceilometer.py
+++ b/sos/plugins/openstack_ceilometer.py
@@ -62,4 +62,4 @@ class RedHatOpenStackCeilometer(OpenStackCeilometer, RedHatPlugin):
         'python-ceilometerclient'
     )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py
index 356480ca..8588f6c1 100644
--- a/sos/plugins/openstack_cinder.py
+++ b/sos/plugins/openstack_cinder.py
@@ -80,4 +80,4 @@ class RedHatOpenStackCinder(OpenStackCinder, RedHatPlugin):
         self.add_copy_spec(["/etc/sudoers.d/cinder"])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py
index 2e56c483..35c406a6 100644
--- a/sos/plugins/openstack_glance.py
+++ b/sos/plugins/openstack_glance.py
@@ -58,4 +58,4 @@ class RedHatGlance(OpenStackGlance, RedHatPlugin):
         'python-glanceclient'
     )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py
index 39532b52..70185dbc 100644
--- a/sos/plugins/openstack_heat.py
+++ b/sos/plugins/openstack_heat.py
@@ -62,4 +62,4 @@ class RedHatHeat(OpenStackHeat, RedHatPlugin):
         'python-heatclient'
     )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py
index 46f0031f..4c93cd91 100644
--- a/sos/plugins/openstack_horizon.py
+++ b/sos/plugins/openstack_horizon.py
@@ -73,4 +73,4 @@ class RedHatOpenStackHorizon(OpenStackHorizon, RedHatPlugin):
         if self.get_option("log"):
             self.add_copy_spec("/var/log/httpd/")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py
index 7df7296b..7d93d889 100644
--- a/sos/plugins/openstack_keystone.py
+++ b/sos/plugins/openstack_keystone.py
@@ -73,4 +73,4 @@ class RedHatOpenStackKeystone(OpenStackKeystone, RedHatPlugin):
         'python-keystoneclient'
     )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
index d37430ef..36de7cc9 100644
--- a/sos/plugins/openstack_neutron.py
+++ b/sos/plugins/openstack_neutron.py
@@ -168,4 +168,4 @@ class RedHatNeutron(Neutron, RedHatPlugin):
         self.packages = self.gen_pkg_tuple(self.package_list_template)
         self.add_copy_spec("/etc/sudoers.d/%s-rootwrap" % self.component_name)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py
index d6dbd832..20fb3a3d 100644
--- a/sos/plugins/openstack_nova.py
+++ b/sos/plugins/openstack_nova.py
@@ -146,4 +146,4 @@ class RedHatOpenStackNova(OpenStackNova, RedHatPlugin):
             "/etc/sysconfig/openstack-nova-novncproxy"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py
index 588fcd09..f0f94bbb 100644
--- a/sos/plugins/openstack_swift.py
+++ b/sos/plugins/openstack_swift.py
@@ -60,4 +60,4 @@ class RedHatOpenStackSwift(OpenStackSwift, RedHatPlugin):
         'python-swiftclient'
     )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openstack_trove.py b/sos/plugins/openstack_trove.py
index 7c8b6618..3b87506a 100644
--- a/sos/plugins/openstack_trove.py
+++ b/sos/plugins/openstack_trove.py
@@ -71,4 +71,4 @@ class RedHatOpenStackTrove(OpenStackTrove, RedHatPlugin):
     def setup(self):
         super(RedHatOpenStackTrove, self).setup()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py
index 0e2d3f23..0da4e07d 100644
--- a/sos/plugins/openswan.py
+++ b/sos/plugins/openswan.py
@@ -42,4 +42,4 @@ class Openswan(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         if self.get_option("ipsec-barf"):
             self.add_cmd_output("ipsec barf")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/openvswitch.py b/sos/plugins/openvswitch.py
index 52005634..fbf3a903 100644
--- a/sos/plugins/openvswitch.py
+++ b/sos/plugins/openvswitch.py
@@ -51,4 +51,4 @@ class DebianOpenVSwitch(OpenVSwitch, DebianPlugin, UbuntuPlugin):
     packages = ('openvswitch-switch',)
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py
index 28b6a240..b670271f 100644
--- a/sos/plugins/pam.py
+++ b/sos/plugins/pam.py
@@ -49,4 +49,4 @@ class DebianPam(Pam, DebianPlugin, UbuntuPlugin):
         super(DebianPam, self).setup()
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/pci.py b/sos/plugins/pci.py
index 304b3e98..39a5bf5f 100644
--- a/sos/plugins/pci.py
+++ b/sos/plugins/pci.py
@@ -32,4 +32,4 @@ class Pci(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         self.add_cmd_output("lspci -nnvv", root_symlink="lspci")
         self.add_cmd_output("lspci -tv")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/pcp.py b/sos/plugins/pcp.py
index 69872a3c..3cdf96a5 100644
--- a/sos/plugins/pcp.py
+++ b/sos/plugins/pcp.py
@@ -156,4 +156,4 @@ class Pcp(Plugin, RedHatPlugin, DebianPlugin):
         self.add_cmd_output("pcp")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py
index efb9558a..7d2b3ac7 100644
--- a/sos/plugins/postfix.py
+++ b/sos/plugins/postfix.py
@@ -49,4 +49,4 @@ class DebianPostfix(Postfix, DebianPlugin, UbuntuPlugin):
         super(DebianPostfix, self).setup()
         self.add_copy_spec("/etc/postfix/dynamicmaps.cf")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/postgresql.py b/sos/plugins/postgresql.py
index 07187397..8f6a1cd5 100644
--- a/sos/plugins/postgresql.py
+++ b/sos/plugins/postgresql.py
@@ -146,4 +146,4 @@ class DebianPostgreSQL(PostgreSQL, DebianPlugin, UbuntuPlugin):
         ])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/powerpath.py b/sos/plugins/powerpath.py
index 53692806..40cd174c 100644
--- a/sos/plugins/powerpath.py
+++ b/sos/plugins/powerpath.py
@@ -60,4 +60,4 @@ class PowerPath(Plugin, RedHatPlugin):
         if os.path.isdir("/proc/emcp"):
             self.get_pp_config()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/powerpc.py b/sos/plugins/powerpc.py
index 39b52f62..051c2377 100644
--- a/sos/plugins/powerpc.py
+++ b/sos/plugins/powerpc.py
@@ -92,4 +92,4 @@ class PowerPC(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
                 self.add_cmd_output("ls -l /var/log/dump")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py
index 705e3865..678c6418 100644
--- a/sos/plugins/ppp.py
+++ b/sos/plugins/ppp.py
@@ -34,4 +34,4 @@ class Ppp(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         self.add_cmd_output("adsl-status")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/procenv.py b/sos/plugins/procenv.py
index 57f45a6d..4db4d18c 100644
--- a/sos/plugins/procenv.py
+++ b/sos/plugins/procenv.py
@@ -26,4 +26,4 @@ class Procenv(Plugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_cmd_output('procenv')
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/process.py b/sos/plugins/process.py
index cae84437..6ae189b3 100644
--- a/sos/plugins/process.py
+++ b/sos/plugins/process.py
@@ -32,4 +32,4 @@ class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "ps alxwww"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/processor.py b/sos/plugins/processor.py
index 19aca462..f8e728c3 100644
--- a/sos/plugins/processor.py
+++ b/sos/plugins/processor.py
@@ -42,4 +42,4 @@ class Processor(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
             self.add_cmd_output("x86info -a")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/psacct.py b/sos/plugins/psacct.py
index 026f6657..069bb52c 100644
--- a/sos/plugins/psacct.py
+++ b/sos/plugins/psacct.py
@@ -49,4 +49,4 @@ class DebianPsacct(Psacct, DebianPlugin, UbuntuPlugin):
         if self.get_option("all"):
             self.add_copy_spec("/var/log/account/pacct*.gz")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py
index b7f1cfa4..c6b04dae 100644
--- a/sos/plugins/pxe.py
+++ b/sos/plugins/pxe.py
@@ -50,4 +50,4 @@ class DebianPxe(Pxe, DebianPlugin, UbuntuPlugin):
         if self.get_option("tftpboot"):
             self.add_copy_spec("/var/lib/tftpboot")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/python.py b/sos/plugins/python.py
index e143d1ef..73a77838 100644
--- a/sos/plugins/python.py
+++ b/sos/plugins/python.py
@@ -29,4 +29,4 @@ class Python(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_cmd_output("python -V", suggest_filename="python-version")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/qpid.py b/sos/plugins/qpid.py
index 54931066..96ee6d6e 100644
--- a/sos/plugins/qpid.py
+++ b/sos/plugins/qpid.py
@@ -65,4 +65,4 @@ class Qpid(Plugin, RedHatPlugin):
             "/var/log/cumin"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/quagga.py b/sos/plugins/quagga.py
index 9ed00cd0..5a0da3bc 100644
--- a/sos/plugins/quagga.py
+++ b/sos/plugins/quagga.py
@@ -30,4 +30,4 @@ class Quagga(Plugin, RedHatPlugin):
     def setup(self):
         self.add_copy_spec("/etc/quagga/")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/rabbitmq.py b/sos/plugins/rabbitmq.py
index d5f1917b..25d9ed20 100644
--- a/sos/plugins/rabbitmq.py
+++ b/sos/plugins/rabbitmq.py
@@ -31,4 +31,4 @@ class RabbitMQ(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec("/etc/rabbitmq/*")
         self.add_copy_spec_limit("/var/log/rabbitmq/*",
                                  sizelimit=self.get_option('log_size'))
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py
index d8a56b4a..70e79426 100644
--- a/sos/plugins/radius.py
+++ b/sos/plugins/radius.py
@@ -56,4 +56,4 @@ class DebianRadius(Radius, DebianPlugin, UbuntuPlugin):
             "/var/log/freeradius"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/rhui.py b/sos/plugins/rhui.py
index c8ae0b7c..1291956a 100644
--- a/sos/plugins/rhui.py
+++ b/sos/plugins/rhui.py
@@ -40,4 +40,4 @@ class Rhui(Plugin, RedHatPlugin):
             suggest_filename="rhui-debug")
         return
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index ee9d4d5d..db55aba7 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -65,4 +65,4 @@ class Rpm(Plugin, RedHatPlugin):
                 self.add_cmd_output("rpm -V %s" % verify_pkgs)
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index 9ffc2af7..c7210a09 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -71,4 +71,4 @@ class S390(Plugin, RedHatPlugin):
             ])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py
index e33876c0..2b07f1f1 100644
--- a/sos/plugins/samba.py
+++ b/sos/plugins/samba.py
@@ -42,4 +42,4 @@ class RedHatSamba(Samba, RedHatPlugin):
         super(RedHatSamba, self).setup()
         self.add_copy_spec("/etc/sysconfig/samba")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/sanlock.py b/sos/plugins/sanlock.py
index cc14449f..dfb90c6d 100644
--- a/sos/plugins/sanlock.py
+++ b/sos/plugins/sanlock.py
@@ -40,4 +40,4 @@ class RedHatSANLock(SANLock, RedHatPlugin):
         super(RedHatSANLock, self).setup()
         self.add_copy_spec("/etc/sysconfig/sanlock")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py
index 16cafe57..73c910e4 100644
--- a/sos/plugins/sar.py
+++ b/sos/plugins/sar.py
@@ -83,4 +83,4 @@ class DebianSar(Sar, DebianPlugin, UbuntuPlugin):
 
     sa_path = '/var/log/sysstat'
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/satellite.py b/sos/plugins/satellite.py
index fef2f14b..5884d79f 100644
--- a/sos/plugins/satellite.py
+++ b/sos/plugins/satellite.py
@@ -86,4 +86,4 @@ class Satellite(Plugin, RedHatPlugin):
         if self.proxy:
             self.add_copy_spec(["/etc/squid", "/var/log/squid"])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/scsi.py b/sos/plugins/scsi.py
index 94520549..4f77fbcb 100644
--- a/sos/plugins/scsi.py
+++ b/sos/plugins/scsi.py
@@ -38,4 +38,4 @@ class Scsi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
             "sg_map"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py
index 9647b061..c452c150 100644
--- a/sos/plugins/selinux.py
+++ b/sos/plugins/selinux.py
@@ -49,4 +49,4 @@ class SELinux(Plugin, RedHatPlugin):
             ])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py
index e88d9782..53e1f6e4 100644
--- a/sos/plugins/sendmail.py
+++ b/sos/plugins/sendmail.py
@@ -52,4 +52,4 @@ class DebianSendmail(Sendmail, DebianPlugin, UbuntuPlugin):
             "/var/log/mail.*"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index e92f1883..4863499e 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -38,4 +38,4 @@ class Smartcard(Plugin, RedHatPlugin):
             "ls -nl /usr/lib*/pam_pkcs11/"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/snmp.py b/sos/plugins/snmp.py
index 5d470b5f..6a1a17dc 100644
--- a/sos/plugins/snmp.py
+++ b/sos/plugins/snmp.py
@@ -44,4 +44,4 @@ class DebianSnmp(Snmp, DebianPlugin, UbuntuPlugin):
     def setup(self):
         super(DebianSnmp, self).setup()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py
index 1ebde602..2912866f 100644
--- a/sos/plugins/soundcard.py
+++ b/sos/plugins/soundcard.py
@@ -49,4 +49,4 @@ class DebianSoundcard(Soundcard, DebianPlugin, UbuntuPlugin):
 
         self.add_copy_spec("/etc/pulse/*")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py
index a995158b..93fe43be 100644
--- a/sos/plugins/squid.py
+++ b/sos/plugins/squid.py
@@ -51,4 +51,4 @@ class DebianSquid(Squid, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec(['/etc/squid-deb-proxy'])
         self.add_copy_spec_limit("/var/log/squid-deb-proxy/*",
                                  sizelimit=self.get_option('log_size'))
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ssh.py b/sos/plugins/ssh.py
index f5cd625c..f1da0165 100644
--- a/sos/plugins/ssh.py
+++ b/sos/plugins/ssh.py
@@ -30,4 +30,4 @@ class Ssh(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/ssh/sshd_config"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/ssmtp.py b/sos/plugins/ssmtp.py
index 14653e65..1f3fcfed 100644
--- a/sos/plugins/ssmtp.py
+++ b/sos/plugins/ssmtp.py
@@ -39,4 +39,4 @@ class Ssmtp(Plugin, RedHatPlugin):
             r'AuthPass=********'
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py
index 25fe61d2..1b20ff3c 100644
--- a/sos/plugins/sssd.py
+++ b/sos/plugins/sssd.py
@@ -49,4 +49,4 @@ class DebianSssd(Sssd, DebianPlugin, UbuntuPlugin):
         super(DebianSssd, self).setup()
         self.add_copy_spec("/etc/default/sssd")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/startup.py b/sos/plugins/startup.py
index 4bf45111..9d923702 100644
--- a/sos/plugins/startup.py
+++ b/sos/plugins/startup.py
@@ -53,4 +53,4 @@ class DebianStartup(Startup, DebianPlugin, UbuntuPlugin):
         if self.get_option('servicestatus'):
             self.add_cmd_output("/sbin/initctl list")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/sunrpc.py b/sos/plugins/sunrpc.py
index 6c97fabc..3ca5ec72 100644
--- a/sos/plugins/sunrpc.py
+++ b/sos/plugins/sunrpc.py
@@ -52,4 +52,4 @@ class RedHatSunRPC(SunRPC, RedHatPlugin):
 #        self.add_cmd_output("rpcinfo -p localhost")
 #        return
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/symcli.py b/sos/plugins/symcli.py
index fd9c896c..b9209962 100644
--- a/sos/plugins/symcli.py
+++ b/sos/plugins/symcli.py
@@ -93,4 +93,4 @@ class Symcli(Plugin, RedHatPlugin):
         self.get_symcli_files()
         self.get_symcli_config()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/system.py b/sos/plugins/system.py
index e25aed7c..c6d67399 100644
--- a/sos/plugins/system.py
+++ b/sos/plugins/system.py
@@ -30,4 +30,4 @@ class System(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/proc/sys/net/ipv6/neigh/*/base_reachable_time")
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py
index a211fd28..92a0b903 100644
--- a/sos/plugins/systemd.py
+++ b/sos/plugins/systemd.py
@@ -54,4 +54,4 @@ class Systemd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/yum/protected.d/systemd.conf"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py
index 58e1f681..6e692f88 100644
--- a/sos/plugins/systemtap.py
+++ b/sos/plugins/systemtap.py
@@ -34,4 +34,4 @@ class SystemTap(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "stap-report"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/sysvipc.py b/sos/plugins/sysvipc.py
index 75b79b59..a0732e73 100644
--- a/sos/plugins/sysvipc.py
+++ b/sos/plugins/sysvipc.py
@@ -31,4 +31,4 @@ class SysVIPC(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         self.add_cmd_output("ipcs")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/targetcli.py b/sos/plugins/targetcli.py
index 823904dc..03038b8e 100644
--- a/sos/plugins/targetcli.py
+++ b/sos/plugins/targetcli.py
@@ -33,4 +33,4 @@ class TargetCli(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         self.add_copy_spec("/etc/target")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/teamd.py b/sos/plugins/teamd.py
index 284d23e6..015c3156 100644
--- a/sos/plugins/teamd.py
+++ b/sos/plugins/teamd.py
@@ -51,4 +51,4 @@ class Teamd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                 "teamnl %s ports" % team
             ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index 9c98447a..f29b9da1 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -30,4 +30,4 @@ class TftpServer(Plugin, RedHatPlugin):
     def setup(self):
         self.add_cmd_output("ls -lanR /tftpboot")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py
index 10a634e5..fe7bab89 100644
--- a/sos/plugins/tomcat.py
+++ b/sos/plugins/tomcat.py
@@ -41,4 +41,4 @@ class Tomcat(Plugin, RedHatPlugin):
             r'password="********"'
         )
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/tuned.py b/sos/plugins/tuned.py
index db3639cd..d6136721 100644
--- a/sos/plugins/tuned.py
+++ b/sos/plugins/tuned.py
@@ -40,4 +40,4 @@ class Tuned(Plugin, RedHatPlugin):
             "/var/log/tuned/tuned.log"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/udev.py b/sos/plugins/udev.py
index 706c6719..a8766f6b 100644
--- a/sos/plugins/udev.py
+++ b/sos/plugins/udev.py
@@ -29,4 +29,4 @@ class Udev(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/udev/rules.d/*"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/unity.py b/sos/plugins/unity.py
index 26aee013..7da4088f 100644
--- a/sos/plugins/unity.py
+++ b/sos/plugins/unity.py
@@ -30,4 +30,4 @@ class unity(Plugin, UbuntuPlugin):
     def setup(self):
         self.add_cmd_output("/usr/lib/nux/unity_support_test -p")
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/upstart.py b/sos/plugins/upstart.py
index 7b8b5c08..fafb6119 100644
--- a/sos/plugins/upstart.py
+++ b/sos/plugins/upstart.py
@@ -50,4 +50,4 @@ class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec('/usr/share/upstart/')
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/usb.py b/sos/plugins/usb.py
index c34e4bcc..571457ec 100644
--- a/sos/plugins/usb.py
+++ b/sos/plugins/usb.py
@@ -31,4 +31,4 @@ class Usb(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "lsusb -t"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/veritas.py b/sos/plugins/veritas.py
index 5bbb7230..643cf1d1 100644
--- a/sos/plugins/veritas.py
+++ b/sos/plugins/veritas.py
@@ -42,4 +42,4 @@ class Veritas(Plugin, RedHatPlugin):
             if len(tarfile) == 1:
                 self.add_copy_spec(tarfile[0])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py
index 02c7c1e5..5949023b 100644
--- a/sos/plugins/vmware.py
+++ b/sos/plugins/vmware.py
@@ -32,4 +32,4 @@ class VMWare(Plugin, RedHatPlugin):
             "/proc/vmmemctl"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/vsftpd.py b/sos/plugins/vsftpd.py
index 6c254e12..169ed574 100644
--- a/sos/plugins/vsftpd.py
+++ b/sos/plugins/vsftpd.py
@@ -31,4 +31,4 @@ class Vsftpd(Plugin, RedHatPlugin):
             "/etc/vsftpd"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py
index 4db7ee39..97b50610 100644
--- a/sos/plugins/x11.py
+++ b/sos/plugins/x11.py
@@ -37,4 +37,4 @@ class X11(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "xrandr --verbose"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py
index 284b079e..096670ce 100644
--- a/sos/plugins/xen.py
+++ b/sos/plugins/xen.py
@@ -104,4 +104,4 @@ class Xen(Plugin, RedHatPlugin):
 
         self.add_custom_text("Xen hostType: "+host_type)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/xfs.py b/sos/plugins/xfs.py
index 4e61e2bf..9ee6e67b 100644
--- a/sos/plugins/xfs.py
+++ b/sos/plugins/xfs.py
@@ -39,4 +39,4 @@ class Xfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                     parts = e.split(' ')
                     self.add_cmd_output("xfs_logprint -c %s" % (parts[0]))
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/xinetd.py b/sos/plugins/xinetd.py
index fe39bc0b..8bed3ef2 100644
--- a/sos/plugins/xinetd.py
+++ b/sos/plugins/xinetd.py
@@ -33,4 +33,4 @@ class Xinetd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/xinetd.d"
         ])
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index 71552802..555a3508 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -66,4 +66,4 @@ class Yum(Plugin, RedHatPlugin):
             except IndexError:
                 pass
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py
index b3f06230..4657614a 100644
--- a/sos/policies/__init__.py
+++ b/sos/policies/__init__.py
@@ -442,4 +442,4 @@ class LinuxPolicy(Policy):
         return
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/policies/debian.py b/sos/policies/debian.py
index 564f5c6b..acb5b85d 100644
--- a/sos/policies/debian.py
+++ b/sos/policies/debian.py
@@ -42,4 +42,4 @@ class DebianPolicy(LinuxPolicy):
         except:
             return False
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/policies/osx.py b/sos/policies/osx.py
index adbeea4f..dd8d7753 100644
--- a/sos/policies/osx.py
+++ b/sos/policies/osx.py
@@ -13,4 +13,4 @@ class OSXPolicy(Policy):
         except Exception:
             return False
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py
index b8dd0c49..d2f8db05 100644
--- a/sos/policies/redhat.py
+++ b/sos/policies/redhat.py
@@ -188,4 +188,4 @@ class FedoraPolicy(RedHatPolicy):
         return int(pkg["version"])
 
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/policies/ubuntu.py b/sos/policies/ubuntu.py
index 4c87ecaa..0dd2ea29 100644
--- a/sos/policies/ubuntu.py
+++ b/sos/policies/ubuntu.py
@@ -36,4 +36,4 @@ class UbuntuPolicy(DebianPolicy):
         except:
             return False
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/reporting.py b/sos/reporting.py
index 709aaf07..1e20dbea 100644
--- a/sos/reporting.py
+++ b/sos/reporting.py
@@ -155,4 +155,4 @@ class PlainTextReport(object):
             for item in section.get(key):
                 self.buf.append(format_ % item)
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/sosreport.py b/sos/sosreport.py
index efa60433..9a0cf6cc 100644
--- a/sos/sosreport.py
+++ b/sos/sosreport.py
@@ -1468,4 +1468,4 @@ def main(args):
     sos = SoSReport(args)
     sos.execute()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/sos/utilities.py b/sos/utilities.py
index b1ec7720..dfe61286 100644
--- a/sos/utilities.py
+++ b/sos/utilities.py
@@ -232,4 +232,4 @@ class ImporterHelper(object):
 
         return plugins
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/archive_tests.py b/tests/archive_tests.py
index c778e4e5..70979093 100644
--- a/tests/archive_tests.py
+++ b/tests/archive_tests.py
@@ -92,4 +92,4 @@ class TarFileArchiveTest(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/importer_tests.py b/tests/importer_tests.py
index e7e20a27..2182ca26 100644
--- a/tests/importer_tests.py
+++ b/tests/importer_tests.py
@@ -12,4 +12,4 @@ class ImporterHelperTests(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/option_tests.py b/tests/option_tests.py
index 3185bce0..fe37ccfe 100644
--- a/tests/option_tests.py
+++ b/tests/option_tests.py
@@ -33,4 +33,4 @@ class GlobalOptionTest(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/plugin_tests.py b/tests/plugin_tests.py
index 7364eff1..e30ded5c 100644
--- a/tests/plugin_tests.py
+++ b/tests/plugin_tests.py
@@ -319,4 +319,4 @@ class RegexSubTests(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/policy_tests.py b/tests/policy_tests.py
index fe208fcd..d02277ba 100644
--- a/tests/policy_tests.py
+++ b/tests/policy_tests.py
@@ -68,4 +68,4 @@ class PackageManagerTests(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/report_tests.py b/tests/report_tests.py
index 5bb1d837..39635104 100644
--- a/tests/report_tests.py
+++ b/tests/report_tests.py
@@ -117,4 +117,4 @@ class TestPlainReport(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/sosreport_pexpect.py b/tests/sosreport_pexpect.py
index 4b807239..af94541c 100644
--- a/tests/sosreport_pexpect.py
+++ b/tests/sosreport_pexpect.py
@@ -27,4 +27,4 @@ class PexpectTest(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/test_exe.py b/tests/test_exe.py
index ee493b72..9b0af075 100755
--- a/tests/test_exe.py
+++ b/tests/test_exe.py
@@ -1,4 +1,4 @@
 #!/usr/bin/python
 print "executed"
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
diff --git a/tests/utilities_tests.py b/tests/utilities_tests.py
index 60087c18..607056e7 100644
--- a/tests/utilities_tests.py
+++ b/tests/utilities_tests.py
@@ -87,4 +87,4 @@ class FindTest(unittest.TestCase):
         leaves = find("leaf", TEST_DIR, path_pattern="tests/path")
         self.assertFalse(any(name.endswith("leaf") for name in leaves))
 
-# vim: et ts=4 sw=4
+# vim: set et ts=4 sw=4 :
-- 
cgit