fix: fix CentOS Linux-7 and add os details from current CI setup

FORMULA

@@ -1,5 +1,5 @@
 name: TEMPLATE
-os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
+os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
 version: 4.0.2
 release: 1

TEMPLATE/osfingermap.yaml

@@ -10,13 +10,40 @@
 # you will need to provide at least an empty dict in this file, e.g.
 # osfingermap: {}
 ---
+# os: Debian
+Debian-10: {}
+Debian-9: {}
+Debian-8: {}
+
 # os: Ubuntu
 Ubuntu-18.04:
   config: /etc/TEMPLATE.d/custom-ubuntu-18.04.conf
+Ubuntu-16.04: {}
+
+# os: Fedora
+Fedora-31: {}
+Fedora-30: {}
 
 # os: CentOS
+CentOS Linux-8: {}
+CentOS Linux-7: {}
 CentOS-6:
   pkg:
     name: TEMPLATE-centos-6
   config: /etc/TEMPLATE.d/custom-centos-6.conf
-CentOS-7: {}
+
+# os: Amazon
+Amazon Linux-2: {}
+Amazon Linux AMI-2018: {}
+
+# os: SUSE
+Leap-15: {}
+
+# os: FreeBSD
+FreeBSD-12: {}
+
+# os: Windows
+Windows-8.1: {}
+
+# os: Gentoo
+Gentoo-2: {}

TEMPLATE/osmap.yaml

@@ -15,7 +15,6 @@ Ubuntu:
   pkg:
     name: TEMPLATE-ubuntu
   config: /etc/TEMPLATE.d/custom-ubuntu.conf
-
 Raspbian: {}
 
 # os_family: RedHat
@@ -24,10 +23,11 @@ Fedora:
     name: TEMPLATE-fedora
   service:
     name: service-fedora
-
 CentOS: {}
+Amazon: {}
 
 # os_family: Suse
+SUSE: {}
 openSUSE: {}
 
 # os_family: Gentoo