Update for 6.3.3 release (#7)

README.rst

@@ -43,6 +43,8 @@ Latest Releases
 
 ----------------------------------------
 
+- `6.3.3 <https://simp.readthedocs.io/en/6.3.3/changelogs/latest.html>`__
+
 - `6.2.0-0 <https://simp.readthedocs.io/en/6.2.0-0/dynamic/Changelog.html>`__
 
 - `6.1.0-0 <https://simp.readthedocs.io/en/6.1.0-0/dynamic/Changelog.html>`__
@@ -55,7 +57,7 @@ Where's the code?!
 Please get the most up-to-date information from the `SIMP Project`_ website.
 
 This site will be updated to reflect the latest releases for those that want a
-single subscription source but all artifact information will be found on the
+single notification source but all artifact information will be found on the
 main project website.
 
 Disclaimer
@@ -202,6 +204,7 @@ SIMP Repositories
 -  `pupmod-simp-compliance_markup <https://github.com/simp/pupmod-simp-compliance_markup>`__ |Puppet_Forge_compliance_markup|_
 -  `pupmod-simp-cron <https://github.com/simp/pupmod-simp-cron>`__ |Puppet_Forge_cron|_
 -  `pupmod-simp-dconf <https://github.com/simp/pupmod-simp-dconf>`__ |Puppet_Forge_dconf|_
+-  `pupmod-simp-deferred_resources <https://github.com/simp/pupmod-simp-deferred_resources>`__ |Puppet_Forge_deferred_resources|_
 -  `pupmod-simp-dhcp <https://github.com/simp/pupmod-simp-dhcp>`__ |Puppet_Forge_dhcp|_
 -  `pupmod-simp-dirtycow <https://github.com/simp/pupmod-simp-dirtycow>`__ |Puppet_Forge_dirtycow|_
 -  `pupmod-simp-fips <https://github.com/simp/pupmod-simp-fips>`__ |Puppet_Forge_fips|_
@@ -211,10 +214,12 @@ SIMP Repositories
 -  `pupmod-simp-gdm <https://github.com/simp/pupmod-simp-gdm>`__ |Puppet_Forge_gdm|_
 -  `pupmod-simp-gnome <https://github.com/simp/pupmod-simp-gnome>`__ |Puppet_Forge_gnome|_
 -  `pupmod-simp-haveged <https://github.com/simp/pupmod-simp-haveged>`__ |Puppet_Forge_haveged|_
+-  `pupmod-simp-ima <https://github.com/simp/pupmod-simp-ima>`__ |Puppet_Forge_ima|_
 -  `pupmod-simp-incron <https://github.com/simp/pupmod-simp-incron>`__ |Puppet_Forge_incron|_
 -  `pupmod-simp-iptables <https://github.com/simp/pupmod-simp-iptables>`__ |Puppet_Forge_iptables|_
 -  `pupmod-simp-issue <https://github.com/simp/pupmod-simp-issue>`__ |Puppet_Forge_issue|_
 -  `pupmod-simp-jenkins <https://github.com/simp/pupmod-simp-jenkins>`__ |Puppet_Forge_jenkins|_
+-  `pupmod-simp-journald <https://github.com/simp/pupmod-simp-journald>`__ |Puppet_Forge_journald|_
 -  `pupmod-simp-krb5 <https://github.com/simp/pupmod-simp-krb5>`__ |Puppet_Forge_krb5|_
 -  `pupmod-simp-libkv <https://github.com/simp/pupmod-simp-libkv>`__ |Puppet_Forge_libkv|_
 -  `pupmod-simp-libreswan <https://github.com/simp/pupmod-simp-libreswan>`__ |Puppet_Forge_libreswan|_
@@ -241,6 +246,7 @@ SIMP Repositories
 -  `pupmod-simp-selinux <https://github.com/simp/pupmod-simp-selinux>`__ |Puppet_Forge_selinux|_
 -  `pupmod-simp-simp <https://github.com/simp/pupmod-simp-simp>`__ |Puppet_Forge_simp|_
 -  `pupmod-simp-simp_apache <https://github.com/simp/pupmod-simp-simp_apache>`__ |Puppet_Forge_simp_apache|_
+-  `pupmod-simp-simp_banners <https://github.com/simp/pupmod-simp-simp_banners>`__ |Puppet_Forge_simp_banners|_
 -  `pupmod-simp-simp_docker <https://github.com/simp/pupmod-simp-simp_docker>`__ |Puppet_Forge_simp_docker|_
 -  `pupmod-simp-simp_elasticsearch <https://github.com/simp/pupmod-simp-simp_elasticsearch>`__ |Puppet_Forge_simp_elasticsearch|_
 -  `pupmod-simp-simp_gitlab <https://github.com/simp/pupmod-simp-simp_gitlab>`__ |Puppet_Forge_simp_gitlab|_
@@ -250,6 +256,7 @@ SIMP Repositories
 -  `pupmod-simp-simp_nfs <https://github.com/simp/pupmod-simp-simp_nfs>`__ |Puppet_Forge_simp_nfs|_
 -  `pupmod-simp-simp_openldap <https://github.com/simp/pupmod-simp-simp_openldap>`__ |Puppet_Forge_simp_openldap|_
 -  `pupmod-simp-simp_options <https://github.com/simp/pupmod-simp-simp_options>`__ |Puppet_Forge_simp_options|_
+-  `pupmod-simp-simp_pki_service <https://github.com/simp/pupmod-simp-simp_pki_service>`__ |Puppet_Forge_simp_pki_service|_
 -  `pupmod-simp-simp_rsyslog <https://github.com/simp/pupmod-simp-simp_rsyslog>`__ |Puppet_Forge_simp_rsyslog|_
 -  `pupmod-simp-simp_snmpd <https://github.com/simp/pupmod-simp-simp_snmpd>`__ |Puppet_Forge_simp_snmpd|_
 -  `pupmod-simp-simpcat <https://github.com/simp/pupmod-simp-simpcat>`__ |Puppet_Forge_simpcat|_
@@ -267,18 +274,20 @@ SIMP Repositories
 -  `pupmod-simp-tcpwrappers <https://github.com/simp/pupmod-simp-tcpwrappers>`__ |Puppet_Forge_tcpwrappers|_
 -  `pupmod-simp-tftpboot <https://github.com/simp/pupmod-simp-tftpboot>`__ |Puppet_Forge_tftpboot|_
 -  `pupmod-simp-timezone <https://github.com/simp/pupmod-simp-timezone>`__ |Puppet_Forge_timezone|_
+-  `pupmod-simp-tlog <https://github.com/simp/pupmod-simp-tlog>`__ |Puppet_Forge_tlog|_
 -  `pupmod-simp-tpm <https://github.com/simp/pupmod-simp-tpm>`__ |Puppet_Forge_tpm|_
+-  `pupmod-simp-tpm2 <https://github.com/simp/pupmod-simp-tpm2>`__ |Puppet_Forge_tpm2|_
 -  `pupmod-simp-tuned <https://github.com/simp/pupmod-simp-tuned>`__ |Puppet_Forge_tuned|_
 -  `pupmod-simp-upstart <https://github.com/simp/pupmod-simp-upstart>`__ |Puppet_Forge_upstart|_
 -  `pupmod-simp-useradd <https://github.com/simp/pupmod-simp-useradd>`__ |Puppet_Forge_useradd|_
 -  `pupmod-simp-vnc <https://github.com/simp/pupmod-simp-vnc>`__ |Puppet_Forge_vnc|_
 -  `pupmod-simp-vsftpd <https://github.com/simp/pupmod-simp-vsftpd>`__ |Puppet_Forge_vsftpd|_
+-  `pupmod-simp-x2go <https://github.com/simp/pupmod-simp-x2go>`__ |Puppet_Forge_x2go|_
 -  `pupmod-simp-xinetd <https://github.com/simp/pupmod-simp-xinetd>`__ |Puppet_Forge_xinetd|_
 
 Forked Repositories
 ^^^^^^^^^^^^^^^^^^^
 
--  `NIST-800-18-SSP_Template <https://github.com/simp/NIST-800-18-SSP_Template>`__
 -  `augeasproviders <https://github.com/simp/augeasproviders>`__
 -  `augeasproviders_apache <https://github.com/simp/augeasproviders_apache>`__
 -  `augeasproviders_base <https://github.com/simp/augeasproviders_base>`__
@@ -296,12 +305,22 @@ Forked Repositories
 -  `binford2k-node_encrypt <https://github.com/simp/binford2k-node_encrypt>`__
 -  `local_security_policy <https://github.com/simp/local_security_policy>`__
 -  `pdk-templates <https://github.com/simp/pdk-templates>`__
+-  `pupmod-puppetlabs-augeas_core <https://github.com/simp/pupmod-puppetlabs-augeas_core>`__
+-  `pupmod-puppetlabs-cron_core <https://github.com/simp/pupmod-puppetlabs-cron_core>`__
 -  `pupmod-puppetlabs-hocon <https://github.com/simp/pupmod-puppetlabs-hocon>`__
+-  `pupmod-puppetlabs-host_core <https://github.com/simp/pupmod-puppetlabs-host_core>`__
+-  `pupmod-puppetlabs-mount_core <https://github.com/simp/pupmod-puppetlabs-mount_core>`__
+-  `pupmod-puppetlabs-ruby_task_helper <https://github.com/simp/pupmod-puppetlabs-ruby_task_helper>`__
+-  `pupmod-puppetlabs-selinux_core <https://github.com/simp/pupmod-puppetlabs-selinux_core>`__
+-  `pupmod-puppetlabs-sshkeys_core <https://github.com/simp/pupmod-puppetlabs-sshkeys_core>`__
 -  `pupmod-puppetlabs-translate <https://github.com/simp/pupmod-puppetlabs-translate>`__
+-  `pupmod-puppetlabs-yumrepo_core <https://github.com/simp/pupmod-puppetlabs-yumrepo_core>`__
+-  `pupmod-saz-locales <https://github.com/simp/pupmod-saz-locales>`__
+-  `pupmod-treydock-kdump <https://github.com/simp/pupmod-treydock-kdump>`__
+-  `pupmod-voxpupuli-posix_acl <https://github.com/simp/pupmod-voxpupuli-posix_acl>`__
 -  `pupmod-voxpupuli-selinux <https://github.com/simp/pupmod-voxpupuli-selinux>`__
 -  `puppet-archive <https://github.com/simp/puppet-archive>`__
 -  `puppet-auditpol <https://github.com/simp/puppet-auditpol>`__
--  `puppet-bundle-face <https://github.com/simp/puppet-bundle-face>`__
 -  `puppet-consul <https://github.com/simp/puppet-consul>`__
 -  `puppet-datacat <https://github.com/simp/puppet-datacat>`__
 -  `puppet-docs <https://github.com/simp/puppet-docs>`__
@@ -323,6 +342,7 @@ Forked Repositories
 -  `puppet-windows_firewall <https://github.com/simp/puppet-windows_firewall>`__
 -  `puppet-windowsfeature <https://github.com/simp/puppet-windowsfeature>`__
 -  `puppet-winlogbeat <https://github.com/simp/puppet-winlogbeat>`__
+-  `puppetlabs-acl <https://github.com/simp/puppetlabs-acl>`__
 -  `puppetlabs-apache <https://github.com/simp/puppetlabs-apache>`__
 -  `puppetlabs-chocolatey <https://github.com/simp/puppetlabs-chocolatey>`__
 -  `puppetlabs-concat <https://github.com/simp/puppetlabs-concat>`__
@@ -343,6 +363,14 @@ Forked Repositories
 -  `registry_acl <https://github.com/simp/registry_acl>`__
 -  `voxpupuli-yum <https://github.com/simp/voxpupuli-yum>`__
 
+Miscellaneous Repositories
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+-  `NIST-800-18-SSP_Template <https://github.com/simp/NIST-800-18-SSP_Template>`__
+-  `puppet-bundle-face <https://github.com/simp/puppet-bundle-face>`__
+-  `releng-misc <https://github.com/simp/releng-misc>`__
+-  `remote-gitlab-ci <https://github.com/simp/remote-gitlab-ci>`__
+
 .. |Puppet_Forge_acpid| image:: https://img.shields.io/puppetforge/dt/simp/acpid.svg
 .. _Puppet_Forge_acpid: https://forge.puppet.com/simp/acpid
 .. |Puppet_Forge_activemq| image:: https://img.shields.io/puppetforge/dt/simp/activemq.svg
@@ -481,6 +509,8 @@ Forked Repositories
 .. _Puppet_Forge_simp_grafana: https://forge.puppet.com/simp/simp_grafana
 .. |Puppet_Forge_dirtycow| image:: https://img.shields.io/puppetforge/dt/simp/dirtycow.svg
 .. _Puppet_Forge_dirtycow: https://forge.puppet.com/simp/dirtycow
+.. |Puppet_Forge_journald| image:: https://img.shields.io/puppetforge/dt/simp/journald.svg
+.. _Puppet_Forge_journald: https://forge.puppet.com/simp/journald
 .. |Puppet_Forge_simp_options| image:: https://img.shields.io/puppetforge/dt/simp/simp_options.svg
 .. _Puppet_Forge_simp_options: https://forge.puppet.com/simp/simp_options
 .. |Puppet_Forge_fips| image:: https://img.shields.io/puppetforge/dt/simp/fips.svg
@@ -519,13 +549,26 @@ Forked Repositories
 .. _Puppet_Forge_simp_snmpd: https://forge.puppet.com/simp/simp_snmpd
 .. |Puppet_Forge_simp_docker| image:: https://img.shields.io/puppetforge/dt/simp/simp_docker.svg
 .. _Puppet_Forge_simp_docker: https://forge.puppet.com/simp/simp_docker
+.. |Puppet_Forge_simp_pki_service| image:: https://img.shields.io/puppetforge/dt/simp/simp_pki_service.svg
+.. _Puppet_Forge_simp_pki_service: https://forge.puppet.com/simp/simp_pki_service
+.. |Puppet_Forge_x2go| image:: https://img.shields.io/puppetforge/dt/simp/x2go.svg
+.. _Puppet_Forge_x2go: https://forge.puppet.com/simp/x2go
+.. |Puppet_Forge_tpm2| image:: https://img.shields.io/puppetforge/dt/simp/tpm2.svg
+.. _Puppet_Forge_tpm2: https://forge.puppet.com/simp/tpm2
 .. |Puppet_Forge_mate| image:: https://img.shields.io/puppetforge/dt/simp/mate.svg
 .. _Puppet_Forge_mate: https://forge.puppet.com/simp/mate
 .. |Puppet_Forge_dconf| image:: https://img.shields.io/puppetforge/dt/simp/dconf.svg
 .. _Puppet_Forge_dconf: https://forge.puppet.com/simp/dconf
 .. |Puppet_Forge_simp_ipa| image:: https://img.shields.io/puppetforge/dt/simp/simp_ipa.svg
 .. _Puppet_Forge_simp_ipa: https://forge.puppet.com/simp/simp_ipa
-
+.. |Puppet_Forge_simp_banners| image:: https://img.shields.io/puppetforge/dt/simp/simp_banners.svg
+.. _Puppet_Forge_simp_banners: https://forge.puppet.com/simp/simp_banners
+.. |Puppet_Forge_deferred_resources| image:: https://img.shields.io/puppetforge/dt/simp/deferred_resources.svg
+.. _Puppet_Forge_deferred_resources: https://forge.puppet.com/simp/deferred_resources
+.. |Puppet_Forge_tlog| image:: https://img.shields.io/puppetforge/dt/simp/tlog.svg
+.. _Puppet_Forge_tlog: https://forge.puppet.com/simp/tlog
+.. |Puppet_Forge_ima| image:: https://img.shields.io/puppetforge/dt/simp/ima.svg
+.. _Puppet_Forge_ima: https://forge.puppet.com/simp/ima
 
 .. _Apache License, Version 2: http://www.apache.org/licenses/LICENSE-2.0.html
 .. _CONTRIBUTING: CONTRIBUTING.md

utils/get_simp_repo_list.rb

@@ -66,6 +66,7 @@ inspec_repos = {}
 monitoring_repos = {}
 simp_repos = {}
 external_repos = {}
+misc_repos = nil
 
 image_links = []
 
@@ -140,11 +141,18 @@ repos.each do |repo|
     else
       simp_repos.delete(repo[:name])
     end
-  else
+  elsif repo.fork
     external_repos[repo[:name]] = {
       :url => repo[:html_url],
       :url_string => %(-  `#{repo[:name]} <#{repo[:html_url]}>`__)
     }
+  else
+    misc_repos ||= {}
+
+    misc_repos[repo[:name]] = {
+      :url => repo[:html_url],
+      :url_string => %(-  `#{repo[:name]} <#{repo[:html_url]}>`__)
+    }
   end
 end
 
@@ -154,6 +162,7 @@ rubygem_repos.delete_if{|x| x =~ /#{to_ignore.join('|')}/} if rubygem_repos
 monitoring_repos.delete_if{|x| x =~ /#{to_ignore.join('|')}/} if monitoring_repos
 simp_repos.delete_if{|x| x =~ /#{to_ignore.join('|')}/} if simp_repos
 external_repos.delete_if{|x| x =~ /#{to_ignore.join('|')}/} if external_repos
+misc_repos.delete_if{|x| x =~ /#{to_ignore.join('|')}/} if misc_repos
 
 puts <<-EOM
 Build Repositories
@@ -197,6 +206,18 @@ Forked Repositories
 ^^^^^^^^^^^^^^^^^^^
 
 #{external_repos.keys.sort.map{|repo| external_repos[repo][:url_string] }.join("\n") if external_repos}
-
-#{image_links.join}
 EOM
+
+
+if misc_repos
+  puts <<-EOM
+
+Miscellaneous Repositories
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#{misc_repos.keys.sort.map{|repo| misc_repos[repo][:url_string] }.join("\n")}
+
+  EOM
+end
+
+puts image_links.join