Manual edits to make comments more consistent

Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>

Author: olehermanse

examples/rss/rss.cf

@@ -19,27 +19,27 @@ bundle agent example_rss_promise
       # REPAIRED if content on disk changes
       # KEPT if content on disk does not need changed
       # NOTKEPT if unable to fetch rss, unable to re-write content
+      # Default to newest
       feed => "https://blogs.nasa.gov/stationreport/feed/",
       select => "oldest";
 
-    # Default to newest
     "/tmp/ISS-random.txt"
       # Contains Item description
       # REPAIRED if content on disk changes
       # KEPT if content on disk does not need changed
       # NOTKEPT if unable to fetch rss, unable to re-write content
+      # Default to newest
       feed => "https://blogs.nasa.gov/stationreport/feed/",
       select => "random";
 
-    # Default to newest
     "/tmp/ISS-newest-from-local-file-source.txt"
       # Contains Item description
       # REPAIRED if content on disk changes
       # KEPT if content on disk does not need changed
       # NOTKEPT if unable to fetch rss, unable to re-write content
+      # Default to newest
       feed => "/tmp/iss.xml",
       select => "newest";
-  # Default to newest
 }
 
 bundle agent __main__

inventory/inventory-fwupd/policy.cf

@@ -43,12 +43,12 @@ bundle agent inventory_fwupd_main
       "_template" string => "$(this.promise_dirname)/fwupd-inventory.mustache";
 
       # TTLs in seconds for the fwupdmgr-derived JSON caches.
+      # 12 h:
       "_updates_ttl" string => "43200";
 
-      # 12 h
+      # 24 h:
       "_security_ttl" string => "86400";
 
-      # 24 h
       # Pre-compute file mtimes here rather than calling filestat() inline
       # inside class expressions: nested $(filestat($(path), mtime)) does not
       # expand reliably inside isgreaterthan(), so the staleness comparisons

security/delete-home-dotrhosts/policy/main.cf

@@ -20,8 +20,8 @@ bundle agent main
 
   vars:
     dotrhosts_management_disabled::
+      # Fill in exception reason if missing (class was used)
       "exception"
-        # Fill in exception reason if missing (class was used)
         string => "Unknown reason",
         if => not(isvariable("delete_home_dotrhosts:main.exception"));
 

security/delete-home-dotshosts/policy/main.cf

@@ -20,8 +20,8 @@ bundle agent main
 
   vars:
     dotshosts_management_disabled::
+      # Fill in exception reason if missing (class was used)
       "exception"
-        # Fill in exception reason if missing (class was used)
         string => "Unknown reason",
         if => not(isvariable("delete_home_dotshosts:main.exception"));
 

security/install-aide/install-aide.cf

@@ -7,12 +7,13 @@ bundle agent install_aide
 {
   vars:
     redhat|suse::
+      # Name in yum:
       "pkg_name" slist => { "aide" };
 
-    # Name in yum
     debian::
+      # Name in apt:
       "pkg_name" slist => { "aide" };
-  # name in apt
+
   packages:
     "${pkg_name}" -> { "CCE-27096-7" }
       policy => "present",

security/inventory-selinux-modules/main.cf

@@ -60,16 +60,17 @@ bundle agent semodule_list_modules
       "$(cache_file)"
         delete => default:tidy,
         if => isgreaterthan(
+          # now minus mtime of cache file:
           format("%d", eval("$(sys.systime)-$(cache_file_age)")),
-          # now minus mtime of cache file
+          # cache minutes:
           format("%d", eval("$(hours_cached)*60*60"))
         );
-  # cache minutes
+
   commands:
     _inventory_selinux_semodule_list_modules_supported_platform::
       "/sbin/semodule"
         arglist => { "--list-modules=full", ">", "$(cache_file)" },
+        # Required for redirection:
         contain => default:in_shell,
-        # Required for redirection
         if => not(fileexists($(cache_file)));
 }

security/uninstall-apache/uninstall-apache.cf

@@ -7,12 +7,13 @@ bundle agent uninstall_apache
 {
   vars:
     redhat|suse::
+      # Name in yum:
       "pkg_name" slist => { "httpd" };
 
-    # Name in yum
     debian::
+      # Name in apt:
       "pkg_name" slist => { "apache2" };
-  # name in apt
+
   classes:
     "apache_allowed"
       or => {

security/uninstall-bind/uninstall-bind.cf

@@ -7,12 +7,13 @@ bundle agent uninstall_bind
 {
   vars:
     redhat|suse::
+      # Name in yum:
       "pkg_name" slist => { "bind" };
 
-    # Name in yum
     debian::
+      # Name in apt:
       "pkg_name" slist => { "bind", "bind9" };
-  # name in apt
+
   classes:
     "bind_allowed"
       or => {

security/uninstall-dhcp/uninstall-dhcp.cf

@@ -7,12 +7,13 @@ bundle agent uninstall_dhcp
 {
   vars:
     redhat|suse::
+      # Name in yum:
       "pkg_name" slist => { "dhcp" };
 
-    # Name in yum
     debian::
+      # Name in apt:
       "pkg_name" slist => { "isc-dhcp-server" };
-  # name in apt
+
   classes:
     "dhcp_allowed"
       or => {

security/uninstall-dovecot/uninstall-dovecot.cf

@@ -7,12 +7,13 @@ bundle agent uninstall_dovecot
 {
   vars:
     redhat|suse::
+      # Name in yum:
       "pkg_name" slist => { "dovecot" };
 
-    # Name in yum
     debian::
+      # Name in apt:
       "pkg_name" slist => { "dovecot-core" };
-  # name in apt
+
   classes:
     "dovecot_allowed"
       or => {