From b84049db058d0ce57c2552ab108a9d80594221b1 Mon Sep 17 00:00:00 2001 From: CV Date: Mon, 18 Jul 2016 23:54:20 +0200 Subject: [PATCH 001/284] Add sysfs repo (#8) * Add sysfs repo * Added service information --- data/sysfs/default.yaml | 7 +++++++ data/sysfs/hiera.yaml | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 data/sysfs/default.yaml create mode 100644 data/sysfs/hiera.yaml diff --git a/data/sysfs/default.yaml b/data/sysfs/default.yaml new file mode 100644 index 00000000..d1b9cf48 --- /dev/null +++ b/data/sysfs/default.yaml @@ -0,0 +1,7 @@ +--- + sysfs::settings: + package_name: 'sysfsutils' + service_name: 'sysfsutils' + config_file_path: '/etc/sysfs.conf' + config_dir_path: '/etc/sysfs.d' + conf_dir_path: '/etc/sysfs.d' diff --git a/data/sysfs/hiera.yaml b/data/sysfs/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/sysfs/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From 2b55bfa33849aa0216d09d65ecbd8cf74eb3c3c7 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 16 Aug 2016 11:25:37 +0200 Subject: [PATCH 002/284] Basic rails data --- data/rails/default.yaml | 3 +++ data/rails/hiera.yaml | 5 +++++ data/rails/osfamily/Debian.yaml | 5 +++++ data/rails/osfamily/RedHat.yaml | 5 +++++ 4 files changed, 18 insertions(+) create mode 100644 data/rails/default.yaml create mode 100644 data/rails/hiera.yaml create mode 100644 data/rails/osfamily/Debian.yaml create mode 100644 data/rails/osfamily/RedHat.yaml diff --git a/data/rails/default.yaml b/data/rails/default.yaml new file mode 100644 index 00000000..53be91d1 --- /dev/null +++ b/data/rails/default.yaml @@ -0,0 +1,3 @@ +--- + rails::settings: + package_name: 'rails' diff --git a/data/rails/hiera.yaml b/data/rails/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/rails/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/rails/osfamily/Debian.yaml b/data/rails/osfamily/Debian.yaml new file mode 100644 index 00000000..18f6c241 --- /dev/null +++ b/data/rails/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- + rails::settings: + package_dependencies: + - 'ruby-dev' + - 'zlib1g-dev' diff --git a/data/rails/osfamily/RedHat.yaml b/data/rails/osfamily/RedHat.yaml new file mode 100644 index 00000000..288d4506 --- /dev/null +++ b/data/rails/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- + rails::settings: + package_dependencies: + - 'ruby-devel' + - 'zlib-devel' From ff4bffddec5593ed025cf6ef82bbdaa3772ab6c0 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 16 Aug 2016 11:26:07 +0200 Subject: [PATCH 003/284] Basic passenger data --- data/passenger/default.yaml | 3 +++ data/passenger/hiera.yaml | 5 +++++ data/passenger/osfamily/Debian.yaml | 7 +++++++ data/passenger/osfamily/RedHat.yaml | 5 +++++ 4 files changed, 20 insertions(+) create mode 100644 data/passenger/default.yaml create mode 100644 data/passenger/hiera.yaml create mode 100644 data/passenger/osfamily/Debian.yaml create mode 100644 data/passenger/osfamily/RedHat.yaml diff --git a/data/passenger/default.yaml b/data/passenger/default.yaml new file mode 100644 index 00000000..5a2b3700 --- /dev/null +++ b/data/passenger/default.yaml @@ -0,0 +1,3 @@ +--- + passenger::settings: + package_name: 'passenger' diff --git a/data/passenger/hiera.yaml b/data/passenger/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/passenger/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/passenger/osfamily/Debian.yaml b/data/passenger/osfamily/Debian.yaml new file mode 100644 index 00000000..2144a0c8 --- /dev/null +++ b/data/passenger/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- + passenger::settings: + repo_url: 'https://oss-binaries.phusionpassenger.com/apt/passenger' + key: '561F9B9CAC40B2F7' + apt_repos: 'main' +# apt_release: 'stable' + apt_key_server: 'http://keyserver.ubuntu.com' diff --git a/data/passenger/osfamily/RedHat.yaml b/data/passenger/osfamily/RedHat.yaml new file mode 100644 index 00000000..0f3df5fd --- /dev/null +++ b/data/passenger/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- + passenger::settings: + repo_url: 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' +# key_url: 'https://packagecloud.io/gpg.key' + From f8bd2b01ceb0437ed9763f100b43b4c4b0aabce2 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 16 Aug 2016 11:29:08 +0200 Subject: [PATCH 004/284] Release v0.0.6 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index ff3ce85c..d41d07f1 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.7", + "version": "0.0.8", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 4ecb1df40f224ad31ace249e4694f144b5af943e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Sep 2016 16:14:20 +0200 Subject: [PATCH 005/284] Added mongo3.2 for RHEL for experimental multi-repo support --- data/mongodb/hiera.yaml | 1 + data/mongodb/repo/mongodb-org-3.2-RedHat.yaml | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 data/mongodb/repo/mongodb-org-3.2-RedHat.yaml diff --git a/data/mongodb/hiera.yaml b/data/mongodb/hiera.yaml index b8dc1a89..634b1ee4 100644 --- a/data/mongodb/hiera.yaml +++ b/data/mongodb/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/repo/%{repo}-%{osfamily}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/mongodb/repo/mongodb-org-3.2-RedHat.yaml b/data/mongodb/repo/mongodb-org-3.2-RedHat.yaml new file mode 100644 index 00000000..8a95a985 --- /dev/null +++ b/data/mongodb/repo/mongodb-org-3.2-RedHat.yaml @@ -0,0 +1,12 @@ +--- + mongodb::settings: + repo_url: 'https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.2/x86_64/' + key_url: 'https://www.mongodb.org/static/pgp/server-3.2.asc' + package_name: 'mongodb-org' + service_name: 'mongod' + config_file_path: '/etc/mongod.conf' + pid_file_path: '/var/run/mongodb/mongod.pid' + log_file_path: '/var/log/mongodb/mongod.log' + data_dir_path: '/var/lib/mongo' + process_user: 'mongod' + process_group: 'mongod' From 0da1428ee7e2d8616e2ebcd9bb089d1f89d3baa5 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 25 Sep 2016 11:19:56 +0200 Subject: [PATCH 006/284] Java 8 packages on rhel --- data/openjdk-jdk/osfamily/RedHat7.yaml | 2 +- data/openjdk-jre/osfamily/RedHat7.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/openjdk-jdk/osfamily/RedHat7.yaml b/data/openjdk-jdk/osfamily/RedHat7.yaml index 216678a3..a1ef2fb2 100644 --- a/data/openjdk-jdk/osfamily/RedHat7.yaml +++ b/data/openjdk-jdk/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- openjdk-jdk::settings: - package_name: 'java-1.7.0-openjdk-devel' + package_name: 'java-1.8.0-openjdk-devel' diff --git a/data/openjdk-jre/osfamily/RedHat7.yaml b/data/openjdk-jre/osfamily/RedHat7.yaml index c5ea157e..88a83c06 100644 --- a/data/openjdk-jre/osfamily/RedHat7.yaml +++ b/data/openjdk-jre/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- openjdk-jre::settings: - package_name: 'java-1.7.0-openjdk' + package_name: 'java-1.8.0-openjdk' From 47db99961341043201c042f5a38b2adca31ed5cd Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 2 Oct 2016 23:54:24 +0200 Subject: [PATCH 007/284] Updated postfix and puppet --- data/postfix/default.yaml | 6 ++++++ data/postfix/osfamily/Debian.yaml | 1 + data/postfix/osfamily/RedHat.yaml | 3 +++ data/postfix/osfamily/Suse.yaml | 4 ++++ data/puppet-agent/osfamily/RedHat.yaml | 2 +- data/puppetserver/osfamily/RedHat.yaml | 2 +- 6 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 data/postfix/osfamily/Suse.yaml diff --git a/data/postfix/default.yaml b/data/postfix/default.yaml index cb1ef535..0db7dfd3 100644 --- a/data/postfix/default.yaml +++ b/data/postfix/default.yaml @@ -10,4 +10,10 @@ process_name: 'master' process_user: 'postfix' process_group: 'postfix' + setgid_group: 'postdrop' tcp_port: '25' + queue_dir_path: '/var/spool/postfix' + daemon_dir_path: '/usr/libexec/postfix' + sendmail_path: '/usr/sbin/sendmail' + newaliases_path: '/usr/bin/newaliases' + mailq_path: '/usr/bin/mailq' diff --git a/data/postfix/osfamily/Debian.yaml b/data/postfix/osfamily/Debian.yaml index bd37c4d6..6597b0f5 100644 --- a/data/postfix/osfamily/Debian.yaml +++ b/data/postfix/osfamily/Debian.yaml @@ -2,3 +2,4 @@ postfix::settings: log_file_path: '/var/log/mail.log' init_file_path: '/etc/default/postfix' + daemon_dir_path: '/usr/lib/postfix/sbin' diff --git a/data/postfix/osfamily/RedHat.yaml b/data/postfix/osfamily/RedHat.yaml index 40503989..bc8b577c 100644 --- a/data/postfix/osfamily/RedHat.yaml +++ b/data/postfix/osfamily/RedHat.yaml @@ -1,3 +1,6 @@ --- postfix::settings: init_file_path: '/etc/sysconfig/postfix' + sendmail_path: '/usr/sbin/sendmail.postfix' + newaliases_path: '/usr/bin/newaliases.postfix' + mailq_path: '/usr/bin/mailq.postfix' diff --git a/data/postfix/osfamily/Suse.yaml b/data/postfix/osfamily/Suse.yaml new file mode 100644 index 00000000..af31ed1a --- /dev/null +++ b/data/postfix/osfamily/Suse.yaml @@ -0,0 +1,4 @@ +--- + postfix::settings: + setgid_group: 'maildrop' + daemon_dir_path: '/usr/lib/postfix' diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index 0bde41fd..2b3804d8 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -2,5 +2,5 @@ puppet-agent::settings: repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' key: '07BB6C57' - key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs' + key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet dockerfile_prerequisites: 'RUN yum install -y wget' diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 0732d4ed..838da7cb 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -3,4 +3,4 @@ init_file_path: '/etc/sysconfig/puppetserver' repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch' key: '07BB6C57' - key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs' + key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet From 13e7d80a90607be6e038e1014b6dc2c4b64985fd Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 8 Oct 2016 13:10:24 +0200 Subject: [PATCH 008/284] NFS data --- data/nfs-client/default.yaml | 3 +++ data/nfs-client/hiera.yaml | 5 +++++ data/nfs-client/osfamily/Debian.yaml | 4 ++++ data/nfs-client/osfamily/RedHat.yaml | 4 ++++ data/nfs-client/osfamily/Suse.yaml | 4 ++++ data/nfs-server/default.yaml | 4 ++++ data/nfs-server/hiera.yaml | 6 ++++++ data/nfs-server/osfamily/Debian.yaml | 4 ++++ data/nfs-server/osfamily/RedHat.yaml | 4 ++++ data/nfs-server/osfamily/RedHat6.yaml | 3 +++ data/nfs-server/osfamily/Suse.yaml | 4 ++++ 11 files changed, 45 insertions(+) create mode 100644 data/nfs-client/default.yaml create mode 100644 data/nfs-client/hiera.yaml create mode 100644 data/nfs-client/osfamily/Debian.yaml create mode 100644 data/nfs-client/osfamily/RedHat.yaml create mode 100644 data/nfs-client/osfamily/Suse.yaml create mode 100644 data/nfs-server/default.yaml create mode 100644 data/nfs-server/hiera.yaml create mode 100644 data/nfs-server/osfamily/Debian.yaml create mode 100644 data/nfs-server/osfamily/RedHat.yaml create mode 100644 data/nfs-server/osfamily/RedHat6.yaml create mode 100644 data/nfs-server/osfamily/Suse.yaml diff --git a/data/nfs-client/default.yaml b/data/nfs-client/default.yaml new file mode 100644 index 00000000..bb8ce3c2 --- /dev/null +++ b/data/nfs-client/default.yaml @@ -0,0 +1,3 @@ +--- + nfs-client::settings: + service_name: 'rpcbind' diff --git a/data/nfs-client/hiera.yaml b/data/nfs-client/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/nfs-client/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/nfs-client/osfamily/Debian.yaml b/data/nfs-client/osfamily/Debian.yaml new file mode 100644 index 00000000..9525f5cc --- /dev/null +++ b/data/nfs-client/osfamily/Debian.yaml @@ -0,0 +1,4 @@ +--- + nfs-client::settings: + package_name: 'nfs-common' + init_file_path: '/etc/default/nfs-common' diff --git a/data/nfs-client/osfamily/RedHat.yaml b/data/nfs-client/osfamily/RedHat.yaml new file mode 100644 index 00000000..49d62550 --- /dev/null +++ b/data/nfs-client/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- + nfs-client::settings: + package_name: 'nfs-utils' + init_file_path: '/etc/sysconfig/nfs-common' diff --git a/data/nfs-client/osfamily/Suse.yaml b/data/nfs-client/osfamily/Suse.yaml new file mode 100644 index 00000000..e1e2b814 --- /dev/null +++ b/data/nfs-client/osfamily/Suse.yaml @@ -0,0 +1,4 @@ +--- + nfs-client::settings: + package_name: 'nfs-client' + init_file_path: '/etc/sysconfig/nfs-client' diff --git a/data/nfs-server/default.yaml b/data/nfs-server/default.yaml new file mode 100644 index 00000000..3c89a6d7 --- /dev/null +++ b/data/nfs-server/default.yaml @@ -0,0 +1,4 @@ +--- + nfs-server::settings: + config_file_path: '/etc/exports' + tcp_port: '2049' diff --git a/data/nfs-server/hiera.yaml b/data/nfs-server/hiera.yaml new file mode 100644 index 00000000..456bda56 --- /dev/null +++ b/data/nfs-server/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/nfs-server/osfamily/Debian.yaml b/data/nfs-server/osfamily/Debian.yaml new file mode 100644 index 00000000..4dd71dfb --- /dev/null +++ b/data/nfs-server/osfamily/Debian.yaml @@ -0,0 +1,4 @@ +--- + nfs-server::settings: + package_name: 'nfs-kernel-server' + service_name: 'nfs-kernel-server' diff --git a/data/nfs-server/osfamily/RedHat.yaml b/data/nfs-server/osfamily/RedHat.yaml new file mode 100644 index 00000000..bbceb5ef --- /dev/null +++ b/data/nfs-server/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- + nfs-server::settings: + service_name: 'nfs-server' + init_file_path: '/etc/sysconfig/nfs' diff --git a/data/nfs-server/osfamily/RedHat6.yaml b/data/nfs-server/osfamily/RedHat6.yaml new file mode 100644 index 00000000..67bdb833 --- /dev/null +++ b/data/nfs-server/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + nfs-server::settings: + service_name: 'nfs' diff --git a/data/nfs-server/osfamily/Suse.yaml b/data/nfs-server/osfamily/Suse.yaml new file mode 100644 index 00000000..4dd71dfb --- /dev/null +++ b/data/nfs-server/osfamily/Suse.yaml @@ -0,0 +1,4 @@ +--- + nfs-server::settings: + package_name: 'nfs-kernel-server' + service_name: 'nfs-kernel-server' From ebbf0fc715797f2c9f10097d2993742a7d8d0ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Mon, 14 Nov 2016 15:07:58 +0100 Subject: [PATCH 009/284] added some more packages added iptraf added lsb-release --- data/iptraf/default.yaml | 3 +++ data/iptraf/hiera.yaml | 5 +++++ data/iptraf/osfamily/RedHat.yaml | 3 +++ data/lsb-release/default.yaml | 3 +++ data/lsb-release/hiera.yaml | 5 +++++ data/lsb-release/osfamily/Debian.yaml | 3 +++ data/lsb-release/osfamily/RedHat.yaml | 3 +++ 7 files changed, 25 insertions(+) create mode 100644 data/iptraf/default.yaml create mode 100644 data/iptraf/hiera.yaml create mode 100644 data/iptraf/osfamily/RedHat.yaml create mode 100644 data/lsb-release/default.yaml create mode 100644 data/lsb-release/hiera.yaml create mode 100644 data/lsb-release/osfamily/Debian.yaml create mode 100644 data/lsb-release/osfamily/RedHat.yaml diff --git a/data/iptraf/default.yaml b/data/iptraf/default.yaml new file mode 100644 index 00000000..e5924942 --- /dev/null +++ b/data/iptraf/default.yaml @@ -0,0 +1,3 @@ +--- + iptraf::settings: + package_name: 'iptraf' diff --git a/data/iptraf/hiera.yaml b/data/iptraf/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/iptraf/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/iptraf/osfamily/RedHat.yaml b/data/iptraf/osfamily/RedHat.yaml new file mode 100644 index 00000000..b67cd214 --- /dev/null +++ b/data/iptraf/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + iptraf::settings: + package_name: 'iptraf-ng' diff --git a/data/lsb-release/default.yaml b/data/lsb-release/default.yaml new file mode 100644 index 00000000..4accc495 --- /dev/null +++ b/data/lsb-release/default.yaml @@ -0,0 +1,3 @@ +--- + lsb-release::settings: + package_name: 'lsb-release' diff --git a/data/lsb-release/hiera.yaml b/data/lsb-release/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/lsb-release/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/lsb-release/osfamily/Debian.yaml b/data/lsb-release/osfamily/Debian.yaml new file mode 100644 index 00000000..4accc495 --- /dev/null +++ b/data/lsb-release/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + lsb-release::settings: + package_name: 'lsb-release' diff --git a/data/lsb-release/osfamily/RedHat.yaml b/data/lsb-release/osfamily/RedHat.yaml new file mode 100644 index 00000000..24dd16a8 --- /dev/null +++ b/data/lsb-release/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + lsb-release::settings: + package_name: 'redhat-lsb' From 009d6f448647f861ecc492875357e244bae35c09 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 14 Nov 2016 18:14:50 +0100 Subject: [PATCH 010/284] Preliminary Darwin support in nginx and apache --- data/apache/osfamily/Darwin.yaml | 3 +++ data/nginx/osfamily/Darwin.yaml | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 data/apache/osfamily/Darwin.yaml create mode 100644 data/nginx/osfamily/Darwin.yaml diff --git a/data/apache/osfamily/Darwin.yaml b/data/apache/osfamily/Darwin.yaml new file mode 100644 index 00000000..3e86bad5 --- /dev/null +++ b/data/apache/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- + apache::settings: + config_file_group: 'wheel' diff --git a/data/nginx/osfamily/Darwin.yaml b/data/nginx/osfamily/Darwin.yaml new file mode 100644 index 00000000..27e7e90a --- /dev/null +++ b/data/nginx/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- + nginx::settings: + config_file_group: 'wheel' From f0bc0449331dcc4fdb351d75fc2fab19cb7b6ece Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 14 Nov 2016 18:50:26 +0100 Subject: [PATCH 011/284] Release v0.0.10 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index d41d07f1..5f62b4b8 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.8", + "version": "0.0.10", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 44d21c36273ba1e6ccb0047396c30afeaa2be86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Tue, 15 Nov 2016 09:03:11 +0100 Subject: [PATCH 012/284] added new package definitions lsof bzip2 telnet pwgen: exclude for OracleLinux strace tcpdump iotop apparmor: exclude for RedHat nano mdadm trickle: exclude for OracleLinux mlocate bash --- data/apparmor/default.yaml | 3 +++ data/apparmor/hiera.yaml | 5 +++++ data/apparmor/osfamily/RedHat.yaml | 3 +++ data/bash/default.yaml | 3 +++ data/bash/hiera.yaml | 5 +++++ data/bzip2/default.yaml | 3 +++ data/bzip2/hiera.yaml | 5 +++++ data/iotop/default.yaml | 3 +++ data/iotop/hiera.yaml | 5 +++++ data/lsof/default.yaml | 3 +++ data/lsof/hiera.yaml | 5 +++++ data/mdadm/default.yaml | 3 +++ data/mdadm/hiera.yaml | 5 +++++ data/mlocate/default.yaml | 3 +++ data/mlocate/hiera.yaml | 5 +++++ data/nano/default.yaml | 3 +++ data/nano/hiera.yaml | 5 +++++ data/pwgen/default.yaml | 3 +++ data/pwgen/hiera.yaml | 6 ++++++ data/pwgen/os/OracleLinux.yaml | 3 +++ data/strace/default.yaml | 3 +++ data/strace/hiera.yaml | 5 +++++ data/tcpdump/default.yaml | 3 +++ data/tcpdump/hiera.yaml | 5 +++++ data/telnet/default.yaml | 3 +++ data/telnet/hiera.yaml | 5 +++++ data/trickle/default.yaml | 3 +++ data/trickle/hiera.yaml | 6 ++++++ data/trickle/os/OracleLinux.yaml | 3 +++ 29 files changed, 115 insertions(+) create mode 100644 data/apparmor/default.yaml create mode 100644 data/apparmor/hiera.yaml create mode 100644 data/apparmor/osfamily/RedHat.yaml create mode 100644 data/bash/default.yaml create mode 100644 data/bash/hiera.yaml create mode 100644 data/bzip2/default.yaml create mode 100644 data/bzip2/hiera.yaml create mode 100644 data/iotop/default.yaml create mode 100644 data/iotop/hiera.yaml create mode 100644 data/lsof/default.yaml create mode 100644 data/lsof/hiera.yaml create mode 100644 data/mdadm/default.yaml create mode 100644 data/mdadm/hiera.yaml create mode 100644 data/mlocate/default.yaml create mode 100644 data/mlocate/hiera.yaml create mode 100644 data/nano/default.yaml create mode 100644 data/nano/hiera.yaml create mode 100644 data/pwgen/default.yaml create mode 100644 data/pwgen/hiera.yaml create mode 100644 data/pwgen/os/OracleLinux.yaml create mode 100644 data/strace/default.yaml create mode 100644 data/strace/hiera.yaml create mode 100644 data/tcpdump/default.yaml create mode 100644 data/tcpdump/hiera.yaml create mode 100644 data/telnet/default.yaml create mode 100644 data/telnet/hiera.yaml create mode 100644 data/trickle/default.yaml create mode 100644 data/trickle/hiera.yaml create mode 100644 data/trickle/os/OracleLinux.yaml diff --git a/data/apparmor/default.yaml b/data/apparmor/default.yaml new file mode 100644 index 00000000..f85fe835 --- /dev/null +++ b/data/apparmor/default.yaml @@ -0,0 +1,3 @@ +--- + apparmor::settings: + package_name: 'apparmor' diff --git a/data/apparmor/hiera.yaml b/data/apparmor/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/apparmor/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/apparmor/osfamily/RedHat.yaml b/data/apparmor/osfamily/RedHat.yaml new file mode 100644 index 00000000..390fb7ef --- /dev/null +++ b/data/apparmor/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + apparmor::settings: + package_name: '' diff --git a/data/bash/default.yaml b/data/bash/default.yaml new file mode 100644 index 00000000..f4428eb2 --- /dev/null +++ b/data/bash/default.yaml @@ -0,0 +1,3 @@ +--- + bash::settings: + package_name: 'bash' diff --git a/data/bash/hiera.yaml b/data/bash/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/bash/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/bzip2/default.yaml b/data/bzip2/default.yaml new file mode 100644 index 00000000..a01899a1 --- /dev/null +++ b/data/bzip2/default.yaml @@ -0,0 +1,3 @@ +--- + bzip2::settings: + package_name: 'bzip2' diff --git a/data/bzip2/hiera.yaml b/data/bzip2/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/bzip2/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/iotop/default.yaml b/data/iotop/default.yaml new file mode 100644 index 00000000..da47c644 --- /dev/null +++ b/data/iotop/default.yaml @@ -0,0 +1,3 @@ +--- + iotop::settings: + package_name: 'iotop' diff --git a/data/iotop/hiera.yaml b/data/iotop/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/iotop/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/lsof/default.yaml b/data/lsof/default.yaml new file mode 100644 index 00000000..8f7abf54 --- /dev/null +++ b/data/lsof/default.yaml @@ -0,0 +1,3 @@ +--- + lsof::settings: + package_name: 'lsof' diff --git a/data/lsof/hiera.yaml b/data/lsof/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/lsof/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/mdadm/default.yaml b/data/mdadm/default.yaml new file mode 100644 index 00000000..a45725b4 --- /dev/null +++ b/data/mdadm/default.yaml @@ -0,0 +1,3 @@ +--- + mdadm::settings: + package_name: 'mdadm' diff --git a/data/mdadm/hiera.yaml b/data/mdadm/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/mdadm/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/mlocate/default.yaml b/data/mlocate/default.yaml new file mode 100644 index 00000000..db3c1173 --- /dev/null +++ b/data/mlocate/default.yaml @@ -0,0 +1,3 @@ +--- + mlocate::settings: + package_name: 'mlocate' diff --git a/data/mlocate/hiera.yaml b/data/mlocate/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/mlocate/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/nano/default.yaml b/data/nano/default.yaml new file mode 100644 index 00000000..1ad8747b --- /dev/null +++ b/data/nano/default.yaml @@ -0,0 +1,3 @@ +--- + nano::settings: + package_name: 'nano' diff --git a/data/nano/hiera.yaml b/data/nano/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/nano/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/pwgen/default.yaml b/data/pwgen/default.yaml new file mode 100644 index 00000000..78fb94bf --- /dev/null +++ b/data/pwgen/default.yaml @@ -0,0 +1,3 @@ +--- + pwgen::settings: + package_name: 'pwgen' diff --git a/data/pwgen/hiera.yaml b/data/pwgen/hiera.yaml new file mode 100644 index 00000000..aa64122a --- /dev/null +++ b/data/pwgen/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/os/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/pwgen/os/OracleLinux.yaml b/data/pwgen/os/OracleLinux.yaml new file mode 100644 index 00000000..7242d7fe --- /dev/null +++ b/data/pwgen/os/OracleLinux.yaml @@ -0,0 +1,3 @@ +--- + pwgen::settings: + package_name: '' diff --git a/data/strace/default.yaml b/data/strace/default.yaml new file mode 100644 index 00000000..fc0be5ed --- /dev/null +++ b/data/strace/default.yaml @@ -0,0 +1,3 @@ +--- + strace::settings: + package_name: 'strace' diff --git a/data/strace/hiera.yaml b/data/strace/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/strace/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/tcpdump/default.yaml b/data/tcpdump/default.yaml new file mode 100644 index 00000000..bcc51c67 --- /dev/null +++ b/data/tcpdump/default.yaml @@ -0,0 +1,3 @@ +--- + tcpdump::settings: + package_name: 'tcpdump' diff --git a/data/tcpdump/hiera.yaml b/data/tcpdump/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/tcpdump/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/telnet/default.yaml b/data/telnet/default.yaml new file mode 100644 index 00000000..cba11df3 --- /dev/null +++ b/data/telnet/default.yaml @@ -0,0 +1,3 @@ +--- + telnet::settings: + package_name: 'telnet' diff --git a/data/telnet/hiera.yaml b/data/telnet/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/telnet/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/trickle/default.yaml b/data/trickle/default.yaml new file mode 100644 index 00000000..0f8429a3 --- /dev/null +++ b/data/trickle/default.yaml @@ -0,0 +1,3 @@ +--- + trickle::settings: + package_name: 'trickle' diff --git a/data/trickle/hiera.yaml b/data/trickle/hiera.yaml new file mode 100644 index 00000000..aa64122a --- /dev/null +++ b/data/trickle/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/os/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/trickle/os/OracleLinux.yaml b/data/trickle/os/OracleLinux.yaml new file mode 100644 index 00000000..4c86eed2 --- /dev/null +++ b/data/trickle/os/OracleLinux.yaml @@ -0,0 +1,3 @@ +--- + trickle::settings: + package_name: '' From dd1fce429893ca14f0f344ee8e28fc921aec3d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Tue, 15 Nov 2016 12:53:54 +0100 Subject: [PATCH 013/284] moved os to operatingsystem, because it make more sense to name dir like the variable from facter added more mdadm properties because its more than a simple package --- data/mdadm/default.yaml | 7 +++++++ data/pwgen/hiera.yaml | 2 +- data/pwgen/{os => operatingsystem}/OracleLinux.yaml | 0 data/trickle/hiera.yaml | 2 +- data/trickle/{os => operatingsystem}/OracleLinux.yaml | 0 5 files changed, 9 insertions(+), 2 deletions(-) rename data/pwgen/{os => operatingsystem}/OracleLinux.yaml (100%) rename data/trickle/{os => operatingsystem}/OracleLinux.yaml (100%) diff --git a/data/mdadm/default.yaml b/data/mdadm/default.yaml index a45725b4..cf61e96b 100644 --- a/data/mdadm/default.yaml +++ b/data/mdadm/default.yaml @@ -1,3 +1,10 @@ --- mdadm::settings: package_name: 'mdadm' + service_name: 'mdadm' + config_file_path: '/etc/mdadm/mdadm.conf' + config_dir_path: '/etc/mdadm' + pid_file_path: '/run/mdadm/monitor.pid' + process_name: 'mdadm' + process_user: 'root' + process_group: 'root' diff --git a/data/pwgen/hiera.yaml b/data/pwgen/hiera.yaml index aa64122a..2010c5af 100644 --- a/data/pwgen/hiera.yaml +++ b/data/pwgen/hiera.yaml @@ -1,6 +1,6 @@ --- :hierarchy: - - "%{title}/os/%{operatingsystem}" + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/pwgen/os/OracleLinux.yaml b/data/pwgen/operatingsystem/OracleLinux.yaml similarity index 100% rename from data/pwgen/os/OracleLinux.yaml rename to data/pwgen/operatingsystem/OracleLinux.yaml diff --git a/data/trickle/hiera.yaml b/data/trickle/hiera.yaml index aa64122a..2010c5af 100644 --- a/data/trickle/hiera.yaml +++ b/data/trickle/hiera.yaml @@ -1,6 +1,6 @@ --- :hierarchy: - - "%{title}/os/%{operatingsystem}" + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/trickle/os/OracleLinux.yaml b/data/trickle/operatingsystem/OracleLinux.yaml similarity index 100% rename from data/trickle/os/OracleLinux.yaml rename to data/trickle/operatingsystem/OracleLinux.yaml From 0c4e98f1cfdba9585888235a6801e5338e92ec5f Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 15 Nov 2016 16:25:49 +0100 Subject: [PATCH 014/284] Added mongodb-mms components --- data/mongodb-mms-automation-agent/README.md | 8 ++++++++ data/mongodb-mms-automation-agent/default.yaml | 12 ++++++++++++ data/mongodb-mms-automation-agent/hiera.yaml | 5 +++++ .../osfamily/Debian.yaml | 3 +++ .../osfamily/RedHat.yaml | 3 +++ data/mongodb-mms-backup-agent/README.md | 8 ++++++++ data/mongodb-mms-backup-agent/default.yaml | 12 ++++++++++++ data/mongodb-mms-backup-agent/hiera.yaml | 5 +++++ data/mongodb-mms-backup-agent/osfamily/Debian.yaml | 3 +++ data/mongodb-mms-backup-agent/osfamily/RedHat.yaml | 3 +++ data/mongodb-mms-monitoring-agent/README.md | 8 ++++++++ data/mongodb-mms-monitoring-agent/default.yaml | 12 ++++++++++++ data/mongodb-mms-monitoring-agent/hiera.yaml | 5 +++++ .../osfamily/Debian.yaml | 3 +++ .../osfamily/RedHat.yaml | 3 +++ data/mongodb-mms/README.md | 8 ++++++++ data/mongodb-mms/default.yaml | 12 ++++++++++++ data/mongodb-mms/hiera.yaml | 5 +++++ data/mongodb-mms/osfamily/Debian.yaml | 3 +++ data/mongodb-mms/osfamily/RedHat.yaml | 3 +++ 20 files changed, 124 insertions(+) create mode 100644 data/mongodb-mms-automation-agent/README.md create mode 100644 data/mongodb-mms-automation-agent/default.yaml create mode 100644 data/mongodb-mms-automation-agent/hiera.yaml create mode 100644 data/mongodb-mms-automation-agent/osfamily/Debian.yaml create mode 100644 data/mongodb-mms-automation-agent/osfamily/RedHat.yaml create mode 100644 data/mongodb-mms-backup-agent/README.md create mode 100644 data/mongodb-mms-backup-agent/default.yaml create mode 100644 data/mongodb-mms-backup-agent/hiera.yaml create mode 100644 data/mongodb-mms-backup-agent/osfamily/Debian.yaml create mode 100644 data/mongodb-mms-backup-agent/osfamily/RedHat.yaml create mode 100644 data/mongodb-mms-monitoring-agent/README.md create mode 100644 data/mongodb-mms-monitoring-agent/default.yaml create mode 100644 data/mongodb-mms-monitoring-agent/hiera.yaml create mode 100644 data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml create mode 100644 data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml create mode 100644 data/mongodb-mms/README.md create mode 100644 data/mongodb-mms/default.yaml create mode 100644 data/mongodb-mms/hiera.yaml create mode 100644 data/mongodb-mms/osfamily/Debian.yaml create mode 100644 data/mongodb-mms/osfamily/RedHat.yaml diff --git a/data/mongodb-mms-automation-agent/README.md b/data/mongodb-mms-automation-agent/README.md new file mode 100644 index 00000000..6550d63a --- /dev/null +++ b/data/mongodb-mms-automation-agent/README.md @@ -0,0 +1,8 @@ +### Notice + +MongoDB MMS packages. + +Tinydata for this application does not provide automatic repo configuration. + +You need to configure by yourself the repositories from where these packages can be downloaded. + diff --git a/data/mongodb-mms-automation-agent/default.yaml b/data/mongodb-mms-automation-agent/default.yaml new file mode 100644 index 00000000..b415cb6b --- /dev/null +++ b/data/mongodb-mms-automation-agent/default.yaml @@ -0,0 +1,12 @@ +--- + mongodb-mms-automation-agent::settings: + package_name: 'mongodb-mms-automation-agent' + service_name: 'mongodb-mms-automation-agent' + config_file_path: '/etc/mongodb-mms/automation-agent.config' + pid_file_path: '/var/run/mongodb-mms-automation-agent.pid' + log_file_path: '/var/log/mongodb-mms/automation-agent.log' + config_dir_path: '/etc/mongodb-mms' + log_dir_path: '/var/log/mongodb-mms' + process_name: 'mongodb-mms-automation-agent' + process_user: 'mongodb-mms-agent' + process_group: 'mongodb-mms-agent' diff --git a/data/mongodb-mms-automation-agent/hiera.yaml b/data/mongodb-mms-automation-agent/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/mongodb-mms-automation-agent/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/mongodb-mms-automation-agent/osfamily/Debian.yaml b/data/mongodb-mms-automation-agent/osfamily/Debian.yaml new file mode 100644 index 00000000..5f7ba7f5 --- /dev/null +++ b/data/mongodb-mms-automation-agent/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + mongodb-mms-automation-agent::settings: + init_file_path: '/etc/init/mongodb-mms-automation-agent.conf' diff --git a/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml b/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml new file mode 100644 index 00000000..4e4d2127 --- /dev/null +++ b/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + mongodb-mms-automation-agent::settings: + init_file_path: '/etc/sysconfig/mongodb-mms-automation-agent' diff --git a/data/mongodb-mms-backup-agent/README.md b/data/mongodb-mms-backup-agent/README.md new file mode 100644 index 00000000..6550d63a --- /dev/null +++ b/data/mongodb-mms-backup-agent/README.md @@ -0,0 +1,8 @@ +### Notice + +MongoDB MMS packages. + +Tinydata for this application does not provide automatic repo configuration. + +You need to configure by yourself the repositories from where these packages can be downloaded. + diff --git a/data/mongodb-mms-backup-agent/default.yaml b/data/mongodb-mms-backup-agent/default.yaml new file mode 100644 index 00000000..e1a01667 --- /dev/null +++ b/data/mongodb-mms-backup-agent/default.yaml @@ -0,0 +1,12 @@ +--- + mongodb-mms-backup-agent::settings: + package_name: 'mongodb-mms-backup-agent' + service_name: 'mongodb-mms-backup-agent' + config_file_path: '/etc/mongodb-mms/backup-agent.config' + pid_file_path: '/var/run/mongodb-mms-backup-agent.pid' + log_file_path: '/var/log/mongodb-mms/backup-agent.log' + config_dir_path: '/etc/mongodb-mms' + log_dir_path: '/var/log/mongodb-mms' + process_name: 'mongodb-mms-backup-agent' + process_user: 'mongodb-mms-agent' + process_group: 'mongodb-mms-agent' diff --git a/data/mongodb-mms-backup-agent/hiera.yaml b/data/mongodb-mms-backup-agent/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/mongodb-mms-backup-agent/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/mongodb-mms-backup-agent/osfamily/Debian.yaml b/data/mongodb-mms-backup-agent/osfamily/Debian.yaml new file mode 100644 index 00000000..86f49aad --- /dev/null +++ b/data/mongodb-mms-backup-agent/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + mongodb-mms-backup-agent::settings: + init_file_path: '/etc/init/mongodb-mms-backup-agent.conf' diff --git a/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml b/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml new file mode 100644 index 00000000..2d57c183 --- /dev/null +++ b/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + mongodb-mms-backup-agent::settings: + init_file_path: '/etc/sysconfig/mongodb-mms-backup-agent' diff --git a/data/mongodb-mms-monitoring-agent/README.md b/data/mongodb-mms-monitoring-agent/README.md new file mode 100644 index 00000000..6550d63a --- /dev/null +++ b/data/mongodb-mms-monitoring-agent/README.md @@ -0,0 +1,8 @@ +### Notice + +MongoDB MMS packages. + +Tinydata for this application does not provide automatic repo configuration. + +You need to configure by yourself the repositories from where these packages can be downloaded. + diff --git a/data/mongodb-mms-monitoring-agent/default.yaml b/data/mongodb-mms-monitoring-agent/default.yaml new file mode 100644 index 00000000..947b79f5 --- /dev/null +++ b/data/mongodb-mms-monitoring-agent/default.yaml @@ -0,0 +1,12 @@ +--- + mongodb-mms-monitoring-agent::settings: + package_name: 'mongodb-mms-monitoring-agent' + service_name: 'mongodb-mms-monitoring-agent' + config_file_path: '/etc/mongodb-mms/monitoring-agent.config' + pid_file_path: '/var/run/mongodb-mms-monitoring-agent.pid' + log_file_path: '/var/log/mongodb-mms/monitoring-agent.log' + config_dir_path: '/etc/mongodb-mms' + log_dir_path: '/var/log/mongodb-mms' + process_name: 'mongodb-mms-monitoring-agent' + process_user: 'mongodb-mms-agent' + process_group: 'mongodb-mms-agent' diff --git a/data/mongodb-mms-monitoring-agent/hiera.yaml b/data/mongodb-mms-monitoring-agent/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/mongodb-mms-monitoring-agent/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml b/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml new file mode 100644 index 00000000..0faf6c8c --- /dev/null +++ b/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + mongodb-mms-monitoring-agent::settings: + init_file_path: '/etc/init/mongodb-mms-monitoring-agent.conf' diff --git a/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml b/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml new file mode 100644 index 00000000..609bc5c4 --- /dev/null +++ b/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + mongodb-mms-monitoring-agent::settings: + init_file_path: '/etc/sysconfig/mongodb-mms-monitoring-agent' diff --git a/data/mongodb-mms/README.md b/data/mongodb-mms/README.md new file mode 100644 index 00000000..6550d63a --- /dev/null +++ b/data/mongodb-mms/README.md @@ -0,0 +1,8 @@ +### Notice + +MongoDB MMS packages. + +Tinydata for this application does not provide automatic repo configuration. + +You need to configure by yourself the repositories from where these packages can be downloaded. + diff --git a/data/mongodb-mms/default.yaml b/data/mongodb-mms/default.yaml new file mode 100644 index 00000000..81b88ac4 --- /dev/null +++ b/data/mongodb-mms/default.yaml @@ -0,0 +1,12 @@ +--- + mongodb-mms::settings: + package_name: 'mongodb-mms' + service_name: 'mongodb-mms' + config_file_path: '/opt/mongodb/mms/conf/mms.conf' + log_file_path: '/opt/mongodb/mms/logs/daemon.log' + pid_file_path: '/opt/mongodb/mms/tmp/mms-0.pid' + config_dir_path: '/opt/mongodb/mms/conf' + log_dir_path: '/opt/mongodb/mms/logs' + process_name: 'mongodb-mms' + process_user: 'mongodb-mms-agent' + process_group: 'mongodb-mms-agent' diff --git a/data/mongodb-mms/hiera.yaml b/data/mongodb-mms/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/mongodb-mms/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/mongodb-mms/osfamily/Debian.yaml b/data/mongodb-mms/osfamily/Debian.yaml new file mode 100644 index 00000000..929ee16e --- /dev/null +++ b/data/mongodb-mms/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + mongodb-mms::settings: + init_file_path: '/etc/init/mongodb-mms.conf' diff --git a/data/mongodb-mms/osfamily/RedHat.yaml b/data/mongodb-mms/osfamily/RedHat.yaml new file mode 100644 index 00000000..6e7d1221 --- /dev/null +++ b/data/mongodb-mms/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + mongodb-mms::settings: + init_file_path: '/etc/sysconfig/mongodb-mms' From 9cc79b9551e799760e2fd03db05f0abfaaae31f6 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 15 Nov 2016 16:30:22 +0100 Subject: [PATCH 015/284] Release v0.0.11 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 5f62b4b8..df355f5a 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.10", + "version": "0.0.11", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From becc3b9f251ace8d7d75a65e75c107023313893f Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 21 Nov 2016 22:35:31 +0100 Subject: [PATCH 016/284] Added fabric data --- data/fabric/default.yaml | 4 ++++ data/fabric/hiera.yaml | 5 +++++ data/fabric/osfamily/Darwin.yaml | 3 +++ data/fabric/osfamily/RedHat.yaml | 3 +++ 4 files changed, 15 insertions(+) create mode 100644 data/fabric/default.yaml create mode 100644 data/fabric/hiera.yaml create mode 100644 data/fabric/osfamily/Darwin.yaml create mode 100644 data/fabric/osfamily/RedHat.yaml diff --git a/data/fabric/default.yaml b/data/fabric/default.yaml new file mode 100644 index 00000000..8652fa11 --- /dev/null +++ b/data/fabric/default.yaml @@ -0,0 +1,4 @@ +--- + fabric::settings: + package_name: 'fabric' + package_provider: 'pip' diff --git a/data/fabric/hiera.yaml b/data/fabric/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/fabric/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/fabric/osfamily/Darwin.yaml b/data/fabric/osfamily/Darwin.yaml new file mode 100644 index 00000000..4aab2ba2 --- /dev/null +++ b/data/fabric/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- + fabric::settings: + config_file_group: 'wheel' diff --git a/data/fabric/osfamily/RedHat.yaml b/data/fabric/osfamily/RedHat.yaml new file mode 100644 index 00000000..980f7ad6 --- /dev/null +++ b/data/fabric/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + fabric::settings: + config_file_path: '/etc/fabricrc' From 9823b5db10ace1099f8abd95254e9e408b114c2e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 21 Nov 2016 22:36:10 +0100 Subject: [PATCH 017/284] Removed useless file --- data/fabric/osfamily/RedHat.yaml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 data/fabric/osfamily/RedHat.yaml diff --git a/data/fabric/osfamily/RedHat.yaml b/data/fabric/osfamily/RedHat.yaml deleted file mode 100644 index 980f7ad6..00000000 --- a/data/fabric/osfamily/RedHat.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - fabric::settings: - config_file_path: '/etc/fabricrc' From b64619d53b108b22242bfad874c2aa7e66ac9eaa Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 21 Nov 2016 22:50:21 +0100 Subject: [PATCH 018/284] Essential ntpdate data --- bin/moduledata_clone.sh | 2 +- data/ntpdate/default.yaml | 3 +++ data/ntpdate/hiera.yaml | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 data/ntpdate/default.yaml create mode 100644 data/ntpdate/hiera.yaml diff --git a/bin/moduledata_clone.sh b/bin/moduledata_clone.sh index a68e914a..e8a8cbc8 100755 --- a/bin/moduledata_clone.sh +++ b/bin/moduledata_clone.sh @@ -10,7 +10,7 @@ $0 -m test Create a module data dir based on test module data $0 -m wget -n vim -Create a module data dir based on wget module data +Create a module data dir for vim based on wget module data EOF } diff --git a/data/ntpdate/default.yaml b/data/ntpdate/default.yaml new file mode 100644 index 00000000..8ee55217 --- /dev/null +++ b/data/ntpdate/default.yaml @@ -0,0 +1,3 @@ +--- + ntpdate::settings: + package_name: 'ntpdate' diff --git a/data/ntpdate/hiera.yaml b/data/ntpdate/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/ntpdate/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From 60845f9a92c0b60c155e084eba51adc41aa20023 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 22 Nov 2016 00:36:29 +0100 Subject: [PATCH 019/284] Fixed quotes on puppetserver and puppet-agent --- data/puppet-agent/osfamily/RedHat.yaml | 2 +- data/puppetserver/osfamily/RedHat.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index 2b3804d8..da5f70d2 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -2,5 +2,5 @@ puppet-agent::settings: repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' key: '07BB6C57' - key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet + key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' dockerfile_prerequisites: 'RUN yum install -y wget' diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 838da7cb..4f076ef7 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -3,4 +3,4 @@ init_file_path: '/etc/sysconfig/puppetserver' repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch' key: '07BB6C57' - key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet + key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' From 1bac3b7425b14fea5b9a68a0bda8650f08423a73 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 22 Nov 2016 00:46:01 +0100 Subject: [PATCH 020/284] Release v0.0.12 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index df355f5a..8a9794d8 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.11", + "version": "0.0.12", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 2fa8b8be255d745428381d24ed557217ad4ea504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Wed, 23 Nov 2016 08:14:07 +0100 Subject: [PATCH 021/284] change package_name to vim because vim-common doesn't install vim only the common stuff for vim. Here are no dependencies to install vim too. --- data/vim/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/vim/default.yaml b/data/vim/default.yaml index 6c8a1073..a9fb6609 100644 --- a/data/vim/default.yaml +++ b/data/vim/default.yaml @@ -1,5 +1,5 @@ --- vim::settings: - package_name: 'vim-common' + package_name: 'vim' config_file_path: '/etc/vim/vimrc' config_dir_path: '/etc/vim' From 8512ffd5fd2d6195c6d04d3109d0e2ebb6374b91 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 23 Nov 2016 08:26:47 +0100 Subject: [PATCH 022/284] Added keepalived data --- data/keepalived/default.yaml | 11 +++++++++++ data/keepalived/hiera.yaml | 5 +++++ data/keepalived/osfamily/Debian.yaml | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 data/keepalived/default.yaml create mode 100644 data/keepalived/hiera.yaml create mode 100644 data/keepalived/osfamily/Debian.yaml diff --git a/data/keepalived/default.yaml b/data/keepalived/default.yaml new file mode 100644 index 00000000..3498e406 --- /dev/null +++ b/data/keepalived/default.yaml @@ -0,0 +1,11 @@ +--- + keepalived::settings: + package_name: 'keepalived' + service_name: 'keepalived' + config_file_path: '/etc/keepalived/keepalived.conf' + config_dir_path: '/etc/keepalived' + init_file_path: '/etc/sysconfig/keepalived' + log_file_path: '/var/log/messages' + process_name: 'keepalived' + process_user: 'root' + process_group: 'root' diff --git a/data/keepalived/hiera.yaml b/data/keepalived/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/keepalived/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/keepalived/osfamily/Debian.yaml b/data/keepalived/osfamily/Debian.yaml new file mode 100644 index 00000000..965a7c89 --- /dev/null +++ b/data/keepalived/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + keepalived::settings: + init_file_path: '/etc/default/keepalived' From 1fd53f340f9d2c9fc851b12cbf12b2f1edefef69 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 24 Nov 2016 12:40:15 +0100 Subject: [PATCH 023/284] Release v0.0.13 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 8a9794d8..2a56e5ba 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.12", + "version": "0.0.13", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 551df28f1edb17e6bcfc06a2b4bfb0f3dbf07926 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 29 Nov 2016 19:35:30 +0100 Subject: [PATCH 024/284] Testing data with dependencies --- data/dkms/default.yaml | 6 ++++++ data/dkms/hiera.yaml | 5 +++++ data/dkms/osfamily/RedHat.yaml | 4 ++++ data/fabric/osfamily/RedHat.yaml | 4 ++++ data/sysdig/default.yaml | 2 ++ 5 files changed, 21 insertions(+) create mode 100644 data/dkms/default.yaml create mode 100644 data/dkms/hiera.yaml create mode 100644 data/dkms/osfamily/RedHat.yaml create mode 100644 data/fabric/osfamily/RedHat.yaml diff --git a/data/dkms/default.yaml b/data/dkms/default.yaml new file mode 100644 index 00000000..21258313 --- /dev/null +++ b/data/dkms/default.yaml @@ -0,0 +1,6 @@ +--- + dkms::settings: + package_name: 'dkms' + service_name: 'dkms' + config_file_path: '/etc/dkms/framework.conf' + config_dir_path: '/etc/dkms' diff --git a/data/dkms/hiera.yaml b/data/dkms/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/dkms/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/dkms/osfamily/RedHat.yaml b/data/dkms/osfamily/RedHat.yaml new file mode 100644 index 00000000..7c351d4a --- /dev/null +++ b/data/dkms/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- + dkms::settings: + tp_prerequisites: + - epel diff --git a/data/fabric/osfamily/RedHat.yaml b/data/fabric/osfamily/RedHat.yaml new file mode 100644 index 00000000..8f48ad36 --- /dev/null +++ b/data/fabric/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- + fabric::settings: + package_prerequisites: + - python-devel diff --git a/data/sysdig/default.yaml b/data/sysdig/default.yaml index 8896c1fa..321f249b 100644 --- a/data/sysdig/default.yaml +++ b/data/sysdig/default.yaml @@ -1,3 +1,5 @@ --- sysdig::settings: package_name: 'sysdig' + tp_prerequisites: + - dkms From a21e21f1d2460ef5b6a8c6f814debaa69eec819b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 29 Nov 2016 20:47:16 +0100 Subject: [PATCH 025/284] More dependencies data --- data/fabric/osfamily/Debian.yaml | 4 ++++ data/rails/osfamily/Debian.yaml | 2 +- data/rails/osfamily/RedHat.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 data/fabric/osfamily/Debian.yaml diff --git a/data/fabric/osfamily/Debian.yaml b/data/fabric/osfamily/Debian.yaml new file mode 100644 index 00000000..be27c309 --- /dev/null +++ b/data/fabric/osfamily/Debian.yaml @@ -0,0 +1,4 @@ +--- + fabric::settings: + package_prerequisites: + - python-dev diff --git a/data/rails/osfamily/Debian.yaml b/data/rails/osfamily/Debian.yaml index 18f6c241..7ab28769 100644 --- a/data/rails/osfamily/Debian.yaml +++ b/data/rails/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- rails::settings: - package_dependencies: + package_prerequisites: - 'ruby-dev' - 'zlib1g-dev' diff --git a/data/rails/osfamily/RedHat.yaml b/data/rails/osfamily/RedHat.yaml index 288d4506..36a9cea5 100644 --- a/data/rails/osfamily/RedHat.yaml +++ b/data/rails/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- rails::settings: - package_dependencies: + package_prerequisites: - 'ruby-devel' - 'zlib-devel' From cc9bc54ace93a07f9bdf26e518bb3a35fbeef59d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 29 Nov 2016 20:47:51 +0100 Subject: [PATCH 026/284] Release v0.0.14 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 2a56e5ba..5cfb4fe0 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.13", + "version": "0.0.14", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From fce733b39c0111ff5671851b4d1e53aaa82f5866 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 30 Nov 2016 01:35:41 +0100 Subject: [PATCH 027/284] Basic virtualbox data --- data/virtualbox/default.yaml | 5 +++++ data/virtualbox/hiera.yaml | 7 +++++++ data/virtualbox/operatingsystem/Debian7.yaml | 3 +++ data/virtualbox/operatingsystem/Debian8.yaml | 3 +++ data/virtualbox/operatingsystem/Debian9.yaml | 3 +++ data/virtualbox/operatingsystem/Ubuntu12.04.yaml | 3 +++ data/virtualbox/operatingsystem/Ubuntu14.04.yaml | 3 +++ data/virtualbox/operatingsystem/Ubuntu14.10.yaml | 3 +++ data/virtualbox/operatingsystem/Ubuntu16.04.yaml | 3 +++ data/virtualbox/osfamily/Debian.yaml | 7 +++++++ data/virtualbox/osfamily/RedHat.yaml | 6 ++++++ 11 files changed, 46 insertions(+) create mode 100644 data/virtualbox/default.yaml create mode 100644 data/virtualbox/hiera.yaml create mode 100644 data/virtualbox/operatingsystem/Debian7.yaml create mode 100644 data/virtualbox/operatingsystem/Debian8.yaml create mode 100644 data/virtualbox/operatingsystem/Debian9.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu12.04.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu14.10.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/virtualbox/osfamily/Debian.yaml create mode 100644 data/virtualbox/osfamily/RedHat.yaml diff --git a/data/virtualbox/default.yaml b/data/virtualbox/default.yaml new file mode 100644 index 00000000..6206e59f --- /dev/null +++ b/data/virtualbox/default.yaml @@ -0,0 +1,5 @@ +--- + virtualbox::settings: + package_name: 'VirtualBox-5.1' + service_name: 'vboxdrv' + config_dir_path: '/etc/vbox' diff --git a/data/virtualbox/hiera.yaml b/data/virtualbox/hiera.yaml new file mode 100644 index 00000000..2cf9014d --- /dev/null +++ b/data/virtualbox/hiera.yaml @@ -0,0 +1,7 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/virtualbox/operatingsystem/Debian7.yaml b/data/virtualbox/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..c37e220d --- /dev/null +++ b/data/virtualbox/operatingsystem/Debian7.yaml @@ -0,0 +1,3 @@ +--- + virtualbox::settings: + apt_release: 'wheezy' diff --git a/data/virtualbox/operatingsystem/Debian8.yaml b/data/virtualbox/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..132e5fd3 --- /dev/null +++ b/data/virtualbox/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- + virtualbox::settings: + apt_release: 'jessie' diff --git a/data/virtualbox/operatingsystem/Debian9.yaml b/data/virtualbox/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..1dc13a01 --- /dev/null +++ b/data/virtualbox/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- + virtualbox::settings: + apt_release: 'stretch' diff --git a/data/virtualbox/operatingsystem/Ubuntu12.04.yaml b/data/virtualbox/operatingsystem/Ubuntu12.04.yaml new file mode 100644 index 00000000..801cba58 --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu12.04.yaml @@ -0,0 +1,3 @@ +--- + virtualbox::settings: + apt_release: 'precise' diff --git a/data/virtualbox/operatingsystem/Ubuntu14.04.yaml b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..b4ed280e --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- + virtualbox::settings: + apt_release: 'trusty' diff --git a/data/virtualbox/operatingsystem/Ubuntu14.10.yaml b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml new file mode 100644 index 00000000..88cd3c2b --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml @@ -0,0 +1,3 @@ +--- + virtualbox::settings: + apt_release: 'ubuntu-utopic' diff --git a/data/virtualbox/operatingsystem/Ubuntu16.04.yaml b/data/virtualbox/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..f3c9b204 --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- + virtualbox::settings: + apt_release: 'xenial' diff --git a/data/virtualbox/osfamily/Debian.yaml b/data/virtualbox/osfamily/Debian.yaml new file mode 100644 index 00000000..b05c447d --- /dev/null +++ b/data/virtualbox/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- + virtualbox::settings: + repo_url: 'http://download.virtualbox.org/virtualbox/debian' + key: '7F438280EF8D349F' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + apt_repos: 'contrib' + diff --git a/data/virtualbox/osfamily/RedHat.yaml b/data/virtualbox/osfamily/RedHat.yaml new file mode 100644 index 00000000..956270af --- /dev/null +++ b/data/virtualbox/osfamily/RedHat.yaml @@ -0,0 +1,6 @@ +--- + virtualbox::settings: + key: '7B0FAB3A' + repo_url: 'http://download.virtualbox.org/virtualbox/rpm/el/$releasever/$basearch' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + From af0cd07fbf1f7d731e76e9e3351b85fbb448cbb5 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 2 Dec 2016 17:59:31 +0100 Subject: [PATCH 028/284] Release v0.0.15 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 5cfb4fe0..59bd6028 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.14", + "version": "0.0.15", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 5bf3e60bc5efaf66b78e191e5681f26ff333dee8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 5 Dec 2016 12:34:19 +0100 Subject: [PATCH 029/284] Added gitlab-ce data --- data/gitlab-ce/default.yaml | 6 ++++++ data/gitlab-ce/hiera.yaml | 7 +++++++ data/gitlab-ce/operatingsystem/Debian7.yaml | 3 +++ data/gitlab-ce/operatingsystem/Debian8.yaml | 3 +++ data/gitlab-ce/operatingsystem/Debian9.yaml | 3 +++ data/gitlab-ce/operatingsystem/Ubuntu.yaml | 3 +++ data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml | 3 +++ data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml | 3 +++ data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml | 3 +++ data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml | 3 +++ data/gitlab-ce/osfamily/Debian.yaml | 7 +++++++ data/gitlab-ce/osfamily/RedHat.yaml | 6 ++++++ 12 files changed, 50 insertions(+) create mode 100644 data/gitlab-ce/default.yaml create mode 100644 data/gitlab-ce/hiera.yaml create mode 100644 data/gitlab-ce/operatingsystem/Debian7.yaml create mode 100644 data/gitlab-ce/operatingsystem/Debian8.yaml create mode 100644 data/gitlab-ce/operatingsystem/Debian9.yaml create mode 100644 data/gitlab-ce/operatingsystem/Ubuntu.yaml create mode 100644 data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml create mode 100644 data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml create mode 100644 data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/gitlab-ce/osfamily/Debian.yaml create mode 100644 data/gitlab-ce/osfamily/RedHat.yaml diff --git a/data/gitlab-ce/default.yaml b/data/gitlab-ce/default.yaml new file mode 100644 index 00000000..690c84f7 --- /dev/null +++ b/data/gitlab-ce/default.yaml @@ -0,0 +1,6 @@ +--- + gitlab-ce::settings: + package_name: 'gitlab-ce' + service_name: 'gitlab-runsvdir' + config_file_path: '/opt/gitlab/etc/gitlab.rb' + config_dir_path: '/opt/gitlab/etc' diff --git a/data/gitlab-ce/hiera.yaml b/data/gitlab-ce/hiera.yaml new file mode 100644 index 00000000..2cf9014d --- /dev/null +++ b/data/gitlab-ce/hiera.yaml @@ -0,0 +1,7 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/gitlab-ce/operatingsystem/Debian7.yaml b/data/gitlab-ce/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..af034a57 --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Debian7.yaml @@ -0,0 +1,3 @@ +--- + gitlab-ce::settings: + apt_release: 'wheezy' diff --git a/data/gitlab-ce/operatingsystem/Debian8.yaml b/data/gitlab-ce/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..df443d37 --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- + gitlab-ce::settings: + apt_release: 'jessie' diff --git a/data/gitlab-ce/operatingsystem/Debian9.yaml b/data/gitlab-ce/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..d95df4e6 --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- + gitlab-ce::settings: + apt_release: 'stretch' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu.yaml b/data/gitlab-ce/operatingsystem/Ubuntu.yaml new file mode 100644 index 00000000..f8c931c7 --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Ubuntu.yaml @@ -0,0 +1,3 @@ +--- + gitlab-ce::settings: + repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce/debian' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml b/data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml new file mode 100644 index 00000000..9ac5fcd1 --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml @@ -0,0 +1,3 @@ +--- + gitlab-ce::settings: + apt_release: 'precise' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml b/data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..54234be0 --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- + gitlab-ce::settings: + apt_release: 'trusty' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml b/data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml new file mode 100644 index 00000000..4fbaf28c --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml @@ -0,0 +1,3 @@ +--- + gitlab-ce::settings: + apt_release: 'ubuntu-utopic' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml b/data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..77b4eaea --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- + gitlab-ce::settings: + apt_release: 'xenial' diff --git a/data/gitlab-ce/osfamily/Debian.yaml b/data/gitlab-ce/osfamily/Debian.yaml new file mode 100644 index 00000000..7901dd78 --- /dev/null +++ b/data/gitlab-ce/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- + gitlab-ce::settings: + repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce/debian' + key: '14219A96E15E78F4' + key_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' + apt_repos: 'main' + diff --git a/data/gitlab-ce/osfamily/RedHat.yaml b/data/gitlab-ce/osfamily/RedHat.yaml new file mode 100644 index 00000000..c9b03d32 --- /dev/null +++ b/data/gitlab-ce/osfamily/RedHat.yaml @@ -0,0 +1,6 @@ +--- + gitlab-ce::settings: + key: '14219A96E15E78F4' + repo_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/el/$releasever/$basearch' + key_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' + From 632be99e854a87af73b85b3e1574bb3bb0e083f3 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 5 Dec 2016 16:53:01 +0100 Subject: [PATCH 030/284] Octocatalog-diff data --- data/gitlab-ce/osfamily/RedHat.yaml | 4 ++-- data/octocatalog/default.yaml | 7 +++++++ data/octocatalog/hiera.yaml | 5 +++++ data/rubygems/default.yaml | 3 +++ data/rubygems/hiera.yaml | 6 ++++++ data/rubygems/osfamily/Debian.yaml | 3 +++ 6 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 data/octocatalog/default.yaml create mode 100644 data/octocatalog/hiera.yaml create mode 100644 data/rubygems/default.yaml create mode 100644 data/rubygems/hiera.yaml create mode 100644 data/rubygems/osfamily/Debian.yaml diff --git a/data/gitlab-ce/osfamily/RedHat.yaml b/data/gitlab-ce/osfamily/RedHat.yaml index c9b03d32..a7402779 100644 --- a/data/gitlab-ce/osfamily/RedHat.yaml +++ b/data/gitlab-ce/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- gitlab-ce::settings: - key: '14219A96E15E78F4' + key: ~ # '14219A96E15E78F4' repo_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/el/$releasever/$basearch' - key_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' + key_url: ~ # 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' diff --git a/data/octocatalog/default.yaml b/data/octocatalog/default.yaml new file mode 100644 index 00000000..66b69c6d --- /dev/null +++ b/data/octocatalog/default.yaml @@ -0,0 +1,7 @@ +--- + octocatalog::settings: + package_name: 'octocatalog' + package_provider: 'gem' + config_file_path: '/etc/octocatalog-diff.cfg.rb' + tp_prerequisites: + - rubygem diff --git a/data/octocatalog/hiera.yaml b/data/octocatalog/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/octocatalog/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/rubygems/default.yaml b/data/rubygems/default.yaml new file mode 100644 index 00000000..4053c7d4 --- /dev/null +++ b/data/rubygems/default.yaml @@ -0,0 +1,3 @@ +--- + rubygems::settings: + package_name: 'rubygems' diff --git a/data/rubygems/hiera.yaml b/data/rubygems/hiera.yaml new file mode 100644 index 00000000..456bda56 --- /dev/null +++ b/data/rubygems/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/rubygems/osfamily/Debian.yaml b/data/rubygems/osfamily/Debian.yaml new file mode 100644 index 00000000..6718384b --- /dev/null +++ b/data/rubygems/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + rubygems::settings: + package_name: 'ruby' From 9ecab01a7593ffa0684c6b8ee07f2cac87ec035d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 5 Dec 2016 16:53:29 +0100 Subject: [PATCH 031/284] Release v0.0.16 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 59bd6028..06025e88 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.15", + "version": "0.0.16", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 5bde8c5584b8553318be5d871d3e437b96455bfb Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 6 Dec 2016 09:26:39 +0100 Subject: [PATCH 032/284] Added octocatalog-diff data --- data/make/default.yaml | 3 +++ data/{rubygems => make}/hiera.yaml | 0 data/octocatalog-diff/default.yaml | 11 +++++++++++ data/{octocatalog => octocatalog-diff}/hiera.yaml | 0 data/octocatalog/default.yaml | 7 ------- data/ruby-dev/default.yaml | 3 +++ data/ruby-dev/hiera.yaml | 6 ++++++ data/ruby-dev/osfamily/Debian.yaml | 3 +++ data/ruby-dev/osfamily/RedHat.yaml | 3 +++ .../osfamily/Debian.yaml => ruby/default.yaml} | 2 +- data/ruby/hiera.yaml | 6 ++++++ data/rubygems/default.yaml | 3 --- 12 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 data/make/default.yaml rename data/{rubygems => make}/hiera.yaml (100%) create mode 100644 data/octocatalog-diff/default.yaml rename data/{octocatalog => octocatalog-diff}/hiera.yaml (100%) delete mode 100644 data/octocatalog/default.yaml create mode 100644 data/ruby-dev/default.yaml create mode 100644 data/ruby-dev/hiera.yaml create mode 100644 data/ruby-dev/osfamily/Debian.yaml create mode 100644 data/ruby-dev/osfamily/RedHat.yaml rename data/{rubygems/osfamily/Debian.yaml => ruby/default.yaml} (56%) create mode 100644 data/ruby/hiera.yaml delete mode 100644 data/rubygems/default.yaml diff --git a/data/make/default.yaml b/data/make/default.yaml new file mode 100644 index 00000000..4992c512 --- /dev/null +++ b/data/make/default.yaml @@ -0,0 +1,3 @@ +--- + make::settings: + package_name: 'make' diff --git a/data/rubygems/hiera.yaml b/data/make/hiera.yaml similarity index 100% rename from data/rubygems/hiera.yaml rename to data/make/hiera.yaml diff --git a/data/octocatalog-diff/default.yaml b/data/octocatalog-diff/default.yaml new file mode 100644 index 00000000..71e46cd8 --- /dev/null +++ b/data/octocatalog-diff/default.yaml @@ -0,0 +1,11 @@ +--- + octocatalog-diff::settings: + package_name: 'octocatalog-diff' + package_provider: 'gem' + config_file_path: '/etc/octocatalog-diff.cfg.rb' + tp_prerequisites: + - ruby + - ruby-dev + - make + package_prerequisites: + - cmake diff --git a/data/octocatalog/hiera.yaml b/data/octocatalog-diff/hiera.yaml similarity index 100% rename from data/octocatalog/hiera.yaml rename to data/octocatalog-diff/hiera.yaml diff --git a/data/octocatalog/default.yaml b/data/octocatalog/default.yaml deleted file mode 100644 index 66b69c6d..00000000 --- a/data/octocatalog/default.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- - octocatalog::settings: - package_name: 'octocatalog' - package_provider: 'gem' - config_file_path: '/etc/octocatalog-diff.cfg.rb' - tp_prerequisites: - - rubygem diff --git a/data/ruby-dev/default.yaml b/data/ruby-dev/default.yaml new file mode 100644 index 00000000..a7132a84 --- /dev/null +++ b/data/ruby-dev/default.yaml @@ -0,0 +1,3 @@ +--- + ruby-dev::settings: + package_name: 'ruby-dev' diff --git a/data/ruby-dev/hiera.yaml b/data/ruby-dev/hiera.yaml new file mode 100644 index 00000000..456bda56 --- /dev/null +++ b/data/ruby-dev/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/ruby-dev/osfamily/Debian.yaml b/data/ruby-dev/osfamily/Debian.yaml new file mode 100644 index 00000000..a7132a84 --- /dev/null +++ b/data/ruby-dev/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + ruby-dev::settings: + package_name: 'ruby-dev' diff --git a/data/ruby-dev/osfamily/RedHat.yaml b/data/ruby-dev/osfamily/RedHat.yaml new file mode 100644 index 00000000..cada3588 --- /dev/null +++ b/data/ruby-dev/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + ruby-dev::settings: + package_name: 'ruby-devel' diff --git a/data/rubygems/osfamily/Debian.yaml b/data/ruby/default.yaml similarity index 56% rename from data/rubygems/osfamily/Debian.yaml rename to data/ruby/default.yaml index 6718384b..eb9bbf09 100644 --- a/data/rubygems/osfamily/Debian.yaml +++ b/data/ruby/default.yaml @@ -1,3 +1,3 @@ --- - rubygems::settings: + ruby::settings: package_name: 'ruby' diff --git a/data/ruby/hiera.yaml b/data/ruby/hiera.yaml new file mode 100644 index 00000000..456bda56 --- /dev/null +++ b/data/ruby/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/rubygems/default.yaml b/data/rubygems/default.yaml deleted file mode 100644 index 4053c7d4..00000000 --- a/data/rubygems/default.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - rubygems::settings: - package_name: 'rubygems' From a3938cca606ba7f224ca5a6250263153350fbff0 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 6 Dec 2016 09:27:18 +0100 Subject: [PATCH 033/284] Release v0.0.17 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 06025e88..6943003c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.16", + "version": "0.0.17", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 31456b4ec3d59441b11c00c8699b66633846222a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 6 Dec 2016 19:01:29 +0100 Subject: [PATCH 034/284] Added gitlab-runner data --- data/gitlab-runner/default.yaml | 6 ++++++ data/gitlab-runner/hiera.yaml | 7 +++++++ data/gitlab-runner/operatingsystem/Debian7.yaml | 3 +++ data/gitlab-runner/operatingsystem/Debian8.yaml | 3 +++ data/gitlab-runner/operatingsystem/Debian9.yaml | 3 +++ data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml | 3 +++ data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml | 3 +++ data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml | 3 +++ data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml | 3 +++ data/gitlab-runner/osfamily/Debian.yaml | 7 +++++++ data/gitlab-runner/osfamily/RedHat.yaml | 6 ++++++ 11 files changed, 47 insertions(+) create mode 100644 data/gitlab-runner/default.yaml create mode 100644 data/gitlab-runner/hiera.yaml create mode 100644 data/gitlab-runner/operatingsystem/Debian7.yaml create mode 100644 data/gitlab-runner/operatingsystem/Debian8.yaml create mode 100644 data/gitlab-runner/operatingsystem/Debian9.yaml create mode 100644 data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml create mode 100644 data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml create mode 100644 data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/gitlab-runner/osfamily/Debian.yaml create mode 100644 data/gitlab-runner/osfamily/RedHat.yaml diff --git a/data/gitlab-runner/default.yaml b/data/gitlab-runner/default.yaml new file mode 100644 index 00000000..3ec83f52 --- /dev/null +++ b/data/gitlab-runner/default.yaml @@ -0,0 +1,6 @@ +--- + gitlab-runner::settings: + package_name: 'gitlab-ci-multi-runner' + service_name: 'gitlab-runner' + config_file_path: '/etc/gitlab-runner/config.toml' + config_dir_path: '/etc/gitlab-runner' diff --git a/data/gitlab-runner/hiera.yaml b/data/gitlab-runner/hiera.yaml new file mode 100644 index 00000000..2cf9014d --- /dev/null +++ b/data/gitlab-runner/hiera.yaml @@ -0,0 +1,7 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/gitlab-runner/operatingsystem/Debian7.yaml b/data/gitlab-runner/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..36aa8f35 --- /dev/null +++ b/data/gitlab-runner/operatingsystem/Debian7.yaml @@ -0,0 +1,3 @@ +--- + gitlab-runner::settings: + apt_release: 'wheezy' diff --git a/data/gitlab-runner/operatingsystem/Debian8.yaml b/data/gitlab-runner/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..4baa8e03 --- /dev/null +++ b/data/gitlab-runner/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- + gitlab-runner::settings: + apt_release: 'jessie' diff --git a/data/gitlab-runner/operatingsystem/Debian9.yaml b/data/gitlab-runner/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..278b6dff --- /dev/null +++ b/data/gitlab-runner/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- + gitlab-runner::settings: + apt_release: 'stretch' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml b/data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml new file mode 100644 index 00000000..a4c5a6fb --- /dev/null +++ b/data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml @@ -0,0 +1,3 @@ +--- + gitlab-runner::settings: + apt_release: 'precise' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml b/data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..cb334620 --- /dev/null +++ b/data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- + gitlab-runner::settings: + apt_release: 'trusty' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml b/data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml new file mode 100644 index 00000000..9cbda82e --- /dev/null +++ b/data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml @@ -0,0 +1,3 @@ +--- + gitlab-runner::settings: + apt_release: 'ubuntu-utopic' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml b/data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..705315e5 --- /dev/null +++ b/data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- + gitlab-runner::settings: + apt_release: 'xenial' diff --git a/data/gitlab-runner/osfamily/Debian.yaml b/data/gitlab-runner/osfamily/Debian.yaml new file mode 100644 index 00000000..b16d7237 --- /dev/null +++ b/data/gitlab-runner/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- + gitlab-runner::settings: + repo_url: 'http://packages.gitlab.com/runner/gitlab-ci-multi-runner/debian' + key: '14219A96E15E78F4' + key_url: 'https://packages.gitlab.com/runner/gitlab-ci-multi-runner/gpgkey' + apt_repos: 'main' + diff --git a/data/gitlab-runner/osfamily/RedHat.yaml b/data/gitlab-runner/osfamily/RedHat.yaml new file mode 100644 index 00000000..ab3da3da --- /dev/null +++ b/data/gitlab-runner/osfamily/RedHat.yaml @@ -0,0 +1,6 @@ +--- + gitlab-runner::settings: + key: ~ # '' + repo_url: 'https://packages.gitlab.com/runner/gitlab-ci-multi-runner/el/$releasever/$basearch' + key_url: ~ # 'https://packages.gitlab.com/runner/gitlab-ci-multi-runner/gpgkey' + From 938009df548f28d1417f3b8bcd968bdf34a2a252 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 11 Dec 2016 16:44:17 +0100 Subject: [PATCH 035/284] Release v0.0.18 --- metadata.json | 2 +- templates/redis/test.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index 6943003c..852d5d52 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.17", + "version": "0.0.18", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", diff --git a/templates/redis/test.conf.erb b/templates/redis/test.conf.erb index bc016fd4..667a94c3 100644 --- a/templates/redis/test.conf.erb +++ b/templates/redis/test.conf.erb @@ -1 +1 @@ -# Test template for tp spec tests +# Test template for tp spec tests From f3ade1ed78fbf54bddd7f23902c4afe982ef2a3c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 14 Dec 2016 01:11:46 +0100 Subject: [PATCH 036/284] Added pip prerequisite on relevant apps --- data/awscli/default.yaml | 3 +++ data/fabric/default.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/data/awscli/default.yaml b/data/awscli/default.yaml index 9423b0e8..6e9efa3e 100644 --- a/data/awscli/default.yaml +++ b/data/awscli/default.yaml @@ -4,3 +4,6 @@ package_provider: 'pip' config_file_path: '/root/.aws/config' config_dir_path: '/etc/aws' + tp_prerequisites: + - python-pip + diff --git a/data/fabric/default.yaml b/data/fabric/default.yaml index 8652fa11..e30c8a40 100644 --- a/data/fabric/default.yaml +++ b/data/fabric/default.yaml @@ -2,3 +2,5 @@ fabric::settings: package_name: 'fabric' package_provider: 'pip' + tp_prerequisites: + - python-pip From 631e762554d03379226f72e1ee002e0a423cf353 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 14 Dec 2016 01:14:03 +0100 Subject: [PATCH 037/284] Added some ruby prerequisites --- data/r10k/default.yaml | 2 ++ data/wpscan/default.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/data/r10k/default.yaml b/data/r10k/default.yaml index dbd33c33..cc7a9b3b 100644 --- a/data/r10k/default.yaml +++ b/data/r10k/default.yaml @@ -3,3 +3,5 @@ package_name: 'r10k' package_provider: 'gem' config_file_path: '/etc/r10k.yaml' + tp_prerequisites: + - ruby diff --git a/data/wpscan/default.yaml b/data/wpscan/default.yaml index 5ad88f5d..f77a0678 100644 --- a/data/wpscan/default.yaml +++ b/data/wpscan/default.yaml @@ -10,3 +10,5 @@ postinstall_exec: bundle_install: command: 'bundle install --without test' + tp_prerequisites: + - ruby From 393132618a9bb9743c6842dd19f2852857f3abcf Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 14 Dec 2016 01:14:53 +0100 Subject: [PATCH 038/284] Release v0.0.19 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 852d5d52..979b940b 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.18", + "version": "0.0.19", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From e7b2b43168c8a8bbeb944d2d50b3861061238a5c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 14 Dec 2016 08:30:09 +0100 Subject: [PATCH 039/284] Added Debian apache conf dirs --- data/apache/osfamily/Debian.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/apache/osfamily/Debian.yaml b/data/apache/osfamily/Debian.yaml index d21cc090..6785a639 100644 --- a/data/apache/osfamily/Debian.yaml +++ b/data/apache/osfamily/Debian.yaml @@ -9,6 +9,8 @@ mods-enabled_dir_path: '/etc/apache2/mods-enabled' sites-available_dir_path: '/etc/apache2/sites-available' sites-enabled_dir_path: '/etc/apache2/sites-enabled' + conf-available_dir_path: '/etc/apache2/conf-available' + conf-enabled_dir_path: '/etc/apache2/conf-enabled' conf_dir_path: '/etc/apache2/conf.d' pid_file_path: '/var/run/apache2.pid' log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] From 177edf76b94bc935076b0850c45ef6e8ee737289 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 14 Dec 2016 08:30:31 +0100 Subject: [PATCH 040/284] Release v0.0.20 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 979b940b..ab2f5349 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.19", + "version": "0.0.20", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From ec69ad98d54f34caeac896337beed4bcc6f5f7f4 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 19 Dec 2016 11:06:13 +0100 Subject: [PATCH 041/284] Added MAx support for Docker --- data/docker-engine/operatingsystem/Darwin.yaml | 5 +++++ data/gitlab-ce/operatingsystem/Debian.yaml | 6 ++++++ data/gitlab-ce/osfamily/Debian.yaml | 1 - 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 data/docker-engine/operatingsystem/Darwin.yaml create mode 100644 data/gitlab-ce/operatingsystem/Debian.yaml diff --git a/data/docker-engine/operatingsystem/Darwin.yaml b/data/docker-engine/operatingsystem/Darwin.yaml new file mode 100644 index 00000000..73650ab6 --- /dev/null +++ b/data/docker-engine/operatingsystem/Darwin.yaml @@ -0,0 +1,5 @@ +--- + docker-engine::settings: + package_source: https://download.docker.com/mac/stable/Docker.dmg + config_file_group: 'wheel' + diff --git a/data/gitlab-ce/operatingsystem/Debian.yaml b/data/gitlab-ce/operatingsystem/Debian.yaml new file mode 100644 index 00000000..a4ef7d70 --- /dev/null +++ b/data/gitlab-ce/operatingsystem/Debian.yaml @@ -0,0 +1,6 @@ +--- + gitlab-ce::settings: + package_prerequisites: + - debian-archive-keyring + - apt-transport-https + diff --git a/data/gitlab-ce/osfamily/Debian.yaml b/data/gitlab-ce/osfamily/Debian.yaml index 7901dd78..76ddab9e 100644 --- a/data/gitlab-ce/osfamily/Debian.yaml +++ b/data/gitlab-ce/osfamily/Debian.yaml @@ -4,4 +4,3 @@ key: '14219A96E15E78F4' key_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' apt_repos: 'main' - From 69e8664435a8e047a1fb5b41597da99088ca81c4 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 19 Dec 2016 11:06:33 +0100 Subject: [PATCH 042/284] Bacula-clinet data --- data/bacula-client/default.yaml | 15 +++++++++++++++ data/{bacula => bacula-client}/hiera.yaml | 0 data/bacula-client/osfamily/Debian.yaml | 3 +++ data/bacula/default.yaml | 9 --------- data/bacula/osfamily/Debian.yaml | 3 --- data/bacula/osfamily/RedHat.yaml | 3 --- 6 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 data/bacula-client/default.yaml rename data/{bacula => bacula-client}/hiera.yaml (100%) create mode 100644 data/bacula-client/osfamily/Debian.yaml delete mode 100644 data/bacula/default.yaml delete mode 100644 data/bacula/osfamily/Debian.yaml delete mode 100644 data/bacula/osfamily/RedHat.yaml diff --git a/data/bacula-client/default.yaml b/data/bacula-client/default.yaml new file mode 100644 index 00000000..3f2b5476 --- /dev/null +++ b/data/bacula-client/default.yaml @@ -0,0 +1,15 @@ +--- + bacula-client::settings: + package_name: 'bacula-client' + service_name: 'bacula-fd' + config_file_path: '/etc/bacula/bacula-fd.conf' + config_dir_path: '/etc/bacula' + data_dir_path: '/var/lib/bacula' + init_file_path: '/etc/sysconfig/bacula-fd' + tcp_port: '9102' + pid_file_path: '/var/run/bacula/bacula-fd.9102.pid' + log_file_path: '/var/log/messages' + log_dir_path: '/var/log/bacula' + process_name: 'bacula-fd' + process_user: 'root' + process_group: 'root' diff --git a/data/bacula/hiera.yaml b/data/bacula-client/hiera.yaml similarity index 100% rename from data/bacula/hiera.yaml rename to data/bacula-client/hiera.yaml diff --git a/data/bacula-client/osfamily/Debian.yaml b/data/bacula-client/osfamily/Debian.yaml new file mode 100644 index 00000000..9698a443 --- /dev/null +++ b/data/bacula-client/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + bacula-client::settings: + init_file_path: '/etc/default/bacula-fd' diff --git a/data/bacula/default.yaml b/data/bacula/default.yaml deleted file mode 100644 index 7b9c1937..00000000 --- a/data/bacula/default.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- - bacula::settings: - package_name: 'bacula' - config_dir_path: '/etc/bacula' - log_file_path: '/var/log/bacula/bacula.log' - log_dir_path: '/var/log/bacula' - process_user: 'bacula' - process_group: 'bacula' - diff --git a/data/bacula/osfamily/Debian.yaml b/data/bacula/osfamily/Debian.yaml deleted file mode 100644 index 61a2c1a7..00000000 --- a/data/bacula/osfamily/Debian.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - bacula::settings: - init_file_path: '/etc/default/bacula' diff --git a/data/bacula/osfamily/RedHat.yaml b/data/bacula/osfamily/RedHat.yaml deleted file mode 100644 index 5d271f77..00000000 --- a/data/bacula/osfamily/RedHat.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - bacula::settings: - init_file_path: '/etc/sysconfig/bacula' From 0229897d98fd50d318db08756ba5d013bfd6d489 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 19 Dec 2016 11:06:56 +0100 Subject: [PATCH 043/284] Release v0.0.21 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index ab2f5349..b59fcb56 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.20", + "version": "0.0.21", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From a2c5ad070bbc71a6a9eec38ca34cb65badbb0fd0 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 19 Dec 2016 12:00:54 +0100 Subject: [PATCH 044/284] Bacula fixes --- data/bacula-client/default.yaml | 2 +- data/bacula-client/osfamily/Debian.yaml | 1 + data/bacula-client/osfamily/RedHat.yaml | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 data/bacula-client/osfamily/RedHat.yaml diff --git a/data/bacula-client/default.yaml b/data/bacula-client/default.yaml index 3f2b5476..36500028 100644 --- a/data/bacula-client/default.yaml +++ b/data/bacula-client/default.yaml @@ -4,7 +4,7 @@ service_name: 'bacula-fd' config_file_path: '/etc/bacula/bacula-fd.conf' config_dir_path: '/etc/bacula' - data_dir_path: '/var/lib/bacula' + work_dir_path: '/var/lib/bacula' init_file_path: '/etc/sysconfig/bacula-fd' tcp_port: '9102' pid_file_path: '/var/run/bacula/bacula-fd.9102.pid' diff --git a/data/bacula-client/osfamily/Debian.yaml b/data/bacula-client/osfamily/Debian.yaml index 9698a443..b129f1c5 100644 --- a/data/bacula-client/osfamily/Debian.yaml +++ b/data/bacula-client/osfamily/Debian.yaml @@ -1,3 +1,4 @@ --- bacula-client::settings: + work_dir_path: '/var/lib/bacula' init_file_path: '/etc/default/bacula-fd' diff --git a/data/bacula-client/osfamily/RedHat.yaml b/data/bacula-client/osfamily/RedHat.yaml new file mode 100644 index 00000000..9e08cb21 --- /dev/null +++ b/data/bacula-client/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- + bacula-client::settings: + work_dir_path: '/var/spool/bacula' + init_file_path: '/etc/default/bacula-fd' From 748610fb73bd1c7e1004b69bb6066c9c1dac678a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 23 Dec 2016 09:10:51 +0100 Subject: [PATCH 045/284] Added yum-cron data --- data/yum-cron/default.yaml | 6 ++++++ data/yum-cron/hiera.yaml | 5 +++++ 2 files changed, 11 insertions(+) create mode 100644 data/yum-cron/default.yaml create mode 100644 data/yum-cron/hiera.yaml diff --git a/data/yum-cron/default.yaml b/data/yum-cron/default.yaml new file mode 100644 index 00000000..bfdd9cef --- /dev/null +++ b/data/yum-cron/default.yaml @@ -0,0 +1,6 @@ +--- + yum-cron::settings: + package_name: 'yum-cron' + service_name: 'yum-cron' + config_file_path: '/etc/yum/yum-cron.conf' + log_file_path: '/var/log/yum.log' diff --git a/data/yum-cron/hiera.yaml b/data/yum-cron/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/yum-cron/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From f1fff7bbccb31abb5c640045b489c0b4d0ceef64 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 28 Dec 2016 18:48:18 +0100 Subject: [PATCH 046/284] Adding Sles data --- data/snmpd/osfamily/Suse.yaml | 4 ++++ data/varnish/default.yaml | 1 + data/varnish/hiera.yaml | 1 + data/varnish/osfamily/Suse12.yaml | 7 +++++++ data/zabbix-agent/osfamily/Suse.yaml | 6 ++++++ 5 files changed, 19 insertions(+) create mode 100644 data/snmpd/osfamily/Suse.yaml create mode 100644 data/varnish/osfamily/Suse12.yaml create mode 100644 data/zabbix-agent/osfamily/Suse.yaml diff --git a/data/snmpd/osfamily/Suse.yaml b/data/snmpd/osfamily/Suse.yaml new file mode 100644 index 00000000..27f313d2 --- /dev/null +++ b/data/snmpd/osfamily/Suse.yaml @@ -0,0 +1,4 @@ +--- + snmpd::settings: + package_name: 'net-snmp' + diff --git a/data/varnish/default.yaml b/data/varnish/default.yaml index 30d298b8..6be27196 100644 --- a/data/varnish/default.yaml +++ b/data/varnish/default.yaml @@ -12,3 +12,4 @@ process_user: 'varnish' process_group: 'varnish' tcp_port: '6081' + nodaemon_args: '-F' diff --git a/data/varnish/hiera.yaml b/data/varnish/hiera.yaml index b8dc1a89..456bda56 100644 --- a/data/varnish/hiera.yaml +++ b/data/varnish/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/varnish/osfamily/Suse12.yaml b/data/varnish/osfamily/Suse12.yaml new file mode 100644 index 00000000..40690c87 --- /dev/null +++ b/data/varnish/osfamily/Suse12.yaml @@ -0,0 +1,7 @@ +--- + varnish::settings: + zypper_repofile_url: 'http://download.opensuse.org/repositories/server:/http/SLE_12/server:http.repo' + repo_name: 'server_http' + init_file_path: '/etc/sysconfig/varnish' + config_file_path: '/etc/varnish/vcl.conf' + pid_file_path: '/var/run/varnishd.pid' diff --git a/data/zabbix-agent/osfamily/Suse.yaml b/data/zabbix-agent/osfamily/Suse.yaml new file mode 100644 index 00000000..f34a9048 --- /dev/null +++ b/data/zabbix-agent/osfamily/Suse.yaml @@ -0,0 +1,6 @@ +--- + zabbix-agent::settings: + zypper_repofile_url: 'http://download.opensuse.org/repositories/server:/monitoring/SLE_12/' + repo_name: 'server_monitoring' + service_name: 'zabbix-agentd' + From 636e56e1540ff74e0586e2a27b132fee783a1326 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 28 Dec 2016 18:53:52 +0100 Subject: [PATCH 047/284] Release v0.0.22 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index b59fcb56..4f8f01c4 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.21", + "version": "0.0.22", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 5e4b46b481040f4f94feaaa18f2ef32d66787d42 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 30 Dec 2016 19:58:02 +0100 Subject: [PATCH 048/284] Fixes for various os/apps --- data/gitlab-runner/operatingsystem/Ubuntu.yaml | 3 +++ data/octocatalog-diff/osfamily/Debian.yaml | 5 +++++ data/puppet-agent/default.yaml | 5 ++++- data/puppetdb/default.yaml | 4 +++- data/puppetserver/default.yaml | 6 +++++- data/ruby-dev/osfamily/Suse.yaml | 3 +++ data/ruby/osfamily/RedHat6.yaml | 3 +++ data/samba/default.yaml | 4 ++-- data/samba/osfamily/Suse.yaml | 5 +++++ 9 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 data/gitlab-runner/operatingsystem/Ubuntu.yaml create mode 100644 data/octocatalog-diff/osfamily/Debian.yaml create mode 100644 data/ruby-dev/osfamily/Suse.yaml create mode 100644 data/ruby/osfamily/RedHat6.yaml create mode 100644 data/samba/osfamily/Suse.yaml diff --git a/data/gitlab-runner/operatingsystem/Ubuntu.yaml b/data/gitlab-runner/operatingsystem/Ubuntu.yaml new file mode 100644 index 00000000..82db207e --- /dev/null +++ b/data/gitlab-runner/operatingsystem/Ubuntu.yaml @@ -0,0 +1,3 @@ +--- + gitlab-runner::settings: + repo_url: 'http://packages.gitlab.com/runner/gitlab-ci-multi-runner/ubuntu' diff --git a/data/octocatalog-diff/osfamily/Debian.yaml b/data/octocatalog-diff/osfamily/Debian.yaml new file mode 100644 index 00000000..ce3fdffe --- /dev/null +++ b/data/octocatalog-diff/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- + octocatalog-diff::settings: + package_prerequisites: + - cmake + - pkgconf diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml index 079b8196..f0fe48f4 100644 --- a/data/puppet-agent/default.yaml +++ b/data/puppet-agent/default.yaml @@ -11,7 +11,10 @@ code_dir_path: '/etc/puppetlabs/code' environment_dir_path: '/etc/puppetlabs/code/environments' pid_file_path: '/var/run/puppetlabs/agent.pid' - log_file_path: '/var/log/puppetlabs/puppet/puppet.log' + log_file_path: + - '/var/log/puppetlabs/puppet/puppet.log' + - '/var/log/puppetlabs/pxp-agent/pxp-agent.log' + - '/var/log/puppetlabs/mcollective-log' log_dir_path: '/var/log/puppetlabs/puppet' process_name: 'puppet' process_user: 'root' diff --git a/data/puppetdb/default.yaml b/data/puppetdb/default.yaml index 4b4ba7dd..a8a5eba2 100644 --- a/data/puppetdb/default.yaml +++ b/data/puppetdb/default.yaml @@ -9,10 +9,12 @@ config_dir_mode: '0640' conf_dir_path: '/etc/puppetdb/conf.d' pid_file_path: '/var/run/puppetdb.pid' - log_file_path: '/var/log/puppetdb/puppetdb.log' log_dir_path: '/var/log/puppetdb' process_name: 'java' process_extra_name: 'puppetdb' process_user: 'puppetdb' process_group: 'puppetdb' tcp_port: '8080' + log_file_path: + - '/var/log/puppetlabs/puppetdb/puppetdb.log' + - '/var/log/puppetlabs/puppetdb/puppetdb-accesss.log' diff --git a/data/puppetserver/default.yaml b/data/puppetserver/default.yaml index 710a89db..6e9d43bd 100644 --- a/data/puppetserver/default.yaml +++ b/data/puppetserver/default.yaml @@ -9,7 +9,6 @@ environment_dir_path: '/etc/puppetlabs/code/environments' install_dir_path: '/opt/puppetlabs/server/apps/puppetserver' pid_file_path: '/var/run/puppetlabs/puppetserver/puppetserver.pid' - log_file_path: '/var/log/puppetlabs/puppetserver/puppetserver-daemon.log' log_dir_path: '/var/log/puppetlabs/puppetserver' process_name: 'puppet' process_user: 'puppet' @@ -18,4 +17,9 @@ config_dir_group: 'puppet' config_dir_mode: '0750' nodaemon_args: 'foreground' + log_file_path: + - '/var/log/puppetlabs/puppetserver/puppetserver.log' + - '/var/log/puppetlabs/puppetserver/masterhttp.log' + - '/var/log/puppetlabs/puppetserver/puppetserver-access.log' + - '/var/log/puppetlabs/puppetserver/file-sync-access.log' diff --git a/data/ruby-dev/osfamily/Suse.yaml b/data/ruby-dev/osfamily/Suse.yaml new file mode 100644 index 00000000..cada3588 --- /dev/null +++ b/data/ruby-dev/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- + ruby-dev::settings: + package_name: 'ruby-devel' diff --git a/data/ruby/osfamily/RedHat6.yaml b/data/ruby/osfamily/RedHat6.yaml new file mode 100644 index 00000000..971b8bf6 --- /dev/null +++ b/data/ruby/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + ruby::settings: + package_name: 'rubygems' diff --git a/data/samba/default.yaml b/data/samba/default.yaml index 47cc018e..e15f552d 100644 --- a/data/samba/default.yaml +++ b/data/samba/default.yaml @@ -8,7 +8,7 @@ tcp_port: '445' pid_file_path: '/var/run/smbd.pid' log_file_path: - - '/var/log/samba/log.smdb' - - '/var/log/samba/log.nmdb' + - '/var/log/samba/log.smbd' + - '/var/log/samba/log.nmbd' process_user: 'samba' process_group: 'samba' diff --git a/data/samba/osfamily/Suse.yaml b/data/samba/osfamily/Suse.yaml new file mode 100644 index 00000000..a117da5d --- /dev/null +++ b/data/samba/osfamily/Suse.yaml @@ -0,0 +1,5 @@ +--- + samba::settings: + log_file_path: + - '/var/log/samba/log.smbd' + - '/var/log/samba/cores/smbd' From fb5c7d1e00d2ac6ce07cc9af1e429cdc84527678 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 30 Dec 2016 19:58:40 +0100 Subject: [PATCH 049/284] Release v0.0.23 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 4f8f01c4..53f613f9 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.22", + "version": "0.0.23", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From f8476e703a7736afa4239f3fc29d977007b93893 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 19 Jan 2017 23:01:49 +0100 Subject: [PATCH 050/284] Gitlab cli data a minor fixes --- data/fabric/osfamily/RedHat.yaml | 1 + data/gitlab-ce/default.yaml | 5 +++-- data/gitlab-cli/default.yaml | 7 +++++++ data/gitlab-cli/hiera.yaml | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 data/gitlab-cli/default.yaml create mode 100644 data/gitlab-cli/hiera.yaml diff --git a/data/fabric/osfamily/RedHat.yaml b/data/fabric/osfamily/RedHat.yaml index 8f48ad36..1202c544 100644 --- a/data/fabric/osfamily/RedHat.yaml +++ b/data/fabric/osfamily/RedHat.yaml @@ -2,3 +2,4 @@ fabric::settings: package_prerequisites: - python-devel + - openssl-devel diff --git a/data/gitlab-ce/default.yaml b/data/gitlab-ce/default.yaml index 690c84f7..8d09ab09 100644 --- a/data/gitlab-ce/default.yaml +++ b/data/gitlab-ce/default.yaml @@ -2,5 +2,6 @@ gitlab-ce::settings: package_name: 'gitlab-ce' service_name: 'gitlab-runsvdir' - config_file_path: '/opt/gitlab/etc/gitlab.rb' - config_dir_path: '/opt/gitlab/etc' + config_file_path: '/etc/gitlab/gitlab.rb' + config_dir_path: '/etc/gitlab' + ssl_dir_path: '/etc/gitlab/ssl' diff --git a/data/gitlab-cli/default.yaml b/data/gitlab-cli/default.yaml new file mode 100644 index 00000000..4b9f476d --- /dev/null +++ b/data/gitlab-cli/default.yaml @@ -0,0 +1,7 @@ +--- + gitlab-cli::settings: + package_name: 'gitlab' + package_provider: 'gem' + tp_prerequisites: + - ruby + - ruby-dev diff --git a/data/gitlab-cli/hiera.yaml b/data/gitlab-cli/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/gitlab-cli/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From cead26aa74972212e0cf8e1ae65cce7607dbba82 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 19 Jan 2017 23:03:06 +0100 Subject: [PATCH 051/284] Release v0.0.24 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 53f613f9..36ebdad3 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.23", + "version": "0.0.24", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From 095edff984938e5db1691d98e9416dc4677d75ed Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 24 Feb 2017 14:34:08 +0100 Subject: [PATCH 052/284] Use exec_prerequisites in gitlab-runner --- data/gitlab-runner/operatingsystem/Debian7.yaml | 3 --- data/gitlab-runner/operatingsystem/Debian8.yaml | 3 --- data/gitlab-runner/operatingsystem/Debian9.yaml | 3 --- data/gitlab-runner/operatingsystem/Ubuntu.yaml | 3 --- data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml | 3 --- data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml | 3 --- data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml | 3 --- data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml | 3 --- data/gitlab-runner/osfamily/Debian.yaml | 8 ++++---- data/gitlab-runner/osfamily/RedHat.yaml | 8 ++++---- 10 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 data/gitlab-runner/operatingsystem/Debian7.yaml delete mode 100644 data/gitlab-runner/operatingsystem/Debian8.yaml delete mode 100644 data/gitlab-runner/operatingsystem/Debian9.yaml delete mode 100644 data/gitlab-runner/operatingsystem/Ubuntu.yaml delete mode 100644 data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml delete mode 100644 data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml delete mode 100644 data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml delete mode 100644 data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml diff --git a/data/gitlab-runner/operatingsystem/Debian7.yaml b/data/gitlab-runner/operatingsystem/Debian7.yaml deleted file mode 100644 index 36aa8f35..00000000 --- a/data/gitlab-runner/operatingsystem/Debian7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-runner::settings: - apt_release: 'wheezy' diff --git a/data/gitlab-runner/operatingsystem/Debian8.yaml b/data/gitlab-runner/operatingsystem/Debian8.yaml deleted file mode 100644 index 4baa8e03..00000000 --- a/data/gitlab-runner/operatingsystem/Debian8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-runner::settings: - apt_release: 'jessie' diff --git a/data/gitlab-runner/operatingsystem/Debian9.yaml b/data/gitlab-runner/operatingsystem/Debian9.yaml deleted file mode 100644 index 278b6dff..00000000 --- a/data/gitlab-runner/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-runner::settings: - apt_release: 'stretch' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu.yaml b/data/gitlab-runner/operatingsystem/Ubuntu.yaml deleted file mode 100644 index 82db207e..00000000 --- a/data/gitlab-runner/operatingsystem/Ubuntu.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-runner::settings: - repo_url: 'http://packages.gitlab.com/runner/gitlab-ci-multi-runner/ubuntu' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml b/data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml deleted file mode 100644 index a4c5a6fb..00000000 --- a/data/gitlab-runner/operatingsystem/Ubuntu12.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-runner::settings: - apt_release: 'precise' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml b/data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml deleted file mode 100644 index cb334620..00000000 --- a/data/gitlab-runner/operatingsystem/Ubuntu14.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-runner::settings: - apt_release: 'trusty' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml b/data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml deleted file mode 100644 index 9cbda82e..00000000 --- a/data/gitlab-runner/operatingsystem/Ubuntu14.10.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-runner::settings: - apt_release: 'ubuntu-utopic' diff --git a/data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml b/data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml deleted file mode 100644 index 705315e5..00000000 --- a/data/gitlab-runner/operatingsystem/Ubuntu16.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-runner::settings: - apt_release: 'xenial' diff --git a/data/gitlab-runner/osfamily/Debian.yaml b/data/gitlab-runner/osfamily/Debian.yaml index b16d7237..bc39564c 100644 --- a/data/gitlab-runner/osfamily/Debian.yaml +++ b/data/gitlab-runner/osfamily/Debian.yaml @@ -1,7 +1,7 @@ --- gitlab-runner::settings: - repo_url: 'http://packages.gitlab.com/runner/gitlab-ci-multi-runner/debian' - key: '14219A96E15E78F4' - key_url: 'https://packages.gitlab.com/runner/gitlab-ci-multi-runner/gpgkey' - apt_repos: 'main' + exec_prerequisites: + repo_setup: + command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.deb.sh | bash' + creates: '/etc/apt/sources.list.d/runner_gitlab-ci-multi-runner.list' diff --git a/data/gitlab-runner/osfamily/RedHat.yaml b/data/gitlab-runner/osfamily/RedHat.yaml index ab3da3da..26532f4d 100644 --- a/data/gitlab-runner/osfamily/RedHat.yaml +++ b/data/gitlab-runner/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- gitlab-runner::settings: - key: ~ # '' - repo_url: 'https://packages.gitlab.com/runner/gitlab-ci-multi-runner/el/$releasever/$basearch' - key_url: ~ # 'https://packages.gitlab.com/runner/gitlab-ci-multi-runner/gpgkey' - + exec_prerequisites: + repo_setup: + command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.rpm.sh | bash' + creates: '/etc/yum.repos.d/runner_gitlab-ci-multi-runner.repo' From ced5377681f3bd839bea859eeb4995eca3a23d03 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 24 Feb 2017 14:34:44 +0100 Subject: [PATCH 053/284] Updated icinga2 data with auto repo via release package --- data/icinga2/default.yaml | 11 +++++++---- data/icinga2/hiera.yaml | 1 + data/icinga2/osfamily/RedHat.yaml | 2 ++ data/icinga2/osfamily/RedHat5.yaml | 3 +++ data/icinga2/osfamily/RedHat6.yaml | 3 +++ data/icinga2/osfamily/RedHat7.yaml | 3 +++ data/icingaweb2/default.yaml | 9 +++++++++ data/icingaweb2/hiera.yaml | 6 ++++++ data/icingaweb2/osfamily/Debian.yaml | 3 +++ data/icingaweb2/osfamily/RedHat.yaml | 8 ++++++++ data/icingaweb2/osfamily/RedHat5.yaml | 3 +++ data/icingaweb2/osfamily/RedHat6.yaml | 3 +++ data/icingaweb2/osfamily/RedHat7.yaml | 3 +++ 13 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 data/icinga2/osfamily/RedHat5.yaml create mode 100644 data/icinga2/osfamily/RedHat6.yaml create mode 100644 data/icinga2/osfamily/RedHat7.yaml create mode 100644 data/icingaweb2/default.yaml create mode 100644 data/icingaweb2/hiera.yaml create mode 100644 data/icingaweb2/osfamily/Debian.yaml create mode 100644 data/icingaweb2/osfamily/RedHat.yaml create mode 100644 data/icingaweb2/osfamily/RedHat5.yaml create mode 100644 data/icingaweb2/osfamily/RedHat6.yaml create mode 100644 data/icingaweb2/osfamily/RedHat7.yaml diff --git a/data/icinga2/default.yaml b/data/icinga2/default.yaml index 9f06dd4a..d6cd0506 100644 --- a/data/icinga2/default.yaml +++ b/data/icinga2/default.yaml @@ -5,9 +5,12 @@ config_file_path: '/etc/icinga2/icinga2.conf' config_dir_path: '/etc/icinga2' conf_dir_path: '/etc/icinga2/conf.d' - pid_file_path: '/var/run/icinga2.pid' - log_file_path: '/var/log/icinga2/icinga2.log' + features_dir_path: '/etc/icinga2/features-enabled' + pid_file_path: '/var/run/icinga2/icinga2.pid' + log_file_path: + - '/var/log/icinga2/icinga2.log' + - '/var/log/icinga2/error.log' log_dir_path: '/var/log/icinga2' process_name: 'icinga2' - process_user: 'icinga2' - process_group: 'icinga2' + process_user: 'icinga' + process_group: 'icinga' diff --git a/data/icinga2/hiera.yaml b/data/icinga2/hiera.yaml index b8dc1a89..456bda56 100644 --- a/data/icinga2/hiera.yaml +++ b/data/icinga2/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/icinga2/osfamily/RedHat.yaml b/data/icinga2/osfamily/RedHat.yaml index e9211839..e490a1b0 100644 --- a/data/icinga2/osfamily/RedHat.yaml +++ b/data/icinga2/osfamily/RedHat.yaml @@ -4,3 +4,5 @@ config_file_owner: 'icinga' config_file_owner: 'icinga' config_file_mode: '0640' + repo_package_provider: 'rpm' + repo_package_name: 'icinga-rpm-release' diff --git a/data/icinga2/osfamily/RedHat5.yaml b/data/icinga2/osfamily/RedHat5.yaml new file mode 100644 index 00000000..f7bf65ef --- /dev/null +++ b/data/icinga2/osfamily/RedHat5.yaml @@ -0,0 +1,3 @@ +--- + icinga2::settings: + repo_package_url: 'https://packages.icinga.com/epel/5/release/noarch/icinga-rpm-release-5-1.el5.centos.noarch.rpm' diff --git a/data/icinga2/osfamily/RedHat6.yaml b/data/icinga2/osfamily/RedHat6.yaml new file mode 100644 index 00000000..c9706900 --- /dev/null +++ b/data/icinga2/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + icinga2::settings: + repo_package_url: 'https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.centos.noarch.rpm' diff --git a/data/icinga2/osfamily/RedHat7.yaml b/data/icinga2/osfamily/RedHat7.yaml new file mode 100644 index 00000000..283cca6e --- /dev/null +++ b/data/icinga2/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- + icinga2::settings: + repo_package_url: 'https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm' diff --git a/data/icingaweb2/default.yaml b/data/icingaweb2/default.yaml new file mode 100644 index 00000000..75c02144 --- /dev/null +++ b/data/icingaweb2/default.yaml @@ -0,0 +1,9 @@ +--- + icingaweb2::settings: + package_name: 'icingaweb2' + config_file_path: '/etc/icingaweb2/icingaweb2.conf' + config_dir_path: '/etc/icingaweb2' + conf_dir_path: '/etc/icingaweb2/conf.d' + modules_dir_path: '/etc/icingaweb2/modules' + log_file_path: '/var/log/icingaweb2/icingaweb2.log' + log_dir_path: '/var/log/icingaweb2' diff --git a/data/icingaweb2/hiera.yaml b/data/icingaweb2/hiera.yaml new file mode 100644 index 00000000..456bda56 --- /dev/null +++ b/data/icingaweb2/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/icingaweb2/osfamily/Debian.yaml b/data/icingaweb2/osfamily/Debian.yaml new file mode 100644 index 00000000..5cfea244 --- /dev/null +++ b/data/icingaweb2/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + icingaweb2::settings: + init_file_path: '/etc/default/icingaweb2' diff --git a/data/icingaweb2/osfamily/RedHat.yaml b/data/icingaweb2/osfamily/RedHat.yaml new file mode 100644 index 00000000..eb452ccd --- /dev/null +++ b/data/icingaweb2/osfamily/RedHat.yaml @@ -0,0 +1,8 @@ +--- + icingaweb2::settings: + init_file_path: '/etc/sysconfig/icingaweb2' + config_file_owner: 'icinga' + config_file_owner: 'icinga' + config_file_mode: '0640' + repo_package_provider: 'rpm' + repo_package_name: 'icinga-rpm-release' diff --git a/data/icingaweb2/osfamily/RedHat5.yaml b/data/icingaweb2/osfamily/RedHat5.yaml new file mode 100644 index 00000000..ea988ad7 --- /dev/null +++ b/data/icingaweb2/osfamily/RedHat5.yaml @@ -0,0 +1,3 @@ +--- + icingaweb2::settings: + repo_package_url: 'https://packages.icinga.com/epel/5/release/noarch/icinga-rpm-release-5-1.el5.centos.noarch.rpm' diff --git a/data/icingaweb2/osfamily/RedHat6.yaml b/data/icingaweb2/osfamily/RedHat6.yaml new file mode 100644 index 00000000..14b5f6ca --- /dev/null +++ b/data/icingaweb2/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + icingaweb2::settings: + repo_package_url: 'https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.centos.noarch.rpm' diff --git a/data/icingaweb2/osfamily/RedHat7.yaml b/data/icingaweb2/osfamily/RedHat7.yaml new file mode 100644 index 00000000..bf4e56b3 --- /dev/null +++ b/data/icingaweb2/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- + icingaweb2::settings: + repo_package_url: 'https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm' From 9926eeb05ee1fce4c06b50bba60ce16280def640 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 24 Feb 2017 14:35:45 +0100 Subject: [PATCH 054/284] Added rundeck data --- data/rundeck/default.yaml | 20 ++++++++++++++++++++ data/rundeck/hiera.yaml | 5 +++++ data/rundeck/osfamily/Debian.yaml | 2 ++ data/rundeck/osfamily/RedHat.yaml | 5 +++++ 4 files changed, 32 insertions(+) create mode 100644 data/rundeck/default.yaml create mode 100644 data/rundeck/hiera.yaml create mode 100644 data/rundeck/osfamily/Debian.yaml create mode 100644 data/rundeck/osfamily/RedHat.yaml diff --git a/data/rundeck/default.yaml b/data/rundeck/default.yaml new file mode 100644 index 00000000..402e3f2c --- /dev/null +++ b/data/rundeck/default.yaml @@ -0,0 +1,20 @@ +--- + rundeck::settings: + package_name: 'rundeck' + service_name: 'rundeckd' + config_file_path: '/etc/rundeck/framework.properties' + init_file_path: '/etc/rundeck/profile' + config_dir_path: '/etc/rundeck' + ssl_dir_path: '/etc/rundeck/ssl' + pid_file_path: '/var/run/rundeckd.pid' + log_file_path: '/var/log/rundeck/rundeck.log' + log_dir_path: '/var/log/rundeck' + projects_dir_path: '/var/rundeck/projects' + process_name: 'rundeck' + process_user: 'rundeck' + process_group: 'rundeck' + config_file_owner: 'rundeck' + config_file_group: 'rundeck' + config_file_mode: '0640' + tp_prerequisites: + - 'openjdk-jdk' diff --git a/data/rundeck/hiera.yaml b/data/rundeck/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/rundeck/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/rundeck/osfamily/Debian.yaml b/data/rundeck/osfamily/Debian.yaml new file mode 100644 index 00000000..074f35a1 --- /dev/null +++ b/data/rundeck/osfamily/Debian.yaml @@ -0,0 +1,2 @@ +--- + rundeck::settings: diff --git a/data/rundeck/osfamily/RedHat.yaml b/data/rundeck/osfamily/RedHat.yaml new file mode 100644 index 00000000..39f4ba6b --- /dev/null +++ b/data/rundeck/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- + rundeck::settings: + repo_package_url: 'http://repo.rundeck.org/latest.rpm' + repo_package_name: 'rundeck-repo' + repo_package_provider: 'rpm' From 350a45389b16a3da435fb069ab95b0e1cbecc56e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 24 Feb 2017 14:36:05 +0100 Subject: [PATCH 055/284] Release v0.0.25 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 36ebdad3..396a9da2 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.24", + "version": "0.0.25", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From cabf3b2e499bb092d5f69d689b3d0219ec5b5b9a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 25 Feb 2017 01:23:31 +0100 Subject: [PATCH 056/284] Use repo_package in epel and puppet --- data/epel/default.yaml | 4 ++-- data/epel/hiera.yaml | 2 +- data/epel/osfamily/RedHat.yaml | 5 +++++ data/epel/osfamily/RedHat4.yaml | 3 +++ data/epel/osfamily/RedHat5.yaml | 3 +++ data/epel/osfamily/RedHat6.yaml | 3 +++ data/epel/osfamily/RedHat7.yaml | 3 +++ data/epel/osfamily/RedHat_5.yaml | 5 ----- data/epel/osfamily/RedHat_6.yaml | 5 ----- data/epel/osfamily/RedHat_7.yaml | 5 ----- data/puppet-agent/hiera.yaml | 1 + data/puppet-agent/osfamily/Debian.yaml | 2 +- data/puppet-agent/osfamily/RedHat.yaml | 8 +++++--- data/puppet-agent/osfamily/RedHat5.yaml | 3 +++ data/puppet-agent/osfamily/RedHat6.yaml | 3 +++ data/puppet-agent/osfamily/RedHat7.yaml | 3 +++ data/puppetserver/hiera.yaml | 1 + data/puppetserver/osfamily/Debian.yaml | 2 +- data/puppetserver/osfamily/RedHat.yaml | 12 +++++++----- data/puppetserver/osfamily/RedHat6.yaml | 3 +++ data/puppetserver/osfamily/RedHat7.yaml | 3 +++ 21 files changed, 51 insertions(+), 28 deletions(-) create mode 100644 data/epel/osfamily/RedHat.yaml create mode 100644 data/epel/osfamily/RedHat4.yaml create mode 100644 data/epel/osfamily/RedHat5.yaml create mode 100644 data/epel/osfamily/RedHat6.yaml create mode 100644 data/epel/osfamily/RedHat7.yaml delete mode 100644 data/epel/osfamily/RedHat_5.yaml delete mode 100644 data/epel/osfamily/RedHat_6.yaml delete mode 100644 data/epel/osfamily/RedHat_7.yaml create mode 100644 data/puppet-agent/osfamily/RedHat5.yaml create mode 100644 data/puppet-agent/osfamily/RedHat6.yaml create mode 100644 data/puppet-agent/osfamily/RedHat7.yaml create mode 100644 data/puppetserver/osfamily/RedHat6.yaml create mode 100644 data/puppetserver/osfamily/RedHat7.yaml diff --git a/data/epel/default.yaml b/data/epel/default.yaml index 4ab708ce..b265bf32 100644 --- a/data/epel/default.yaml +++ b/data/epel/default.yaml @@ -1,4 +1,4 @@ --- epel::settings: - comment: 'Extra Packages for Enterprise Linux - $basearch' - key_url: 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' +# comment: 'Extra Packages for Enterprise Linux - $basearch' +# key_url: 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' diff --git a/data/epel/hiera.yaml b/data/epel/hiera.yaml index b2d8b161..456bda56 100644 --- a/data/epel/hiera.yaml +++ b/data/epel/hiera.yaml @@ -1,6 +1,6 @@ --- :hierarchy: - - "%{title}/osfamily/%{osfamily}_%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/epel/osfamily/RedHat.yaml b/data/epel/osfamily/RedHat.yaml new file mode 100644 index 00000000..64b79fe9 --- /dev/null +++ b/data/epel/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- + epel::settings: + repo_package_name: 'epel-release' + repo_package_provider: 'rpm' + diff --git a/data/epel/osfamily/RedHat4.yaml b/data/epel/osfamily/RedHat4.yaml new file mode 100644 index 00000000..e303425b --- /dev/null +++ b/data/epel/osfamily/RedHat4.yaml @@ -0,0 +1,3 @@ +--- + epel::settings: + repo_package_url: 'http://download.fedoraproject.org/pub/epel/4/i386/epel-release-4-10.noarch.rpm' diff --git a/data/epel/osfamily/RedHat5.yaml b/data/epel/osfamily/RedHat5.yaml new file mode 100644 index 00000000..0ea793fe --- /dev/null +++ b/data/epel/osfamily/RedHat5.yaml @@ -0,0 +1,3 @@ +--- + epel::settings: + repo_package_url: 'http://download.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm' diff --git a/data/epel/osfamily/RedHat6.yaml b/data/epel/osfamily/RedHat6.yaml new file mode 100644 index 00000000..3fa1fa5a --- /dev/null +++ b/data/epel/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + epel::settings: + repo_package_url: 'http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm' diff --git a/data/epel/osfamily/RedHat7.yaml b/data/epel/osfamily/RedHat7.yaml new file mode 100644 index 00000000..05075a2d --- /dev/null +++ b/data/epel/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- + epel::settings: + repo_package_url: 'http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-9.noarch.rpm' diff --git a/data/epel/osfamily/RedHat_5.yaml b/data/epel/osfamily/RedHat_5.yaml deleted file mode 100644 index 1ba58972..00000000 --- a/data/epel/osfamily/RedHat_5.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - epel::settings: - comment: 'Extra Packages for Enterprise Linux 5 - $basearch' - yum_mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch' - key_url: 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-5' diff --git a/data/epel/osfamily/RedHat_6.yaml b/data/epel/osfamily/RedHat_6.yaml deleted file mode 100644 index 36e92a1e..00000000 --- a/data/epel/osfamily/RedHat_6.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - epel::settings: - comment: 'Extra Packages for Enterprise Linux 6 - $basearch' - yum_mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch' - key_url: 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6' diff --git a/data/epel/osfamily/RedHat_7.yaml b/data/epel/osfamily/RedHat_7.yaml deleted file mode 100644 index e1fa84c0..00000000 --- a/data/epel/osfamily/RedHat_7.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - epel::settings: - description: 'Extra Packages for Enterprise Linux 7 - $basearch' - yum_mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch' - key_url: 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7' diff --git a/data/puppet-agent/hiera.yaml b/data/puppet-agent/hiera.yaml index e6a01c6b..61231d6c 100644 --- a/data/puppet-agent/hiera.yaml +++ b/data/puppet-agent/hiera.yaml @@ -1,6 +1,7 @@ --- :hierarchy: - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index 41729264..909c51db 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -1,7 +1,7 @@ --- puppet-agent::settings: repo_url: 'http://apt.puppetlabs.com' - key: '4BD6EC30' + key: 'EF8D349F' key_url: 'http://apt.puppetlabs.com/pubkey.gpg' apt_repos: 'PC1' apt_release: 'stable' diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index da5f70d2..3941ce5a 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -1,6 +1,8 @@ --- puppet-agent::settings: - repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' - key: '07BB6C57' - key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' + repo_package_name: 'puppetlabs-release-pc1' + repo_package_provider: 'rpm' +# repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' +# key: '07BB6C57' +# key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' dockerfile_prerequisites: 'RUN yum install -y wget' diff --git a/data/puppet-agent/osfamily/RedHat5.yaml b/data/puppet-agent/osfamily/RedHat5.yaml new file mode 100644 index 00000000..8908b3bd --- /dev/null +++ b/data/puppet-agent/osfamily/RedHat5.yaml @@ -0,0 +1,3 @@ +--- + puppet-agent::settings: + repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-5.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat6.yaml b/data/puppet-agent/osfamily/RedHat6.yaml new file mode 100644 index 00000000..db021cc3 --- /dev/null +++ b/data/puppet-agent/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + puppet-agent::settings: + repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat7.yaml b/data/puppet-agent/osfamily/RedHat7.yaml new file mode 100644 index 00000000..7508e74c --- /dev/null +++ b/data/puppet-agent/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- + puppet-agent::settings: + repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm' diff --git a/data/puppetserver/hiera.yaml b/data/puppetserver/hiera.yaml index e6a01c6b..61231d6c 100644 --- a/data/puppetserver/hiera.yaml +++ b/data/puppetserver/hiera.yaml @@ -1,6 +1,7 @@ --- :hierarchy: - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/puppetserver/osfamily/Debian.yaml b/data/puppetserver/osfamily/Debian.yaml index 01df1d03..cd7c0190 100644 --- a/data/puppetserver/osfamily/Debian.yaml +++ b/data/puppetserver/osfamily/Debian.yaml @@ -2,7 +2,7 @@ puppetserver::settings: init_file_path: '/etc/default/puppetserver' repo_url: 'http://apt.puppetlabs.com' - key: '4BD6EC30' + key: 'EF8D349F' key_url: 'http://apt.puppetlabs.com/pubkey.gpg' apt_repos: 'PC1' apt_release: 'stable' diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 4f076ef7..3941ce5a 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -1,6 +1,8 @@ --- - puppetserver::settings: - init_file_path: '/etc/sysconfig/puppetserver' - repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch' - key: '07BB6C57' - key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' + puppet-agent::settings: + repo_package_name: 'puppetlabs-release-pc1' + repo_package_provider: 'rpm' +# repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' +# key: '07BB6C57' +# key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' + dockerfile_prerequisites: 'RUN yum install -y wget' diff --git a/data/puppetserver/osfamily/RedHat6.yaml b/data/puppetserver/osfamily/RedHat6.yaml new file mode 100644 index 00000000..47e90b7c --- /dev/null +++ b/data/puppetserver/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + puppetserver::settings: + repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm' diff --git a/data/puppetserver/osfamily/RedHat7.yaml b/data/puppetserver/osfamily/RedHat7.yaml new file mode 100644 index 00000000..ef9ae261 --- /dev/null +++ b/data/puppetserver/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- + puppetserver::settings: + repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm' From 0b45744a7017e120412f3c4d4dc5a84c4a2d4604 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 25 Feb 2017 01:23:56 +0100 Subject: [PATCH 057/284] Added foreman data --- data/foreman/default.yaml | 23 +++++++++++++++++++ data/foreman/hiera.yaml | 7 ++++++ data/foreman/operatingsystem/Debian8.yaml | 3 +++ data/foreman/operatingsystem/Ubuntu16.04.yaml | 3 +++ data/foreman/osfamily/Debian.yaml | 9 ++++++++ data/foreman/osfamily/RedHat.yaml | 5 ++++ data/foreman/osfamily/RedHat7.yaml | 3 +++ 7 files changed, 53 insertions(+) create mode 100644 data/foreman/default.yaml create mode 100644 data/foreman/hiera.yaml create mode 100644 data/foreman/operatingsystem/Debian8.yaml create mode 100644 data/foreman/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/foreman/osfamily/Debian.yaml create mode 100644 data/foreman/osfamily/RedHat.yaml create mode 100644 data/foreman/osfamily/RedHat7.yaml diff --git a/data/foreman/default.yaml b/data/foreman/default.yaml new file mode 100644 index 00000000..5dd182a1 --- /dev/null +++ b/data/foreman/default.yaml @@ -0,0 +1,23 @@ +--- + foreman::settings: + package_name: 'foreman-installer' + service_name: 'foreman' + config_file_path: '/etc/foreman/config.yml' + config_dir_path: '/etc/foreman' + pid_file_path: '/var/run/foreman/foreman.pid' + log_file_path: + - '/var/log/foreman/production.log' + - '/var/log/foreman/error.log' + log_dir_path: '/var/log/foreman' +# process_name: 'foreman' + process_user: 'foreman' + process_group: 'foreman' + tp_prerequisites: + - puppet-agent + - puppetserver + exec_postinstall: + foreman_installer: + command: 'foreman-installer -l warning' + creates: '/etc/foreman/settings.yaml' + logoutput: true + diff --git a/data/foreman/hiera.yaml b/data/foreman/hiera.yaml new file mode 100644 index 00000000..61231d6c --- /dev/null +++ b/data/foreman/hiera.yaml @@ -0,0 +1,7 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/foreman/operatingsystem/Debian8.yaml b/data/foreman/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..a71f503a --- /dev/null +++ b/data/foreman/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- + foreman::settings: + apt_release: 'jessie' diff --git a/data/foreman/operatingsystem/Ubuntu16.04.yaml b/data/foreman/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..0c3a33b6 --- /dev/null +++ b/data/foreman/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- + foreman::settings: + apt_release: 'xenial' diff --git a/data/foreman/osfamily/Debian.yaml b/data/foreman/osfamily/Debian.yaml new file mode 100644 index 00000000..e76b2b55 --- /dev/null +++ b/data/foreman/osfamily/Debian.yaml @@ -0,0 +1,9 @@ +--- + foreman::settings: + init_file_path: '/etc/default/foreman' + repo_url: 'http://deb.theforeman.org/' + key: '563278F6' + key_url: 'https://deb.theforeman.org/pubkey.gpg' + apt_repos: '1.14' + package_prerequisites: + - ca-certificates diff --git a/data/foreman/osfamily/RedHat.yaml b/data/foreman/osfamily/RedHat.yaml new file mode 100644 index 00000000..6bfe4912 --- /dev/null +++ b/data/foreman/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- + foreman::settings: + init_file_path: '/etc/sysconfig/foreman' + repo_package_name: 'foreman-release' + repo_package_provider: 'rpm' diff --git a/data/foreman/osfamily/RedHat7.yaml b/data/foreman/osfamily/RedHat7.yaml new file mode 100644 index 00000000..db941da2 --- /dev/null +++ b/data/foreman/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- + foreman::settings: + repo_package_url: 'https://yum.theforeman.org/releases/1.14/el7/x86_64/foreman-release.rpm' From 34aa971294802279023cb4b8261de1fb400e9247 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 25 Feb 2017 01:24:14 +0100 Subject: [PATCH 058/284] Fixing mariadb, icingaweb2 and profile --- data/icingaweb2/default.yaml | 1 + data/mariadb/default.yaml | 13 +++++++------ data/mariadb/osfamily/RedHat.yaml | 4 ++-- data/profile/default.yaml | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/data/icingaweb2/default.yaml b/data/icingaweb2/default.yaml index 75c02144..1137e982 100644 --- a/data/icingaweb2/default.yaml +++ b/data/icingaweb2/default.yaml @@ -7,3 +7,4 @@ modules_dir_path: '/etc/icingaweb2/modules' log_file_path: '/var/log/icingaweb2/icingaweb2.log' log_dir_path: '/var/log/icingaweb2' + config_dir_mode: '0775' diff --git a/data/mariadb/default.yaml b/data/mariadb/default.yaml index 5b668b10..230618ff 100644 --- a/data/mariadb/default.yaml +++ b/data/mariadb/default.yaml @@ -1,12 +1,13 @@ --- mariadb::settings: package_name: 'mariadb' - service_name: 'mysql' - config_file_path: '/etc/mysql/my.cnf' - config_dir_path: '/etc/mysql' - pid_file_path: '/var/run/mysql.pid' - log_file_path: '/var/log/mysql.log' - log_dir_path: '/var/log/mysql' + service_name: 'mariadb' + config_file_path: '/etc/my.cnf' + server_file_path: '/etc/my.cnf.d/server.cnf' + config_dir_path: '/etc/my.cnf.d' + pid_file_path: '/var/run/mariadb.pid' + log_file_path: '/var/log/mariadb/mariadb.log' + log_dir_path: '/var/log/mariadb' data_dir_path: '/var/lib/mysql' process_name: 'mysqld' process_user: 'mysql' diff --git a/data/mariadb/osfamily/RedHat.yaml b/data/mariadb/osfamily/RedHat.yaml index a0517de0..903be669 100644 --- a/data/mariadb/osfamily/RedHat.yaml +++ b/data/mariadb/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- mariadb::settings: - package_name: 'MariaDB-server' - init_file_path: '/etc/sysconfig/mysql' + package_name: 'mariadb-server' + init_file_path: '/etc/sysconfig/mariadb' diff --git a/data/profile/default.yaml b/data/profile/default.yaml index 95b990a6..11d39bc1 100644 --- a/data/profile/default.yaml +++ b/data/profile/default.yaml @@ -1,5 +1,5 @@ --- profile::settings: - config_file_path: '/etc/profile.d' - config_dir_path: '/etc/profile' + config_dir_path: '/etc/profile.d' + config_file_path: '/etc/profile' conf_dir_path: '/etc/profile.d' From 983c3ddc07f1f23ca11a9cd0a4b03154b35cbb29 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 25 Feb 2017 01:25:47 +0100 Subject: [PATCH 059/284] Release v0.1.1 --- metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index 396a9da2..512ed273 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.0.25", + "version": "0.1.1", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", @@ -68,7 +68,7 @@ "requirements": [ { "name": "pe", - "version_requirement": ">= 3.0.0 < 2015.3.0" + "version_requirement": ">= 3.0.0 < 2016.4.0" }, { "name": "puppet", From 998c6c99d072f67eb5b11c6ccd91f94749b4bc94 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 2 Mar 2017 17:49:23 +0100 Subject: [PATCH 060/284] Packaged dependencied for virtualbox on redhat --- data/virtualbox/osfamily/RedHat.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/virtualbox/osfamily/RedHat.yaml b/data/virtualbox/osfamily/RedHat.yaml index 956270af..9c3f93e7 100644 --- a/data/virtualbox/osfamily/RedHat.yaml +++ b/data/virtualbox/osfamily/RedHat.yaml @@ -3,4 +3,7 @@ key: '7B0FAB3A' repo_url: 'http://download.virtualbox.org/virtualbox/rpm/el/$releasever/$basearch' key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' - + package_prerequisites: + - gcc + - make + - kernel-devel From 353ea97033c91db9f68071f2800878fc497f089c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 13 Mar 2017 11:26:43 +0100 Subject: [PATCH 061/284] Nagions plugins need epel --- data/nagios-plugins/osfamily/RedHat.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/nagios-plugins/osfamily/RedHat.yaml b/data/nagios-plugins/osfamily/RedHat.yaml index 9bd3603c..84f7f324 100644 --- a/data/nagios-plugins/osfamily/RedHat.yaml +++ b/data/nagios-plugins/osfamily/RedHat.yaml @@ -1,3 +1,5 @@ --- nagios-plugins::settings: package_name: 'nagios-plugins-all' + tp_prerequisites: + - epel From 46c63df434c3be63a19b8f6cb60bf2d63074e4dc Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 13 Mar 2017 11:27:15 +0100 Subject: [PATCH 062/284] Release v0.1.2 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 512ed273..9db22ea0 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.1", + "version": "0.1.2", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From bebb60947723fb191fa2029c097d3b4459470072 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Mar 2017 09:50:57 +0100 Subject: [PATCH 063/284] Install which on rhel docker images --- data/puppet-agent/osfamily/RedHat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index 3941ce5a..b9f0bc6a 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -5,4 +5,4 @@ # repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' # key: '07BB6C57' # key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' - dockerfile_prerequisites: 'RUN yum install -y wget' + dockerfile_prerequisites: 'RUN yum install -y wget which' From 4aaf42f3f8886e7fc5c78c8d7f7cc7ef3c9b1ce2 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Mar 2017 09:51:28 +0100 Subject: [PATCH 064/284] Release v0.1.3 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 9db22ea0..2cf8fb4c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.2", + "version": "0.1.3", "summary": "Tiny Puppet Data", "license": "Apache-2.0", "author": "Alessandro Franceschi", From d4da6eceb9e30348e03646664ae5b367f81d6f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Thu, 30 Mar 2017 09:04:29 +0200 Subject: [PATCH 065/284] added package configuration for bind on ubuntu --- data/bind/hiera.yaml | 1 + data/bind/operatingsystem/Ubuntu.yaml | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 data/bind/operatingsystem/Ubuntu.yaml diff --git a/data/bind/hiera.yaml b/data/bind/hiera.yaml index b8dc1a89..2010c5af 100644 --- a/data/bind/hiera.yaml +++ b/data/bind/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/bind/operatingsystem/Ubuntu.yaml b/data/bind/operatingsystem/Ubuntu.yaml new file mode 100644 index 00000000..7d60c288 --- /dev/null +++ b/data/bind/operatingsystem/Ubuntu.yaml @@ -0,0 +1,11 @@ +--- + bind::settings: + config_file_path: '/etc/bind/named.conf' + config_dir_path: '/etc/bind' + conf_dir_path: '/etc/bind' + pid_file_path: '/var/run/named/named.pid' + log_file_path: '/var/log/syslog' + service_name: 'bind9' + process_name: 'named' + process_user: 'bind' + process_group: 'bind' From b0d1a2a16d56afbefe557fb65601e1fda851a5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Tue, 4 Apr 2017 15:23:07 +0200 Subject: [PATCH 066/284] added rinse as a managed package --- data/rinse/default.yaml | 5 +++++ data/rinse/hiera.yaml | 5 +++++ data/rinse/osfamily/Debian.yaml | 3 +++ 3 files changed, 13 insertions(+) create mode 100644 data/rinse/default.yaml create mode 100644 data/rinse/hiera.yaml create mode 100644 data/rinse/osfamily/Debian.yaml diff --git a/data/rinse/default.yaml b/data/rinse/default.yaml new file mode 100644 index 00000000..686657e4 --- /dev/null +++ b/data/rinse/default.yaml @@ -0,0 +1,5 @@ +--- + rinse::settings: + package_name: 'rinse' + config_file_path: '/etc/rinse/rinse.conf' + config_dir_path: '/etc/rinse' diff --git a/data/rinse/hiera.yaml b/data/rinse/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/rinse/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/rinse/osfamily/Debian.yaml b/data/rinse/osfamily/Debian.yaml new file mode 100644 index 00000000..7705d06e --- /dev/null +++ b/data/rinse/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + rinse::settings: + config_file_path: '/etc/rinse/rinse.conf' From c5956194296202d7b13f475ae4d7a0bc1a7da6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Wed, 5 Apr 2017 07:26:03 +0200 Subject: [PATCH 067/284] added debootstrap as a managed package --- data/debootstrap/default.yaml | 3 +++ data/debootstrap/hiera.yaml | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 data/debootstrap/default.yaml create mode 100644 data/debootstrap/hiera.yaml diff --git a/data/debootstrap/default.yaml b/data/debootstrap/default.yaml new file mode 100644 index 00000000..d8653c8d --- /dev/null +++ b/data/debootstrap/default.yaml @@ -0,0 +1,3 @@ +--- + debootstrap::settings: + package_name: 'debootstrap' diff --git a/data/debootstrap/hiera.yaml b/data/debootstrap/hiera.yaml new file mode 100644 index 00000000..def16483 --- /dev/null +++ b/data/debootstrap/hiera.yaml @@ -0,0 +1,3 @@ +--- + :hierarchy: + - default From 3a791e60e74b64c5534c18ead8a0d376e94f6cb3 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 20 Apr 2017 00:41:11 +0200 Subject: [PATCH 068/284] Added missing data (which breaks tp tests) for puppetserver --- checksums.json | 658 +++++++++++++++++++++++++ data/puppet-agent/osfamily/Debian.yaml | 2 +- data/puppetserver/osfamily/RedHat.yaml | 1 + metadata.json | 12 +- 4 files changed, 666 insertions(+), 7 deletions(-) create mode 100644 checksums.json diff --git a/checksums.json b/checksums.json new file mode 100644 index 00000000..e9697ee7 --- /dev/null +++ b/checksums.json @@ -0,0 +1,658 @@ +{ + "README.md": "bfa2fb4516c74172d049adab33c13d3a", + "bin/moduledata_clone.sh": "e315d6e2ad1537ea6da6c71c2cb647a1", + "data/activemq/default.yaml": "e1b67aa096df1915e88069de7b7a8861", + "data/activemq/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/activemq/osfamily/Debian.yaml": "e6f9eabcacdaf7aad216d53d387284d6", + "data/activemq/osfamily/RedHat.yaml": "38cad6e0b59dded37993b84960899e2d", + "data/apache/default.yaml": "bb7ae7f56d7c8bb492e811486269edd2", + "data/apache/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/apache/osfamily/Darwin.yaml": "affda61d92e82735d3f7cc8a69962294", + "data/apache/osfamily/Debian.yaml": "d38340cf7459850f1e0e2513c1ae5211", + "data/apache/osfamily/FreeBSD.yaml": "a93350bb6b2160815bb76b4a0342ba9c", + "data/apache/osfamily/Linux.yaml": "0f355b35ae16acf847752cdcf9fd9fba", + "data/apache/osfamily/RedHat.yaml": "24550a57e4a665f8c5e8db35da986e58", + "data/apache/osfamily/Suse.yaml": "c5ab38437c45f0b62582e2c8d9469fe8", + "data/apparmor/default.yaml": "cb0091ff936ed7bd30236c7efe29dee0", + "data/apparmor/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/apparmor/osfamily/RedHat.yaml": "665f524170e4b9ba0b3d1adf81339635", + "data/apt/default.yaml": "a21c8eece698f78476f4181b2916100b", + "data/apt/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/autofs/default.yaml": "8223823770d44edacfb7003ea50b00a1", + "data/autofs/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/autofs/osfamily/Debian.yaml": "ae57da88c8e75970ba1af6efd263253a", + "data/autofs/osfamily/RedHat.yaml": "5e3d1d2d862e33898146d6e39c4f855e", + "data/awscli/default.yaml": "c579fe552ceb0088abc21c2f3bdf61eb", + "data/awscli/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/awscli/osfamily/RedHat.yaml": "42116f2dbb65651e9e40f58a8d2a63e1", + "data/bacula-client/default.yaml": "607c5a2b1bed8cab8893f0dd1727d1a7", + "data/bacula-client/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/bacula-client/osfamily/Debian.yaml": "8cf9bc5beff31c512034f6cf48b25fef", + "data/bacula-client/osfamily/RedHat.yaml": "c0fd9f25e700647349ebbd98388fd1b4", + "data/bash/default.yaml": "c730af6f8efc287955b145824fa49721", + "data/bash/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/bind/default.yaml": "d0c7346bc9815de909bba69daa17b37c", + "data/bind/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/bind/osfamily/Debian.yaml": "6b079faf6f70e533ad1ea4dce614bdb1", + "data/bind/osfamily/RedHat.yaml": "834c2a5daa217a13b032513b373faedf", + "data/bluepill/default.yaml": "fc3d990a7a16d8773575773ac99dc422", + "data/bluepill/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/bluepill/osfamily/Debian.yaml": "36df3ba9ce05063b4d7b2475e76ae832", + "data/bluepill/osfamily/RedHat.yaml": "8f09ae16353c38f14e99030e4189e797", + "data/bzip2/default.yaml": "16481258ff0262117fbb9dbf22ccb7ca", + "data/bzip2/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/ceilometer/default.yaml": "c771d1fc72c506288e4a410f36d7c09a", + "data/ceilometer/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/ceilometer/osfamily/Debian.yaml": "51e8262ed581e19600a4c1331531bc83", + "data/ceilometer/osfamily/RedHat.yaml": "94864af77df4036de3c6880907245cf9", + "data/ceph/default.yaml": "b94ec3925e6387efda1c8b1a20c0eb55", + "data/ceph/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/ceph/osfamily/Debian.yaml": "ee3354dab3b04ec04fd3bb315f86e679", + "data/ceph/osfamily/RedHat.yaml": "6ae7c289e13840c9482ab674056a41e8", + "data/cinder/default.yaml": "a2323b2aadf1715d59a774fff0bd62b8", + "data/cinder/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/cinder/osfamily/Debian.yaml": "8db83d5815143c693e1b8667989515eb", + "data/cinder/osfamily/RedHat.yaml": "7260d3bb1e65db2a82b5c26cc9669af9", + "data/clvm/default.yaml": "f7b0df2085b00557606b50860dfacb41", + "data/clvm/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/clvm/osfamily/Debian.yaml": "7aae8ef421a01189934261fc4591617d", + "data/clvm/osfamily/RedHat.yaml": "6940e020942a717815e9b0db905742e0", + "data/collectd/default.yaml": "5cce5811adbd703207ab50107b6bf5f9", + "data/collectd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/collectd/osfamily/Debian.yaml": "af94e0dd4be1e49736b7b190afb86ed1", + "data/collectd/osfamily/RedHat.yaml": "bcfc5bf88cc1b6cc16b210e90fa10eb5", + "data/corosync/default.yaml": "ad5ee90d834e68bb6c16d9fcb4670139", + "data/corosync/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/corosync/osfamily/Debian.yaml": "f6857bbe866dd001fe2884581c9fc081", + "data/corosync/osfamily/RedHat.yaml": "55aacb581740206ce2f9db7150eeba3e", + "data/cron/default.yaml": "2cdfecd932546e8d62a1bd65d2187e06", + "data/cron/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/ddclient/default.yaml": "8cb0fefbcb0b14e5f3726cefc739933d", + "data/ddclient/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/ddclient/osfamily/Debian.yaml": "2b5763d89b9e78cfae136ee4d6aaa3a2", + "data/ddclient/osfamily/RedHat.yaml": "cb322389b4a5f61f7c4d01f679af6497", + "data/default.yaml": "5960ec03d1f37852384b599f9eaa7585", + "data/dhcpd/default.yaml": "21fa0946cef9d69609a9c28eb94a0f08", + "data/dhcpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/dhcpd/osfamily/Debian.yaml": "9ce7dda623c179b3e2e9293f027484bd", + "data/dhcpd/osfamily/OpenBSD.yaml": "663f18daabe50affd31e1d1256c05693", + "data/dhcpd/osfamily/RedHat.yaml": "315f1e54a7a503f343aa7eb5b86c532d", + "data/dhcpd/osfamily/SuSE.yaml": "dec0742c4109b93845ced16ea40fd318", + "data/dkms/default.yaml": "02e86a426ac64c7e4d216c23d5a11871", + "data/dkms/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/dkms/osfamily/RedHat.yaml": "bc6a8d985cfe6b5e93ca0f819443c5bb", + "data/dnsmasq/default.yaml": "d91930a502460d5ac7ca6626542792b5", + "data/dnsmasq/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/dnsmasq/osfamily/Debian.yaml": "dabcc29290a10d044ba7aaad942b376b", + "data/dnsmasq/osfamily/RedHat.yaml": "b65c7b5bbf650c3baadfd59c318ff0e7", + "data/docker-engine/default.yaml": "3cfa818fc983734cedae8dfb6c3dacf9", + "data/docker-engine/hiera.yaml": "dc27f882df46ace5e3ed266ef3590fee", + "data/docker-engine/operatingsystem/CentOS.yaml": "3642afcacb44bf431fd8d9f6ef313957", + "data/docker-engine/operatingsystem/CentOS6.yaml": "317f5f140a49699c556b16dad54ade4b", + "data/docker-engine/operatingsystem/CentOS7.yaml": "f3c981683b75906b12d1de70f9d53eb1", + "data/docker-engine/operatingsystem/Darwin.yaml": "38d2eada4c0036a0cebc160988468c78", + "data/docker-engine/operatingsystem/Debian.yaml": "e3ba408e400b8bcf9fa2be061f06825c", + "data/docker-engine/operatingsystem/Debian7.yaml": "a4d21fc0fe2e7ec90086cd636b28fc66", + "data/docker-engine/operatingsystem/Debian8.yaml": "7b05cdef0af2f273041fe741990b67ef", + "data/docker-engine/operatingsystem/Debian9.yaml": "9035409e662a734798c21f871db2f5d2", + "data/docker-engine/operatingsystem/RedHat.yaml": "3642afcacb44bf431fd8d9f6ef313957", + "data/docker-engine/operatingsystem/Ubuntu.yaml": "e3ba408e400b8bcf9fa2be061f06825c", + "data/docker-engine/operatingsystem/Ubuntu12.04.yaml": "4fb7ce5d8fb7bf488b34fdf681bbeafb", + "data/docker-engine/operatingsystem/Ubuntu14.04.yaml": "7f807e10a3f91a4f06294dcf3519d097", + "data/docker-engine/operatingsystem/Ubuntu14.10.yaml": "cb56529fb0101ee9df3336d28f43972a", + "data/docker-engine/operatingsystem/Ubuntu15.04.yaml": "722ff6866bf23d499be3ff23a99aef96", + "data/docker-engine/operatingsystem/Ubuntu15.10.yaml": "fc6d0201709f919530b32e724b91e678", + "data/docker-engine/operatingsystem/Ubuntu16.04.yaml": "b730e0ebfb467038a6b59272d45a4927", + "data/dovecot/default.yaml": "2fc554e3307500b910f6e2d4c0d97064", + "data/dovecot/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/dovecot/osfamily/Debian.yaml": "d29cc79eccc8a8b7bfa4309542db25d6", + "data/dovecot/osfamily/FreeBSD.yaml": "50cb1cc306a99eb4aa91f2532f67fa71", + "data/dovecot/osfamily/RedHat.yaml": "1261138bee283d093ee6beba6141b11d", + "data/duply/default.yaml": "f434b4755c1fe38660c95088743c2af2", + "data/duply/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/elasticsearch/default.yaml": "a9d81aea7098911d28614cf64a8ac9af", + "data/elasticsearch/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/elasticsearch/osfamily/Debian.yaml": "4df17af14a19bf3645e9eb0d1e06f8d9", + "data/elasticsearch/osfamily/RedHat.yaml": "ff52faaf7da226022bd83604bae6f75f", + "data/epel/default.yaml": "1c1334803e78393c98b432639ba25541", + "data/epel/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/epel/osfamily/RedHat.yaml": "4631ac1e0871b315cd6fb47096e0487d", + "data/epel/osfamily/RedHat4.yaml": "7637a2d03f823b3be2aa1f50155530d2", + "data/epel/osfamily/RedHat5.yaml": "c76f5b5d7e056301f889d2f2a04db37e", + "data/epel/osfamily/RedHat6.yaml": "b783b153e5af3453ff24a223e8e2af20", + "data/epel/osfamily/RedHat7.yaml": "f9dae97ed56317518a1b8276d3bc080d", + "data/exim/default.yaml": "0e91c3c579ab34c952c11d9d7ceeff2b", + "data/exim/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/exim/osfamily/Debian.yaml": "e2f9da11e0a318c6bd5da56be021c771", + "data/exim/osfamily/RedHat.yaml": "683d3118df6d2b194143a7d4a1c74202", + "data/fabric/default.yaml": "8b65445e8cf384b782b984d21dec2c0c", + "data/fabric/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/fabric/osfamily/Darwin.yaml": "426c0f39216b54ea77348d29a898cad9", + "data/fabric/osfamily/Debian.yaml": "343ee54e61f8080b33fe1cf77febc7d9", + "data/fabric/osfamily/RedHat.yaml": "7945e50c465ba2f835348043dd41e4bb", + "data/fail2ban/default.yaml": "37a413421721f465718660d12b39c636", + "data/fail2ban/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/fail2ban/osfamily/Debian.yaml": "8638a70b201f296cebb00759f254ab1d", + "data/foreman/default.yaml": "7e65687cbcdac7f2a65b943428b23bc6", + "data/foreman/hiera.yaml": "ab996f8151aca9b984166789f4a7d1ef", + "data/foreman/operatingsystem/Debian8.yaml": "fbb7c350353d31175aaf84430e8ce727", + "data/foreman/operatingsystem/Ubuntu16.04.yaml": "d1793c127b70879d92d3752af3a067f0", + "data/foreman/osfamily/Debian.yaml": "dd79a1e80f9fc0d08a5a2ee061855cbe", + "data/foreman/osfamily/RedHat.yaml": "b4d8be9451fcf50e778cfd6bbd8276e9", + "data/foreman/osfamily/RedHat7.yaml": "d588af71218fe1be79f87e8a05ffd7d1", + "data/freeradius/default.yaml": "85df9e1f62eb8846cbc439073b820d6f", + "data/freeradius/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/freeradius/osfamily/Debian.yaml": "c5cfd093e30936659fe4ce0f2b6ad491", + "data/freeradius/osfamily/RedHat.yaml": "90c6ca5241945a12436f7262161a2d99", + "data/git/default.yaml": "59ad2fc76e24cb273062b1d0d8cce6bc", + "data/git/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/gitlab-ce/default.yaml": "164921fc0206d14f60801b2ce303100e", + "data/gitlab-ce/hiera.yaml": "edee7da7eaff769879bd909847177897", + "data/gitlab-ce/operatingsystem/Debian.yaml": "d3882528fe6175c3ee79a7c6ded3a805", + "data/gitlab-ce/operatingsystem/Debian7.yaml": "801b9456b8ac38d81cd0ea48366d1f20", + "data/gitlab-ce/operatingsystem/Debian8.yaml": "3a166edb22f4aeaff6625fc81fbe3970", + "data/gitlab-ce/operatingsystem/Debian9.yaml": "fda89122523320131fa78f7fb84690a4", + "data/gitlab-ce/operatingsystem/Ubuntu.yaml": "eb661511717264d5610f799c55c74806", + "data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml": "4000f24c55ddb3d3b7e0d1bcfbf9eacf", + "data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml": "a6b66234417e6bb1907c6e2ddb12831f", + "data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml": "bb4b5ee9525edc66ae56843e0d997a71", + "data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml": "920e69a420accf1f580a1111f9b09b15", + "data/gitlab-ce/osfamily/Debian.yaml": "7686dc15b282b3c209e96a6c534172f9", + "data/gitlab-ce/osfamily/RedHat.yaml": "cec19a08b78613cab83c9cbaf8be4fcb", + "data/gitlab-cli/default.yaml": "a6fbf27670abc1240e35062eeec239bf", + "data/gitlab-cli/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/gitlab-runner/default.yaml": "ad9796615c688015bf87d525cc2ce3be", + "data/gitlab-runner/hiera.yaml": "edee7da7eaff769879bd909847177897", + "data/gitlab-runner/osfamily/Debian.yaml": "cce4b80faddd546eb2c9e6805f398be7", + "data/gitlab-runner/osfamily/RedHat.yaml": "db189f791638ff4e20d04eca2cae64b1", + "data/glance/default.yaml": "01b3219a950fcad61633a01c71f185d5", + "data/glance/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/glance/osfamily/Debian.yaml": "57359c98e7a59364a5ba390fe559287a", + "data/glance/osfamily/RedHat.yaml": "c4db4cbbd50da329de6743e784e67820", + "data/go-server/default.yaml": "f720f05c33df2fd0275bff1198d1bd82", + "data/go-server/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/go-server/osfamily/Debian.yaml": "84f078e1b6bbcd00fc049c364eaad0f0", + "data/go-server/osfamily/RedHat.yaml": "1a6dd12fdaaeee71e53b89a8148b649e", + "data/graylog2/default.yaml": "25ace5e1246d5b2c83acb84e4cea1c42", + "data/graylog2/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/graylog2/osfamily/Debian.yaml": "ae7f3f88cc370aad62b1c0b9fde1c237", + "data/graylog2/osfamily/RedHat.yaml": "4cb63c2876e6c3d384a3de0a90ffceb9", + "data/haproxy/default.yaml": "66d0e6ecd6cfd2c8e63e213a5fd9e253", + "data/haproxy/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/haproxy/osfamily/Debian.yaml": "bbf562ea4519cd78f0c7b66f2b9a6f12", + "data/haproxy/osfamily/RedHat.yaml": "3dd53d213718f6638713714caf237d02", + "data/heartbeat/default.yaml": "3604e18fc9baa7ff108170c2883c759a", + "data/heartbeat/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/heartbeat/osfamily/Debian.yaml": "4c48e6895155739b43fc61e89f6d1624", + "data/heartbeat/osfamily/RedHat.yaml": "d4b6a3dc7f68aa8c0b2bb665b09c2fe2", + "data/hosts/default.yaml": "fe647cb517da72ff5d07ef7327f7e5d6", + "data/hosts/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/hosts/osfamily/FreeBSD.yaml": "b5d983a9abe0c440ac198737c1b4c118", + "data/icinga/default.yaml": "44991c749c0a08a3c159e933a4e7283f", + "data/icinga/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/icinga/osfamily/Debian.yaml": "f0da081f90a340b3ee74c0f526abd867", + "data/icinga/osfamily/RedHat.yaml": "01295a3c5297d6cfdbeca00e258a2222", + "data/icinga2/default.yaml": "4db7bbcc3c54007ab4ea6c75589f48e1", + "data/icinga2/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/icinga2/osfamily/Debian.yaml": "299ec9e44a4a98a1ae812beccf68c098", + "data/icinga2/osfamily/RedHat.yaml": "37dcfa100103a698755973a16b307560", + "data/icinga2/osfamily/RedHat5.yaml": "2e3e659ade1abc9cbb2499c6d78da853", + "data/icinga2/osfamily/RedHat6.yaml": "27fdfc754a4605298abd7a0c28e94b01", + "data/icinga2/osfamily/RedHat7.yaml": "58f1f9e358c3a40a7a9c0a3084624123", + "data/icingaweb2/default.yaml": "1fcc83301b9f5b77feb0e9b998e8daf4", + "data/icingaweb2/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/icingaweb2/osfamily/Debian.yaml": "945a2969c1488b5f7a4c85f3c1cb5250", + "data/icingaweb2/osfamily/RedHat.yaml": "17b13cb2c98a7ec4ae503d4d55cbe72f", + "data/icingaweb2/osfamily/RedHat5.yaml": "08555c5848e465c83668c8d61ac413cd", + "data/icingaweb2/osfamily/RedHat6.yaml": "a7d08c388b819ed5569cca7beb6ff2eb", + "data/icingaweb2/osfamily/RedHat7.yaml": "a0fb761ea7b5281ce8988b99b2c5e89f", + "data/iotop/default.yaml": "132445432d6890e94adc76ed7d6b1eb2", + "data/iotop/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/iptraf/default.yaml": "ce3106e2f38193b709dddf0d06c508a8", + "data/iptraf/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/iptraf/osfamily/RedHat.yaml": "0cfa17156da35eb15bbaa13c9124973f", + "data/jboss/default.yaml": "eb12ad7540b9304f8406eb117d9ca11e", + "data/jboss/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/jboss/osfamily/Debian.yaml": "8d7ad85845fc863dc9261c5442e84f07", + "data/jboss/osfamily/RedHat.yaml": "fa38da25ecae4b389e5e306a2babbbfd", + "data/jenkins/default.yaml": "e4df012487ce10a4a1e9f253d78422c0", + "data/jenkins/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/jenkins/osfamily/Debian.yaml": "e7feb3495aa00ba146e39403b4afdfcc", + "data/jenkins/osfamily/RedHat.yaml": "52da74588f46b3456477cc526f1929a9", + "data/keepalived/default.yaml": "ba2e758c40009e1a520cc4c3e8d7c225", + "data/keepalived/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/keepalived/osfamily/Debian.yaml": "4931588bba22fed290e9a2d9768a675f", + "data/keystone/default.yaml": "bbbfdb69364054838ec8d1ebdddd6c7a", + "data/keystone/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/keystone/osfamily/Debian.yaml": "f8349024578ea40fc12d6d3315bbfdba", + "data/keystone/osfamily/RedHat.yaml": "13d332e677b0a8a5e8549511aaa1c9eb", + "data/kibana/default.yaml": "7cef4a3517611b207989db0740afd910", + "data/kibana/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/kibana/osfamily/Debian.yaml": "64b2403f698736b1b6cd21ca21fb3f92", + "data/kibana/osfamily/RedHat.yaml": "293ab39b5f5fccea10a71e60445b796e", + "data/libvirt/default.yaml": "7adf4c4a2993dbd22165eef1ffa8b65b", + "data/libvirt/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/libvirt/osfamily/Debian.yaml": "cb8e32e14d551c0eb0c5e68866761e60", + "data/libvirt/osfamily/RedHat.yaml": "dba677fc326ed045239791b24c429b7b", + "data/lighttpd/default.yaml": "c86801c27ff1a27b442012a76258d72c", + "data/lighttpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/lighttpd/osfamily/Debian.yaml": "cd3bf9a9d1c8b2aab3b81d3f4a505acd", + "data/logrotate/default.yaml": "55ac106b18241aea2dcc0404ecc6605d", + "data/logrotate/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/logstash/default.yaml": "976f95bad6948c97268a79e137cd983e", + "data/logstash/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/logstash/osfamily/Debian.yaml": "6d340bc0588b9afa50e8987bf697baca", + "data/logstash/osfamily/RedHat.yaml": "cca4ff1754554f03b462ad5682033a1c", + "data/lsb/default.yaml": "9e6dd1422dd57dd408418d3e20b3b495", + "data/lsb/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/lsb/osfamily/Debian.yaml": "3981e50993fc114c27fffa6b722ff03a", + "data/lsb/osfamily/RedHat.yaml": "8ff67692a9a90f5920ec867b2ff949ce", + "data/lsb/osfamily/Suse.yaml": "88ed1f714eae6e95e4a49f8201344884", + "data/lsb-release/default.yaml": "1a6b5cc014baf8c22a7c073e69b8f511", + "data/lsb-release/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/lsb-release/osfamily/Debian.yaml": "1a6b5cc014baf8c22a7c073e69b8f511", + "data/lsb-release/osfamily/RedHat.yaml": "5b370d0896920841bc983aaf5b463596", + "data/lsof/default.yaml": "1d0f64da00b798a1ca86f31e060cf379", + "data/lsof/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mailx/default.yaml": "72c7c1f4515978922e0d92df444ed8bc", + "data/mailx/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mailx/osfamily/Debian.yaml": "0761663f5eaef5ce13a7e40f3e51760e", + "data/make/default.yaml": "abd69460c02b10c5c2193eea5ac724be", + "data/make/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/mariadb/default.yaml": "f10b6dc9d556b479177634e59df3385b", + "data/mariadb/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mariadb/osfamily/Debian.yaml": "b56dbdeda756522b8da01fb8c7864c6e", + "data/mariadb/osfamily/RedHat.yaml": "5cb6a41c2fde73d4591cb86dc9cf18ea", + "data/mcollective/default.yaml": "1a30df4e2f8e453824c312dd4b269ed0", + "data/mcollective/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mcollective/osfamily/Debian.yaml": "4371e5d8dc20a0ee1c3a46c2005acec3", + "data/mcollective/osfamily/RedHat.yaml": "708ac419f94f6e33c6963dbf393d07fc", + "data/mdadm/default.yaml": "5ed5153ca439d979e1b40c5e29973aac", + "data/mdadm/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/memcached/default.yaml": "f1bd046fcca7822d8cc5d80f74bcfb39", + "data/memcached/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/memcached/osfamily/Debian.yaml": "040efd7a386dbeaf90468fc72b215c0f", + "data/memcached/osfamily/RedHat.yaml": "8246accc1dfc08d65473810989753f80", + "data/mlocate/default.yaml": "1a9c70d0e0659e5daaff904d6c68bac5", + "data/mlocate/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mongodb/default.yaml": "addb23295909c1fbcef4802160496b3b", + "data/mongodb/hiera.yaml": "4e84057f31c34e481a09f2b6acb50fea", + "data/mongodb/osfamily/Debian.yaml": "569c5c2a7f1a5d768ade2f7d9b690431", + "data/mongodb/osfamily/RedHat.yaml": "68d559a8cae6abde51009e657eb4a1b3", + "data/mongodb/repo/mongodb-org-3.2-RedHat.yaml": "466e82085520a7a61852e91e405b8c2f", + "data/mongodb-mms/README.md": "074fa0fecf3d708f9db32fb13aa38ffd", + "data/mongodb-mms/default.yaml": "ca6724eccda44440f0055319f6d8510d", + "data/mongodb-mms/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mongodb-mms/osfamily/Debian.yaml": "98bef51e5d033c58044b20c77114c71b", + "data/mongodb-mms/osfamily/RedHat.yaml": "cbdbee9d88e085a34ae079e3c5d18511", + "data/mongodb-mms-automation-agent/README.md": "074fa0fecf3d708f9db32fb13aa38ffd", + "data/mongodb-mms-automation-agent/default.yaml": "84829fdbfae8fba14e20640c7a3a484f", + "data/mongodb-mms-automation-agent/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mongodb-mms-automation-agent/osfamily/Debian.yaml": "9b74a92ebb0383f36e69e138b315f71f", + "data/mongodb-mms-automation-agent/osfamily/RedHat.yaml": "54242aba1ec2d690e59a767d3d87ee62", + "data/mongodb-mms-backup-agent/README.md": "074fa0fecf3d708f9db32fb13aa38ffd", + "data/mongodb-mms-backup-agent/default.yaml": "62460cf29e09af371fa9fd3a10048e48", + "data/mongodb-mms-backup-agent/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mongodb-mms-backup-agent/osfamily/Debian.yaml": "ae963f5e9945a7d6c599dd6f47d601f3", + "data/mongodb-mms-backup-agent/osfamily/RedHat.yaml": "da6ee3b9459fac29e8dc623d1a84afd9", + "data/mongodb-mms-monitoring-agent/README.md": "074fa0fecf3d708f9db32fb13aa38ffd", + "data/mongodb-mms-monitoring-agent/default.yaml": "efa131dc27f03303906156530bd33a49", + "data/mongodb-mms-monitoring-agent/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml": "41dda90aa151ba14d43acc05e6d29f36", + "data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml": "cd0c36cb3f20abf2086851edba988544", + "data/monit/default.yaml": "3f2cb26070470862e4ad2059873f2765", + "data/monit/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/monit/osfamily/Debian.yaml": "3760071b703e8b06944751f026a644db", + "data/monit/osfamily/RedHat.yaml": "8a18c6b663825640fe74c6418c8c809c", + "data/motd/default.yaml": "241ffdb810ef29631ea1ec98f215f1e0", + "data/motd/hiera.yaml": "d14c34382dde51c57f6e985708b176ca", + "data/motd/lsbdistcodename/wheezy.yaml": "241ffdb810ef29631ea1ec98f215f1e0", + "data/motd/operatingsystem/Debian.yaml": "7a347b3a59a0b9f8c208dc3e46be72ed", + "data/motd/operatingsystem/Solaris.yaml": "d11945cd53ce77d73428987c19535536", + "data/msmtp/default.yaml": "e13cea09134251c454a06510c208fd05", + "data/msmtp/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/msmtp/osfamily/Debian.yaml": "7f73400590aa68894ac18710357f99d0", + "data/multipath/default.yaml": "0fda164e17f0da8ab2b19656a8ce545d", + "data/multipath/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/multipath/osfamily/Debian.yaml": "733809fb21e9755aab10d488870f4ac3", + "data/multipath/osfamily/RedHat.yaml": "940954ab8842a5fde8802f21d93ea238", + "data/munin/default.yaml": "427bd36ed7f83a5fd7b65cbc05b1da07", + "data/munin/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/munin/osfamily/Debian.yaml": "68de9ff6ee7368427908b60627ac5ae3", + "data/munin/osfamily/OpenBSD.yaml": "75022b8f23a95801106a2367601fb3ac", + "data/munin/osfamily/RedHat.yaml": "cdc4a0b23971e46eeea983777cffe478", + "data/munin-node/default.yaml": "70074d1922eb37b57c66e8440064c0bb", + "data/munin-node/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/munin-node/osfamily/Debian.yaml": "63879a166ed65f4a7d7ca873c88ac0fa", + "data/munin-node/osfamily/OpenBSD.yaml": "6ced4f8e710191d6b846450ad33fc10f", + "data/munin-node/osfamily/RedHat.yaml": "c2de39ef21f539eeb1524440aae8b78f", + "data/mysql/default.yaml": "23582e0d83b4096c314e969d23790fb8", + "data/mysql/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/mysql/osfamily/Debian.yaml": "850cd8ff000decb2e583c5daf5fbfa8e", + "data/mysql/osfamily/FreeBSD.yaml": "826710b8a39a7eb4dae8155e2248a011", + "data/mysql/osfamily/RedHat.yaml": "af36f4680b4f907b19b164df2bcb0fdf", + "data/nagios/default.yaml": "9761ef0cfbc5778c5f05a966f0d4343f", + "data/nagios/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/nagios/osfamily/Debian.yaml": "e2b77a681568d370d15188cda607fd40", + "data/nagios/osfamily/RedHat.yaml": "55a6f44bb5757eacf95fbcec0b49fea6", + "data/nagios-plugins/default.yaml": "e64789f409114cea49e61cd3fdb7175c", + "data/nagios-plugins/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/nagios-plugins/osfamily/RedHat.yaml": "62abd56c1b46813017740c7d9afbfabe", + "data/nagios-plugins/osfamily/Solaris.yaml": "a1e352bc0d3a7cfde091b6dffb2d8dcd", + "data/nano/default.yaml": "51fe8ac7ac9b3fb4768b459eac2d9679", + "data/nano/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/newrelic/default.yaml": "5cf0c4890d9ec6d83986c8eb690ad472", + "data/newrelic/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/newrelic/osfamily/Debian.yaml": "d596bd6dbf226d3236220173da096e71", + "data/newrelic/osfamily/RedHat.yaml": "8d71b17da3b708685bb06da1b3ba5125", + "data/nfs/default.yaml": "9eb078fd9c84cbf77d5f49cb23a969dd", + "data/nfs/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/nfs/osfamily/Debian.yaml": "9a0e31f8fd843cdc4d00c961df600d21", + "data/nfs/osfamily/RedHat.yaml": "c39ff02d38b89b9475be5693fc14fdfe", + "data/nfs-client/default.yaml": "bd9e74dba9d8439a2b13df4d27d5011d", + "data/nfs-client/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/nfs-client/osfamily/Debian.yaml": "046c9c425553a7c14ac85d458cd44c41", + "data/nfs-client/osfamily/RedHat.yaml": "4b77a23aa29ae9b0f3a0d89cdf83214d", + "data/nfs-client/osfamily/Suse.yaml": "3016ae00fe555ce9ea4d9b3e69b049a7", + "data/nfs-server/default.yaml": "f94079c29c95cb4ce5b94beaf2035cae", + "data/nfs-server/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/nfs-server/osfamily/Debian.yaml": "0c2cbffa97dd29d480eabad9b45d7df1", + "data/nfs-server/osfamily/RedHat.yaml": "41e3be25cc04fac747fe377ebd6d5e37", + "data/nfs-server/osfamily/RedHat6.yaml": "b35e2855e2950f8dd9528beb8d0ff81d", + "data/nfs-server/osfamily/Suse.yaml": "0c2cbffa97dd29d480eabad9b45d7df1", + "data/nginx/default.yaml": "94660f0b17b37582f669d7ed755993b6", + "data/nginx/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/nginx/osfamily/Darwin.yaml": "a5002561ba477470aa367bd69e148f8c", + "data/nginx/osfamily/Debian.yaml": "b85c24b63bdd43bba4b88f44957e2dc9", + "data/nova/default.yaml": "985849de07e90f2e3ae13c6529e99394", + "data/nova/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/nova/osfamily/Debian.yaml": "85a2876ca0c4918da454940b2dab166a", + "data/nova/osfamily/RedHat.yaml": "2ada4f8b2fc8d5b13b8012936fc01c09", + "data/nrpe/default.yaml": "a2be126e6101f6470518b4a72f3f3745", + "data/nrpe/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/nrpe/osfamily/Debian.yaml": "76d5366f80020fff37b227fbd48971b6", + "data/nrpe/osfamily/OpenBSD.yaml": "712f8efb78a642307fa45f8d13744886", + "data/nrpe/osfamily/RedHat.yaml": "886809b1a0e1efda9a32fd571f993f19", + "data/nrpe/osfamily/Solaris.yaml": "3fc7665f3d5ff8d8c3a1236216c0abb6", + "data/ntp/default.yaml": "4c14798705f7f3d8c16fdddb0f69b572", + "data/ntp/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/ntp/osfamily/Debian.yaml": "d231fa7e6a5f748f8077d07d0b135d40", + "data/ntp/osfamily/RedHat.yaml": "afb52d7e398c4871ecc7a476cd80d380", + "data/ntp/osfamily/Solaris": "b755c8bd5d8a4a7df0756656510aaa39", + "data/ntp/osfamily/SuSE.yaml": "8ce0df0e21c8df04ba4e0de2bce8ce84", + "data/ntpdate/default.yaml": "f25cf0ded1fe27eab5158e7db95d7c8e", + "data/ntpdate/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/octocatalog-diff/default.yaml": "fe163b4a25cc761b5cbcff4a4c3d7c6b", + "data/octocatalog-diff/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/octocatalog-diff/osfamily/Debian.yaml": "6fe5fd6a06b1a7f4c06dd45fa655bcec", + "data/openjdk-jdk/default.yaml": "64560de7d235bdf76514432195a76f2e", + "data/openjdk-jdk/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/openjdk-jdk/osfamily/Debian.yaml": "d35db4709c72d184ccb11fdebfe235ab", + "data/openjdk-jdk/osfamily/Debian10.04.yaml": "53b86fec571fbf97748d49c610efd87c", + "data/openjdk-jdk/osfamily/Debian10.10.yaml": "53b86fec571fbf97748d49c610efd87c", + "data/openjdk-jdk/osfamily/Debian15.04.yaml": "fed71ff721517378e54b3c6e47d50077", + "data/openjdk-jdk/osfamily/Debian15.10.yaml": "fed71ff721517378e54b3c6e47d50077", + "data/openjdk-jdk/osfamily/Debian5.yaml": "53b86fec571fbf97748d49c610efd87c", + "data/openjdk-jdk/osfamily/Debian6.yaml": "53b86fec571fbf97748d49c610efd87c", + "data/openjdk-jdk/osfamily/OpenBSD.yaml": "0798ff186d072f8d3b398933f5e5cb7f", + "data/openjdk-jdk/osfamily/RedHat6.yaml": "81c9a006952c1230e78d27350749e64f", + "data/openjdk-jdk/osfamily/RedHat7.yaml": "7cdff6d38de004eeb717ae1e32ffed61", + "data/openjdk-jdk/osfamily/Suse.yaml": "905147a0c369040f573e2539ac81cf65", + "data/openjdk-jre/default.yaml": "eddd4ef2dffbad8fc58651714ad3cb58", + "data/openjdk-jre/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/openjdk-jre/osfamily/Debian.yaml": "9430a6a8d982e8dec645981120bcd9ea", + "data/openjdk-jre/osfamily/Debian10.04.yaml": "b7d4a3f438adb949a94a444f5e658cdc", + "data/openjdk-jre/osfamily/Debian10.10.yaml": "b7d4a3f438adb949a94a444f5e658cdc", + "data/openjdk-jre/osfamily/Debian15.04.yaml": "18f3566f268bd7d32862247a880c41a5", + "data/openjdk-jre/osfamily/Debian15.10.yaml": "18f3566f268bd7d32862247a880c41a5", + "data/openjdk-jre/osfamily/Debian5.yaml": "b7d4a3f438adb949a94a444f5e658cdc", + "data/openjdk-jre/osfamily/Debian6.yaml": "b7d4a3f438adb949a94a444f5e658cdc", + "data/openjdk-jre/osfamily/OpenBSD.yaml": "18a947e8d08e1e127f13b58daf85379c", + "data/openjdk-jre/osfamily/RedHat6.yaml": "1241a0fa3715f1fd10d28445d6304350", + "data/openjdk-jre/osfamily/RedHat7.yaml": "c2e6efe94c4f8a4cf1c9df5a63c0340c", + "data/openjdk-jre/osfamily/Suse.yaml": "a9ecc84bda266b11f7b98ed1771fc5eb", + "data/openntpd/default.yaml": "ff925f8108bf6de41676c153b6d2ce30", + "data/openntpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/openntpd/osfamily/Debian.yaml": "6857064b8284c7cbafb384837e028cac", + "data/openntpd/osfamily/OpenBSD.yaml": "b25e804e7a95279b90a5df05d1acac68", + "data/openssh/default.yaml": "96c99540b5660fd4c32b7932de2f2fc1", + "data/openssh/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/openssh/osfamily/Debian.yaml": "066f91003d4db716869890fd74cdd36c", + "data/openssh/osfamily/OpenBSD.yaml": "6fb27acee04b0f212b5c0e7b714695b4", + "data/openssh/osfamily/RedHat.yaml": "60570de26d64e294db450b0054b253f2", + "data/openssh/osfamily/Solaris.yaml": "da68d34878576b089ece2b353edb1874", + "data/openssh/osfamily/Suse.yaml": "e73550127839b69346d5ed84e4d28bbc", + "data/openvpn/default.yaml": "68da7605271023f49c40eb2026433594", + "data/openvpn/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/openvpn/osfamily/Debian.yaml": "345c5b9030da89474a5490553825e111", + "data/openvpn/osfamily/RedHat.yaml": "c6960b8d9ec102bec30fccc4bbd531b6", + "data/openvswitch/default.yaml": "fbadeae690aadab514a7a1eef5d7b7b8", + "data/openvswitch/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/openvswitch/osfamily/Debian.yaml": "9133ab2db2a44a7e7bac0f048e767a05", + "data/openvswitch/osfamily/RedHat.yaml": "bb00cf290cf8898ab07d2dd8d3ffa8e5", + "data/orientdb/default.yaml": "6caec48e68f819fc5eb3be915acbfa95", + "data/orientdb/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/orientdb/osfamily/Debian.yaml": "c188eecfb86bc295bd923dbcfe507988", + "data/orientdb/osfamily/RedHat.yaml": "aee5ae054c02f13d6132209961d69595", + "data/pacemaker/default.yaml": "e9d380e649168a7972d8435602b54615", + "data/pacemaker/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/pacemaker/osfamily/Debian.yaml": "92f2701d089cffd7c84e7062855549e0", + "data/pacemaker/osfamily/RedHat.yaml": "a25defff4435ad97cac202fa9bd7dc73", + "data/pam/default.yaml": "344e8b662f95b5f73768eb17eca7dedd", + "data/pam/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/passenger/default.yaml": "768ae64d9a2b618a7910c09f9db41478", + "data/passenger/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/passenger/osfamily/Debian.yaml": "74c5354e3c81761d19716637ee1ff916", + "data/passenger/osfamily/RedHat.yaml": "ef9a4da783529ae17cbe2679d432d0e3", + "data/php/default.yaml": "80c1da105bfda38f9d133de799f8249c", + "data/php/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/php/osfamily/Debian.yaml": "ba58e09dca2d821a01b4fffdb5dd76f5", + "data/php/osfamily/RedHat.yaml": "13f7096b98896a2f65ea6bcd6931c96f", + "data/php/osfamily/SuSE.yaml": "ba58e09dca2d821a01b4fffdb5dd76f5", + "data/postfix/default.yaml": "c8ada8cec3d37d10588ab6e4f0b24636", + "data/postfix/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/postfix/osfamily/Debian.yaml": "973d9faa22acc6c8b73433ca38fcbd2c", + "data/postfix/osfamily/RedHat.yaml": "83b1a47587e18b986082f5fffdf3b8bf", + "data/postfix/osfamily/Suse.yaml": "dfcd979fae16ee03fa9aa81c9848812a", + "data/postgresql/default.yaml": "3c021d41422b9a13ecfe89af4581ef88", + "data/postgresql/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/postgresql/osfamily/Debian.yaml": "20cff54885ba8a7429c749176568b28d", + "data/postgresql/osfamily/RedHat.yaml": "7b396946b39e311e1c36117c2f00607b", + "data/profile/default.yaml": "eee438661f0e9636888bae4b84e8ef1f", + "data/profile/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/proftpd/default.yaml": "d571050bef3034fba727d05925210463", + "data/proftpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/proftpd/osfamily/Debian.yaml": "15b2f73341ecdf33cbcd785b372bfbda", + "data/proftpd/osfamily/RedHat.yaml": "c1176adfedf16d4dd61e7c87fc667171", + "data/puppet/default.yaml": "512e658237bf4317d0da95489f549631", + "data/puppet/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/puppet/osfamily/Debian.yaml": "2780fd559ee0e1b532ea9a7ffe1e96cf", + "data/puppet/osfamily/RedHat.yaml": "605971813ebd4d40542fbe9ee235b0f9", + "data/puppet-agent/default.yaml": "2d15fdcc73d872161d8097d0839cb23e", + "data/puppet-agent/hiera.yaml": "ab996f8151aca9b984166789f4a7d1ef", + "data/puppet-agent/operatingsystem/Centos6.yaml": "2afd2c2a15fdf57a4025f015453daec8", + "data/puppet-agent/operatingsystem/Debian6.yaml": "01b2b4f6421f3f3596292ec765e8597e", + "data/puppet-agent/operatingsystem/Debian7.yaml": "50cac0235f6df522e147d3f9aaf25f52", + "data/puppet-agent/operatingsystem/Debian8.yaml": "b091fa31f3d91bde452f8ecd975138be", + "data/puppet-agent/operatingsystem/Ubuntu12.04.yaml": "6019787587e52a0e4b39e37cf766b18e", + "data/puppet-agent/operatingsystem/Ubuntu14.04.yaml": "6540a0be4784a72b3757a054669e6ca9", + "data/puppet-agent/operatingsystem/Ubuntu16.04.yaml": "fdb3dfc2c2c9a0bda02c5c538a6651a3", + "data/puppet-agent/osfamily/Debian.yaml": "06b606a6ad2049d1bbea22d337ffd091", + "data/puppet-agent/osfamily/Linux.yaml": "b7fc4eeef70955c551c58adbc88cdd7f", + "data/puppet-agent/osfamily/RedHat.yaml": "c4c6e545059cba58c540675dd161cfc4", + "data/puppet-agent/osfamily/RedHat5.yaml": "b5010b5e27a2566336090cafbf425abf", + "data/puppet-agent/osfamily/RedHat6.yaml": "7611f5d66734db3c6fd36ffe5d2d1137", + "data/puppet-agent/osfamily/RedHat7.yaml": "563ac700233ca1c38beaf8dc75e5258c", + "data/puppet-agent/osfamily/Windows.yaml": "11fd64e3c2b882f275bc21e361597f38", + "data/puppetdb/default.yaml": "bc91d75b233d4c4379757d0f375a76e3", + "data/puppetdb/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/puppetdb/osfamily/Debian.yaml": "b5b28f0766f6df18a901c8888472635a", + "data/puppetdb/osfamily/RedHat.yaml": "6a29574e40aa1909d0865fea48bdadb2", + "data/puppetserver/default.yaml": "96f01ccdc8beb117207128b343998ce9", + "data/puppetserver/hiera.yaml": "ab996f8151aca9b984166789f4a7d1ef", + "data/puppetserver/operatingsystem/Debian6.yaml": "61f21484fa76ce8f2252b53fa088d3d6", + "data/puppetserver/operatingsystem/Debian7.yaml": "721a3d1d148b977931778bf152a45a11", + "data/puppetserver/operatingsystem/Debian8.yaml": "2aade63a965c8fe8cb67b5fcd5744908", + "data/puppetserver/operatingsystem/Ubuntu12.04.yaml": "005cea954e73dd6f83f936eac85db195", + "data/puppetserver/operatingsystem/Ubuntu14.04.yaml": "2d11a1f7e068e4d826e2153a2ddf88ee", + "data/puppetserver/osfamily/Debian.yaml": "dcbdab70c8cd78e3d43d8cdf9f4e4316", + "data/puppetserver/osfamily/RedHat.yaml": "d7b1620101ebd8261fbc183799050493", + "data/puppetserver/osfamily/RedHat6.yaml": "5bbae0407e931758fca7a7696baaed4e", + "data/puppetserver/osfamily/RedHat7.yaml": "2dd1d314e9b7812a0bb3a65b8337a5ad", + "data/pwgen/default.yaml": "db4ab2d9d820346c3a141adfaad690c4", + "data/pwgen/hiera.yaml": "3c00c0a5dd017f72694b642d099c1e74", + "data/pwgen/operatingsystem/OracleLinux.yaml": "1318808f5d9cc0b71712b2c06c7160bf", + "data/python-pip/default.yaml": "cf15680bd60b6cbe7e7ad0a82c23085a", + "data/python-pip/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/python-pip/osfamily/Debian.yaml": "cf15680bd60b6cbe7e7ad0a82c23085a", + "data/python-pip/osfamily/RedHat7.yaml": "e60ec774d6e4f4289cd2080b1bd3c5f7", + "data/quagga/default.yaml": "09d46408350413662ffc3728ef08b793", + "data/quagga/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/quagga/osfamily/Debian.yaml": "a08e060e6262caef173059d2db01ea75", + "data/quagga/osfamily/RedHat.yaml": "231d55f45f2b0d97fc48620da9b39a40", + "data/quantum/default.yaml": "90bca19ca020c21a078297bff9e329eb", + "data/quantum/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/quantum/osfamily/Debian.yaml": "bbbfc947fee80f04bfed530e23d2b959", + "data/quantum/osfamily/RedHat.yaml": "36735f35c626906672690ccc9a4c2baf", + "data/r10k/default.yaml": "57949502a0001eebb2085e0b2f3fa927", + "data/r10k/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/rabbitmq/default.yaml": "c09cabcc876764834ed05f3adb30d88a", + "data/rabbitmq/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/rabbitmq/osfamily/Debian.yaml": "48dcc8cf1da74375a7712bf21a848895", + "data/rabbitmq/osfamily/RedHat.yaml": "9415b7b86879fa1dfec5bceb05b30eb6", + "data/rails/default.yaml": "e8536599d352a4bcf588015084995b94", + "data/rails/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/rails/osfamily/Debian.yaml": "027f471b51687986dd87977978e4b9ea", + "data/rails/osfamily/RedHat.yaml": "8600ea6563655edbc7ec5291d2507836", + "data/redis/default.yaml": "bf17b55f6f5661d6d8c276295a2c2ee9", + "data/redis/hiera.yaml": "3b0ca91dda92b40370037f7669bc85ad", + "data/redis/operatingsystem/testos-0.0.1.yaml": "ec1ac97546037d7946126308c7d5d178", + "data/redis/operatingsystem/testos.yaml": "5d5d408e4aa30df8588c21dfedd1ed03", + "data/redis/osfamily/Debian.yaml": "90167aae4d72626cb487880151b9709e", + "data/redis/osfamily/RedHat.yaml": "3b30bca3827623f2363e267b27b9e009", + "data/redis/osfamily/test.yaml": "3890b346224ce501a6e5f724431e0852", + "data/rsync/default.yaml": "38dfa5af96e4eb9d71048b979b5003e3", + "data/rsync/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/rsync/osfamily/Debian.yaml": "e28471c52edc614e3dc3835c2d656981", + "data/rsync/osfamily/FreeBSD.yaml": "c7564c1ac1e5d266154ccc267b0cc4ce", + "data/rsync/osfamily/RedHat.yaml": "da526de2452c0ea8771df4ccce7e9580", + "data/rsyslog/default.yaml": "b4cdd6e581f6f6e7f218662fa731e43d", + "data/rsyslog/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/rsyslog/osfamily/Debian.yaml": "3ccdbd08bc021dc50819b593684d4b47", + "data/ruby/default.yaml": "5d878c416ad911d42243cf831e7e97af", + "data/ruby/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/ruby/osfamily/RedHat6.yaml": "818c489c88fad56f620caf757b51ec0c", + "data/ruby-dev/default.yaml": "5f271da72ea0b18de29ba7644f55d3f2", + "data/ruby-dev/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/ruby-dev/osfamily/Debian.yaml": "5f271da72ea0b18de29ba7644f55d3f2", + "data/ruby-dev/osfamily/RedHat.yaml": "e66554163a246158271fb7999e302d2c", + "data/ruby-dev/osfamily/Suse.yaml": "e66554163a246158271fb7999e302d2c", + "data/rundeck/default.yaml": "7ace3073099aba683ae21a68fc604763", + "data/rundeck/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/rundeck/osfamily/Debian.yaml": "c19d70902563caf01b16af4851291dd8", + "data/rundeck/osfamily/RedHat.yaml": "91e1fe20591d572282bc670c8c26f0ac", + "data/samba/default.yaml": "1abea9149d560c6a45e40e09482d7fe5", + "data/samba/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/samba/osfamily/Debian.yaml": "6d1b69090d5b0106c08629718d906d40", + "data/samba/osfamily/Suse.yaml": "2a357ddf3019ad16beaf7d87c385f4bb", + "data/sendmail/default.yaml": "57eea97ffdcc29657e9e971409f27a8d", + "data/sendmail/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/sendmail/osfamily/Debian.yaml": "0f7645803011967247c9c56a8b0adc63", + "data/sendmail/osfamily/RedHat.yaml": "d8150e85928d37798ce9eff28d341a63", + "data/snmpd/default.yaml": "91792c8c913ca9da9d135dd6afc3e424", + "data/snmpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/snmpd/osfamily/Debian.yaml": "028a516506554a22f6171a6d4eb90de7", + "data/snmpd/osfamily/OpenBSD.yaml": "95b706df50917f10506b238f50b3bb6b", + "data/snmpd/osfamily/RedHat.yaml": "c288ade52c781aa885adc92b5a905ee6", + "data/snmpd/osfamily/Solaris.yaml": "92d74c485c2b2f0861418668e058e0c8", + "data/snmpd/osfamily/Suse.yaml": "2e7155dfec85266d4f2a50500372cb13", + "data/squid/default.yaml": "31f7a3a1d37b05413d2a9522791013d4", + "data/squid/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/squid/osfamily/Debian.yaml": "9da8e82372f5756cfc8af36414598701", + "data/ssmtp/default.yaml": "00aac5257b5330cce7c9f611f54cae98", + "data/ssmtp/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/strace/default.yaml": "0d1e03791d216479cc0f596de3b6d269", + "data/strace/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/subversion/default.yaml": "400cacbe70ff8aab4b7334af8060ecba", + "data/subversion/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/sudo/default.yaml": "df1f7f08a7f6ba83d96c38209402e4e9", + "data/sudo/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/supervisor/default.yaml": "6dc4b59aacf293242a54d2dd35c685c7", + "data/supervisor/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/supervisor/osfamily/Debian.yaml": "1ebe753a26142c5612970c675a822a1d", + "data/supervisor/osfamily/Linux.yaml": "b4222a6ce52745fcd121782f555effb5", + "data/supervisor/osfamily/RedHat.yaml": "4afe9807f02b99b4096ba13b2ebd4fb6", + "data/supervisor/osfamily/RedHat6.yaml": "d7b6691a5c7af47b760b885feeec6931", + "data/sysdig/default.yaml": "667150252f3fbc11116192d1ad48a265", + "data/sysdig/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/sysdig/osfamily/Debian.yaml": "3cdb4a8941d940e350a0ce8ce1b19153", + "data/sysdig/osfamily/RedHat.yaml": "8780b8cfb74be10d6ff1f767719309ff", + "data/sysfs/default.yaml": "1dba03699dc4b6ff99e0162bc5806ac9", + "data/sysfs/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/sysklogd/default.yaml": "41b8ff1eaa42cae8f71c87265a6d42b9", + "data/sysklogd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/sysklogd/osfamily/Debian.yaml": "0a3826a930d60468ee2eb9785b401b14", + "data/syslog-ng/default.yaml": "4e7dd28e01669ef8897649386f2c986b", + "data/syslog-ng/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/syslog-ng/osfamily/Debian.yaml": "bbc2d4ab294adfdd3ab539c8a788ef76", + "data/syslog-ng/osfamily/RedHat.yaml": "39f937c5606512c30744ccb6adaf7218", + "data/sysstat/default.yaml": "2e8f8822e2573c26e2a417c1e40c3752", + "data/sysstat/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/sysstat/osfamily/Debian.yaml": "b2127f867cd0251e810b84720b1e4432", + "data/sysstat/osfamily/RedHat.yaml": "4feeefcdd6e61818cd73a9a8a6a49c70", + "data/tcpdump/default.yaml": "1a1d7459552326aa8d8a3757e308c2d0", + "data/tcpdump/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/telnet/default.yaml": "354fe9bbd50ae51cb31828f5361a4190", + "data/telnet/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/test/default.yaml": "90d9cd8c6a1a3d78d8bef26713b4d2eb", + "data/test/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/test/osfamily/Debian.yaml": "8ba7acf82265d11a730bc2ed77c5817e", + "data/test/osfamily/RedHat.yaml": "8b0fadf275cf312207187a7319a6a192", + "data/tftpd/default.yaml": "990439dd2b1e3e1835b1777692fffbc6", + "data/tftpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/tftpd/osfamily/Debian.yaml": "9f0d9fd3f41c05cd9101e6b6ada520de", + "data/tinc/default.yaml": "b858ca299bf364c279902efb0aa87929", + "data/tinc/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/tinc/osfamily/Debian.yaml": "24297271e84a521ab4d3954a01bd95db", + "data/tinc/osfamily/RedHat.yaml": "af9c29ab05edb7ca75b6b3904ddacdf9", + "data/trickle/default.yaml": "b7ce85086aa91ebe73a81c5a811f2a66", + "data/trickle/hiera.yaml": "3c00c0a5dd017f72694b642d099c1e74", + "data/trickle/operatingsystem/OracleLinux.yaml": "e81a05bdbe9fe384270dfb1a189f88e7", + "data/varnish/default.yaml": "167b7bdc964e554d1a2b674e0f5f6f81", + "data/varnish/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", + "data/varnish/osfamily/Debian.yaml": "167fab60e41da0f4c9461837abe9818c", + "data/varnish/osfamily/RedHat.yaml": "2258d2d79389e4e68f70e8946f344a0b", + "data/varnish/osfamily/Suse12.yaml": "84c50c9d9e139f3b74cac9b0d2c77087", + "data/vim/default.yaml": "4b8c609464f13a7e6729734ead8cd8fe", + "data/vim/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/vim/osfamily/RedHat.yaml": "c4d48c5c0be80a4f9c8605145f3a3653", + "data/virtualbox/default.yaml": "055e0e858b5cf580aa507e0756edeaa0", + "data/virtualbox/hiera.yaml": "edee7da7eaff769879bd909847177897", + "data/virtualbox/operatingsystem/Debian7.yaml": "0b2baf08445466aa04054777c47a2f7b", + "data/virtualbox/operatingsystem/Debian8.yaml": "fc2673b68d7df76d75082b806f0d87ee", + "data/virtualbox/operatingsystem/Debian9.yaml": "a4916efad03a45d27787355f56758509", + "data/virtualbox/operatingsystem/Ubuntu12.04.yaml": "3b8d035fac82a62e680578d70e8c7ed9", + "data/virtualbox/operatingsystem/Ubuntu14.04.yaml": "910f5840256dc07b666f93e04fff9121", + "data/virtualbox/operatingsystem/Ubuntu14.10.yaml": "5a2d353b07d8346465e4cbc785f79873", + "data/virtualbox/operatingsystem/Ubuntu16.04.yaml": "4721028ed10b8639edae995746083f72", + "data/virtualbox/osfamily/Debian.yaml": "208a7814bbcbd7969f6bdb01c9a2c7ad", + "data/virtualbox/osfamily/RedHat.yaml": "586de868f23ea85949f4cad14648176d", + "data/vsftpd/default.yaml": "df3ba5da8dac7212418de9dd457e7ca4", + "data/vsftpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/vsftpd/osfamily/Debian.yaml": "0061e7979a5af7a99d9fcd54aa6d6ea3", + "data/vsftpd/osfamily/RedHat.yaml": "9fa4fb0974f2bbd4ea5d4b2c51d6bd27", + "data/wpscan/default.yaml": "cf24bcb30b7036c1fc9fa36543daa9a1", + "data/wpscan/hiera.yaml": "3b0ca91dda92b40370037f7669bc85ad", + "data/xinetd/default.yaml": "19683b34fb799a6e6d21947148f516ea", + "data/xinetd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/xinetd/osfamily/Debian.yaml": "acd012f3d1c5424738d086e26168720c", + "data/yum-cron/default.yaml": "5658cd9cb93f35c8bf3c65ab8c05db5b", + "data/yum-cron/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/zabbix-agent/default.yaml": "321c0b60c3702dad1864ce8bc7851553", + "data/zabbix-agent/hiera.yaml": "19813e81c91a4454c1c2743c41054278", + "data/zabbix-agent/osfamily/Debian.yaml": "0f9d28325dbe657b4798c394e4d17fcd", + "data/zabbix-agent/osfamily/RedHat.yaml": "2fb43d5892d605c2868db93b281cdbd3", + "data/zabbix-agent/osfamily/Suse.yaml": "044299383d425b42672a4a5a7c440d7a", + "metadata.json": "a4e7935753ef17b04190808872191f6f", + "templates/redis/test.conf.erb": "f09ca97a70ea07a22be01f43eff3e716" +} \ No newline at end of file diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index 909c51db..0eec192e 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -4,5 +4,5 @@ key: 'EF8D349F' key_url: 'http://apt.puppetlabs.com/pubkey.gpg' apt_repos: 'PC1' - apt_release: 'stable' + # apt_release: 'stable' dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 3941ce5a..5a6e9b27 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -1,5 +1,6 @@ --- puppet-agent::settings: + init_file_path: '/etc/sysconfig/puppetserver' repo_package_name: 'puppetlabs-release-pc1' repo_package_provider: 'rpm' # repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' diff --git a/metadata.json b/metadata.json index 2cf8fb4c..d0e0b7c0 100644 --- a/metadata.json +++ b/metadata.json @@ -1,17 +1,17 @@ { "name": "example42-tinydata", - "version": "0.1.3", + "version": "0.1.4", + "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", - "author": "Alessandro Franceschi", + "source": "https://github.com/example42/tinydata", + "project_page": "https://github.com/example42/tinydata", + "issues_url": "https://github.com/example42/tinydata/issues", "dependencies": [ - + ], "checksums": { }, - "source": "https://github.com/example42/tinydata", - "project_page": "https://github.com/example42/tinydata", - "issues_url": "https://github.com/example42/tinydata/issues", "operatingsystem_support": [ { "operatingsystem": "RedHat", From 0ee70a5ccf2edd526f4745c2a3489c89a6051d76 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 20 Apr 2017 00:41:58 +0200 Subject: [PATCH 069/284] Release v0.1.5 --- metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index d0e0b7c0..3314e92c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.4", + "version": "0.1.5", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", @@ -8,7 +8,7 @@ "project_page": "https://github.com/example42/tinydata", "issues_url": "https://github.com/example42/tinydata/issues", "dependencies": [ - + ], "checksums": { }, From 6d0a3b3dcc8e5771a3ee1e51c13d8b53435521a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Thu, 4 May 2017 07:20:21 +0200 Subject: [PATCH 070/284] added psmisc --- data/psmisc/default.yaml | 3 +++ data/psmisc/hiera.yaml | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 data/psmisc/default.yaml create mode 100644 data/psmisc/hiera.yaml diff --git a/data/psmisc/default.yaml b/data/psmisc/default.yaml new file mode 100644 index 00000000..27e96be7 --- /dev/null +++ b/data/psmisc/default.yaml @@ -0,0 +1,3 @@ +--- + psmisc::settings: + package_name: 'psmisc' diff --git a/data/psmisc/hiera.yaml b/data/psmisc/hiera.yaml new file mode 100644 index 00000000..2010c5af --- /dev/null +++ b/data/psmisc/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From 9658ef981308b27382534225136ae2b7a350f3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Mon, 8 May 2017 11:31:12 +0200 Subject: [PATCH 071/284] added unzip tool --- data/unzip/default.yaml | 3 +++ data/unzip/hiera.yaml | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 data/unzip/default.yaml create mode 100644 data/unzip/hiera.yaml diff --git a/data/unzip/default.yaml b/data/unzip/default.yaml new file mode 100644 index 00000000..e451bb69 --- /dev/null +++ b/data/unzip/default.yaml @@ -0,0 +1,3 @@ +--- + unzip::settings: + package_name: 'unzip' diff --git a/data/unzip/hiera.yaml b/data/unzip/hiera.yaml new file mode 100644 index 00000000..2010c5af --- /dev/null +++ b/data/unzip/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From a6feb87b9927120529e562cea82a15ade020122c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Thu, 1 Jun 2017 10:19:05 +0200 Subject: [PATCH 072/284] added screen and tree there are no known special needs for other operationsystems. --- data/screen/default.yaml | 4 ++++ data/screen/hiera.yaml | 4 ++++ data/tree/default.yaml | 3 +++ data/tree/hiera.yaml | 4 ++++ 4 files changed, 15 insertions(+) create mode 100644 data/screen/default.yaml create mode 100644 data/screen/hiera.yaml create mode 100644 data/tree/default.yaml create mode 100644 data/tree/hiera.yaml diff --git a/data/screen/default.yaml b/data/screen/default.yaml new file mode 100644 index 00000000..6c4f030a --- /dev/null +++ b/data/screen/default.yaml @@ -0,0 +1,4 @@ +--- + screen::settings: + package_name: 'screen' + config_file_path: '/etc/screenrc' diff --git a/data/screen/hiera.yaml b/data/screen/hiera.yaml new file mode 100644 index 00000000..b1fa7245 --- /dev/null +++ b/data/screen/hiera.yaml @@ -0,0 +1,4 @@ +--- + :hierarchy: + - "%{title}/default" + - default diff --git a/data/tree/default.yaml b/data/tree/default.yaml new file mode 100644 index 00000000..af2132d5 --- /dev/null +++ b/data/tree/default.yaml @@ -0,0 +1,3 @@ +--- + tree::settings: + package_name: 'tree' diff --git a/data/tree/hiera.yaml b/data/tree/hiera.yaml new file mode 100644 index 00000000..b1fa7245 --- /dev/null +++ b/data/tree/hiera.yaml @@ -0,0 +1,4 @@ +--- + :hierarchy: + - "%{title}/default" + - default From e1f8de4e591992d92e2db7191fbb3e4f9adc7b8e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 6 Jun 2017 07:58:17 +0200 Subject: [PATCH 073/284] Release v0.1.6 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 3314e92c..13023999 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.5", + "version": "0.1.6", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From d89bf7ca2782cc27d620115d40e4ddff6199300f Mon Sep 17 00:00:00 2001 From: "Grimm, A. (ZTR)" Date: Fri, 21 Jul 2017 10:52:16 +0200 Subject: [PATCH 074/284] add package rsyslog-relp --- data/rsyslog-relp/default.yaml | 3 +++ data/rsyslog-relp/hiera.yaml | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 data/rsyslog-relp/default.yaml create mode 100644 data/rsyslog-relp/hiera.yaml diff --git a/data/rsyslog-relp/default.yaml b/data/rsyslog-relp/default.yaml new file mode 100644 index 00000000..988144f9 --- /dev/null +++ b/data/rsyslog-relp/default.yaml @@ -0,0 +1,3 @@ +--- + rsyslog-relp::settings: + package_name: 'rsyslog-relp' diff --git a/data/rsyslog-relp/hiera.yaml b/data/rsyslog-relp/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/rsyslog-relp/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From 945187f1df5175fe04e4ddb6e6fd88c012c98ee8 Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Fri, 21 Jul 2017 16:00:37 +0200 Subject: [PATCH 075/284] add relp support for rsyslog remote logging --- data/rsyslog-relp/hiera.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/data/rsyslog-relp/hiera.yaml b/data/rsyslog-relp/hiera.yaml index b8dc1a89..b1fa7245 100644 --- a/data/rsyslog-relp/hiera.yaml +++ b/data/rsyslog-relp/hiera.yaml @@ -1,5 +1,4 @@ --- :hierarchy: - - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default From c6cc387379f99004b718f4786e369693ea8ce5fe Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Sun, 6 Aug 2017 12:46:56 +0200 Subject: [PATCH 076/284] new epel release --- data/epel/osfamily/RedHat7.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/epel/osfamily/RedHat7.yaml b/data/epel/osfamily/RedHat7.yaml index 05075a2d..12dd7d9d 100644 --- a/data/epel/osfamily/RedHat7.yaml +++ b/data/epel/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-9.noarch.rpm' + repo_package_url: 'http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm' From 64f062cc8d329591ba6d11aa66d0a845b1484f50 Mon Sep 17 00:00:00 2001 From: grimmzen Date: Mon, 7 Aug 2017 16:26:10 +0200 Subject: [PATCH 077/284] add package snmp (#2) * add package snmp * add package snmp config for Debian/Ubuntu --- data/snmp/default.yaml | 3 +++ data/snmp/hiera.yaml | 5 +++++ data/snmp/osfamily/Debian.yaml | 5 +++++ data/snmp/osfamily/RedHat.yaml | 3 +++ data/snmp/osfamily/Solaris.yaml | 3 +++ data/snmp/osfamily/Suse.yaml | 4 ++++ data/snmp/osfamily/Ubuntu.yaml | 5 +++++ 7 files changed, 28 insertions(+) create mode 100644 data/snmp/default.yaml create mode 100644 data/snmp/hiera.yaml create mode 100644 data/snmp/osfamily/Debian.yaml create mode 100644 data/snmp/osfamily/RedHat.yaml create mode 100644 data/snmp/osfamily/Solaris.yaml create mode 100644 data/snmp/osfamily/Suse.yaml create mode 100644 data/snmp/osfamily/Ubuntu.yaml diff --git a/data/snmp/default.yaml b/data/snmp/default.yaml new file mode 100644 index 00000000..b34b576e --- /dev/null +++ b/data/snmp/default.yaml @@ -0,0 +1,3 @@ +--- + snmp::settings: + package_name: 'snmp' diff --git a/data/snmp/hiera.yaml b/data/snmp/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/snmp/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/snmp/osfamily/Debian.yaml b/data/snmp/osfamily/Debian.yaml new file mode 100644 index 00000000..fbf24279 --- /dev/null +++ b/data/snmp/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- + snmp::settings: + config_file_path: '/etc/snmp/snmp.conf' + config_dir_path: '/etc/snmp/' + diff --git a/data/snmp/osfamily/RedHat.yaml b/data/snmp/osfamily/RedHat.yaml new file mode 100644 index 00000000..c0d0288a --- /dev/null +++ b/data/snmp/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + snmp::settings: + package_name: 'net-snmp-utils' diff --git a/data/snmp/osfamily/Solaris.yaml b/data/snmp/osfamily/Solaris.yaml new file mode 100644 index 00000000..04b7fbe0 --- /dev/null +++ b/data/snmp/osfamily/Solaris.yaml @@ -0,0 +1,3 @@ +--- + snmp::settings: + package_name: 'net-snmp' diff --git a/data/snmp/osfamily/Suse.yaml b/data/snmp/osfamily/Suse.yaml new file mode 100644 index 00000000..4d1cf055 --- /dev/null +++ b/data/snmp/osfamily/Suse.yaml @@ -0,0 +1,4 @@ +--- + snmp::settings: + package_name: 'net-snmp-utils' + diff --git a/data/snmp/osfamily/Ubuntu.yaml b/data/snmp/osfamily/Ubuntu.yaml new file mode 100644 index 00000000..fbf24279 --- /dev/null +++ b/data/snmp/osfamily/Ubuntu.yaml @@ -0,0 +1,5 @@ +--- + snmp::settings: + config_file_path: '/etc/snmp/snmp.conf' + config_dir_path: '/etc/snmp/' + From 5c77dfac6c1907858bb50bea78cecbe5db629454 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 28 Aug 2017 18:11:22 +0200 Subject: [PATCH 078/284] Fixed puppetserver data for RedHat --- data/puppetserver/osfamily/RedHat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 5a6e9b27..95f48eb3 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - puppet-agent::settings: + puppetserver::settings: init_file_path: '/etc/sysconfig/puppetserver' repo_package_name: 'puppetlabs-release-pc1' repo_package_provider: 'rpm' From 52b44b53d93be646a9e4112631d38a90efd53f2f Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 6 Sep 2017 10:47:40 +0200 Subject: [PATCH 079/284] Added sensu data --- data/sensu/default.yaml | 23 +++++++++++++++++++++++ data/sensu/hiera.yaml | 5 +++++ 2 files changed, 28 insertions(+) create mode 100644 data/sensu/default.yaml create mode 100644 data/sensu/hiera.yaml diff --git a/data/sensu/default.yaml b/data/sensu/default.yaml new file mode 100644 index 00000000..b625dbcc --- /dev/null +++ b/data/sensu/default.yaml @@ -0,0 +1,23 @@ +--- +sensu::settings: + package_name: 'sensu' + service_name: 'sensu-client' + config_file_path: '/etc/sensu/config.json' + config_dir_path: '/etc/sensu' + conf_dir_path: '/etc/sensu/conf.d' + checks_dir_path: '/etc/sensu/conf.d/checks' + contacts_dir_path: '/etc/sensu/conf.d/contacts' + extensions_dir_path: '/etc/sensu/conf.d/extensions' + filters_dir_path: '/etc/sensu/conf.d/filters' + handlers_dir_path: '/etc/sensu/conf.d/handlers' + mutators_dir_path: '/etc/sensu/conf.d/mutators' + pid_file_path: '/var/run/sensu/sensu-client.pid' + log_file_path: + - '/var/log/sensu/sensu-client.log' + - '/var/log/sensu/sensu-server.log' + - '/var/log/sensu/sensu-api.log' + log_dir_path: '/var/log/sensu' + process_name: 'sensu' + process_user: 'sensu' + process_group: 'sensu' + init_file_path: '/etc/default/sensu' diff --git a/data/sensu/hiera.yaml b/data/sensu/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/sensu/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From 4d8117ed1637bfdf1d28e3f952f6d5fe400f94e2 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 6 Sep 2017 11:02:06 +0200 Subject: [PATCH 080/284] [blacksmith] Bump version to 0.1.7 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 13023999..429326d0 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.6", + "version": "0.1.7", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 76ebead4189c13b4e65f1760b90a559870676ce4 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 6 Sep 2017 11:04:58 +0200 Subject: [PATCH 081/284] Release v0.1.7 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 429326d0..b29cf9e9 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.7", + "version": "0.1.8", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 5147a2e5e351601e844c68ded110373df877fc84 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 23 Sep 2017 17:55:30 +0200 Subject: [PATCH 082/284] Updated docker-engine settings --- Rakefile | 72 +++++++++++++++++++ data/docker-engine/default.yaml | 17 ++--- .../docker-engine/operatingsystem/CentOS.yaml | 11 +-- .../operatingsystem/CentOS6.yaml | 5 +- .../operatingsystem/CentOS7.yaml | 4 +- .../docker-engine/operatingsystem/Debian.yaml | 17 ++--- .../operatingsystem/Debian7.yaml | 4 +- .../operatingsystem/Debian8.yaml | 4 +- .../operatingsystem/Debian9.yaml | 5 +- .../docker-engine/operatingsystem/RedHat.yaml | 10 +-- .../docker-engine/operatingsystem/Ubuntu.yaml | 17 ++--- .../operatingsystem/Ubuntu12.04.yaml | 5 +- .../operatingsystem/Ubuntu14.04.yaml | 5 +- .../operatingsystem/Ubuntu14.10.yaml | 3 +- .../operatingsystem/Ubuntu15.04.yaml | 4 +- .../operatingsystem/Ubuntu15.10.yaml | 4 +- .../operatingsystem/Ubuntu16.04.yaml | 4 +- 17 files changed, 136 insertions(+), 55 deletions(-) create mode 100644 Rakefile diff --git a/Rakefile b/Rakefile new file mode 100644 index 00000000..993c43c1 --- /dev/null +++ b/Rakefile @@ -0,0 +1,72 @@ +require 'puppetlabs_spec_helper/rake_tasks' +require 'rspec/core/rake_task' +require 'puppet' + +# abort if puppet version is to old +if Puppet::version < '4' + puts 'YOU MUST RUN THIS WITH PUPPET 4.x' + abort +end + +exclude_paths = %w( + vendor/**/* + spec/**/* + modules/**/* + pkg/**/* + tests/**/* +) + +# the default lint task can not override the pattern configuration +Rake::Task[:lint].clear +PuppetLint::RakeTask.new(:lint) do |config| + # Pattern of files to ignore + config.ignore_paths = exclude_paths + # Pattern of files to check, defaults to `**/*.pp` + config.pattern = ['manifests/**/*.pp', 'site/**/*.pp'] + # List of checks to disable + config.disable_checks = ['140chars', 'relative', 'class_inherits_from_params_class', 'empty_string_assignment'] + # Should the task fail if there were any warnings, defaults to false + config.fail_on_warnings = true + # Print out the context for the problem, defaults to false + #config.with_context = true + # Log Format + #config.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}' +end + +# beaker is designed to run same tests on multiple nodes +# we have another usecase: multiple tests on multiple os +Rake::Task[:beaker].clear +RSpec::Core::RakeTask.new(:beaker) do |config| + puts 'dont use beaker, use beaker_roles: or all_roles instead' + abort +end + +# iterate over acceptance tests and create namespaced rake tasks +namespace :beaker_roles do + Dir.glob("spec/acceptance/*_spec.rb") do |acceptance_test| + test_name = acceptance_test.split('/').last.split('_spec').first + RSpec::Core::RakeTask.new(test_name) do |t| + t.rspec_opts = ['--color'] + t.pattern = acceptance_test + end + end +end + +# find all rake tasks in beaker_roles namespace and run them in parallel +all_roles = [] +Rake.application.in_namespace(:beaker_roles) do |beaker_roles_namespace| + beaker_roles_namespace.tasks.each do |beaker_roles_tasks| + all_roles << beaker_roles_tasks + end +end +multitask :all_roles => all_roles + +PuppetSyntax.exclude_paths = exclude_paths + +# Blacksmith +begin + require 'puppet_blacksmith/rake_tasks' +rescue LoadError + puts "Blacksmith needed only to push to the Forge" +end +# vim: syntax=ruby diff --git a/data/docker-engine/default.yaml b/data/docker-engine/default.yaml index 753f79c0..c615acf9 100644 --- a/data/docker-engine/default.yaml +++ b/data/docker-engine/default.yaml @@ -1,9 +1,10 @@ --- - docker-engine::settings: - package_name: 'docker-engine' - service_name: 'docker' - pid_file_path: '/var/run/docker.pid' - process_name: 'docker' - process_user: 'docker' - process_group: 'docker' - tcp_port: '2375' +docker-engine::settings: + package_name: 'docker-engine' + service_name: 'docker' + pid_file_path: '/var/run/docker.pid' + process_name: 'docker' + process_user: 'docker' + process_group: 'docker' + tcp_port: '2375' + compose_version: '1.16.0' diff --git a/data/docker-engine/operatingsystem/CentOS.yaml b/data/docker-engine/operatingsystem/CentOS.yaml index 1c5c5cb9..54d0729c 100644 --- a/data/docker-engine/operatingsystem/CentOS.yaml +++ b/data/docker-engine/operatingsystem/CentOS.yaml @@ -1,6 +1,7 @@ --- - docker-engine::settings: - init_file_path: '/etc/sysconfig/docker' - config_file_path: '/etc/sysconfig/docker' - key: '2C52609D' - key_url: 'http://yum.dockerproject.org/gpg' +docker-engine::settings: + init_file_path: '/etc/sysconfig/docker' + init_system: 'systemd' + config_file_path: '/etc/sysconfig/docker' + key: '2C52609D' + key_url: 'http://yum.dockerproject.org/gpg' diff --git a/data/docker-engine/operatingsystem/CentOS6.yaml b/data/docker-engine/operatingsystem/CentOS6.yaml index 9a837d82..4d376007 100644 --- a/data/docker-engine/operatingsystem/CentOS6.yaml +++ b/data/docker-engine/operatingsystem/CentOS6.yaml @@ -1,3 +1,4 @@ --- - docker-engine::settings: - repo_url: 'https://yum.dockerproject.org/repo/main/centos/6' +docker-engine::settings: + repo_url: 'https://yum.dockerproject.org/repo/main/centos/6' + init_system: 'sysvinit' diff --git a/data/docker-engine/operatingsystem/CentOS7.yaml b/data/docker-engine/operatingsystem/CentOS7.yaml index d02d682f..b48ef7fd 100644 --- a/data/docker-engine/operatingsystem/CentOS7.yaml +++ b/data/docker-engine/operatingsystem/CentOS7.yaml @@ -1,3 +1,3 @@ --- - docker-engine::settings: - repo_url: 'https://yum.dockerproject.org/repo/main/centos/7' +docker-engine::settings: + repo_url: 'https://yum.dockerproject.org/repo/main/centos/7' diff --git a/data/docker-engine/operatingsystem/Debian.yaml b/data/docker-engine/operatingsystem/Debian.yaml index d00e3c8f..b08d3fa7 100644 --- a/data/docker-engine/operatingsystem/Debian.yaml +++ b/data/docker-engine/operatingsystem/Debian.yaml @@ -1,9 +1,10 @@ --- - docker-engine::settings: - init_file_path: '/etc/default/docker' - config_file_path: '/etc/default/docker' - repo_url: 'https://apt.dockerproject.org/repo' - key: '2C52609D' - key_url: 'http://apt.dockerproject.org/gpg' - apt_repos: 'main' - apt_key_server: 'http://p80.pool.sks-keyservers.net' +docker-engine::settings: + init_file_path: '/etc/default/docker' + config_file_path: '/etc/default/docker' + repo_url: 'https://apt.dockerproject.org/repo' + key: '2C52609D' + key_url: 'http://apt.dockerproject.org/gpg' + apt_repos: 'main' + apt_key_server: 'http://p80.pool.sks-keyservers.net' + init_system: 'sysvinit' diff --git a/data/docker-engine/operatingsystem/Debian7.yaml b/data/docker-engine/operatingsystem/Debian7.yaml index b58bc3ef..93ce4f2b 100644 --- a/data/docker-engine/operatingsystem/Debian7.yaml +++ b/data/docker-engine/operatingsystem/Debian7.yaml @@ -1,3 +1,3 @@ --- - docker-engine::settings: - apt_release: 'debian-wheezy' +docker-engine::settings: + apt_release: 'debian-wheezy' diff --git a/data/docker-engine/operatingsystem/Debian8.yaml b/data/docker-engine/operatingsystem/Debian8.yaml index a4f68f21..50972c48 100644 --- a/data/docker-engine/operatingsystem/Debian8.yaml +++ b/data/docker-engine/operatingsystem/Debian8.yaml @@ -1,3 +1,3 @@ --- - docker-engine::settings: - apt_release: 'debian-jessie' +docker-engine::settings: + apt_release: 'debian-jessie' diff --git a/data/docker-engine/operatingsystem/Debian9.yaml b/data/docker-engine/operatingsystem/Debian9.yaml index 5b0fbb97..218beca5 100644 --- a/data/docker-engine/operatingsystem/Debian9.yaml +++ b/data/docker-engine/operatingsystem/Debian9.yaml @@ -1,3 +1,4 @@ --- - docker-engine::settings: - apt_release: 'debian-stretch' +docker-engine::settings: + apt_release: 'debian-stretch' + init_system: 'systemd' diff --git a/data/docker-engine/operatingsystem/RedHat.yaml b/data/docker-engine/operatingsystem/RedHat.yaml index 1c5c5cb9..05945325 100644 --- a/data/docker-engine/operatingsystem/RedHat.yaml +++ b/data/docker-engine/operatingsystem/RedHat.yaml @@ -1,6 +1,6 @@ --- - docker-engine::settings: - init_file_path: '/etc/sysconfig/docker' - config_file_path: '/etc/sysconfig/docker' - key: '2C52609D' - key_url: 'http://yum.dockerproject.org/gpg' +docker-engine::settings: + init_file_path: '/etc/sysconfig/docker' + config_file_path: '/etc/sysconfig/docker' + key: '2C52609D' + key_url: 'http://yum.dockerproject.org/gpg' diff --git a/data/docker-engine/operatingsystem/Ubuntu.yaml b/data/docker-engine/operatingsystem/Ubuntu.yaml index d00e3c8f..f564c5c1 100644 --- a/data/docker-engine/operatingsystem/Ubuntu.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu.yaml @@ -1,9 +1,10 @@ --- - docker-engine::settings: - init_file_path: '/etc/default/docker' - config_file_path: '/etc/default/docker' - repo_url: 'https://apt.dockerproject.org/repo' - key: '2C52609D' - key_url: 'http://apt.dockerproject.org/gpg' - apt_repos: 'main' - apt_key_server: 'http://p80.pool.sks-keyservers.net' +docker-engine::settings: + init_file_path: '/etc/default/docker' + config_file_path: '/etc/default/docker' + repo_url: 'https://apt.dockerproject.org/repo' + key: '2C52609D' + key_url: 'http://apt.dockerproject.org/gpg' + apt_repos: 'main' + apt_key_server: 'http://p80.pool.sks-keyservers.net' + init_system: 'systemd' diff --git a/data/docker-engine/operatingsystem/Ubuntu12.04.yaml b/data/docker-engine/operatingsystem/Ubuntu12.04.yaml index 774edf48..b90faeab 100644 --- a/data/docker-engine/operatingsystem/Ubuntu12.04.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu12.04.yaml @@ -1,3 +1,4 @@ --- - docker-engine::settings: - apt_release: 'ubuntu-precise' +docker-engine::settings: + apt_release: 'ubuntu-precise' + init_system: 'upstart' diff --git a/data/docker-engine/operatingsystem/Ubuntu14.04.yaml b/data/docker-engine/operatingsystem/Ubuntu14.04.yaml index cd2bcbb0..0d1d9763 100644 --- a/data/docker-engine/operatingsystem/Ubuntu14.04.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,4 @@ --- - docker-engine::settings: - apt_release: 'ubuntu-trusty' +docker-engine::settings: + apt_release: 'ubuntu-trusty' + init_system: 'upstart' diff --git a/data/docker-engine/operatingsystem/Ubuntu14.10.yaml b/data/docker-engine/operatingsystem/Ubuntu14.10.yaml index e7a0e587..2c0ad65f 100644 --- a/data/docker-engine/operatingsystem/Ubuntu14.10.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu14.10.yaml @@ -1,3 +1,4 @@ --- - docker-engine::settings: + docker::settings: apt_release: 'ubuntu-utopic' + init_system: 'upstart' diff --git a/data/docker-engine/operatingsystem/Ubuntu15.04.yaml b/data/docker-engine/operatingsystem/Ubuntu15.04.yaml index 2e68f7ae..bacf1d26 100644 --- a/data/docker-engine/operatingsystem/Ubuntu15.04.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu15.04.yaml @@ -1,3 +1,3 @@ --- - docker-engine::settings: - apt_release: 'ubuntu-vivid' +docker-engine::settings: + apt_release: 'ubuntu-vivid' diff --git a/data/docker-engine/operatingsystem/Ubuntu15.10.yaml b/data/docker-engine/operatingsystem/Ubuntu15.10.yaml index de26184d..b125db1f 100644 --- a/data/docker-engine/operatingsystem/Ubuntu15.10.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu15.10.yaml @@ -1,3 +1,3 @@ --- - docker-engine::settings: - apt_release: 'ubuntu-wily' +docker-engine::settings: + apt_release: 'ubuntu-wily' diff --git a/data/docker-engine/operatingsystem/Ubuntu16.04.yaml b/data/docker-engine/operatingsystem/Ubuntu16.04.yaml index 1f0cfa91..1a9dd487 100644 --- a/data/docker-engine/operatingsystem/Ubuntu16.04.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,3 @@ --- - docker-engine::settings: - apt_release: 'ubuntu-xenial' +docker-engine::settings: + apt_release: 'ubuntu-xenial' From ec2e3486307a5c206001d6549b4f2f1984ce51f0 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 25 Sep 2017 10:12:05 +0200 Subject: [PATCH 083/284] Clone docker-engine data to docker --- data/docker/default.yaml | 10 ++++++++++ data/docker/hiera.yaml | 6 ++++++ data/docker/operatingsystem/CentOS.yaml | 7 +++++++ data/docker/operatingsystem/CentOS6.yaml | 4 ++++ data/docker/operatingsystem/CentOS7.yaml | 3 +++ data/docker/operatingsystem/Darwin.yaml | 5 +++++ data/docker/operatingsystem/Debian.yaml | 10 ++++++++++ data/docker/operatingsystem/Debian7.yaml | 3 +++ data/docker/operatingsystem/Debian8.yaml | 3 +++ data/docker/operatingsystem/Debian9.yaml | 4 ++++ data/docker/operatingsystem/RedHat.yaml | 6 ++++++ data/docker/operatingsystem/Ubuntu.yaml | 10 ++++++++++ data/docker/operatingsystem/Ubuntu12.04.yaml | 4 ++++ data/docker/operatingsystem/Ubuntu14.04.yaml | 4 ++++ data/docker/operatingsystem/Ubuntu14.10.yaml | 4 ++++ data/docker/operatingsystem/Ubuntu15.04.yaml | 3 +++ data/docker/operatingsystem/Ubuntu15.10.yaml | 3 +++ data/docker/operatingsystem/Ubuntu16.04.yaml | 3 +++ 18 files changed, 92 insertions(+) create mode 100644 data/docker/default.yaml create mode 100644 data/docker/hiera.yaml create mode 100644 data/docker/operatingsystem/CentOS.yaml create mode 100644 data/docker/operatingsystem/CentOS6.yaml create mode 100644 data/docker/operatingsystem/CentOS7.yaml create mode 100644 data/docker/operatingsystem/Darwin.yaml create mode 100644 data/docker/operatingsystem/Debian.yaml create mode 100644 data/docker/operatingsystem/Debian7.yaml create mode 100644 data/docker/operatingsystem/Debian8.yaml create mode 100644 data/docker/operatingsystem/Debian9.yaml create mode 100644 data/docker/operatingsystem/RedHat.yaml create mode 100644 data/docker/operatingsystem/Ubuntu.yaml create mode 100644 data/docker/operatingsystem/Ubuntu12.04.yaml create mode 100644 data/docker/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/docker/operatingsystem/Ubuntu14.10.yaml create mode 100644 data/docker/operatingsystem/Ubuntu15.04.yaml create mode 100644 data/docker/operatingsystem/Ubuntu15.10.yaml create mode 100644 data/docker/operatingsystem/Ubuntu16.04.yaml diff --git a/data/docker/default.yaml b/data/docker/default.yaml new file mode 100644 index 00000000..c615acf9 --- /dev/null +++ b/data/docker/default.yaml @@ -0,0 +1,10 @@ +--- +docker-engine::settings: + package_name: 'docker-engine' + service_name: 'docker' + pid_file_path: '/var/run/docker.pid' + process_name: 'docker' + process_user: 'docker' + process_group: 'docker' + tcp_port: '2375' + compose_version: '1.16.0' diff --git a/data/docker/hiera.yaml b/data/docker/hiera.yaml new file mode 100644 index 00000000..df27bff8 --- /dev/null +++ b/data/docker/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/default" + - default diff --git a/data/docker/operatingsystem/CentOS.yaml b/data/docker/operatingsystem/CentOS.yaml new file mode 100644 index 00000000..54d0729c --- /dev/null +++ b/data/docker/operatingsystem/CentOS.yaml @@ -0,0 +1,7 @@ +--- +docker-engine::settings: + init_file_path: '/etc/sysconfig/docker' + init_system: 'systemd' + config_file_path: '/etc/sysconfig/docker' + key: '2C52609D' + key_url: 'http://yum.dockerproject.org/gpg' diff --git a/data/docker/operatingsystem/CentOS6.yaml b/data/docker/operatingsystem/CentOS6.yaml new file mode 100644 index 00000000..4d376007 --- /dev/null +++ b/data/docker/operatingsystem/CentOS6.yaml @@ -0,0 +1,4 @@ +--- +docker-engine::settings: + repo_url: 'https://yum.dockerproject.org/repo/main/centos/6' + init_system: 'sysvinit' diff --git a/data/docker/operatingsystem/CentOS7.yaml b/data/docker/operatingsystem/CentOS7.yaml new file mode 100644 index 00000000..b48ef7fd --- /dev/null +++ b/data/docker/operatingsystem/CentOS7.yaml @@ -0,0 +1,3 @@ +--- +docker-engine::settings: + repo_url: 'https://yum.dockerproject.org/repo/main/centos/7' diff --git a/data/docker/operatingsystem/Darwin.yaml b/data/docker/operatingsystem/Darwin.yaml new file mode 100644 index 00000000..73650ab6 --- /dev/null +++ b/data/docker/operatingsystem/Darwin.yaml @@ -0,0 +1,5 @@ +--- + docker-engine::settings: + package_source: https://download.docker.com/mac/stable/Docker.dmg + config_file_group: 'wheel' + diff --git a/data/docker/operatingsystem/Debian.yaml b/data/docker/operatingsystem/Debian.yaml new file mode 100644 index 00000000..b08d3fa7 --- /dev/null +++ b/data/docker/operatingsystem/Debian.yaml @@ -0,0 +1,10 @@ +--- +docker-engine::settings: + init_file_path: '/etc/default/docker' + config_file_path: '/etc/default/docker' + repo_url: 'https://apt.dockerproject.org/repo' + key: '2C52609D' + key_url: 'http://apt.dockerproject.org/gpg' + apt_repos: 'main' + apt_key_server: 'http://p80.pool.sks-keyservers.net' + init_system: 'sysvinit' diff --git a/data/docker/operatingsystem/Debian7.yaml b/data/docker/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..93ce4f2b --- /dev/null +++ b/data/docker/operatingsystem/Debian7.yaml @@ -0,0 +1,3 @@ +--- +docker-engine::settings: + apt_release: 'debian-wheezy' diff --git a/data/docker/operatingsystem/Debian8.yaml b/data/docker/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..50972c48 --- /dev/null +++ b/data/docker/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- +docker-engine::settings: + apt_release: 'debian-jessie' diff --git a/data/docker/operatingsystem/Debian9.yaml b/data/docker/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..218beca5 --- /dev/null +++ b/data/docker/operatingsystem/Debian9.yaml @@ -0,0 +1,4 @@ +--- +docker-engine::settings: + apt_release: 'debian-stretch' + init_system: 'systemd' diff --git a/data/docker/operatingsystem/RedHat.yaml b/data/docker/operatingsystem/RedHat.yaml new file mode 100644 index 00000000..05945325 --- /dev/null +++ b/data/docker/operatingsystem/RedHat.yaml @@ -0,0 +1,6 @@ +--- +docker-engine::settings: + init_file_path: '/etc/sysconfig/docker' + config_file_path: '/etc/sysconfig/docker' + key: '2C52609D' + key_url: 'http://yum.dockerproject.org/gpg' diff --git a/data/docker/operatingsystem/Ubuntu.yaml b/data/docker/operatingsystem/Ubuntu.yaml new file mode 100644 index 00000000..f564c5c1 --- /dev/null +++ b/data/docker/operatingsystem/Ubuntu.yaml @@ -0,0 +1,10 @@ +--- +docker-engine::settings: + init_file_path: '/etc/default/docker' + config_file_path: '/etc/default/docker' + repo_url: 'https://apt.dockerproject.org/repo' + key: '2C52609D' + key_url: 'http://apt.dockerproject.org/gpg' + apt_repos: 'main' + apt_key_server: 'http://p80.pool.sks-keyservers.net' + init_system: 'systemd' diff --git a/data/docker/operatingsystem/Ubuntu12.04.yaml b/data/docker/operatingsystem/Ubuntu12.04.yaml new file mode 100644 index 00000000..b90faeab --- /dev/null +++ b/data/docker/operatingsystem/Ubuntu12.04.yaml @@ -0,0 +1,4 @@ +--- +docker-engine::settings: + apt_release: 'ubuntu-precise' + init_system: 'upstart' diff --git a/data/docker/operatingsystem/Ubuntu14.04.yaml b/data/docker/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..0d1d9763 --- /dev/null +++ b/data/docker/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,4 @@ +--- +docker-engine::settings: + apt_release: 'ubuntu-trusty' + init_system: 'upstart' diff --git a/data/docker/operatingsystem/Ubuntu14.10.yaml b/data/docker/operatingsystem/Ubuntu14.10.yaml new file mode 100644 index 00000000..2c0ad65f --- /dev/null +++ b/data/docker/operatingsystem/Ubuntu14.10.yaml @@ -0,0 +1,4 @@ +--- + docker::settings: + apt_release: 'ubuntu-utopic' + init_system: 'upstart' diff --git a/data/docker/operatingsystem/Ubuntu15.04.yaml b/data/docker/operatingsystem/Ubuntu15.04.yaml new file mode 100644 index 00000000..bacf1d26 --- /dev/null +++ b/data/docker/operatingsystem/Ubuntu15.04.yaml @@ -0,0 +1,3 @@ +--- +docker-engine::settings: + apt_release: 'ubuntu-vivid' diff --git a/data/docker/operatingsystem/Ubuntu15.10.yaml b/data/docker/operatingsystem/Ubuntu15.10.yaml new file mode 100644 index 00000000..b125db1f --- /dev/null +++ b/data/docker/operatingsystem/Ubuntu15.10.yaml @@ -0,0 +1,3 @@ +--- +docker-engine::settings: + apt_release: 'ubuntu-wily' diff --git a/data/docker/operatingsystem/Ubuntu16.04.yaml b/data/docker/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..1a9dd487 --- /dev/null +++ b/data/docker/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- +docker-engine::settings: + apt_release: 'ubuntu-xenial' From fa40f4773c817367dfce56ec616a7a94cac6d398 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 25 Sep 2017 12:01:13 +0200 Subject: [PATCH 084/284] Added default config dir and file path to docker --- data/docker/default.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/docker/default.yaml b/data/docker/default.yaml index c615acf9..7b0161ec 100644 --- a/data/docker/default.yaml +++ b/data/docker/default.yaml @@ -8,3 +8,5 @@ docker-engine::settings: process_group: 'docker' tcp_port: '2375' compose_version: '1.16.0' + config_file_path: '/etc/docker/daemon.json' + config_dir_path: '/etc/docker' From 02c00dce419e02da32217f06135cadfa76c06524 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 25 Sep 2017 12:12:11 +0200 Subject: [PATCH 085/284] Fixed docker key names --- data/docker/default.yaml | 2 +- data/docker/operatingsystem/CentOS.yaml | 2 +- data/docker/operatingsystem/CentOS6.yaml | 2 +- data/docker/operatingsystem/CentOS7.yaml | 2 +- data/docker/operatingsystem/Darwin.yaml | 2 +- data/docker/operatingsystem/Debian.yaml | 2 +- data/docker/operatingsystem/Debian7.yaml | 2 +- data/docker/operatingsystem/Debian8.yaml | 2 +- data/docker/operatingsystem/Debian9.yaml | 2 +- data/docker/operatingsystem/RedHat.yaml | 2 +- data/docker/operatingsystem/Ubuntu.yaml | 2 +- data/docker/operatingsystem/Ubuntu12.04.yaml | 2 +- data/docker/operatingsystem/Ubuntu14.04.yaml | 2 +- data/docker/operatingsystem/Ubuntu15.04.yaml | 2 +- data/docker/operatingsystem/Ubuntu15.10.yaml | 2 +- data/docker/operatingsystem/Ubuntu16.04.yaml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/docker/default.yaml b/data/docker/default.yaml index 7b0161ec..4346a42a 100644 --- a/data/docker/default.yaml +++ b/data/docker/default.yaml @@ -1,5 +1,5 @@ --- -docker-engine::settings: +docker::settings: package_name: 'docker-engine' service_name: 'docker' pid_file_path: '/var/run/docker.pid' diff --git a/data/docker/operatingsystem/CentOS.yaml b/data/docker/operatingsystem/CentOS.yaml index 54d0729c..b3652ed2 100644 --- a/data/docker/operatingsystem/CentOS.yaml +++ b/data/docker/operatingsystem/CentOS.yaml @@ -1,5 +1,5 @@ --- -docker-engine::settings: +docker::settings: init_file_path: '/etc/sysconfig/docker' init_system: 'systemd' config_file_path: '/etc/sysconfig/docker' diff --git a/data/docker/operatingsystem/CentOS6.yaml b/data/docker/operatingsystem/CentOS6.yaml index 4d376007..b58899b7 100644 --- a/data/docker/operatingsystem/CentOS6.yaml +++ b/data/docker/operatingsystem/CentOS6.yaml @@ -1,4 +1,4 @@ --- -docker-engine::settings: +docker::settings: repo_url: 'https://yum.dockerproject.org/repo/main/centos/6' init_system: 'sysvinit' diff --git a/data/docker/operatingsystem/CentOS7.yaml b/data/docker/operatingsystem/CentOS7.yaml index b48ef7fd..6ebdf115 100644 --- a/data/docker/operatingsystem/CentOS7.yaml +++ b/data/docker/operatingsystem/CentOS7.yaml @@ -1,3 +1,3 @@ --- -docker-engine::settings: +docker::settings: repo_url: 'https://yum.dockerproject.org/repo/main/centos/7' diff --git a/data/docker/operatingsystem/Darwin.yaml b/data/docker/operatingsystem/Darwin.yaml index 73650ab6..4f95eb75 100644 --- a/data/docker/operatingsystem/Darwin.yaml +++ b/data/docker/operatingsystem/Darwin.yaml @@ -1,5 +1,5 @@ --- - docker-engine::settings: + docker::settings: package_source: https://download.docker.com/mac/stable/Docker.dmg config_file_group: 'wheel' diff --git a/data/docker/operatingsystem/Debian.yaml b/data/docker/operatingsystem/Debian.yaml index b08d3fa7..4523a30f 100644 --- a/data/docker/operatingsystem/Debian.yaml +++ b/data/docker/operatingsystem/Debian.yaml @@ -1,5 +1,5 @@ --- -docker-engine::settings: +docker::settings: init_file_path: '/etc/default/docker' config_file_path: '/etc/default/docker' repo_url: 'https://apt.dockerproject.org/repo' diff --git a/data/docker/operatingsystem/Debian7.yaml b/data/docker/operatingsystem/Debian7.yaml index 93ce4f2b..9b19bd45 100644 --- a/data/docker/operatingsystem/Debian7.yaml +++ b/data/docker/operatingsystem/Debian7.yaml @@ -1,3 +1,3 @@ --- -docker-engine::settings: +docker::settings: apt_release: 'debian-wheezy' diff --git a/data/docker/operatingsystem/Debian8.yaml b/data/docker/operatingsystem/Debian8.yaml index 50972c48..23e278b7 100644 --- a/data/docker/operatingsystem/Debian8.yaml +++ b/data/docker/operatingsystem/Debian8.yaml @@ -1,3 +1,3 @@ --- -docker-engine::settings: +docker::settings: apt_release: 'debian-jessie' diff --git a/data/docker/operatingsystem/Debian9.yaml b/data/docker/operatingsystem/Debian9.yaml index 218beca5..61e0cd8d 100644 --- a/data/docker/operatingsystem/Debian9.yaml +++ b/data/docker/operatingsystem/Debian9.yaml @@ -1,4 +1,4 @@ --- -docker-engine::settings: +docker::settings: apt_release: 'debian-stretch' init_system: 'systemd' diff --git a/data/docker/operatingsystem/RedHat.yaml b/data/docker/operatingsystem/RedHat.yaml index 05945325..7a847bc2 100644 --- a/data/docker/operatingsystem/RedHat.yaml +++ b/data/docker/operatingsystem/RedHat.yaml @@ -1,5 +1,5 @@ --- -docker-engine::settings: +docker::settings: init_file_path: '/etc/sysconfig/docker' config_file_path: '/etc/sysconfig/docker' key: '2C52609D' diff --git a/data/docker/operatingsystem/Ubuntu.yaml b/data/docker/operatingsystem/Ubuntu.yaml index f564c5c1..a5b16d61 100644 --- a/data/docker/operatingsystem/Ubuntu.yaml +++ b/data/docker/operatingsystem/Ubuntu.yaml @@ -1,5 +1,5 @@ --- -docker-engine::settings: +docker::settings: init_file_path: '/etc/default/docker' config_file_path: '/etc/default/docker' repo_url: 'https://apt.dockerproject.org/repo' diff --git a/data/docker/operatingsystem/Ubuntu12.04.yaml b/data/docker/operatingsystem/Ubuntu12.04.yaml index b90faeab..a15a4b17 100644 --- a/data/docker/operatingsystem/Ubuntu12.04.yaml +++ b/data/docker/operatingsystem/Ubuntu12.04.yaml @@ -1,4 +1,4 @@ --- -docker-engine::settings: +docker::settings: apt_release: 'ubuntu-precise' init_system: 'upstart' diff --git a/data/docker/operatingsystem/Ubuntu14.04.yaml b/data/docker/operatingsystem/Ubuntu14.04.yaml index 0d1d9763..fc0b6773 100644 --- a/data/docker/operatingsystem/Ubuntu14.04.yaml +++ b/data/docker/operatingsystem/Ubuntu14.04.yaml @@ -1,4 +1,4 @@ --- -docker-engine::settings: +docker::settings: apt_release: 'ubuntu-trusty' init_system: 'upstart' diff --git a/data/docker/operatingsystem/Ubuntu15.04.yaml b/data/docker/operatingsystem/Ubuntu15.04.yaml index bacf1d26..e5ba498f 100644 --- a/data/docker/operatingsystem/Ubuntu15.04.yaml +++ b/data/docker/operatingsystem/Ubuntu15.04.yaml @@ -1,3 +1,3 @@ --- -docker-engine::settings: +docker::settings: apt_release: 'ubuntu-vivid' diff --git a/data/docker/operatingsystem/Ubuntu15.10.yaml b/data/docker/operatingsystem/Ubuntu15.10.yaml index b125db1f..fd22e6d6 100644 --- a/data/docker/operatingsystem/Ubuntu15.10.yaml +++ b/data/docker/operatingsystem/Ubuntu15.10.yaml @@ -1,3 +1,3 @@ --- -docker-engine::settings: +docker::settings: apt_release: 'ubuntu-wily' diff --git a/data/docker/operatingsystem/Ubuntu16.04.yaml b/data/docker/operatingsystem/Ubuntu16.04.yaml index 1a9dd487..828fcd83 100644 --- a/data/docker/operatingsystem/Ubuntu16.04.yaml +++ b/data/docker/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,3 @@ --- -docker-engine::settings: +docker::settings: apt_release: 'ubuntu-xenial' From f3a19805dc65d46383073a783b428db0c61da285 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 25 Sep 2017 12:14:49 +0200 Subject: [PATCH 086/284] Release v0.1.9 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index b29cf9e9..6a599f39 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.8", + "version": "0.1.9", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 1fab46d715d77f8896f8f94c8ef42e4ff502bbdc Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 27 Sep 2017 11:02:29 +0200 Subject: [PATCH 087/284] Gitlab runner 10 --- data/gitlab-runner/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gitlab-runner/default.yaml b/data/gitlab-runner/default.yaml index 3ec83f52..57bc14d8 100644 --- a/data/gitlab-runner/default.yaml +++ b/data/gitlab-runner/default.yaml @@ -1,6 +1,6 @@ --- gitlab-runner::settings: - package_name: 'gitlab-ci-multi-runner' + package_name: 'gitlab-runner' service_name: 'gitlab-runner' config_file_path: '/etc/gitlab-runner/config.toml' config_dir_path: '/etc/gitlab-runner' From caf7a86a8486ea4e06aa532c2998e256046b8380 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 6 Oct 2017 01:00:57 +0200 Subject: [PATCH 088/284] new gitlab runner repo --- data/gitlab-runner/osfamily/Debian.yaml | 4 ++-- data/gitlab-runner/osfamily/RedHat.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/gitlab-runner/osfamily/Debian.yaml b/data/gitlab-runner/osfamily/Debian.yaml index bc39564c..1bb5773e 100644 --- a/data/gitlab-runner/osfamily/Debian.yaml +++ b/data/gitlab-runner/osfamily/Debian.yaml @@ -2,6 +2,6 @@ gitlab-runner::settings: exec_prerequisites: repo_setup: - command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.deb.sh | bash' - creates: '/etc/apt/sources.list.d/runner_gitlab-ci-multi-runner.list' + command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash' + creates: '/etc/apt/sources.list.d/runner_gitlab-runner.list' diff --git a/data/gitlab-runner/osfamily/RedHat.yaml b/data/gitlab-runner/osfamily/RedHat.yaml index 26532f4d..eda93973 100644 --- a/data/gitlab-runner/osfamily/RedHat.yaml +++ b/data/gitlab-runner/osfamily/RedHat.yaml @@ -2,5 +2,5 @@ gitlab-runner::settings: exec_prerequisites: repo_setup: - command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.rpm.sh | bash' - creates: '/etc/yum.repos.d/runner_gitlab-ci-multi-runner.repo' + command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.rpm.sh | bash' + creates: '/etc/yum.repos.d/runner_gitlab-runner.repo' From 0a82a77eb9265c140ba7bb4aa303bc8e46e1c035 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 6 Oct 2017 01:01:11 +0200 Subject: [PATCH 089/284] Added ansible data --- data/ansible/default.yaml | 95 +++++++++++++++++++++++++++++++++++++++ data/ansible/hiera.yaml | 5 +++ 2 files changed, 100 insertions(+) create mode 100644 data/ansible/default.yaml create mode 100644 data/ansible/hiera.yaml diff --git a/data/ansible/default.yaml b/data/ansible/default.yaml new file mode 100644 index 00000000..be35b6eb --- /dev/null +++ b/data/ansible/default.yaml @@ -0,0 +1,95 @@ +--- + ansible::settings: + package_name: 'ansible' + config_file_path: '/etc/ansible/ansible.cfg' + config_dir_path: '/etc/ansible' + roles_dir_path: '/etc/ansible/roles' + inventory_file_path: '/etc/ansible/hosts' + config_file_template: 'ansible/ansible.cfg.erb' + + ansible::options: + inventory: /etc/ansible/hosts + library: /usr/share/my_modules/ + remote_tmp: $HOME/.ansible/tmp + local_tmp: $HOME/.ansible/tmp + forks: 5 + poll_interval: 15 + sudo_user: root + ask_sudo_pass: False + ask_pass: False + transport: smart + remote_port: 22 + module_lang: C + module_set_locale: True + gathering: implicit + gather_subset: all + role_parh: all + host_key_checking: True + #stdout_callback: skippy + #callback_whitelist: timer, mail + task_includes_static: True + handler_includes_static: True + sudo_exe: sudo + sudo_flags: -H -S -n + timeout: 10 + remote_user: root + log_path: false + module_name: command + executable: /bin/sh + hash_behaviour: replace + private_role_vars: no + jinja2_extensions: jinja2.ext.do,jinja2.ext.i18n + #private_key_file: /path/to/file + #vault_password_file: /path/to/vault_password_file + ansible_managed: 'Ansible managed: {file} on {host}' + display_skipped_hosts: True + display_args_to_stdout: False + error_on_undefined_vars: True + system_warnings: True + deprecation_warnings: True + command_warnings: True + bin_ansible_callbacks: False + nocows: 0 + cow_selection: default + nocolor: 0 + fact_caching: memory + retry_files_enabled: True + retry_files_save_path: ~/.ansible-retry + squash_actions: apk,apt,dnf,package,pacman,pkgng,yum,zypper + no_log: False + no_target_syslog: False + allow_world_readable_tmpfiles: False + var_compression_level: 0 + module_compression: "'ZIP_DEFLATED'" + max_diff_size: 1048576 + become: True + become_method: sudo + become_user: root + become_ask_pass: False + record_host_keys: True + pty: True + ssh_args: -o ControlMaster:auto -o ControlPersist:60s + control_path: '%(directory)s/ansible-ssh-%%h-%%p-%%r' + pipelining: False + scp_if_ssh: False + sftp_batch_mode: True + accelerate_port: 5099 + accelerate_timeout: 30 + accelerate_connect_timeout: 5.0 + accelerate_daemon_timeout: 30 + accelerate_multi_key: no + special_context_filesystems: nfs,vboxsf,fuse,ramfs + libvirt_lxc_noseclabel: no + highlight: white + verbose: blue + warn: bright purple + error: red + debug: dark gray + deprecate: purple + skip: cyan + unreachable: red + ok: green + changed: yellow + diff_add: green + diff_remove: red + diff_lines: cyan diff --git a/data/ansible/hiera.yaml b/data/ansible/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/ansible/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From e071a4becd879d6f326c9409e11b71d6e494aa2b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 6 Oct 2017 01:01:57 +0200 Subject: [PATCH 090/284] Release v0.1.10 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 6a599f39..30085651 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.9", + "version": "0.1.10", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From fa1baa5cc63b03114701422adf82d74729556463 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 6 Oct 2017 01:19:40 +0200 Subject: [PATCH 091/284] Removed extra data from ansible data --- data/ansible/default.yaml | 88 --------------------------------------- 1 file changed, 88 deletions(-) diff --git a/data/ansible/default.yaml b/data/ansible/default.yaml index be35b6eb..daab30d7 100644 --- a/data/ansible/default.yaml +++ b/data/ansible/default.yaml @@ -5,91 +5,3 @@ config_dir_path: '/etc/ansible' roles_dir_path: '/etc/ansible/roles' inventory_file_path: '/etc/ansible/hosts' - config_file_template: 'ansible/ansible.cfg.erb' - - ansible::options: - inventory: /etc/ansible/hosts - library: /usr/share/my_modules/ - remote_tmp: $HOME/.ansible/tmp - local_tmp: $HOME/.ansible/tmp - forks: 5 - poll_interval: 15 - sudo_user: root - ask_sudo_pass: False - ask_pass: False - transport: smart - remote_port: 22 - module_lang: C - module_set_locale: True - gathering: implicit - gather_subset: all - role_parh: all - host_key_checking: True - #stdout_callback: skippy - #callback_whitelist: timer, mail - task_includes_static: True - handler_includes_static: True - sudo_exe: sudo - sudo_flags: -H -S -n - timeout: 10 - remote_user: root - log_path: false - module_name: command - executable: /bin/sh - hash_behaviour: replace - private_role_vars: no - jinja2_extensions: jinja2.ext.do,jinja2.ext.i18n - #private_key_file: /path/to/file - #vault_password_file: /path/to/vault_password_file - ansible_managed: 'Ansible managed: {file} on {host}' - display_skipped_hosts: True - display_args_to_stdout: False - error_on_undefined_vars: True - system_warnings: True - deprecation_warnings: True - command_warnings: True - bin_ansible_callbacks: False - nocows: 0 - cow_selection: default - nocolor: 0 - fact_caching: memory - retry_files_enabled: True - retry_files_save_path: ~/.ansible-retry - squash_actions: apk,apt,dnf,package,pacman,pkgng,yum,zypper - no_log: False - no_target_syslog: False - allow_world_readable_tmpfiles: False - var_compression_level: 0 - module_compression: "'ZIP_DEFLATED'" - max_diff_size: 1048576 - become: True - become_method: sudo - become_user: root - become_ask_pass: False - record_host_keys: True - pty: True - ssh_args: -o ControlMaster:auto -o ControlPersist:60s - control_path: '%(directory)s/ansible-ssh-%%h-%%p-%%r' - pipelining: False - scp_if_ssh: False - sftp_batch_mode: True - accelerate_port: 5099 - accelerate_timeout: 30 - accelerate_connect_timeout: 5.0 - accelerate_daemon_timeout: 30 - accelerate_multi_key: no - special_context_filesystems: nfs,vboxsf,fuse,ramfs - libvirt_lxc_noseclabel: no - highlight: white - verbose: blue - warn: bright purple - error: red - debug: dark gray - deprecate: purple - skip: cyan - unreachable: red - ok: green - changed: yellow - diff_add: green - diff_remove: red - diff_lines: cyan From 462b6b8d2e5c57ec7377258e45d07bf9e425bc67 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 6 Oct 2017 01:19:57 +0200 Subject: [PATCH 092/284] Release v0.1.11 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 30085651..1b9f1fa7 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.10", + "version": "0.1.11", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From c54f75c97ac5d9555b23f44be5a56ba413060cbc Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 23 Oct 2017 12:56:46 +0200 Subject: [PATCH 093/284] updated data for Jenkins, GitLab and jdk for Ubuntu --- data/gitlab-ce/operatingsystem/Ubuntu.yaml | 2 +- data/gitlab-ce/osfamily/Debian.yaml | 2 +- data/jenkins/osfamily/Debian.yaml | 4 ++++ data/openjdk-jdk/hiera.yaml | 3 ++- .../Debian15.04.yaml => operatingsystem/Ubuntu.yaml} | 0 .../Debian10.04.yaml => operatingsystem/Ubuntu10.04.yaml} | 0 .../Debian10.10.yaml => operatingsystem/Ubuntu10.10.yaml} | 0 data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml | 3 +++ data/openjdk-jre/hiera.yaml | 3 ++- .../Debian15.04.yaml => operatingsystem/Ubuntu.yaml} | 0 .../Debian10.04.yaml => operatingsystem/Ubuntu10.04.yaml} | 0 .../Debian10.10.yaml => operatingsystem/Ubuntu10.10.yaml} | 0 .../Debian15.10.yaml => operatingsystem/Ubuntu15.04.yaml} | 0 data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml | 3 +++ 14 files changed, 16 insertions(+), 4 deletions(-) rename data/openjdk-jdk/{osfamily/Debian15.04.yaml => operatingsystem/Ubuntu.yaml} (100%) rename data/openjdk-jdk/{osfamily/Debian10.04.yaml => operatingsystem/Ubuntu10.04.yaml} (100%) rename data/openjdk-jdk/{osfamily/Debian10.10.yaml => operatingsystem/Ubuntu10.10.yaml} (100%) create mode 100644 data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml rename data/openjdk-jre/{osfamily/Debian15.04.yaml => operatingsystem/Ubuntu.yaml} (100%) rename data/openjdk-jre/{osfamily/Debian10.04.yaml => operatingsystem/Ubuntu10.04.yaml} (100%) rename data/openjdk-jre/{osfamily/Debian10.10.yaml => operatingsystem/Ubuntu10.10.yaml} (100%) rename data/openjdk-jre/{osfamily/Debian15.10.yaml => operatingsystem/Ubuntu15.04.yaml} (100%) create mode 100644 data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml diff --git a/data/gitlab-ce/operatingsystem/Ubuntu.yaml b/data/gitlab-ce/operatingsystem/Ubuntu.yaml index f8c931c7..ff3f1577 100644 --- a/data/gitlab-ce/operatingsystem/Ubuntu.yaml +++ b/data/gitlab-ce/operatingsystem/Ubuntu.yaml @@ -1,3 +1,3 @@ --- gitlab-ce::settings: - repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce/debian' + repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce/ubuntu' diff --git a/data/gitlab-ce/osfamily/Debian.yaml b/data/gitlab-ce/osfamily/Debian.yaml index 76ddab9e..41b02817 100644 --- a/data/gitlab-ce/osfamily/Debian.yaml +++ b/data/gitlab-ce/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- gitlab-ce::settings: - repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce/debian' + repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce' key: '14219A96E15E78F4' key_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' apt_repos: 'main' diff --git a/data/jenkins/osfamily/Debian.yaml b/data/jenkins/osfamily/Debian.yaml index efcc4b69..df297b61 100644 --- a/data/jenkins/osfamily/Debian.yaml +++ b/data/jenkins/osfamily/Debian.yaml @@ -2,3 +2,7 @@ jenkins::settings: pid_file_path: '/var/run/jenkins/jenkins.pid' init_file_path: '/etc/default/jenkins' + repo_url: 'https://pkg.jenkins.io/debian-stable' + key: 'D50582E6' + key_url: 'https://pkg.jenkins.io/debian-stable/jenkins.io.key' + apt_repos: 'binary/' diff --git a/data/openjdk-jdk/hiera.yaml b/data/openjdk-jdk/hiera.yaml index 456bda56..2cf9014d 100644 --- a/data/openjdk-jdk/hiera.yaml +++ b/data/openjdk-jdk/hiera.yaml @@ -1,6 +1,7 @@ --- :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/openjdk-jdk/osfamily/Debian15.04.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu.yaml similarity index 100% rename from data/openjdk-jdk/osfamily/Debian15.04.yaml rename to data/openjdk-jdk/operatingsystem/Ubuntu.yaml diff --git a/data/openjdk-jdk/osfamily/Debian10.04.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml similarity index 100% rename from data/openjdk-jdk/osfamily/Debian10.04.yaml rename to data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml diff --git a/data/openjdk-jdk/osfamily/Debian10.10.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml similarity index 100% rename from data/openjdk-jdk/osfamily/Debian10.10.yaml rename to data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml new file mode 100644 index 00000000..3c63bcd2 --- /dev/null +++ b/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml @@ -0,0 +1,3 @@ +--- + openjdk-jdk::settings: + package_name: 'openjdk-8-jdk' diff --git a/data/openjdk-jre/hiera.yaml b/data/openjdk-jre/hiera.yaml index 456bda56..2cf9014d 100644 --- a/data/openjdk-jre/hiera.yaml +++ b/data/openjdk-jre/hiera.yaml @@ -1,6 +1,7 @@ --- :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/openjdk-jre/osfamily/Debian15.04.yaml b/data/openjdk-jre/operatingsystem/Ubuntu.yaml similarity index 100% rename from data/openjdk-jre/osfamily/Debian15.04.yaml rename to data/openjdk-jre/operatingsystem/Ubuntu.yaml diff --git a/data/openjdk-jre/osfamily/Debian10.04.yaml b/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml similarity index 100% rename from data/openjdk-jre/osfamily/Debian10.04.yaml rename to data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml diff --git a/data/openjdk-jre/osfamily/Debian10.10.yaml b/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml similarity index 100% rename from data/openjdk-jre/osfamily/Debian10.10.yaml rename to data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml diff --git a/data/openjdk-jre/osfamily/Debian15.10.yaml b/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml similarity index 100% rename from data/openjdk-jre/osfamily/Debian15.10.yaml rename to data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml diff --git a/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml b/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml new file mode 100644 index 00000000..a682bc33 --- /dev/null +++ b/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml @@ -0,0 +1,3 @@ +--- + openjdk-jre::settings: + package_name: 'openjdk-8-jre-headless' From 70bbc776c964619100710238415e116d22f5fafb Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 23 Oct 2017 12:58:00 +0200 Subject: [PATCH 094/284] Fix for gitlab on debian --- data/gitlab-ce/osfamily/Debian.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gitlab-ce/osfamily/Debian.yaml b/data/gitlab-ce/osfamily/Debian.yaml index 41b02817..76ddab9e 100644 --- a/data/gitlab-ce/osfamily/Debian.yaml +++ b/data/gitlab-ce/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- gitlab-ce::settings: - repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce' + repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce/debian' key: '14219A96E15E78F4' key_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' apt_repos: 'main' From 228a0b668343dd0471b90b4f30354be2ff6b049c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 24 Oct 2017 10:57:46 +0200 Subject: [PATCH 095/284] Added data for openswan --- data/openswan/default.yaml | 15 +++++++++++++++ data/openswan/hiera.yaml | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 data/openswan/default.yaml create mode 100644 data/openswan/hiera.yaml diff --git a/data/openswan/default.yaml b/data/openswan/default.yaml new file mode 100644 index 00000000..793a3bba --- /dev/null +++ b/data/openswan/default.yaml @@ -0,0 +1,15 @@ +--- + openswan::settings: + package_name: 'openswan' + service_name: 'ipsec' + config_file_path: '/etc/ipsec.conf' + secrets_file_path: '/etc/ipsec.secrets' + config_dir_path: '/etc/ipsec.d' + connections_dir_path: '/etc/ipsec.d/connections' + secrets_dir_path: '/etc/ipsec.d/secrets' + udp_port: + - '500' + - '4500' + process_name: 'openswan' + process_user: 'root' + process_group: 'root' diff --git a/data/openswan/hiera.yaml b/data/openswan/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/openswan/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From e56d370e9eb2c8960fb6f6806d7f03c04e6e6af5 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 24 Oct 2017 13:31:40 +0200 Subject: [PATCH 096/284] Added openswan data --- data/openswan/default.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/openswan/default.yaml b/data/openswan/default.yaml index 793a3bba..c026c412 100644 --- a/data/openswan/default.yaml +++ b/data/openswan/default.yaml @@ -10,6 +10,9 @@ udp_port: - '500' - '4500' - process_name: 'openswan' + process_name: 'pluto' process_user: 'root' process_group: 'root' + pid_file_path: '/var/run/pluto' + log_file_path: '/var/log/pluto/peer' + log_dir_path: '/var/log/pluto' From 55560b6bda09a7baa62945da6feff48ef01ec4c8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 29 Oct 2017 21:41:14 +0100 Subject: [PATCH 097/284] Updated epel data --- data/epel/osfamily/RedHat4.yaml | 2 +- data/epel/osfamily/RedHat5.yaml | 2 +- data/epel/osfamily/RedHat6.yaml | 2 +- data/epel/osfamily/RedHat7.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/epel/osfamily/RedHat4.yaml b/data/epel/osfamily/RedHat4.yaml index e303425b..85b56a51 100644 --- a/data/epel/osfamily/RedHat4.yaml +++ b/data/epel/osfamily/RedHat4.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/epel/4/i386/epel-release-4-10.noarch.rpm' + repo_package_url: 'http://download.fedoraproject.org/pub/archive/epel/4/i386/epel-release-4-10.noarch.rpm' diff --git a/data/epel/osfamily/RedHat5.yaml b/data/epel/osfamily/RedHat5.yaml index 0ea793fe..3a10fade 100644 --- a/data/epel/osfamily/RedHat5.yaml +++ b/data/epel/osfamily/RedHat5.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm' + repo_package_url: 'http://download.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm' diff --git a/data/epel/osfamily/RedHat6.yaml b/data/epel/osfamily/RedHat6.yaml index 3fa1fa5a..cbe15eb3 100644 --- a/data/epel/osfamily/RedHat6.yaml +++ b/data/epel/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm' + repo_package_url: 'http://download.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm' diff --git a/data/epel/osfamily/RedHat7.yaml b/data/epel/osfamily/RedHat7.yaml index 12dd7d9d..d70144be 100644 --- a/data/epel/osfamily/RedHat7.yaml +++ b/data/epel/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm' + repo_package_url: 'http://download.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' From 9f1ae4b8edd3e2581ae9f833cfd4d6bb8f1f743d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 4 Nov 2017 16:43:17 +0100 Subject: [PATCH 098/284] Release 0.1.12 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 1b9f1fa7..857bc43b 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.11", + "version": "0.1.12", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 2b07697e8d246c6a6583a3f083330eae76209bc8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 11 Nov 2017 18:18:49 +0100 Subject: [PATCH 099/284] Added validate_cmd values for openssh apache and nginx --- data/apache/default.yaml | 2 ++ data/nginx/default.yaml | 1 + data/openssh/default.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/data/apache/default.yaml b/data/apache/default.yaml index 1acf3286..f198fc8e 100644 --- a/data/apache/default.yaml +++ b/data/apache/default.yaml @@ -13,3 +13,5 @@ process_user: 'apache' process_group: 'apache' nodaemon_args: '-DFOREGROUND' + validate_cmd: + config: 'httpd -t -f %' diff --git a/data/nginx/default.yaml b/data/nginx/default.yaml index cfdcbe51..9c98a1af 100644 --- a/data/nginx/default.yaml +++ b/data/nginx/default.yaml @@ -17,3 +17,4 @@ process_user: 'nginx' process_group: 'nginx' nodaemon_args: -g 'daemon off;' + validate_cmd: 'nginx -t -c %' diff --git a/data/openssh/default.yaml b/data/openssh/default.yaml index 05757bf1..707a827a 100644 --- a/data/openssh/default.yaml +++ b/data/openssh/default.yaml @@ -12,3 +12,4 @@ process_user: 'root' process_group: 'root' nodaemon_args: '-D' + validate_cmd: 'sshd -t -f %' From 9f519094c75a7741944d8f049042658eb861ff0c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 12 Nov 2017 16:47:42 +0100 Subject: [PATCH 100/284] nginx validate_cmd valid only on main config --- data/nginx/default.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/nginx/default.yaml b/data/nginx/default.yaml index 9c98a1af..0ba7df0e 100644 --- a/data/nginx/default.yaml +++ b/data/nginx/default.yaml @@ -17,4 +17,5 @@ process_user: 'nginx' process_group: 'nginx' nodaemon_args: -g 'daemon off;' - validate_cmd: 'nginx -t -c %' + validate_cmd: + config: 'nginx -t -c %' From 3bc0cdb933a78dd34e992d855e1c3059cef908ee Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 12 Nov 2017 18:27:50 +0100 Subject: [PATCH 101/284] Release 0.2.0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 857bc43b..935a65cf 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.1.12", + "version": "0.2.0", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From d39301518ef02de825f251e37bde72f41f30d218 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 25 Nov 2017 19:27:19 +0100 Subject: [PATCH 102/284] Fix jenkins key_url for RedHat --- data/jenkins/osfamily/RedHat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/jenkins/osfamily/RedHat.yaml b/data/jenkins/osfamily/RedHat.yaml index 048f55f8..2293818e 100644 --- a/data/jenkins/osfamily/RedHat.yaml +++ b/data/jenkins/osfamily/RedHat.yaml @@ -3,4 +3,4 @@ init_file_path: '/etc/sysconfig/jenkins' repo_url: 'http://pkg.jenkins.io/redhat-stable' # key: 'D88E42B4' - key_url: 'https://jenkins-ci.org/redhat/jenkins-ci.org.key' + key_url: 'https://pkg.jenkins.io/redhat-stable/jenkins.io.key' From d6e5e2f70b3fe3a2ba728e241909c3a8a1bb6ae5 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 24 Dec 2017 11:00:51 +0100 Subject: [PATCH 103/284] Fixed openjdk-jdk package name on suse --- data/jenkins/operatingsystem/Amazon.yaml | 3 +++ data/openjdk-jdk/osfamily/Suse.yaml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 data/jenkins/operatingsystem/Amazon.yaml diff --git a/data/jenkins/operatingsystem/Amazon.yaml b/data/jenkins/operatingsystem/Amazon.yaml new file mode 100644 index 00000000..d5a7d7ff --- /dev/null +++ b/data/jenkins/operatingsystem/Amazon.yaml @@ -0,0 +1,3 @@ +--- +jenkins::settings: + diff --git a/data/openjdk-jdk/osfamily/Suse.yaml b/data/openjdk-jdk/osfamily/Suse.yaml index 6ba9bd1e..0102ff32 100644 --- a/data/openjdk-jdk/osfamily/Suse.yaml +++ b/data/openjdk-jdk/osfamily/Suse.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'java-1_7_0-openjdk' +openjdk-jdk::settings: + package_name: 'java-1_7_0-openjdk-devel' From ed8505752f150fbc7178900612f024709111ee9e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 24 Dec 2017 13:49:06 +0100 Subject: [PATCH 104/284] Release v0.2.1 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 935a65cf..3795f731 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.2.0", + "version": "0.2.1", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 815bc4d1a3fbd7e089ac52051087dc56764f3175 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 27 Dec 2017 11:02:47 +0100 Subject: [PATCH 105/284] Suse fixes --- data/dhcpd/osfamily/{SuSE.yaml => Suse.yaml} | 0 data/jenkins/operatingsystem/Amazon.yaml | 2 +- data/jenkins/osfamily/Suse.yaml | 3 +++ data/ntp/osfamily/{SuSE.yaml => Suse.yaml} | 0 data/php/osfamily/{SuSE.yaml => Suse.yaml} | 0 5 files changed, 4 insertions(+), 1 deletion(-) rename data/dhcpd/osfamily/{SuSE.yaml => Suse.yaml} (100%) create mode 100644 data/jenkins/osfamily/Suse.yaml rename data/ntp/osfamily/{SuSE.yaml => Suse.yaml} (100%) rename data/php/osfamily/{SuSE.yaml => Suse.yaml} (100%) diff --git a/data/dhcpd/osfamily/SuSE.yaml b/data/dhcpd/osfamily/Suse.yaml similarity index 100% rename from data/dhcpd/osfamily/SuSE.yaml rename to data/dhcpd/osfamily/Suse.yaml diff --git a/data/jenkins/operatingsystem/Amazon.yaml b/data/jenkins/operatingsystem/Amazon.yaml index d5a7d7ff..99f68334 100644 --- a/data/jenkins/operatingsystem/Amazon.yaml +++ b/data/jenkins/operatingsystem/Amazon.yaml @@ -1,3 +1,3 @@ --- jenkins::settings: - + init_file_path: '/etc/sysconfig/jenkins' diff --git a/data/jenkins/osfamily/Suse.yaml b/data/jenkins/osfamily/Suse.yaml new file mode 100644 index 00000000..99f68334 --- /dev/null +++ b/data/jenkins/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- +jenkins::settings: + init_file_path: '/etc/sysconfig/jenkins' diff --git a/data/ntp/osfamily/SuSE.yaml b/data/ntp/osfamily/Suse.yaml similarity index 100% rename from data/ntp/osfamily/SuSE.yaml rename to data/ntp/osfamily/Suse.yaml diff --git a/data/php/osfamily/SuSE.yaml b/data/php/osfamily/Suse.yaml similarity index 100% rename from data/php/osfamily/SuSE.yaml rename to data/php/osfamily/Suse.yaml From a9e37d47d41a16a1f6602c19403fcbe98d257e49 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 27 Dec 2017 11:03:25 +0100 Subject: [PATCH 106/284] Release v0.2.2 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 3795f731..f57a5071 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.2.1", + "version": "0.2.2", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 69b89cf75d90b196663dc52667ef6f59abb0da11 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 21 Jan 2018 18:25:00 +0100 Subject: [PATCH 107/284] Fixed puppetserver repo for Ubuntu1604 --- data/puppetserver/operatingsystem/Ubuntu16.04.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/puppetserver/operatingsystem/Ubuntu16.04.yaml diff --git a/data/puppetserver/operatingsystem/Ubuntu16.04.yaml b/data/puppetserver/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..64c32d26 --- /dev/null +++ b/data/puppetserver/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,4 @@ +--- + puppetserver::settings: + apt_release: 'xenial' + From d3b1cb675a65f1bb4bc40b2d358841c054e4b7b1 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 21 Jan 2018 18:27:00 +0100 Subject: [PATCH 108/284] Release v0.2.3 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index f57a5071..98aa8b80 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.2.2", + "version": "0.2.3", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From a24ff88d7397f09ef6ed370a734acf5dbe989f31 Mon Sep 17 00:00:00 2001 From: "Christian Meissner (me)" Date: Tue, 23 Jan 2018 14:54:06 +0100 Subject: [PATCH 109/284] add htop --- data/htop/default.yaml | 3 +++ data/htop/hiera.yaml | 5 +++++ data/htop/osfamily/RedHat.yaml | 5 +++++ 3 files changed, 13 insertions(+) create mode 100644 data/htop/default.yaml create mode 100644 data/htop/hiera.yaml create mode 100644 data/htop/osfamily/RedHat.yaml diff --git a/data/htop/default.yaml b/data/htop/default.yaml new file mode 100644 index 00000000..4f06aba4 --- /dev/null +++ b/data/htop/default.yaml @@ -0,0 +1,3 @@ +--- +htop::settings: + package_name: 'htop' diff --git a/data/htop/hiera.yaml b/data/htop/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/htop/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/htop/osfamily/RedHat.yaml b/data/htop/osfamily/RedHat.yaml new file mode 100644 index 00000000..84f7f324 --- /dev/null +++ b/data/htop/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- + nagios-plugins::settings: + package_name: 'nagios-plugins-all' + tp_prerequisites: + - epel From 729a807074073c6a7c84d716fc2c84c4b8944adc Mon Sep 17 00:00:00 2001 From: "Christian Meissner (me)" Date: Fri, 26 Jan 2018 13:53:27 +0100 Subject: [PATCH 110/284] add bind-utils --- data/bind-utils/default.yaml | 3 +++ data/bind-utils/hiera.yaml | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 data/bind-utils/default.yaml create mode 100644 data/bind-utils/hiera.yaml diff --git a/data/bind-utils/default.yaml b/data/bind-utils/default.yaml new file mode 100644 index 00000000..ef6dbf71 --- /dev/null +++ b/data/bind-utils/default.yaml @@ -0,0 +1,3 @@ +--- +bind-utils::settings: + package_name: 'bind-utils' diff --git a/data/bind-utils/hiera.yaml b/data/bind-utils/hiera.yaml new file mode 100644 index 00000000..b8dc1a89 --- /dev/null +++ b/data/bind-utils/hiera.yaml @@ -0,0 +1,5 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From b04c7281b698742d1f25b441fe4944f0d0a4520c Mon Sep 17 00:00:00 2001 From: "Christian Meissner (me)" Date: Fri, 26 Jan 2018 14:32:17 +0100 Subject: [PATCH 111/284] add osfamily Debian and Ubuntu for bind-utils --- data/bind-utils/osfamily/Debian.yaml | 4 ++++ data/bind-utils/osfamily/Ubuntu.yaml | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 data/bind-utils/osfamily/Debian.yaml create mode 100644 data/bind-utils/osfamily/Ubuntu.yaml diff --git a/data/bind-utils/osfamily/Debian.yaml b/data/bind-utils/osfamily/Debian.yaml new file mode 100644 index 00000000..fc53f5bb --- /dev/null +++ b/data/bind-utils/osfamily/Debian.yaml @@ -0,0 +1,4 @@ +--- + bind-utils::settings: + package_name: 'dnsutils' + diff --git a/data/bind-utils/osfamily/Ubuntu.yaml b/data/bind-utils/osfamily/Ubuntu.yaml new file mode 100644 index 00000000..fc53f5bb --- /dev/null +++ b/data/bind-utils/osfamily/Ubuntu.yaml @@ -0,0 +1,4 @@ +--- + bind-utils::settings: + package_name: 'dnsutils' + From d2a1512c40985148fcc92ff6dc7440c29a5ef8e6 Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Fri, 9 Feb 2018 13:48:41 +0100 Subject: [PATCH 112/284] openssh - add support for solaris 10 and 11 --- data/openssh/hiera.yaml | 1 + data/openssh/osfamily/Solaris/10.yaml | 9 +++++++++ data/openssh/osfamily/Solaris/11.yaml | 4 ++++ 3 files changed, 14 insertions(+) create mode 100644 data/openssh/osfamily/Solaris/10.yaml create mode 100644 data/openssh/osfamily/Solaris/11.yaml diff --git a/data/openssh/hiera.yaml b/data/openssh/hiera.yaml index b8dc1a89..b18896c3 100644 --- a/data/openssh/hiera.yaml +++ b/data/openssh/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}/%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/openssh/osfamily/Solaris/10.yaml b/data/openssh/osfamily/Solaris/10.yaml new file mode 100644 index 00000000..a12dc74d --- /dev/null +++ b/data/openssh/osfamily/Solaris/10.yaml @@ -0,0 +1,9 @@ +--- + openssh::settings: + package_name: + - 'SUNWsshcu' + - 'SUNWsshdr' + - 'SUNWsshdu' + - 'SUNWsshr' + - 'SUNWsshu' + diff --git a/data/openssh/osfamily/Solaris/11.yaml b/data/openssh/osfamily/Solaris/11.yaml new file mode 100644 index 00000000..b8e5f7f7 --- /dev/null +++ b/data/openssh/osfamily/Solaris/11.yaml @@ -0,0 +1,4 @@ +--- + openssh::settings: + package_name: 'network/openssh' + From bd132210bf46be4c18f51987357f329ed4ed2020 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 20 Feb 2018 19:56:48 +0100 Subject: [PATCH 113/284] Added support for puppet-agent (4) to Debian9 --- data/puppet-agent/operatingsystem/Debian9.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/puppet-agent/operatingsystem/Debian9.yaml diff --git a/data/puppet-agent/operatingsystem/Debian9.yaml b/data/puppet-agent/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..9bbb1ec2 --- /dev/null +++ b/data/puppet-agent/operatingsystem/Debian9.yaml @@ -0,0 +1,4 @@ +--- + puppet-agent::settings: + apt_release: 'stretch' + From e56a07a88d11a64ce21440e5dda5c7560577950f Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 15 Mar 2018 18:14:46 +0100 Subject: [PATCH 114/284] Updated epel-release packages --- data/epel/default.yaml | 2 +- data/epel/osfamily/RedHat4.yaml | 2 +- data/epel/osfamily/RedHat5.yaml | 2 +- data/epel/osfamily/RedHat6.yaml | 2 +- data/epel/osfamily/RedHat7.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/epel/default.yaml b/data/epel/default.yaml index b265bf32..476385c3 100644 --- a/data/epel/default.yaml +++ b/data/epel/default.yaml @@ -1,4 +1,4 @@ --- - epel::settings: +# epel::settings: # comment: 'Extra Packages for Enterprise Linux - $basearch' # key_url: 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' diff --git a/data/epel/osfamily/RedHat4.yaml b/data/epel/osfamily/RedHat4.yaml index 85b56a51..4cd451cd 100644 --- a/data/epel/osfamily/RedHat4.yaml +++ b/data/epel/osfamily/RedHat4.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/archive/epel/4/i386/epel-release-4-10.noarch.rpm' + repo_package_url: 'http://dl.fedoraproject.org/pub/archive/epel/4/i386/epel-release-4-10.noarch.rpm' diff --git a/data/epel/osfamily/RedHat5.yaml b/data/epel/osfamily/RedHat5.yaml index 3a10fade..0b8bc02c 100644 --- a/data/epel/osfamily/RedHat5.yaml +++ b/data/epel/osfamily/RedHat5.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm' + repo_package_url: 'http://dl.fedoraproject.org/pub/archive/epel/5/x86_64/epel-release-5-4.noarch.rpm' diff --git a/data/epel/osfamily/RedHat6.yaml b/data/epel/osfamily/RedHat6.yaml index cbe15eb3..2e1f8083 100644 --- a/data/epel/osfamily/RedHat6.yaml +++ b/data/epel/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm' + repo_package_url: 'http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm' diff --git a/data/epel/osfamily/RedHat7.yaml b/data/epel/osfamily/RedHat7.yaml index d70144be..08d0c8dc 100644 --- a/data/epel/osfamily/RedHat7.yaml +++ b/data/epel/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'http://download.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' + repo_package_url: 'http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' From 7ca8d05adf216d64f64c840cc81cb1c8d3f07cb1 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 15 Mar 2018 18:15:43 +0100 Subject: [PATCH 115/284] Release v0.2.4 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 98aa8b80..d609e36e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.2.3", + "version": "0.2.4", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 4a141633221cb5eeb1f353bcf63ac8f39cdbc20a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 21 Mar 2018 17:07:57 +0100 Subject: [PATCH 116/284] Removed unused and troubleful epel common.yaml --- data/epel/default.yaml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 data/epel/default.yaml diff --git a/data/epel/default.yaml b/data/epel/default.yaml deleted file mode 100644 index 476385c3..00000000 --- a/data/epel/default.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# epel::settings: -# comment: 'Extra Packages for Enterprise Linux - $basearch' -# key_url: 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' From 790300b7fba62d2b480acb8b636dd61e3d69801e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 21 Mar 2018 17:08:57 +0100 Subject: [PATCH 117/284] Release v0.2.5 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index d609e36e..01a21952 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.2.4", + "version": "0.2.5", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From ea5749a1871d19e17081f9b8d2dcc83872ac5ed4 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 30 Mar 2018 18:19:48 +0200 Subject: [PATCH 118/284] grafana data --- data/grafana/default.yaml | 19 +++++++++++++++++++ data/grafana/hiera.yaml | 6 ++++++ data/grafana/osfamily/Debian.yaml | 9 +++++++++ data/grafana/osfamily/RedHat.yaml | 10 ++++++++++ 4 files changed, 44 insertions(+) create mode 100644 data/grafana/default.yaml create mode 100644 data/grafana/hiera.yaml create mode 100644 data/grafana/osfamily/Debian.yaml create mode 100644 data/grafana/osfamily/RedHat.yaml diff --git a/data/grafana/default.yaml b/data/grafana/default.yaml new file mode 100644 index 00000000..64466055 --- /dev/null +++ b/data/grafana/default.yaml @@ -0,0 +1,19 @@ +--- + grafana::settings: + package_name: 'grafana' + service_name: 'grafana-server' + config_file_path: '/etc/grafana/grafana.ini' + custom_file_path: '/etc/grafana/custom.ini' + ldap_file_path: '/etc/grafana/ldap.toml' + config_dir_path: '/etc/grafana' + datasources_dir_path: '/etc/grafana/provisioning/datasources' + dashboards_dir_path: '/etc/grafana/provisioning/dashboards' + provisioning_dir_path: '/etc/grafana/provisioning' + pid_file_path: '/var/run/grafana/grafana-server.pid' + log_file_path: '/var/log/grafana/grafana.log' + log_dir_path: '/var/log/grafana' + process_name: 'grafana-server' + process_user: 'grafana' + process_group: 'grafana' + tcp_port: '3000' + diff --git a/data/grafana/hiera.yaml b/data/grafana/hiera.yaml new file mode 100644 index 00000000..456bda56 --- /dev/null +++ b/data/grafana/hiera.yaml @@ -0,0 +1,6 @@ +--- + :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/grafana/osfamily/Debian.yaml b/data/grafana/osfamily/Debian.yaml new file mode 100644 index 00000000..a2496851 --- /dev/null +++ b/data/grafana/osfamily/Debian.yaml @@ -0,0 +1,9 @@ +--- + grafana::settings: + init_file_path: '/etc/default/grafana-server' + repo_package_name: 'grafana-release' + repo_package_provider: 'dpkg' + repo_package_url: 'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.0.4_amd64.deb' + package_prerequisites: + - 'libfontconfig' + - 'adduser' diff --git a/data/grafana/osfamily/RedHat.yaml b/data/grafana/osfamily/RedHat.yaml new file mode 100644 index 00000000..e0dc17f2 --- /dev/null +++ b/data/grafana/osfamily/RedHat.yaml @@ -0,0 +1,10 @@ +--- + grafana::settings: + init_file_path: '/etc/sysconfig/grafana-server' + repo_package_provider: 'rpm' + repo_package_name: 'grafana' + repo_package_url: 'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4-1.x86_64.rpm' + package_prerequisites: + - 'initscripts' + - 'fontconfig' + - 'urw-fonts' From 690da10f0f810942e8aa217a739b5e40505b3341 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 30 Mar 2018 18:20:05 +0200 Subject: [PATCH 119/284] influxdb data --- data/influxdb/default.yaml | 17 +++++++++++++++++ data/influxdb/hiera.yaml | 8 ++++++++ data/influxdb/operatingsystem/Debian7.yaml | 3 +++ data/influxdb/operatingsystem/Debian8.yaml | 3 +++ data/influxdb/operatingsystem/Debian9.yaml | 3 +++ data/influxdb/operatingsystem/Ubuntu.yaml | 5 +++++ data/influxdb/operatingsystem/Ubuntu12.04.yaml | 3 +++ data/influxdb/operatingsystem/Ubuntu14.04.yaml | 3 +++ data/influxdb/operatingsystem/Ubuntu14.10.yaml | 3 +++ data/influxdb/operatingsystem/Ubuntu16.04.yaml | 3 +++ data/influxdb/osfamily/Debian.yaml | 6 ++++++ data/influxdb/osfamily/RedHat.yaml | 3 +++ data/influxdb/osfamily/RedHat6.yaml | 3 +++ data/influxdb/osfamily/RedHat7.yaml | 3 +++ 14 files changed, 66 insertions(+) create mode 100644 data/influxdb/default.yaml create mode 100644 data/influxdb/hiera.yaml create mode 100644 data/influxdb/operatingsystem/Debian7.yaml create mode 100644 data/influxdb/operatingsystem/Debian8.yaml create mode 100644 data/influxdb/operatingsystem/Debian9.yaml create mode 100644 data/influxdb/operatingsystem/Ubuntu.yaml create mode 100644 data/influxdb/operatingsystem/Ubuntu12.04.yaml create mode 100644 data/influxdb/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/influxdb/operatingsystem/Ubuntu14.10.yaml create mode 100644 data/influxdb/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/influxdb/osfamily/Debian.yaml create mode 100644 data/influxdb/osfamily/RedHat.yaml create mode 100644 data/influxdb/osfamily/RedHat6.yaml create mode 100644 data/influxdb/osfamily/RedHat7.yaml diff --git a/data/influxdb/default.yaml b/data/influxdb/default.yaml new file mode 100644 index 00000000..9a2ef3ef --- /dev/null +++ b/data/influxdb/default.yaml @@ -0,0 +1,17 @@ +--- + influxdb::settings: + package_name: 'influxdb' + service_name: 'influxdb' + config_file_path: '/etc/influxdb/influxdb.conf' + config_dir_path: '/etc/influxdb' + pid_file_path: '/var/run/influxdb.pid' + log_file_path: '/var/log/influxdb/influxdb.log' + log_dir_path: '/var/log/influxdb' + process_name: 'influxd' + process_user: 'influxdb' + process_group: 'influxdb' + tcp_port: + - 8088 + - 8086 + key: '87F70D56' + key_url: 'https://repos.influxdata.com/influxdb.key' diff --git a/data/influxdb/hiera.yaml b/data/influxdb/hiera.yaml new file mode 100644 index 00000000..67927db6 --- /dev/null +++ b/data/influxdb/hiera.yaml @@ -0,0 +1,8 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/influxdb/operatingsystem/Debian7.yaml b/data/influxdb/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..2324f9fc --- /dev/null +++ b/data/influxdb/operatingsystem/Debian7.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + apt_release: 'wheezy' diff --git a/data/influxdb/operatingsystem/Debian8.yaml b/data/influxdb/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..f7dfbfe0 --- /dev/null +++ b/data/influxdb/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + apt_release: 'jessie' diff --git a/data/influxdb/operatingsystem/Debian9.yaml b/data/influxdb/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..315ddca0 --- /dev/null +++ b/data/influxdb/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + apt_release: 'stretch' diff --git a/data/influxdb/operatingsystem/Ubuntu.yaml b/data/influxdb/operatingsystem/Ubuntu.yaml new file mode 100644 index 00000000..9d7efa7e --- /dev/null +++ b/data/influxdb/operatingsystem/Ubuntu.yaml @@ -0,0 +1,5 @@ +--- + influxdb::settings: + init_file_path: '/etc/default/influxdb' + repo_url: 'https://repos.influxdata.com/ubuntu/pool/stable/i/influxdb/' + apt_repos: 'main' diff --git a/data/influxdb/operatingsystem/Ubuntu12.04.yaml b/data/influxdb/operatingsystem/Ubuntu12.04.yaml new file mode 100644 index 00000000..3090eeab --- /dev/null +++ b/data/influxdb/operatingsystem/Ubuntu12.04.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + apt_release: 'precise' diff --git a/data/influxdb/operatingsystem/Ubuntu14.04.yaml b/data/influxdb/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..0c3b248d --- /dev/null +++ b/data/influxdb/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + apt_release: 'trusty' diff --git a/data/influxdb/operatingsystem/Ubuntu14.10.yaml b/data/influxdb/operatingsystem/Ubuntu14.10.yaml new file mode 100644 index 00000000..14b94ac6 --- /dev/null +++ b/data/influxdb/operatingsystem/Ubuntu14.10.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + apt_release: 'ubuntu-utopic' diff --git a/data/influxdb/operatingsystem/Ubuntu16.04.yaml b/data/influxdb/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..b94d632e --- /dev/null +++ b/data/influxdb/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + apt_release: 'xenial' diff --git a/data/influxdb/osfamily/Debian.yaml b/data/influxdb/osfamily/Debian.yaml new file mode 100644 index 00000000..2e46b1eb --- /dev/null +++ b/data/influxdb/osfamily/Debian.yaml @@ -0,0 +1,6 @@ +--- + influxdb::settings: + init_file_path: '/etc/default/influxdb' + repo_url: 'https://repos.influxdata.com/debian/pool/stable/i/influxdb/' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/influxdb/osfamily/RedHat.yaml b/data/influxdb/osfamily/RedHat.yaml new file mode 100644 index 00000000..aa7e4f44 --- /dev/null +++ b/data/influxdb/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + init_file_path: '/etc/sysconfig/influxdb' diff --git a/data/influxdb/osfamily/RedHat6.yaml b/data/influxdb/osfamily/RedHat6.yaml new file mode 100644 index 00000000..754b755c --- /dev/null +++ b/data/influxdb/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + repo_url: 'https://repos.influxdata.com/rhel/6/x86_64/stable/' diff --git a/data/influxdb/osfamily/RedHat7.yaml b/data/influxdb/osfamily/RedHat7.yaml new file mode 100644 index 00000000..9b1b5bc3 --- /dev/null +++ b/data/influxdb/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- + influxdb::settings: + repo_url: 'https://repos.influxdata.com/rhel/7/x86_64/stable/' From 2b69fa80e94e0ef59cddf3589d6ce7885f38e7b1 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 31 Mar 2018 01:53:09 +0200 Subject: [PATCH 120/284] Added scl and dependency for icingaweb2 --- data/icingaweb2/osfamily/RedHat.yaml | 2 ++ data/scl/hiera.yaml | 7 +++++++ data/scl/operatingsystem/CentOS.yaml | 3 +++ data/scl/operatingsystem/RedHat6.yaml | 7 +++++++ data/scl/operatingsystem/RedHat7.yaml | 7 +++++++ data/scl/osfamily/RedHat.yaml | 4 ++++ 6 files changed, 30 insertions(+) create mode 100644 data/scl/hiera.yaml create mode 100644 data/scl/operatingsystem/CentOS.yaml create mode 100644 data/scl/operatingsystem/RedHat6.yaml create mode 100644 data/scl/operatingsystem/RedHat7.yaml create mode 100644 data/scl/osfamily/RedHat.yaml diff --git a/data/icingaweb2/osfamily/RedHat.yaml b/data/icingaweb2/osfamily/RedHat.yaml index eb452ccd..00219644 100644 --- a/data/icingaweb2/osfamily/RedHat.yaml +++ b/data/icingaweb2/osfamily/RedHat.yaml @@ -6,3 +6,5 @@ config_file_mode: '0640' repo_package_provider: 'rpm' repo_package_name: 'icinga-rpm-release' + tp_prerequisites: + - scl diff --git a/data/scl/hiera.yaml b/data/scl/hiera.yaml new file mode 100644 index 00000000..2cf9014d --- /dev/null +++ b/data/scl/hiera.yaml @@ -0,0 +1,7 @@ +--- + :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/scl/operatingsystem/CentOS.yaml b/data/scl/operatingsystem/CentOS.yaml new file mode 100644 index 00000000..a4c4cca9 --- /dev/null +++ b/data/scl/operatingsystem/CentOS.yaml @@ -0,0 +1,3 @@ +--- + scl::settings: + package_name: 'centos-release-scl' diff --git a/data/scl/operatingsystem/RedHat6.yaml b/data/scl/operatingsystem/RedHat6.yaml new file mode 100644 index 00000000..9830ecfc --- /dev/null +++ b/data/scl/operatingsystem/RedHat6.yaml @@ -0,0 +1,7 @@ +--- +# untested + scl::settings: + exec_prerequisites: + subscription_scl: + command: 'subscription-manager repos --enable rhel-server-rhscl-6-rpms' + unless: 'subscription-manager repos --list | grep scl' diff --git a/data/scl/operatingsystem/RedHat7.yaml b/data/scl/operatingsystem/RedHat7.yaml new file mode 100644 index 00000000..43c2e3ac --- /dev/null +++ b/data/scl/operatingsystem/RedHat7.yaml @@ -0,0 +1,7 @@ +--- +# untested + scl::settings: + exec_prerequisites: + subscription_scl: + command: 'subscription-manager repos --enable rhel-server-rhscl-7-rpms' + unless: 'subscription-manager repos --list | grep scl' diff --git a/data/scl/osfamily/RedHat.yaml b/data/scl/osfamily/RedHat.yaml new file mode 100644 index 00000000..f15f3d9d --- /dev/null +++ b/data/scl/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- + scl::settings: + repo_package_provider: 'rpm' + From f20d9aa27d8b10fa47f0fc6d42106326c88fbcdf Mon Sep 17 00:00:00 2001 From: Alessandro Lorenzi Date: Tue, 17 Apr 2018 12:47:11 +0200 Subject: [PATCH 121/284] Grafana: installs repo debian refs: #56 --- data/grafana/osfamily/Debian.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/grafana/osfamily/Debian.yaml b/data/grafana/osfamily/Debian.yaml index a2496851..be3b7a30 100644 --- a/data/grafana/osfamily/Debian.yaml +++ b/data/grafana/osfamily/Debian.yaml @@ -1,9 +1,10 @@ --- grafana::settings: init_file_path: '/etc/default/grafana-server' - repo_package_name: 'grafana-release' - repo_package_provider: 'dpkg' - repo_package_url: 'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.0.4_amd64.deb' + repo_url: 'https://packagecloud.io/grafana/stable/debian/' + apt_repos: 'stretch main' + key: 'D59097AB' + key_url: 'https://packagecloud.io/gpg.key' package_prerequisites: - 'libfontconfig' - 'adduser' From 19ef73982512558c351c1fff596246c9b94e77ef Mon Sep 17 00:00:00 2001 From: Alessandro Lorenzi Date: Tue, 17 Apr 2018 15:18:36 +0200 Subject: [PATCH 122/284] Grafana: RedHat installation refs: https://github.com/example42/puppet-psick/issues/56 --- data/grafana/osfamily/RedHat.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/grafana/osfamily/RedHat.yaml b/data/grafana/osfamily/RedHat.yaml index e0dc17f2..75e2d048 100644 --- a/data/grafana/osfamily/RedHat.yaml +++ b/data/grafana/osfamily/RedHat.yaml @@ -1,9 +1,9 @@ --- grafana::settings: init_file_path: '/etc/sysconfig/grafana-server' - repo_package_provider: 'rpm' - repo_package_name: 'grafana' - repo_package_url: 'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4-1.x86_64.rpm' + repo_url: 'https://packagecloud.io/grafana/stable/el/7/$basearch' + key: 'D59097AB' + key_url: 'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana' package_prerequisites: - 'initscripts' - 'fontconfig' From 14508a9ecfb30afb1845e14df54b0e5087dcdc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Mon, 28 May 2018 13:59:40 +0200 Subject: [PATCH 123/284] change repo to puppet5 --- data/puppet-agent/osfamily/Debian.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index 0eec192e..35da2a5d 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -3,6 +3,6 @@ repo_url: 'http://apt.puppetlabs.com' key: 'EF8D349F' key_url: 'http://apt.puppetlabs.com/pubkey.gpg' - apt_repos: 'PC1' + apt_repos: 'puppet5' # apt_release: 'stable' dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' From 93464240ab6de654b9124f7767ff35641fff7fa6 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 28 May 2018 14:16:48 +0200 Subject: [PATCH 124/284] Swtich puppet-agent to version 5. Manage repo via release package also on Debian --- data/puppet-agent/operatingsystem/Debian6.yaml | 4 ---- data/puppet-agent/operatingsystem/Debian7.yaml | 4 +++- data/puppet-agent/operatingsystem/Debian8.yaml | 4 +++- data/puppet-agent/operatingsystem/Debian9.yaml | 4 +++- data/puppet-agent/operatingsystem/Ubuntu12.04.yaml | 4 +++- data/puppet-agent/operatingsystem/Ubuntu14.04.yaml | 4 +++- data/puppet-agent/operatingsystem/Ubuntu16.04.yaml | 4 +++- data/puppet-agent/osfamily/Debian.yaml | 6 +----- data/puppet-agent/osfamily/RedHat.yaml | 5 +---- data/puppet-agent/osfamily/RedHat5.yaml | 2 +- data/puppet-agent/osfamily/RedHat6.yaml | 2 +- data/puppet-agent/osfamily/RedHat7.yaml | 2 +- 12 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 data/puppet-agent/operatingsystem/Debian6.yaml diff --git a/data/puppet-agent/operatingsystem/Debian6.yaml b/data/puppet-agent/operatingsystem/Debian6.yaml deleted file mode 100644 index 219c4011..00000000 --- a/data/puppet-agent/operatingsystem/Debian6.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppet-agent::settings: - apt_release: 'squeeze' - diff --git a/data/puppet-agent/operatingsystem/Debian7.yaml b/data/puppet-agent/operatingsystem/Debian7.yaml index 221fad1e..e4e43967 100644 --- a/data/puppet-agent/operatingsystem/Debian7.yaml +++ b/data/puppet-agent/operatingsystem/Debian7.yaml @@ -1,4 +1,6 @@ --- puppet-agent::settings: - apt_release: 'wheezy' + repo_package_name: 'puppet5-release-wheezy' + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-wheezy.deb' + # apt_release: 'wheezy' diff --git a/data/puppet-agent/operatingsystem/Debian8.yaml b/data/puppet-agent/operatingsystem/Debian8.yaml index 554f3fae..404d98fa 100644 --- a/data/puppet-agent/operatingsystem/Debian8.yaml +++ b/data/puppet-agent/operatingsystem/Debian8.yaml @@ -1,4 +1,6 @@ --- puppet-agent::settings: - apt_release: 'jessie' + repo_package_name: 'puppet5-release-jessie' + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-jessie.deb' + # apt_release: 'jessie' diff --git a/data/puppet-agent/operatingsystem/Debian9.yaml b/data/puppet-agent/operatingsystem/Debian9.yaml index 9bbb1ec2..a834ffe6 100644 --- a/data/puppet-agent/operatingsystem/Debian9.yaml +++ b/data/puppet-agent/operatingsystem/Debian9.yaml @@ -1,4 +1,6 @@ --- puppet-agent::settings: - apt_release: 'stretch' + repo_package_name: 'puppet5-release-stretch' + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-stretch.deb' + # apt_release: 'stretch' diff --git a/data/puppet-agent/operatingsystem/Ubuntu12.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu12.04.yaml index 88524087..42d361ae 100644 --- a/data/puppet-agent/operatingsystem/Ubuntu12.04.yaml +++ b/data/puppet-agent/operatingsystem/Ubuntu12.04.yaml @@ -1,4 +1,6 @@ --- puppet-agent::settings: - apt_release: 'precise' + repo_package_name: 'puppet5-release-precise' + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-precise.deb' + # apt_release: 'precise' diff --git a/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml index cfbc62ff..b83e9b0f 100644 --- a/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml +++ b/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml @@ -1,4 +1,6 @@ --- puppet-agent::settings: - apt_release: 'trusty' + repo_package_name: 'puppet5-release-trusty' + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-trusty.deb' + # apt_release: 'trusty' diff --git a/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml index bda3cebe..36647572 100644 --- a/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml +++ b/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,5 @@ --- puppet-agent::settings: - apt_release: 'xenial' + repo_package_name: 'puppet5-release-xenial' + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-xenial.deb' + # apt_release: 'xenial' diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index 0eec192e..23a3d3ea 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -1,8 +1,4 @@ --- puppet-agent::settings: - repo_url: 'http://apt.puppetlabs.com' - key: 'EF8D349F' - key_url: 'http://apt.puppetlabs.com/pubkey.gpg' - apt_repos: 'PC1' - # apt_release: 'stable' + repo_package_provider: dpkg dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index b9f0bc6a..186986f9 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -1,8 +1,5 @@ --- puppet-agent::settings: - repo_package_name: 'puppetlabs-release-pc1' + repo_package_name: 'puppet5-release' repo_package_provider: 'rpm' -# repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' -# key: '07BB6C57' -# key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppet-agent/osfamily/RedHat5.yaml b/data/puppet-agent/osfamily/RedHat5.yaml index 8908b3bd..1189f326 100644 --- a/data/puppet-agent/osfamily/RedHat5.yaml +++ b/data/puppet-agent/osfamily/RedHat5.yaml @@ -1,3 +1,3 @@ --- puppet-agent::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-5.noarch.rpm' + repo_package_url: 'https://yum.puppet.com/puppet5/puppet5-release-el-5.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat6.yaml b/data/puppet-agent/osfamily/RedHat6.yaml index db021cc3..630eec28 100644 --- a/data/puppet-agent/osfamily/RedHat6.yaml +++ b/data/puppet-agent/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- puppet-agent::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm' + repo_package_url: 'https://yum.puppet.com/puppet5/puppet5-release-el-6.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat7.yaml b/data/puppet-agent/osfamily/RedHat7.yaml index 7508e74c..ccb750fa 100644 --- a/data/puppet-agent/osfamily/RedHat7.yaml +++ b/data/puppet-agent/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- puppet-agent::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm' + repo_package_url: 'https://yum.puppet.com/puppet5/puppet5-release-el-7.noarch.rpm' From 0f6911526ad363567f31541ee7603b31fb795fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Thu, 31 May 2018 12:02:08 +0200 Subject: [PATCH 125/284] add puppetdb-termini package definition --- data/puppetdb-termini/default.yaml | 4 ++++ data/puppetdb-termini/hiera.yaml | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 data/puppetdb-termini/default.yaml create mode 100644 data/puppetdb-termini/hiera.yaml diff --git a/data/puppetdb-termini/default.yaml b/data/puppetdb-termini/default.yaml new file mode 100644 index 00000000..fd837ff5 --- /dev/null +++ b/data/puppetdb-termini/default.yaml @@ -0,0 +1,4 @@ +--- +puppetdb-termini::settings: + package_name: 'puppetdb-termini' + config_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' diff --git a/data/puppetdb-termini/hiera.yaml b/data/puppetdb-termini/hiera.yaml new file mode 100644 index 00000000..dfd3d93f --- /dev/null +++ b/data/puppetdb-termini/hiera.yaml @@ -0,0 +1,5 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default From e94c2088f83374490a8f1ec0b3c7617ba321bd0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Thu, 31 May 2018 13:05:37 +0200 Subject: [PATCH 126/284] add config_dir_path for puppetdb-termini --- data/puppetdb-termini/default.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/puppetdb-termini/default.yaml b/data/puppetdb-termini/default.yaml index fd837ff5..d484e564 100644 --- a/data/puppetdb-termini/default.yaml +++ b/data/puppetdb-termini/default.yaml @@ -2,3 +2,4 @@ puppetdb-termini::settings: package_name: 'puppetdb-termini' config_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' + config_dir_path: '/etc/puppetlabs/puppet' From b2c4da13e6569d4d5b1a40f5d7ea9c737ff7d32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Thu, 31 May 2018 13:21:04 +0200 Subject: [PATCH 127/284] remove wrong file --- data/htop/osfamily/RedHat.yaml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 data/htop/osfamily/RedHat.yaml diff --git a/data/htop/osfamily/RedHat.yaml b/data/htop/osfamily/RedHat.yaml deleted file mode 100644 index 84f7f324..00000000 --- a/data/htop/osfamily/RedHat.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - nagios-plugins::settings: - package_name: 'nagios-plugins-all' - tp_prerequisites: - - epel From 87cd663b15f5745188bc882ebb2a7b920d531299 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 31 May 2018 19:49:51 +0200 Subject: [PATCH 128/284] Fix idempotency for grafana on Debian --- data/grafana/osfamily/Debian.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/grafana/osfamily/Debian.yaml b/data/grafana/osfamily/Debian.yaml index be3b7a30..be66de8e 100644 --- a/data/grafana/osfamily/Debian.yaml +++ b/data/grafana/osfamily/Debian.yaml @@ -6,5 +6,5 @@ key: 'D59097AB' key_url: 'https://packagecloud.io/gpg.key' package_prerequisites: - - 'libfontconfig' + - 'libfontconfig1' - 'adduser' From 82c0e9605fc633e947ced16b085130092f6e2217 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 31 May 2018 23:18:27 +0200 Subject: [PATCH 129/284] Fix influx repo for ubuntu --- data/influxdb/operatingsystem/Ubuntu.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/influxdb/operatingsystem/Ubuntu.yaml b/data/influxdb/operatingsystem/Ubuntu.yaml index 9d7efa7e..40cbeca9 100644 --- a/data/influxdb/operatingsystem/Ubuntu.yaml +++ b/data/influxdb/operatingsystem/Ubuntu.yaml @@ -1,5 +1,3 @@ --- influxdb::settings: - init_file_path: '/etc/default/influxdb' - repo_url: 'https://repos.influxdata.com/ubuntu/pool/stable/i/influxdb/' - apt_repos: 'main' + repo_url: 'https://repos.influxdata.com/ubuntu' From 352c4621689f8c8a0c53b44d6d11b960973a3be8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 16 Jul 2018 23:54:12 +0200 Subject: [PATCH 130/284] Added Ubuntu18.04 support to puppet-agent #27 --- data/puppet-agent/operatingsystem/Ubuntu18.04.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/puppet-agent/operatingsystem/Ubuntu18.04.yaml diff --git a/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..8eda9f68 --- /dev/null +++ b/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,5 @@ +--- + puppet-agent::settings: + repo_package_name: 'puppet5-release' + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-bionic.deb' + apt_release: 'bionic' From e6f6ac521e2fe12231963e396e4ab8093b5eb1ee Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 16 Jul 2018 23:56:58 +0200 Subject: [PATCH 131/284] Release v0.2.6 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 01a21952..5fe47fa8 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.2.5", + "version": "0.2.6", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From cc4a7205408731713ae2881f99691c1f397bb73b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 25 Jul 2018 00:25:56 +0200 Subject: [PATCH 132/284] Added data for mysql oracle upstream repos --- data/mysql/hiera.yaml | 2 ++ data/mysql/repo/mysql57-community-RedHat6.yaml | 4 ++++ data/mysql/repo/mysql57-community-RedHat7.yaml | 4 ++++ data/mysql/repo/mysql80-community-Debian.yaml | 5 +++++ data/mysql/repo/mysql80-community-RedHat.yaml | 3 +++ data/mysql/repo/mysql80-community-RedHat6.yaml | 5 +++++ data/mysql/repo/mysql80-community-RedHat7.yaml | 5 +++++ 7 files changed, 28 insertions(+) create mode 100644 data/mysql/repo/mysql57-community-RedHat6.yaml create mode 100644 data/mysql/repo/mysql57-community-RedHat7.yaml create mode 100644 data/mysql/repo/mysql80-community-Debian.yaml create mode 100644 data/mysql/repo/mysql80-community-RedHat.yaml create mode 100644 data/mysql/repo/mysql80-community-RedHat6.yaml create mode 100644 data/mysql/repo/mysql80-community-RedHat7.yaml diff --git a/data/mysql/hiera.yaml b/data/mysql/hiera.yaml index b8dc1a89..4d2c7fec 100644 --- a/data/mysql/hiera.yaml +++ b/data/mysql/hiera.yaml @@ -1,5 +1,7 @@ --- :hierarchy: + - "%{title}/repo/%{repo}-%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/repo/%{repo}-%{osfamily}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - default diff --git a/data/mysql/repo/mysql57-community-RedHat6.yaml b/data/mysql/repo/mysql57-community-RedHat6.yaml new file mode 100644 index 00000000..dd1ff298 --- /dev/null +++ b/data/mysql/repo/mysql57-community-RedHat6.yaml @@ -0,0 +1,4 @@ +--- +mysql::settings: + repo_package_url: 'https://dev.mysql.com/get/mysql57-community-release-el6-1.noarch.rpm' + repo_package_name: 'mysql57-community-release-el6-1' diff --git a/data/mysql/repo/mysql57-community-RedHat7.yaml b/data/mysql/repo/mysql57-community-RedHat7.yaml new file mode 100644 index 00000000..0ee3e43d --- /dev/null +++ b/data/mysql/repo/mysql57-community-RedHat7.yaml @@ -0,0 +1,4 @@ +--- +mysql::settings: + repo_package_url: 'https://dev.mysql.com/get/mysql57-community-release-el7-1.noarch.rpm' + repo_package_name: 'mysql57-community-release-el7-1' diff --git a/data/mysql/repo/mysql80-community-Debian.yaml b/data/mysql/repo/mysql80-community-Debian.yaml new file mode 100644 index 00000000..ca5050fc --- /dev/null +++ b/data/mysql/repo/mysql80-community-Debian.yaml @@ -0,0 +1,5 @@ +--- +mysql::settings: + package_name: 'mysql-community-server' + repo_package_url: 'https://dev.mysql.com/get/mysql-apt-config_0.8.10-1_all.deb' + repo_package_name: 'mysqlapt-config_0.8' diff --git a/data/mysql/repo/mysql80-community-RedHat.yaml b/data/mysql/repo/mysql80-community-RedHat.yaml new file mode 100644 index 00000000..fa66e6ea --- /dev/null +++ b/data/mysql/repo/mysql80-community-RedHat.yaml @@ -0,0 +1,3 @@ +--- +mysql::settings: + package_name: 'mysql-community-server' diff --git a/data/mysql/repo/mysql80-community-RedHat6.yaml b/data/mysql/repo/mysql80-community-RedHat6.yaml new file mode 100644 index 00000000..b4499e16 --- /dev/null +++ b/data/mysql/repo/mysql80-community-RedHat6.yaml @@ -0,0 +1,5 @@ +--- +mysql::settings: + package_name: 'mysql-community-server' + repo_package_url: 'https://dev.mysql.com/get/mysql80-community-release-el6-1.noarch.rpm' + repo_package_name: 'mysql80-community-release-el6-1' diff --git a/data/mysql/repo/mysql80-community-RedHat7.yaml b/data/mysql/repo/mysql80-community-RedHat7.yaml new file mode 100644 index 00000000..23dc13e5 --- /dev/null +++ b/data/mysql/repo/mysql80-community-RedHat7.yaml @@ -0,0 +1,5 @@ +--- +mysql::settings: + package_name: 'mysql-community-server' + repo_package_url: 'https://dev.mysql.com/get/mysql80-community-release-el7-1.noarch.rpm' + repo_package_name: 'mysql80-community-release-el7-1' From 66f690242230947ecfa63e0f0523a0cd965ce328 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 2 Sep 2018 19:29:27 +0200 Subject: [PATCH 133/284] PDocker package name changed --- data/docker/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/docker/default.yaml b/data/docker/default.yaml index 4346a42a..a7927374 100644 --- a/data/docker/default.yaml +++ b/data/docker/default.yaml @@ -1,6 +1,6 @@ --- docker::settings: - package_name: 'docker-engine' + package_name: 'docker' service_name: 'docker' pid_file_path: '/var/run/docker.pid' process_name: 'docker' From ed60dc1a75bb6839ca5e51c4139d3e4a915c5579 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 4 Sep 2018 11:36:42 +0100 Subject: [PATCH 134/284] Added Darwin support to most of apps, via homebrew provider --- data/activemq/hiera.yaml | 9 +++++---- data/ansible/hiera.yaml | 9 +++++---- data/apache/hiera.yaml | 9 +++++---- data/awscli/hiera.yaml | 9 +++++---- data/bacula-client/hiera.yaml | 9 +++++---- data/bluepill/hiera.yaml | 9 +++++---- data/collectd/hiera.yaml | 9 +++++---- data/default/Darwin.yaml | 4 ++++ data/docker/hiera.yaml | 11 ++++++----- data/dovecot/hiera.yaml | 9 +++++---- data/elasticsearch/hiera.yaml | 9 +++++---- data/exim/hiera.yaml | 9 +++++---- data/fabric/hiera.yaml | 9 +++++---- data/git/hiera.yaml | 9 +++++---- data/gitlab-runner/hiera.yaml | 13 +++++++------ data/go-server/hiera.yaml | 9 +++++---- data/grafana/hiera.yaml | 11 ++++++----- data/haproxy/hiera.yaml | 9 +++++---- data/heartbeat/hiera.yaml | 9 +++++---- data/htop/hiera.yaml | 9 +++++---- data/influxdb/hiera.yaml | 15 ++++++++------- data/jenkins/hiera.yaml | 9 +++++---- data/kibana/hiera.yaml | 9 +++++---- data/logrotate/hiera.yaml | 9 +++++---- data/logstash/hiera.yaml | 9 +++++---- data/mariadb/hiera.yaml | 9 +++++---- data/memcached/hiera.yaml | 9 +++++---- data/mongodb/hiera.yaml | 11 ++++++----- data/monit/hiera.yaml | 9 +++++---- data/nagios-plugins/hiera.yaml | 9 +++++---- data/nagios/hiera.yaml | 9 +++++---- data/nginx/hiera.yaml | 9 +++++---- data/nrpe/hiera.yaml | 9 +++++---- data/ntp/hiera.yaml | 9 +++++---- data/ntpdate/hiera.yaml | 9 +++++---- data/openvpn/hiera.yaml | 9 +++++---- data/orientdb/hiera.yaml | 9 +++++---- data/postfix/hiera.yaml | 9 +++++---- data/postgresql/hiera.yaml | 9 +++++---- data/proftpd/hiera.yaml | 9 +++++---- data/puppet/hiera.yaml | 9 +++++---- data/puppetdb/hiera.yaml | 9 +++++---- data/r10k/hiera.yaml | 9 +++++---- data/screen/hiera.yaml | 8 +++++--- data/sendmail/hiera.yaml | 9 +++++---- data/sensu/hiera.yaml | 9 +++++---- data/snmp/hiera.yaml | 9 +++++---- data/snmpd/hiera.yaml | 9 +++++---- data/squid/hiera.yaml | 9 +++++---- data/ssmtp/hiera.yaml | 9 +++++---- data/strace/hiera.yaml | 9 +++++---- data/sysdig/hiera.yaml | 9 +++++---- data/sysstat/hiera.yaml | 9 +++++---- data/tftpd/hiera.yaml | 9 +++++---- data/tinc/hiera.yaml | 9 +++++---- data/vim/hiera.yaml | 9 +++++---- data/virtualbox/hiera.yaml | 12 ++++++------ data/vsftpd/hiera.yaml | 9 +++++---- data/zabbix-agent/hiera.yaml | 9 +++++---- 59 files changed, 303 insertions(+), 241 deletions(-) create mode 100644 data/default/Darwin.yaml diff --git a/data/activemq/hiera.yaml b/data/activemq/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/activemq/hiera.yaml +++ b/data/activemq/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ansible/hiera.yaml b/data/ansible/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/ansible/hiera.yaml +++ b/data/ansible/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/apache/hiera.yaml b/data/apache/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/apache/hiera.yaml +++ b/data/apache/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/awscli/hiera.yaml b/data/awscli/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/awscli/hiera.yaml +++ b/data/awscli/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/bacula-client/hiera.yaml b/data/bacula-client/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/bacula-client/hiera.yaml +++ b/data/bacula-client/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/bluepill/hiera.yaml b/data/bluepill/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/bluepill/hiera.yaml +++ b/data/bluepill/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/collectd/hiera.yaml b/data/collectd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/collectd/hiera.yaml +++ b/data/collectd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/default/Darwin.yaml b/data/default/Darwin.yaml new file mode 100644 index 00000000..e642e9ea --- /dev/null +++ b/data/default/Darwin.yaml @@ -0,0 +1,4 @@ +--- +default::settings: + config_file_group: 'wheel' + package_provider: 'homebrew' diff --git a/data/docker/hiera.yaml b/data/docker/hiera.yaml index df27bff8..7be5ad41 100644 --- a/data/docker/hiera.yaml +++ b/data/docker/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/dovecot/hiera.yaml b/data/dovecot/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/dovecot/hiera.yaml +++ b/data/dovecot/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/elasticsearch/hiera.yaml b/data/elasticsearch/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/elasticsearch/hiera.yaml +++ b/data/elasticsearch/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/exim/hiera.yaml b/data/exim/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/exim/hiera.yaml +++ b/data/exim/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/fabric/hiera.yaml b/data/fabric/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/fabric/hiera.yaml +++ b/data/fabric/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/git/hiera.yaml b/data/git/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/git/hiera.yaml +++ b/data/git/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/gitlab-runner/hiera.yaml b/data/gitlab-runner/hiera.yaml index 2cf9014d..27062e71 100644 --- a/data/gitlab-runner/hiera.yaml +++ b/data/gitlab-runner/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/go-server/hiera.yaml b/data/go-server/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/go-server/hiera.yaml +++ b/data/go-server/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/grafana/hiera.yaml b/data/grafana/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/grafana/hiera.yaml +++ b/data/grafana/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/haproxy/hiera.yaml b/data/haproxy/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/haproxy/hiera.yaml +++ b/data/haproxy/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/heartbeat/hiera.yaml b/data/heartbeat/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/heartbeat/hiera.yaml +++ b/data/heartbeat/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/htop/hiera.yaml b/data/htop/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/htop/hiera.yaml +++ b/data/htop/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/influxdb/hiera.yaml b/data/influxdb/hiera.yaml index 67927db6..34389e5b 100644 --- a/data/influxdb/hiera.yaml +++ b/data/influxdb/hiera.yaml @@ -1,8 +1,9 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/jenkins/hiera.yaml b/data/jenkins/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/jenkins/hiera.yaml +++ b/data/jenkins/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/kibana/hiera.yaml b/data/kibana/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/kibana/hiera.yaml +++ b/data/kibana/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/logrotate/hiera.yaml b/data/logrotate/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/logrotate/hiera.yaml +++ b/data/logrotate/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/logstash/hiera.yaml b/data/logstash/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/logstash/hiera.yaml +++ b/data/logstash/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mariadb/hiera.yaml b/data/mariadb/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/mariadb/hiera.yaml +++ b/data/mariadb/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/memcached/hiera.yaml b/data/memcached/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/memcached/hiera.yaml +++ b/data/memcached/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mongodb/hiera.yaml b/data/mongodb/hiera.yaml index 634b1ee4..3ce93e93 100644 --- a/data/mongodb/hiera.yaml +++ b/data/mongodb/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/repo/%{repo}-%{osfamily}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/repo/%{repo}-%{osfamily}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/monit/hiera.yaml b/data/monit/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/monit/hiera.yaml +++ b/data/monit/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nagios-plugins/hiera.yaml b/data/nagios-plugins/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/nagios-plugins/hiera.yaml +++ b/data/nagios-plugins/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nagios/hiera.yaml b/data/nagios/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/nagios/hiera.yaml +++ b/data/nagios/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nginx/hiera.yaml b/data/nginx/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/nginx/hiera.yaml +++ b/data/nginx/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nrpe/hiera.yaml b/data/nrpe/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/nrpe/hiera.yaml +++ b/data/nrpe/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ntp/hiera.yaml b/data/ntp/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/ntp/hiera.yaml +++ b/data/ntp/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ntpdate/hiera.yaml b/data/ntpdate/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/ntpdate/hiera.yaml +++ b/data/ntpdate/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/openvpn/hiera.yaml b/data/openvpn/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/openvpn/hiera.yaml +++ b/data/openvpn/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/orientdb/hiera.yaml b/data/orientdb/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/orientdb/hiera.yaml +++ b/data/orientdb/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/postfix/hiera.yaml b/data/postfix/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/postfix/hiera.yaml +++ b/data/postfix/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/postgresql/hiera.yaml b/data/postgresql/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/postgresql/hiera.yaml +++ b/data/postgresql/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/proftpd/hiera.yaml b/data/proftpd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/proftpd/hiera.yaml +++ b/data/proftpd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/puppet/hiera.yaml b/data/puppet/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/puppet/hiera.yaml +++ b/data/puppet/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/puppetdb/hiera.yaml b/data/puppetdb/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/puppetdb/hiera.yaml +++ b/data/puppetdb/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/r10k/hiera.yaml b/data/r10k/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/r10k/hiera.yaml +++ b/data/r10k/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/screen/hiera.yaml b/data/screen/hiera.yaml index b1fa7245..19fa9ae9 100644 --- a/data/screen/hiera.yaml +++ b/data/screen/hiera.yaml @@ -1,4 +1,6 @@ --- - :hierarchy: - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/sendmail/hiera.yaml b/data/sendmail/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/sendmail/hiera.yaml +++ b/data/sendmail/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/sensu/hiera.yaml b/data/sensu/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/sensu/hiera.yaml +++ b/data/sensu/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/snmp/hiera.yaml b/data/snmp/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/snmp/hiera.yaml +++ b/data/snmp/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/snmpd/hiera.yaml b/data/snmpd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/snmpd/hiera.yaml +++ b/data/snmpd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/squid/hiera.yaml b/data/squid/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/squid/hiera.yaml +++ b/data/squid/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ssmtp/hiera.yaml b/data/ssmtp/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/ssmtp/hiera.yaml +++ b/data/ssmtp/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/strace/hiera.yaml b/data/strace/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/strace/hiera.yaml +++ b/data/strace/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/sysdig/hiera.yaml b/data/sysdig/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/sysdig/hiera.yaml +++ b/data/sysdig/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/sysstat/hiera.yaml b/data/sysstat/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/sysstat/hiera.yaml +++ b/data/sysstat/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/tftpd/hiera.yaml b/data/tftpd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/tftpd/hiera.yaml +++ b/data/tftpd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/tinc/hiera.yaml b/data/tinc/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/tinc/hiera.yaml +++ b/data/tinc/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/vim/hiera.yaml b/data/vim/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/vim/hiera.yaml +++ b/data/vim/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/virtualbox/hiera.yaml b/data/virtualbox/hiera.yaml index 2cf9014d..dd6d5254 100644 --- a/data/virtualbox/hiera.yaml +++ b/data/virtualbox/hiera.yaml @@ -1,7 +1,7 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "default/%{operatingsystem}" + - default diff --git a/data/vsftpd/hiera.yaml b/data/vsftpd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/vsftpd/hiera.yaml +++ b/data/vsftpd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/zabbix-agent/hiera.yaml b/data/zabbix-agent/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/zabbix-agent/hiera.yaml +++ b/data/zabbix-agent/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default From c4bd39b9e01ffc772c72c9a363a14793e84d592e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 4 Sep 2018 12:44:51 +0100 Subject: [PATCH 135/284] Added default Windows support and aligned all data to use default/%{operatingsystem} --- data/apparmor/hiera.yaml | 9 +++++---- data/apt/hiera.yaml | 9 +++++---- data/autofs/hiera.yaml | 9 +++++---- data/bash/hiera.yaml | 9 +++++---- data/bind-utils/hiera.yaml | 9 +++++---- data/bind/hiera.yaml | 11 ++++++----- data/bzip2/hiera.yaml | 9 +++++---- data/ceilometer/hiera.yaml | 9 +++++---- data/ceph/hiera.yaml | 9 +++++---- data/cinder/hiera.yaml | 9 +++++---- data/clvm/hiera.yaml | 9 +++++---- data/corosync/hiera.yaml | 9 +++++---- data/cron/hiera.yaml | 9 +++++---- data/ddclient/hiera.yaml | 9 +++++---- data/debootstrap/hiera.yaml | 5 +++-- data/default/Windows.yaml | 3 +++ data/dhcpd/hiera.yaml | 10 ++++++---- data/dkms/hiera.yaml | 9 +++++---- data/dnsmasq/hiera.yaml | 9 +++++---- data/duply/hiera.yaml | 9 +++++---- data/epel/hiera.yaml | 11 ++++++----- data/fail2ban/hiera.yaml | 9 +++++---- data/foreman/hiera.yaml | 13 +++++++------ data/freeradius/hiera.yaml | 9 +++++---- data/gitlab-ce/hiera.yaml | 13 +++++++------ data/gitlab-cli/hiera.yaml | 9 +++++---- data/glance/hiera.yaml | 9 +++++---- data/graylog2/hiera.yaml | 9 +++++---- data/hosts/hiera.yaml | 9 +++++---- data/icinga2/hiera.yaml | 11 ++++++----- data/icingaweb2/hiera.yaml | 11 ++++++----- data/iotop/hiera.yaml | 9 +++++---- data/iptraf/hiera.yaml | 9 +++++---- data/jboss/hiera.yaml | 9 +++++---- data/keepalived/hiera.yaml | 9 +++++---- data/keystone/hiera.yaml | 9 +++++---- data/libvirt/hiera.yaml | 9 +++++---- data/lighttpd/hiera.yaml | 9 +++++---- data/lsb-release/hiera.yaml | 8 ++++---- data/lsb/hiera.yaml | 8 ++++---- data/lsof/hiera.yaml | 9 +++++---- data/mailx/hiera.yaml | 9 +++++---- data/make/hiera.yaml | 11 ++++++----- data/mdadm/hiera.yaml | 9 +++++---- data/mlocate/hiera.yaml | 9 +++++---- data/mongodb-mms-automation-agent/hiera.yaml | 9 +++++---- data/mongodb-mms-backup-agent/hiera.yaml | 9 +++++---- data/mongodb-mms-monitoring-agent/hiera.yaml | 9 +++++---- data/mongodb-mms/hiera.yaml | 9 +++++---- data/motd/hiera.yaml | 11 ++++++----- data/msmtp/hiera.yaml | 9 +++++---- data/multipath/hiera.yaml | 9 +++++---- data/munin-node/hiera.yaml | 9 +++++---- data/munin/hiera.yaml | 9 +++++---- data/mysql/hiera.yaml | 13 +++++++------ data/nano/hiera.yaml | 9 +++++---- data/newrelic/hiera.yaml | 9 +++++---- data/nfs-client/hiera.yaml | 9 +++++---- data/nfs-server/hiera.yaml | 11 ++++++----- data/nfs/hiera.yaml | 9 +++++---- data/nova/hiera.yaml | 9 +++++---- data/octocatalog-diff/hiera.yaml | 8 ++++---- data/openjdk-jdk/hiera.yaml | 13 +++++++------ data/openjdk-jre/hiera.yaml | 13 +++++++------ data/openntpd/hiera.yaml | 9 +++++---- data/openssh/hiera.yaml | 11 ++++++----- data/openswan/hiera.yaml | 9 +++++---- data/openvswitch/hiera.yaml | 9 +++++---- data/pacemaker/hiera.yaml | 9 +++++---- data/pam/hiera.yaml | 9 +++++---- data/passenger/hiera.yaml | 9 +++++---- data/php/hiera.yaml | 9 +++++---- data/profile/hiera.yaml | 9 +++++---- data/psmisc/hiera.yaml | 11 ++++++----- data/puppet-agent/hiera.yaml | 13 +++++++------ data/puppetserver/hiera.yaml | 13 +++++++------ data/pwgen/hiera.yaml | 11 ++++++----- data/python-pip/hiera.yaml | 11 ++++++----- data/quagga/hiera.yaml | 9 +++++---- data/quantum/hiera.yaml | 9 +++++---- data/rabbitmq/hiera.yaml | 9 +++++---- data/rails/hiera.yaml | 9 +++++---- data/redis/hiera.yaml | 13 +++++++------ data/rinse/hiera.yaml | 9 +++++---- data/rsync/hiera.yaml | 9 +++++---- data/rsyslog-relp/hiera.yaml | 7 ++++--- data/rsyslog/hiera.yaml | 9 +++++---- data/ruby-dev/hiera.yaml | 11 ++++++----- data/ruby/hiera.yaml | 11 ++++++----- data/rundeck/hiera.yaml | 9 +++++---- data/samba/hiera.yaml | 9 +++++---- data/scl/hiera.yaml | 13 +++++++------ data/subversion/hiera.yaml | 9 +++++---- data/sudo/hiera.yaml | 9 +++++---- data/supervisor/hiera.yaml | 11 ++++++----- data/sysfs/hiera.yaml | 9 +++++---- data/sysklogd/hiera.yaml | 9 +++++---- data/syslog-ng/hiera.yaml | 9 +++++---- data/tcpdump/hiera.yaml | 9 +++++---- data/telnet/hiera.yaml | 9 +++++---- data/test/hiera.yaml | 9 +++++---- data/tree/hiera.yaml | 7 ++++--- data/trickle/hiera.yaml | 11 ++++++----- data/varnish/hiera.yaml | 11 ++++++----- data/wpscan/hiera.yaml | 13 +++++++------ data/xinetd/hiera.yaml | 9 +++++---- data/yum-cron/hiera.yaml | 9 +++++---- 107 files changed, 563 insertions(+), 456 deletions(-) create mode 100644 data/default/Windows.yaml diff --git a/data/apparmor/hiera.yaml b/data/apparmor/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/apparmor/hiera.yaml +++ b/data/apparmor/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/apt/hiera.yaml b/data/apt/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/apt/hiera.yaml +++ b/data/apt/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/autofs/hiera.yaml b/data/autofs/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/autofs/hiera.yaml +++ b/data/autofs/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/bash/hiera.yaml b/data/bash/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/bash/hiera.yaml +++ b/data/bash/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/bind-utils/hiera.yaml b/data/bind-utils/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/bind-utils/hiera.yaml +++ b/data/bind-utils/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/bind/hiera.yaml b/data/bind/hiera.yaml index 2010c5af..7ba6fd10 100644 --- a/data/bind/hiera.yaml +++ b/data/bind/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/bzip2/hiera.yaml b/data/bzip2/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/bzip2/hiera.yaml +++ b/data/bzip2/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ceilometer/hiera.yaml b/data/ceilometer/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/ceilometer/hiera.yaml +++ b/data/ceilometer/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ceph/hiera.yaml b/data/ceph/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/ceph/hiera.yaml +++ b/data/ceph/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/cinder/hiera.yaml b/data/cinder/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/cinder/hiera.yaml +++ b/data/cinder/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/clvm/hiera.yaml b/data/clvm/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/clvm/hiera.yaml +++ b/data/clvm/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/corosync/hiera.yaml b/data/corosync/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/corosync/hiera.yaml +++ b/data/corosync/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/cron/hiera.yaml b/data/cron/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/cron/hiera.yaml +++ b/data/cron/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ddclient/hiera.yaml b/data/ddclient/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/ddclient/hiera.yaml +++ b/data/ddclient/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/debootstrap/hiera.yaml b/data/debootstrap/hiera.yaml index def16483..cdb37c27 100644 --- a/data/debootstrap/hiera.yaml +++ b/data/debootstrap/hiera.yaml @@ -1,3 +1,4 @@ --- - :hierarchy: - - default +:hierarchy: + - "%{title}/default" + - default diff --git a/data/default/Windows.yaml b/data/default/Windows.yaml new file mode 100644 index 00000000..ec9ed18d --- /dev/null +++ b/data/default/Windows.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + package_provider: 'chocolatey' diff --git a/data/dhcpd/hiera.yaml b/data/dhcpd/hiera.yaml index b8dc1a89..0e7fa077 100644 --- a/data/dhcpd/hiera.yaml +++ b/data/dhcpd/hiera.yaml @@ -1,5 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - "%{title}/default" + - default diff --git a/data/dkms/hiera.yaml b/data/dkms/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/dkms/hiera.yaml +++ b/data/dkms/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/dnsmasq/hiera.yaml b/data/dnsmasq/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/dnsmasq/hiera.yaml +++ b/data/dnsmasq/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/duply/hiera.yaml b/data/duply/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/duply/hiera.yaml +++ b/data/duply/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/epel/hiera.yaml b/data/epel/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/epel/hiera.yaml +++ b/data/epel/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/fail2ban/hiera.yaml b/data/fail2ban/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/fail2ban/hiera.yaml +++ b/data/fail2ban/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/foreman/hiera.yaml b/data/foreman/hiera.yaml index 61231d6c..037b0e42 100644 --- a/data/foreman/hiera.yaml +++ b/data/foreman/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/freeradius/hiera.yaml b/data/freeradius/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/freeradius/hiera.yaml +++ b/data/freeradius/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/gitlab-ce/hiera.yaml b/data/gitlab-ce/hiera.yaml index 2cf9014d..27062e71 100644 --- a/data/gitlab-ce/hiera.yaml +++ b/data/gitlab-ce/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/gitlab-cli/hiera.yaml b/data/gitlab-cli/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/gitlab-cli/hiera.yaml +++ b/data/gitlab-cli/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/glance/hiera.yaml b/data/glance/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/glance/hiera.yaml +++ b/data/glance/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/graylog2/hiera.yaml b/data/graylog2/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/graylog2/hiera.yaml +++ b/data/graylog2/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/hosts/hiera.yaml b/data/hosts/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/hosts/hiera.yaml +++ b/data/hosts/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/icinga2/hiera.yaml b/data/icinga2/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/icinga2/hiera.yaml +++ b/data/icinga2/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/icingaweb2/hiera.yaml b/data/icingaweb2/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/icingaweb2/hiera.yaml +++ b/data/icingaweb2/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/iotop/hiera.yaml b/data/iotop/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/iotop/hiera.yaml +++ b/data/iotop/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/iptraf/hiera.yaml b/data/iptraf/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/iptraf/hiera.yaml +++ b/data/iptraf/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/jboss/hiera.yaml b/data/jboss/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/jboss/hiera.yaml +++ b/data/jboss/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/keepalived/hiera.yaml b/data/keepalived/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/keepalived/hiera.yaml +++ b/data/keepalived/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/keystone/hiera.yaml b/data/keystone/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/keystone/hiera.yaml +++ b/data/keystone/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/libvirt/hiera.yaml b/data/libvirt/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/libvirt/hiera.yaml +++ b/data/libvirt/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/lighttpd/hiera.yaml b/data/lighttpd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/lighttpd/hiera.yaml +++ b/data/lighttpd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/lsb-release/hiera.yaml b/data/lsb-release/hiera.yaml index b8dc1a89..dfd3d93f 100644 --- a/data/lsb-release/hiera.yaml +++ b/data/lsb-release/hiera.yaml @@ -1,5 +1,5 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/lsb/hiera.yaml b/data/lsb/hiera.yaml index b8dc1a89..dfd3d93f 100644 --- a/data/lsb/hiera.yaml +++ b/data/lsb/hiera.yaml @@ -1,5 +1,5 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/lsof/hiera.yaml b/data/lsof/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/lsof/hiera.yaml +++ b/data/lsof/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mailx/hiera.yaml b/data/mailx/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/mailx/hiera.yaml +++ b/data/mailx/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/make/hiera.yaml b/data/make/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/make/hiera.yaml +++ b/data/make/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mdadm/hiera.yaml b/data/mdadm/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/mdadm/hiera.yaml +++ b/data/mdadm/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mlocate/hiera.yaml b/data/mlocate/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/mlocate/hiera.yaml +++ b/data/mlocate/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mongodb-mms-automation-agent/hiera.yaml b/data/mongodb-mms-automation-agent/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/mongodb-mms-automation-agent/hiera.yaml +++ b/data/mongodb-mms-automation-agent/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mongodb-mms-backup-agent/hiera.yaml b/data/mongodb-mms-backup-agent/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/mongodb-mms-backup-agent/hiera.yaml +++ b/data/mongodb-mms-backup-agent/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mongodb-mms-monitoring-agent/hiera.yaml b/data/mongodb-mms-monitoring-agent/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/mongodb-mms-monitoring-agent/hiera.yaml +++ b/data/mongodb-mms-monitoring-agent/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mongodb-mms/hiera.yaml b/data/mongodb-mms/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/mongodb-mms/hiera.yaml +++ b/data/mongodb-mms/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/motd/hiera.yaml b/data/motd/hiera.yaml index 9381ee7a..72fea1e8 100644 --- a/data/motd/hiera.yaml +++ b/data/motd/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/lsbdistcodename/%{lsbdistcodename}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/lsbdistcodename/%{lsbdistcodename}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/msmtp/hiera.yaml b/data/msmtp/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/msmtp/hiera.yaml +++ b/data/msmtp/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/multipath/hiera.yaml b/data/multipath/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/multipath/hiera.yaml +++ b/data/multipath/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/munin-node/hiera.yaml b/data/munin-node/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/munin-node/hiera.yaml +++ b/data/munin-node/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/munin/hiera.yaml b/data/munin/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/munin/hiera.yaml +++ b/data/munin/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mysql/hiera.yaml b/data/mysql/hiera.yaml index 4d2c7fec..bb9e3e88 100644 --- a/data/mysql/hiera.yaml +++ b/data/mysql/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/repo/%{repo}-%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/repo/%{repo}-%{osfamily}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/repo/%{repo}-%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/repo/%{repo}-%{osfamily}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nano/hiera.yaml b/data/nano/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/nano/hiera.yaml +++ b/data/nano/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/newrelic/hiera.yaml b/data/newrelic/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/newrelic/hiera.yaml +++ b/data/newrelic/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nfs-client/hiera.yaml b/data/nfs-client/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/nfs-client/hiera.yaml +++ b/data/nfs-client/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nfs-server/hiera.yaml b/data/nfs-server/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/nfs-server/hiera.yaml +++ b/data/nfs-server/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nfs/hiera.yaml b/data/nfs/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/nfs/hiera.yaml +++ b/data/nfs/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nova/hiera.yaml b/data/nova/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/nova/hiera.yaml +++ b/data/nova/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/octocatalog-diff/hiera.yaml b/data/octocatalog-diff/hiera.yaml index b8dc1a89..dfd3d93f 100644 --- a/data/octocatalog-diff/hiera.yaml +++ b/data/octocatalog-diff/hiera.yaml @@ -1,5 +1,5 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/openjdk-jdk/hiera.yaml b/data/openjdk-jdk/hiera.yaml index 2cf9014d..27062e71 100644 --- a/data/openjdk-jdk/hiera.yaml +++ b/data/openjdk-jdk/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/openjdk-jre/hiera.yaml b/data/openjdk-jre/hiera.yaml index 2cf9014d..27062e71 100644 --- a/data/openjdk-jre/hiera.yaml +++ b/data/openjdk-jre/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/openntpd/hiera.yaml b/data/openntpd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/openntpd/hiera.yaml +++ b/data/openntpd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/openssh/hiera.yaml b/data/openssh/hiera.yaml index b18896c3..01b212f1 100644 --- a/data/openssh/hiera.yaml +++ b/data/openssh/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}/%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}/%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/openswan/hiera.yaml b/data/openswan/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/openswan/hiera.yaml +++ b/data/openswan/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/openvswitch/hiera.yaml b/data/openvswitch/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/openvswitch/hiera.yaml +++ b/data/openvswitch/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/pacemaker/hiera.yaml b/data/pacemaker/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/pacemaker/hiera.yaml +++ b/data/pacemaker/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/pam/hiera.yaml b/data/pam/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/pam/hiera.yaml +++ b/data/pam/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/passenger/hiera.yaml b/data/passenger/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/passenger/hiera.yaml +++ b/data/passenger/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/php/hiera.yaml b/data/php/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/php/hiera.yaml +++ b/data/php/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/profile/hiera.yaml b/data/profile/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/profile/hiera.yaml +++ b/data/profile/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/psmisc/hiera.yaml b/data/psmisc/hiera.yaml index 2010c5af..7ba6fd10 100644 --- a/data/psmisc/hiera.yaml +++ b/data/psmisc/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/puppet-agent/hiera.yaml b/data/puppet-agent/hiera.yaml index 61231d6c..037b0e42 100644 --- a/data/puppet-agent/hiera.yaml +++ b/data/puppet-agent/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/puppetserver/hiera.yaml b/data/puppetserver/hiera.yaml index 61231d6c..037b0e42 100644 --- a/data/puppetserver/hiera.yaml +++ b/data/puppetserver/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/pwgen/hiera.yaml b/data/pwgen/hiera.yaml index 2010c5af..7ba6fd10 100644 --- a/data/pwgen/hiera.yaml +++ b/data/pwgen/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/python-pip/hiera.yaml b/data/python-pip/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/python-pip/hiera.yaml +++ b/data/python-pip/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/quagga/hiera.yaml b/data/quagga/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/quagga/hiera.yaml +++ b/data/quagga/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/quantum/hiera.yaml b/data/quantum/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/quantum/hiera.yaml +++ b/data/quantum/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rabbitmq/hiera.yaml b/data/rabbitmq/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/rabbitmq/hiera.yaml +++ b/data/rabbitmq/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rails/hiera.yaml b/data/rails/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/rails/hiera.yaml +++ b/data/rails/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/redis/hiera.yaml b/data/redis/hiera.yaml index b079afd1..d3a8bd3b 100644 --- a/data/redis/hiera.yaml +++ b/data/redis/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}-%{operatingsystemrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}-%{operatingsystemrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rinse/hiera.yaml b/data/rinse/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/rinse/hiera.yaml +++ b/data/rinse/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rsync/hiera.yaml b/data/rsync/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/rsync/hiera.yaml +++ b/data/rsync/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rsyslog-relp/hiera.yaml b/data/rsyslog-relp/hiera.yaml index b1fa7245..c3397250 100644 --- a/data/rsyslog-relp/hiera.yaml +++ b/data/rsyslog-relp/hiera.yaml @@ -1,4 +1,5 @@ --- - :hierarchy: - - "%{title}/default" - - default +:hierarchy: + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rsyslog/hiera.yaml b/data/rsyslog/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/rsyslog/hiera.yaml +++ b/data/rsyslog/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ruby-dev/hiera.yaml b/data/ruby-dev/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/ruby-dev/hiera.yaml +++ b/data/ruby-dev/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ruby/hiera.yaml b/data/ruby/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/ruby/hiera.yaml +++ b/data/ruby/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rundeck/hiera.yaml b/data/rundeck/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/rundeck/hiera.yaml +++ b/data/rundeck/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/samba/hiera.yaml b/data/samba/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/samba/hiera.yaml +++ b/data/samba/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/scl/hiera.yaml b/data/scl/hiera.yaml index 2cf9014d..27062e71 100644 --- a/data/scl/hiera.yaml +++ b/data/scl/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/subversion/hiera.yaml b/data/subversion/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/subversion/hiera.yaml +++ b/data/subversion/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/sudo/hiera.yaml b/data/sudo/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/sudo/hiera.yaml +++ b/data/sudo/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/supervisor/hiera.yaml b/data/supervisor/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/supervisor/hiera.yaml +++ b/data/supervisor/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/sysfs/hiera.yaml b/data/sysfs/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/sysfs/hiera.yaml +++ b/data/sysfs/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/sysklogd/hiera.yaml b/data/sysklogd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/sysklogd/hiera.yaml +++ b/data/sysklogd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/syslog-ng/hiera.yaml b/data/syslog-ng/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/syslog-ng/hiera.yaml +++ b/data/syslog-ng/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/tcpdump/hiera.yaml b/data/tcpdump/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/tcpdump/hiera.yaml +++ b/data/tcpdump/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/telnet/hiera.yaml b/data/telnet/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/telnet/hiera.yaml +++ b/data/telnet/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/test/hiera.yaml b/data/test/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/test/hiera.yaml +++ b/data/test/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/tree/hiera.yaml b/data/tree/hiera.yaml index b1fa7245..c3397250 100644 --- a/data/tree/hiera.yaml +++ b/data/tree/hiera.yaml @@ -1,4 +1,5 @@ --- - :hierarchy: - - "%{title}/default" - - default +:hierarchy: + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/trickle/hiera.yaml b/data/trickle/hiera.yaml index 2010c5af..7ba6fd10 100644 --- a/data/trickle/hiera.yaml +++ b/data/trickle/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/varnish/hiera.yaml b/data/varnish/hiera.yaml index 456bda56..a3944b3d 100644 --- a/data/varnish/hiera.yaml +++ b/data/varnish/hiera.yaml @@ -1,6 +1,7 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/wpscan/hiera.yaml b/data/wpscan/hiera.yaml index b079afd1..d3a8bd3b 100644 --- a/data/wpscan/hiera.yaml +++ b/data/wpscan/hiera.yaml @@ -1,7 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}-%{operatingsystemrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}-%{operatingsystemrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/xinetd/hiera.yaml b/data/xinetd/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/xinetd/hiera.yaml +++ b/data/xinetd/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/yum-cron/hiera.yaml b/data/yum-cron/hiera.yaml index b8dc1a89..19fa9ae9 100644 --- a/data/yum-cron/hiera.yaml +++ b/data/yum-cron/hiera.yaml @@ -1,5 +1,6 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default From 59b87b9994887dec2d367a4e3631b462bf9406b3 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 4 Sep 2018 15:59:33 +0100 Subject: [PATCH 136/284] Add hiera.yaml for default app. Used by tp 2.3.0 --- data/default/hiera.yaml | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 data/default/hiera.yaml diff --git a/data/default/hiera.yaml b/data/default/hiera.yaml new file mode 100644 index 00000000..4fdcd74f --- /dev/null +++ b/data/default/hiera.yaml @@ -0,0 +1,4 @@ +--- +:hierarchy: + - "default/%{operatingsystem}" + - default diff --git a/metadata.json b/metadata.json index 5fe47fa8..c6c01b11 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.2.6", + "version": "0.3.0", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 128918ec224b63aacaa9070cac4d65414f69e6fb Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 17 Sep 2018 11:22:11 +0200 Subject: [PATCH 137/284] Updated puppetserver data to use puppet5 repos --- data/puppetserver/operatingsystem/Debian6.yaml | 4 ---- data/puppetserver/operatingsystem/Debian7.yaml | 2 +- data/puppetserver/operatingsystem/Debian8.yaml | 2 +- data/puppetserver/operatingsystem/Debian9.yaml | 4 ++++ data/puppetserver/operatingsystem/Ubuntu14.04.yaml | 2 +- data/puppetserver/operatingsystem/Ubuntu16.04.yaml | 2 +- data/puppetserver/operatingsystem/Ubuntu18.04.yaml | 4 ++++ data/puppetserver/osfamily/Debian.yaml | 5 +++-- data/puppetserver/osfamily/RedHat.yaml | 5 +---- data/puppetserver/osfamily/RedHat6.yaml | 2 +- data/puppetserver/osfamily/RedHat7.yaml | 2 +- 11 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 data/puppetserver/operatingsystem/Debian6.yaml create mode 100644 data/puppetserver/operatingsystem/Debian9.yaml create mode 100644 data/puppetserver/operatingsystem/Ubuntu18.04.yaml diff --git a/data/puppetserver/operatingsystem/Debian6.yaml b/data/puppetserver/operatingsystem/Debian6.yaml deleted file mode 100644 index 75da904b..00000000 --- a/data/puppetserver/operatingsystem/Debian6.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppetserver::settings: - apt_release: 'squeeze' - diff --git a/data/puppetserver/operatingsystem/Debian7.yaml b/data/puppetserver/operatingsystem/Debian7.yaml index 50cf8849..98e36b69 100644 --- a/data/puppetserver/operatingsystem/Debian7.yaml +++ b/data/puppetserver/operatingsystem/Debian7.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: apt_release: 'wheezy' - + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-wheezy.deb' diff --git a/data/puppetserver/operatingsystem/Debian8.yaml b/data/puppetserver/operatingsystem/Debian8.yaml index 2aa6129b..4f48fe97 100644 --- a/data/puppetserver/operatingsystem/Debian8.yaml +++ b/data/puppetserver/operatingsystem/Debian8.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: apt_release: 'jessie' - + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-jessie.deb' diff --git a/data/puppetserver/operatingsystem/Debian9.yaml b/data/puppetserver/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..9ccd1a44 --- /dev/null +++ b/data/puppetserver/operatingsystem/Debian9.yaml @@ -0,0 +1,4 @@ +--- + puppetserver::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-stretch.deb' + apt_release: 'stretch' diff --git a/data/puppetserver/operatingsystem/Ubuntu14.04.yaml b/data/puppetserver/operatingsystem/Ubuntu14.04.yaml index 1a2f6b68..6dc6dc04 100644 --- a/data/puppetserver/operatingsystem/Ubuntu14.04.yaml +++ b/data/puppetserver/operatingsystem/Ubuntu14.04.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: apt_release: 'trusty' - + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-trusty.deb' diff --git a/data/puppetserver/operatingsystem/Ubuntu16.04.yaml b/data/puppetserver/operatingsystem/Ubuntu16.04.yaml index 64c32d26..19d737d1 100644 --- a/data/puppetserver/operatingsystem/Ubuntu16.04.yaml +++ b/data/puppetserver/operatingsystem/Ubuntu16.04.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: apt_release: 'xenial' - + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-xenial.deb' diff --git a/data/puppetserver/operatingsystem/Ubuntu18.04.yaml b/data/puppetserver/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..9d111a7b --- /dev/null +++ b/data/puppetserver/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,4 @@ +--- + puppetserver::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-bionic.deb' + apt_release: 'bionic' diff --git a/data/puppetserver/osfamily/Debian.yaml b/data/puppetserver/osfamily/Debian.yaml index cd7c0190..29dfacfc 100644 --- a/data/puppetserver/osfamily/Debian.yaml +++ b/data/puppetserver/osfamily/Debian.yaml @@ -4,6 +4,7 @@ repo_url: 'http://apt.puppetlabs.com' key: 'EF8D349F' key_url: 'http://apt.puppetlabs.com/pubkey.gpg' - apt_repos: 'PC1' + apt_repos: 'puppet5' apt_release: 'stable' - + repo_package_provider: dpkg + repo_package_name: 'puppet5-release' diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 95f48eb3..3a5daf5b 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -1,9 +1,6 @@ --- puppetserver::settings: init_file_path: '/etc/sysconfig/puppetserver' - repo_package_name: 'puppetlabs-release-pc1' + repo_package_name: 'puppet5-release' repo_package_provider: 'rpm' -# repo_url: 'http://yum.puppetlabs.com/el/7/PC1/$basearch/' -# key: '07BB6C57' -# key_url: 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppet' dockerfile_prerequisites: 'RUN yum install -y wget' diff --git a/data/puppetserver/osfamily/RedHat6.yaml b/data/puppetserver/osfamily/RedHat6.yaml index 47e90b7c..7cdd2ead 100644 --- a/data/puppetserver/osfamily/RedHat6.yaml +++ b/data/puppetserver/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- puppetserver::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm' + repo_package_url: 'https://yum.puppetlabs.com/puppet5-release-el-6.noarch.rpm' diff --git a/data/puppetserver/osfamily/RedHat7.yaml b/data/puppetserver/osfamily/RedHat7.yaml index ef9ae261..7c030057 100644 --- a/data/puppetserver/osfamily/RedHat7.yaml +++ b/data/puppetserver/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- puppetserver::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm' + repo_package_url: 'https://yum.puppetlabs.com/puppet5-release-el-7.noarch.rpm' From c36b398f8e8d46e2802cc82da75760bc2f5d6e82 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 17 Sep 2018 11:34:50 +0200 Subject: [PATCH 138/284] Updated puppetdb data --- data/puppetdb/default.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/data/puppetdb/default.yaml b/data/puppetdb/default.yaml index a8a5eba2..29feb5c9 100644 --- a/data/puppetdb/default.yaml +++ b/data/puppetdb/default.yaml @@ -2,14 +2,15 @@ puppetdb::settings: package_name: 'puppetdb' service_name: 'puppetdb' - config_file_path: '/etc/puppetdb/puppetdb.ini' - config_dir_path: '/etc/puppetdb' + config_file_path: '/etc/puppetlabs/puppetsdb/bootstrap.cfg' + config_dir_path: '/etc/puppetlabs/puppetdb' + conf_dir_path: '/etc/puppetlabs/puppetdb/conf.d' + install_dir_path: '/opt/puppetlabs/server/apps/puppetdb' + pid_file_path: '/var/run/puppetlabs/puppetdb/puppetdb.pid' config_dir_owner: 'puppetdb' config_dir_group: 'puppetdb' config_dir_mode: '0640' - conf_dir_path: '/etc/puppetdb/conf.d' - pid_file_path: '/var/run/puppetdb.pid' - log_dir_path: '/var/log/puppetdb' + log_dir_path: '/var/log/puppetlabs/puppetdb' process_name: 'java' process_extra_name: 'puppetdb' process_user: 'puppetdb' From 7b44a70c7a83d38c1f0a61ad75d8aced40c234a6 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 17 Sep 2018 11:36:01 +0200 Subject: [PATCH 139/284] Release v0.3.1 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index c6c01b11..af318f64 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.3.0", + "version": "0.3.1", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From ad0637c1a02336f080fc040eb8090e7de66c7ac7 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 9 Nov 2018 20:04:57 +0100 Subject: [PATCH 140/284] Added defaults for apt on Debian and Ubuntu --- data/default/Debian7.yaml | 3 +++ data/default/Debian8.yaml | 3 +++ data/default/Debian9.yaml | 3 +++ data/default/Ubuntu12.04.yaml | 4 ++++ data/default/Ubuntu14.04.yaml | 4 ++++ data/default/Ubuntu14.10.yaml | 4 ++++ data/default/Ubuntu15.04.yaml | 3 +++ data/default/Ubuntu15.10.yaml | 3 +++ data/default/Ubuntu16.04.yaml | 3 +++ data/default/Ubuntu18.04.yaml | 3 +++ data/default/Ubuntu18.10.yaml | 3 +++ 11 files changed, 36 insertions(+) create mode 100644 data/default/Debian7.yaml create mode 100644 data/default/Debian8.yaml create mode 100644 data/default/Debian9.yaml create mode 100644 data/default/Ubuntu12.04.yaml create mode 100644 data/default/Ubuntu14.04.yaml create mode 100644 data/default/Ubuntu14.10.yaml create mode 100644 data/default/Ubuntu15.04.yaml create mode 100644 data/default/Ubuntu15.10.yaml create mode 100644 data/default/Ubuntu16.04.yaml create mode 100644 data/default/Ubuntu18.04.yaml create mode 100644 data/default/Ubuntu18.10.yaml diff --git a/data/default/Debian7.yaml b/data/default/Debian7.yaml new file mode 100644 index 00000000..db381a8f --- /dev/null +++ b/data/default/Debian7.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'wheezy' diff --git a/data/default/Debian8.yaml b/data/default/Debian8.yaml new file mode 100644 index 00000000..96ed21e6 --- /dev/null +++ b/data/default/Debian8.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'jessie' diff --git a/data/default/Debian9.yaml b/data/default/Debian9.yaml new file mode 100644 index 00000000..c4bb6bc9 --- /dev/null +++ b/data/default/Debian9.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'stretch' diff --git a/data/default/Ubuntu12.04.yaml b/data/default/Ubuntu12.04.yaml new file mode 100644 index 00000000..f8acd7b9 --- /dev/null +++ b/data/default/Ubuntu12.04.yaml @@ -0,0 +1,4 @@ +--- +default::settings: + apt_release: 'precise' + init_system: 'upstart' diff --git a/data/default/Ubuntu14.04.yaml b/data/default/Ubuntu14.04.yaml new file mode 100644 index 00000000..fea8b952 --- /dev/null +++ b/data/default/Ubuntu14.04.yaml @@ -0,0 +1,4 @@ +--- +default::settings: + apt_release: 'trusty' + init_system: 'upstart' diff --git a/data/default/Ubuntu14.10.yaml b/data/default/Ubuntu14.10.yaml new file mode 100644 index 00000000..d790a02c --- /dev/null +++ b/data/default/Ubuntu14.10.yaml @@ -0,0 +1,4 @@ +--- +default::settings: + apt_release: 'utopic' + init_system: 'upstart' diff --git a/data/default/Ubuntu15.04.yaml b/data/default/Ubuntu15.04.yaml new file mode 100644 index 00000000..1eb001c0 --- /dev/null +++ b/data/default/Ubuntu15.04.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'vivid' diff --git a/data/default/Ubuntu15.10.yaml b/data/default/Ubuntu15.10.yaml new file mode 100644 index 00000000..595286cd --- /dev/null +++ b/data/default/Ubuntu15.10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'wily' diff --git a/data/default/Ubuntu16.04.yaml b/data/default/Ubuntu16.04.yaml new file mode 100644 index 00000000..e6ea3d31 --- /dev/null +++ b/data/default/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'xenial' diff --git a/data/default/Ubuntu18.04.yaml b/data/default/Ubuntu18.04.yaml new file mode 100644 index 00000000..9f7695c2 --- /dev/null +++ b/data/default/Ubuntu18.04.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'bionic' diff --git a/data/default/Ubuntu18.10.yaml b/data/default/Ubuntu18.10.yaml new file mode 100644 index 00000000..54448eb2 --- /dev/null +++ b/data/default/Ubuntu18.10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'cosmic' From b692dbe177f56a5ab8258f41034cbfd6ff9e9647 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 9 Nov 2018 20:06:43 +0100 Subject: [PATCH 141/284] Updated docker data --- data/docker/default.yaml | 2 +- data/docker/hiera.yaml | 1 + data/docker/operatingsystem/Debian.yaml | 3 +-- data/docker/operatingsystem/Ubuntu.yaml | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/data/docker/default.yaml b/data/docker/default.yaml index a7927374..2710576c 100644 --- a/data/docker/default.yaml +++ b/data/docker/default.yaml @@ -1,6 +1,6 @@ --- docker::settings: - package_name: 'docker' + package_name: 'docker-ce' service_name: 'docker' pid_file_path: '/var/run/docker.pid' process_name: 'docker' diff --git a/data/docker/hiera.yaml b/data/docker/hiera.yaml index 7be5ad41..505fb3e9 100644 --- a/data/docker/hiera.yaml +++ b/data/docker/hiera.yaml @@ -3,5 +3,6 @@ - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/docker/operatingsystem/Debian.yaml b/data/docker/operatingsystem/Debian.yaml index 4523a30f..31a8deaf 100644 --- a/data/docker/operatingsystem/Debian.yaml +++ b/data/docker/operatingsystem/Debian.yaml @@ -1,10 +1,9 @@ --- docker::settings: init_file_path: '/etc/default/docker' - config_file_path: '/etc/default/docker' repo_url: 'https://apt.dockerproject.org/repo' key: '2C52609D' key_url: 'http://apt.dockerproject.org/gpg' - apt_repos: 'main' + apt_repos: 'stable' apt_key_server: 'http://p80.pool.sks-keyservers.net' init_system: 'sysvinit' diff --git a/data/docker/operatingsystem/Ubuntu.yaml b/data/docker/operatingsystem/Ubuntu.yaml index a5b16d61..7dae02fc 100644 --- a/data/docker/operatingsystem/Ubuntu.yaml +++ b/data/docker/operatingsystem/Ubuntu.yaml @@ -1,10 +1,9 @@ --- docker::settings: init_file_path: '/etc/default/docker' - config_file_path: '/etc/default/docker' - repo_url: 'https://apt.dockerproject.org/repo' - key: '2C52609D' - key_url: 'http://apt.dockerproject.org/gpg' - apt_repos: 'main' + repo_url: 'https://download.docker.com/linux/ubuntu' + key: '0EBFCD88' + key_url: 'https://download.docker.com/linux/ubuntu/gpg' + apt_repos: 'stable' apt_key_server: 'http://p80.pool.sks-keyservers.net' init_system: 'systemd' From f9d147179a356681d3a4f1569d42ce45683ebc01 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 10 Nov 2018 16:44:34 +0100 Subject: [PATCH 142/284] Fixed keys for docker (requires tp update) --- data/docker/operatingsystem/Ubuntu.yaml | 2 +- data/virtualbox/default.yaml | 2 +- data/virtualbox/hiera.yaml | 1 + data/virtualbox/operatingsystem/Debian7.yaml | 3 --- data/virtualbox/operatingsystem/Debian8.yaml | 3 --- data/virtualbox/operatingsystem/Debian9.yaml | 3 --- data/virtualbox/operatingsystem/Ubuntu12.04.yaml | 3 --- data/virtualbox/operatingsystem/Ubuntu14.04.yaml | 3 --- data/virtualbox/operatingsystem/Ubuntu14.10.yaml | 3 --- data/virtualbox/operatingsystem/Ubuntu16.04.yaml | 3 --- data/virtualbox/operatingsystem/Ubuntu18.04.yaml | 6 ++++++ data/virtualbox/osfamily/Debian.yaml | 4 ++-- 12 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 data/virtualbox/operatingsystem/Debian7.yaml delete mode 100644 data/virtualbox/operatingsystem/Debian8.yaml delete mode 100644 data/virtualbox/operatingsystem/Debian9.yaml delete mode 100644 data/virtualbox/operatingsystem/Ubuntu12.04.yaml delete mode 100644 data/virtualbox/operatingsystem/Ubuntu14.04.yaml delete mode 100644 data/virtualbox/operatingsystem/Ubuntu14.10.yaml delete mode 100644 data/virtualbox/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu18.04.yaml diff --git a/data/docker/operatingsystem/Ubuntu.yaml b/data/docker/operatingsystem/Ubuntu.yaml index 7dae02fc..5256b9f3 100644 --- a/data/docker/operatingsystem/Ubuntu.yaml +++ b/data/docker/operatingsystem/Ubuntu.yaml @@ -2,7 +2,7 @@ docker::settings: init_file_path: '/etc/default/docker' repo_url: 'https://download.docker.com/linux/ubuntu' - key: '0EBFCD88' + key: '9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88' key_url: 'https://download.docker.com/linux/ubuntu/gpg' apt_repos: 'stable' apt_key_server: 'http://p80.pool.sks-keyservers.net' diff --git a/data/virtualbox/default.yaml b/data/virtualbox/default.yaml index 6206e59f..209c79fa 100644 --- a/data/virtualbox/default.yaml +++ b/data/virtualbox/default.yaml @@ -1,5 +1,5 @@ --- virtualbox::settings: - package_name: 'VirtualBox-5.1' + package_name: 'VirtualBox-5.2' service_name: 'vboxdrv' config_dir_path: '/etc/vbox' diff --git a/data/virtualbox/hiera.yaml b/data/virtualbox/hiera.yaml index dd6d5254..bdfda96e 100644 --- a/data/virtualbox/hiera.yaml +++ b/data/virtualbox/hiera.yaml @@ -3,5 +3,6 @@ - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/virtualbox/operatingsystem/Debian7.yaml b/data/virtualbox/operatingsystem/Debian7.yaml deleted file mode 100644 index c37e220d..00000000 --- a/data/virtualbox/operatingsystem/Debian7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - virtualbox::settings: - apt_release: 'wheezy' diff --git a/data/virtualbox/operatingsystem/Debian8.yaml b/data/virtualbox/operatingsystem/Debian8.yaml deleted file mode 100644 index 132e5fd3..00000000 --- a/data/virtualbox/operatingsystem/Debian8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - virtualbox::settings: - apt_release: 'jessie' diff --git a/data/virtualbox/operatingsystem/Debian9.yaml b/data/virtualbox/operatingsystem/Debian9.yaml deleted file mode 100644 index 1dc13a01..00000000 --- a/data/virtualbox/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - virtualbox::settings: - apt_release: 'stretch' diff --git a/data/virtualbox/operatingsystem/Ubuntu12.04.yaml b/data/virtualbox/operatingsystem/Ubuntu12.04.yaml deleted file mode 100644 index 801cba58..00000000 --- a/data/virtualbox/operatingsystem/Ubuntu12.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - virtualbox::settings: - apt_release: 'precise' diff --git a/data/virtualbox/operatingsystem/Ubuntu14.04.yaml b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml deleted file mode 100644 index b4ed280e..00000000 --- a/data/virtualbox/operatingsystem/Ubuntu14.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - virtualbox::settings: - apt_release: 'trusty' diff --git a/data/virtualbox/operatingsystem/Ubuntu14.10.yaml b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml deleted file mode 100644 index 88cd3c2b..00000000 --- a/data/virtualbox/operatingsystem/Ubuntu14.10.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - virtualbox::settings: - apt_release: 'ubuntu-utopic' diff --git a/data/virtualbox/operatingsystem/Ubuntu16.04.yaml b/data/virtualbox/operatingsystem/Ubuntu16.04.yaml deleted file mode 100644 index f3c9b204..00000000 --- a/data/virtualbox/operatingsystem/Ubuntu16.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - virtualbox::settings: - apt_release: 'xenial' diff --git a/data/virtualbox/operatingsystem/Ubuntu18.04.yaml b/data/virtualbox/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..77fb05da --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,6 @@ +--- + virtualbox::settings: + key: 'B9F8 D658 297A F3EF C18D 5CDF A2F6 83C5 2980 AECF' + key_url: 'https://www.virtualbox.org/download/oracle_vbox_2016.asc' + apt_repos: 'contrib' + diff --git a/data/virtualbox/osfamily/Debian.yaml b/data/virtualbox/osfamily/Debian.yaml index b05c447d..b5c53881 100644 --- a/data/virtualbox/osfamily/Debian.yaml +++ b/data/virtualbox/osfamily/Debian.yaml @@ -1,7 +1,7 @@ --- virtualbox::settings: - repo_url: 'http://download.virtualbox.org/virtualbox/debian' - key: '7F438280EF8D349F' + repo_url: 'https://download.virtualbox.org/virtualbox/debian' + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' apt_repos: 'contrib' From d365140644400512f31b7d1153b3c9555ed728aa Mon Sep 17 00:00:00 2001 From: CV Date: Wed, 19 Dec 2018 16:38:13 +0100 Subject: [PATCH 143/284] Debian 9: samba.service is masked Debian 9 is using systemd. `samba.service` is masked. Therefore restarting the service will fail. --- data/samba/operatingsystem/Debian9.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/samba/operatingsystem/Debian9.yaml diff --git a/data/samba/operatingsystem/Debian9.yaml b/data/samba/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..52191279 --- /dev/null +++ b/data/samba/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- + samba::settings: + service_name: 'smb' From bb8879a8a44f4829dc55d4d90fe4ea129ece906e Mon Sep 17 00:00:00 2001 From: CV Date: Wed, 19 Dec 2018 16:40:44 +0100 Subject: [PATCH 144/284] Update hiera.yaml --- data/samba/hiera.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/samba/hiera.yaml b/data/samba/hiera.yaml index 19fa9ae9..f133d93f 100644 --- a/data/samba/hiera.yaml +++ b/data/samba/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" From bd76290473a81d2b8f5db9d58b0ebae8297cc6cb Mon Sep 17 00:00:00 2001 From: CV Date: Fri, 28 Dec 2018 13:45:34 +0100 Subject: [PATCH 145/284] Debian 9 now using Default directory Debian 9 switched from using `squid3` to `squid` as name and path. --- data/squid/hiera.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/squid/hiera.yaml b/data/squid/hiera.yaml index 19fa9ae9..a3944b3d 100644 --- a/data/squid/hiera.yaml +++ b/data/squid/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" From 8e31071d8ef97319db6263371e5cdd50e6b62fc7 Mon Sep 17 00:00:00 2001 From: CV Date: Fri, 28 Dec 2018 13:48:02 +0100 Subject: [PATCH 146/284] Rename Debian.yaml to Debian9.yaml --- data/squid/osfamily/{Debian.yaml => Debian9.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/squid/osfamily/{Debian.yaml => Debian9.yaml} (100%) diff --git a/data/squid/osfamily/Debian.yaml b/data/squid/osfamily/Debian9.yaml similarity index 100% rename from data/squid/osfamily/Debian.yaml rename to data/squid/osfamily/Debian9.yaml From 043c157ee0a84563c517ff11013d1e5bb6ddd8a7 Mon Sep 17 00:00:00 2001 From: CV Date: Thu, 3 Jan 2019 23:42:17 +0100 Subject: [PATCH 147/284] Adding file path configuration puppetdb.conf When using puppetdb in the puppet-agent configuration path we need a file called puppetdb.conf. Since there are also mappings for eg. file routes.yaml I thing it makes sense to add this also. --- data/puppet-agent/default.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml index f0fe48f4..f15e974a 100644 --- a/data/puppet-agent/default.yaml +++ b/data/puppet-agent/default.yaml @@ -7,6 +7,7 @@ routes_file_path: '/etc/puppetlabs/puppet/routes.yaml' autosign_file_path: '/etc/puppetlabs/puppet/autosign.conf' auth_file_path: '/etc/puppetlabs/puppet/auth.conf' + puppetdb_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' config_dir_path: '/etc/puppetlabs/puppet/' code_dir_path: '/etc/puppetlabs/code' environment_dir_path: '/etc/puppetlabs/code/environments' From 8d64afd45a8355d3fbcb5773d03ed095d31bd513 Mon Sep 17 00:00:00 2001 From: CV Date: Sun, 6 Jan 2019 18:58:07 +0100 Subject: [PATCH 148/284] Typo in config file naming --- data/sudo/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sudo/default.yaml b/data/sudo/default.yaml index f856fc32..45fe7ce9 100644 --- a/data/sudo/default.yaml +++ b/data/sudo/default.yaml @@ -1,5 +1,5 @@ --- sudo::settings: - config_file_path: '/etc/sudors' + config_file_path: '/etc/sudoers' config_file_mode: '0440' config_dir_path: '/etc/sudoers.d' From 4e1adbb025edf52a9161822ee80823e9f61f6e62 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 7 Jan 2019 23:33:02 +0100 Subject: [PATCH 149/284] Updated docker apt-releases on Ubuntu --- data/docker/operatingsystem/Ubuntu12.04.yaml | 4 ---- data/docker/operatingsystem/Ubuntu14.04.yaml | 4 ---- data/docker/operatingsystem/Ubuntu14.10.yaml | 4 ---- data/docker/operatingsystem/Ubuntu15.04.yaml | 3 --- data/docker/operatingsystem/Ubuntu15.10.yaml | 3 --- data/docker/operatingsystem/Ubuntu16.04.yaml | 3 --- 6 files changed, 21 deletions(-) delete mode 100644 data/docker/operatingsystem/Ubuntu12.04.yaml delete mode 100644 data/docker/operatingsystem/Ubuntu14.04.yaml delete mode 100644 data/docker/operatingsystem/Ubuntu14.10.yaml delete mode 100644 data/docker/operatingsystem/Ubuntu15.04.yaml delete mode 100644 data/docker/operatingsystem/Ubuntu15.10.yaml delete mode 100644 data/docker/operatingsystem/Ubuntu16.04.yaml diff --git a/data/docker/operatingsystem/Ubuntu12.04.yaml b/data/docker/operatingsystem/Ubuntu12.04.yaml deleted file mode 100644 index a15a4b17..00000000 --- a/data/docker/operatingsystem/Ubuntu12.04.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -docker::settings: - apt_release: 'ubuntu-precise' - init_system: 'upstart' diff --git a/data/docker/operatingsystem/Ubuntu14.04.yaml b/data/docker/operatingsystem/Ubuntu14.04.yaml deleted file mode 100644 index fc0b6773..00000000 --- a/data/docker/operatingsystem/Ubuntu14.04.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -docker::settings: - apt_release: 'ubuntu-trusty' - init_system: 'upstart' diff --git a/data/docker/operatingsystem/Ubuntu14.10.yaml b/data/docker/operatingsystem/Ubuntu14.10.yaml deleted file mode 100644 index 2c0ad65f..00000000 --- a/data/docker/operatingsystem/Ubuntu14.10.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - docker::settings: - apt_release: 'ubuntu-utopic' - init_system: 'upstart' diff --git a/data/docker/operatingsystem/Ubuntu15.04.yaml b/data/docker/operatingsystem/Ubuntu15.04.yaml deleted file mode 100644 index e5ba498f..00000000 --- a/data/docker/operatingsystem/Ubuntu15.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker::settings: - apt_release: 'ubuntu-vivid' diff --git a/data/docker/operatingsystem/Ubuntu15.10.yaml b/data/docker/operatingsystem/Ubuntu15.10.yaml deleted file mode 100644 index fd22e6d6..00000000 --- a/data/docker/operatingsystem/Ubuntu15.10.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker::settings: - apt_release: 'ubuntu-wily' diff --git a/data/docker/operatingsystem/Ubuntu16.04.yaml b/data/docker/operatingsystem/Ubuntu16.04.yaml deleted file mode 100644 index 828fcd83..00000000 --- a/data/docker/operatingsystem/Ubuntu16.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker::settings: - apt_release: 'ubuntu-xenial' From 15bd9f539dab39c0fa7fb1e13d8c868cab3d6521 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 11 Jan 2019 13:38:35 +0100 Subject: [PATCH 150/284] Update Puppet release packages to latest version (6) --- data/puppet-agent/operatingsystem/Debian7.yaml | 4 ++-- data/puppet-agent/operatingsystem/Debian8.yaml | 4 ++-- data/puppet-agent/operatingsystem/Debian9.yaml | 4 ++-- data/puppet-agent/operatingsystem/Ubuntu14.04.yaml | 4 ++-- data/puppet-agent/operatingsystem/Ubuntu16.04.yaml | 4 ++-- data/puppet-agent/operatingsystem/Ubuntu18.04.yaml | 4 ++-- data/puppet-agent/osfamily/RedHat.yaml | 2 +- data/puppet-agent/osfamily/RedHat5.yaml | 2 +- data/puppet-agent/osfamily/RedHat6.yaml | 2 +- data/puppet-agent/osfamily/RedHat7.yaml | 2 +- data/puppetserver/operatingsystem/Debian7.yaml | 2 +- data/puppetserver/operatingsystem/Debian8.yaml | 2 +- data/puppetserver/operatingsystem/Debian9.yaml | 2 +- data/puppetserver/operatingsystem/Ubuntu14.04.yaml | 2 +- data/puppetserver/operatingsystem/Ubuntu16.04.yaml | 2 +- data/puppetserver/operatingsystem/Ubuntu18.04.yaml | 2 +- data/puppetserver/osfamily/Debian.yaml | 2 +- data/puppetserver/osfamily/RedHat.yaml | 2 +- data/puppetserver/osfamily/RedHat6.yaml | 2 +- data/puppetserver/osfamily/RedHat7.yaml | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/puppet-agent/operatingsystem/Debian7.yaml b/data/puppet-agent/operatingsystem/Debian7.yaml index 986039e1..e2fd5e2d 100644 --- a/data/puppet-agent/operatingsystem/Debian7.yaml +++ b/data/puppet-agent/operatingsystem/Debian7.yaml @@ -1,5 +1,5 @@ --- puppet-agent::settings: - repo_package_name: 'puppet5-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-wheezy.deb' + repo_package_name: 'puppet-release' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-wheezy.deb' apt_release: 'wheezy' diff --git a/data/puppet-agent/operatingsystem/Debian8.yaml b/data/puppet-agent/operatingsystem/Debian8.yaml index ce946107..348ed32c 100644 --- a/data/puppet-agent/operatingsystem/Debian8.yaml +++ b/data/puppet-agent/operatingsystem/Debian8.yaml @@ -1,5 +1,5 @@ --- puppet-agent::settings: - repo_package_name: 'puppet5-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-jessie.deb' + repo_package_name: 'puppet-release' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-jessie.deb' apt_release: 'jessie' diff --git a/data/puppet-agent/operatingsystem/Debian9.yaml b/data/puppet-agent/operatingsystem/Debian9.yaml index 2666de38..89813871 100644 --- a/data/puppet-agent/operatingsystem/Debian9.yaml +++ b/data/puppet-agent/operatingsystem/Debian9.yaml @@ -1,5 +1,5 @@ --- puppet-agent::settings: - repo_package_name: 'puppet5-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-stretch.deb' + repo_package_name: 'puppet-release' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-stretch.deb' apt_release: 'stretch' diff --git a/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml index 6193eda3..f0246669 100644 --- a/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml +++ b/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml @@ -1,5 +1,5 @@ --- puppet-agent::settings: - repo_package_name: 'puppet5-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-trusty.deb' + repo_package_name: 'puppet-release' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-trusty.deb' apt_release: 'trusty' diff --git a/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml index 3ea9a5f0..e080cd66 100644 --- a/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml +++ b/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml @@ -1,5 +1,5 @@ --- puppet-agent::settings: - repo_package_name: 'puppet5-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-xenial.deb' + repo_package_name: 'puppet-release' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-xenial.deb' apt_release: 'xenial' diff --git a/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml index 8eda9f68..18661e62 100644 --- a/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml +++ b/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml @@ -1,5 +1,5 @@ --- puppet-agent::settings: - repo_package_name: 'puppet5-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-bionic.deb' + repo_package_name: 'puppet-release' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-bionic.deb' apt_release: 'bionic' diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index 186986f9..876f1de3 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- puppet-agent::settings: - repo_package_name: 'puppet5-release' + repo_package_name: 'puppet-release' repo_package_provider: 'rpm' dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppet-agent/osfamily/RedHat5.yaml b/data/puppet-agent/osfamily/RedHat5.yaml index 1189f326..9728a3f9 100644 --- a/data/puppet-agent/osfamily/RedHat5.yaml +++ b/data/puppet-agent/osfamily/RedHat5.yaml @@ -1,3 +1,3 @@ --- puppet-agent::settings: - repo_package_url: 'https://yum.puppet.com/puppet5/puppet5-release-el-5.noarch.rpm' + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-5.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat6.yaml b/data/puppet-agent/osfamily/RedHat6.yaml index 630eec28..1be15485 100644 --- a/data/puppet-agent/osfamily/RedHat6.yaml +++ b/data/puppet-agent/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- puppet-agent::settings: - repo_package_url: 'https://yum.puppet.com/puppet5/puppet5-release-el-6.noarch.rpm' + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-6.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat7.yaml b/data/puppet-agent/osfamily/RedHat7.yaml index ccb750fa..5534eaab 100644 --- a/data/puppet-agent/osfamily/RedHat7.yaml +++ b/data/puppet-agent/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- puppet-agent::settings: - repo_package_url: 'https://yum.puppet.com/puppet5/puppet5-release-el-7.noarch.rpm' + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-7.noarch.rpm' diff --git a/data/puppetserver/operatingsystem/Debian7.yaml b/data/puppetserver/operatingsystem/Debian7.yaml index 98e36b69..e606bf81 100644 --- a/data/puppetserver/operatingsystem/Debian7.yaml +++ b/data/puppetserver/operatingsystem/Debian7.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: apt_release: 'wheezy' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-wheezy.deb' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-wheezy.deb' diff --git a/data/puppetserver/operatingsystem/Debian8.yaml b/data/puppetserver/operatingsystem/Debian8.yaml index 4f48fe97..c73421f2 100644 --- a/data/puppetserver/operatingsystem/Debian8.yaml +++ b/data/puppetserver/operatingsystem/Debian8.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: apt_release: 'jessie' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-jessie.deb' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-jessie.deb' diff --git a/data/puppetserver/operatingsystem/Debian9.yaml b/data/puppetserver/operatingsystem/Debian9.yaml index 9ccd1a44..ff06096e 100644 --- a/data/puppetserver/operatingsystem/Debian9.yaml +++ b/data/puppetserver/operatingsystem/Debian9.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-stretch.deb' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-stretch.deb' apt_release: 'stretch' diff --git a/data/puppetserver/operatingsystem/Ubuntu14.04.yaml b/data/puppetserver/operatingsystem/Ubuntu14.04.yaml index 6dc6dc04..eb3d764e 100644 --- a/data/puppetserver/operatingsystem/Ubuntu14.04.yaml +++ b/data/puppetserver/operatingsystem/Ubuntu14.04.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: apt_release: 'trusty' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-trusty.deb' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-trusty.deb' diff --git a/data/puppetserver/operatingsystem/Ubuntu16.04.yaml b/data/puppetserver/operatingsystem/Ubuntu16.04.yaml index 19d737d1..e5cbdc59 100644 --- a/data/puppetserver/operatingsystem/Ubuntu16.04.yaml +++ b/data/puppetserver/operatingsystem/Ubuntu16.04.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: apt_release: 'xenial' - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-xenial.deb' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-xenial.deb' diff --git a/data/puppetserver/operatingsystem/Ubuntu18.04.yaml b/data/puppetserver/operatingsystem/Ubuntu18.04.yaml index 9d111a7b..0b2ba542 100644 --- a/data/puppetserver/operatingsystem/Ubuntu18.04.yaml +++ b/data/puppetserver/operatingsystem/Ubuntu18.04.yaml @@ -1,4 +1,4 @@ --- puppetserver::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-bionic.deb' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-bionic.deb' apt_release: 'bionic' diff --git a/data/puppetserver/osfamily/Debian.yaml b/data/puppetserver/osfamily/Debian.yaml index 29dfacfc..22528f1f 100644 --- a/data/puppetserver/osfamily/Debian.yaml +++ b/data/puppetserver/osfamily/Debian.yaml @@ -7,4 +7,4 @@ apt_repos: 'puppet5' apt_release: 'stable' repo_package_provider: dpkg - repo_package_name: 'puppet5-release' + repo_package_name: 'puppet-release' diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 3a5daf5b..6b3f80b8 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- puppetserver::settings: init_file_path: '/etc/sysconfig/puppetserver' - repo_package_name: 'puppet5-release' + repo_package_name: 'puppet-release' repo_package_provider: 'rpm' dockerfile_prerequisites: 'RUN yum install -y wget' diff --git a/data/puppetserver/osfamily/RedHat6.yaml b/data/puppetserver/osfamily/RedHat6.yaml index 7cdd2ead..08fe8a14 100644 --- a/data/puppetserver/osfamily/RedHat6.yaml +++ b/data/puppetserver/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- puppetserver::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppet5-release-el-6.noarch.rpm' + repo_package_url: 'https://yum.puppetlabs.com/puppet-release-el-6.noarch.rpm' diff --git a/data/puppetserver/osfamily/RedHat7.yaml b/data/puppetserver/osfamily/RedHat7.yaml index 7c030057..190e17f9 100644 --- a/data/puppetserver/osfamily/RedHat7.yaml +++ b/data/puppetserver/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- puppetserver::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppet5-release-el-7.noarch.rpm' + repo_package_url: 'https://yum.puppetlabs.com/puppet-release-el-7.noarch.rpm' From 343bd64acac1d3044fc37b33bb3bf0b0d580be67 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 11 Jan 2019 16:13:48 +0100 Subject: [PATCH 151/284] Fixed yum url for puppetserver release-package --- data/puppetserver/osfamily/RedHat6.yaml | 2 +- data/puppetserver/osfamily/RedHat7.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/puppetserver/osfamily/RedHat6.yaml b/data/puppetserver/osfamily/RedHat6.yaml index 08fe8a14..94d26624 100644 --- a/data/puppetserver/osfamily/RedHat6.yaml +++ b/data/puppetserver/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- puppetserver::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppet-release-el-6.noarch.rpm' + repo_package_url: 'https://yum.puppetlabs.com/puppet/puppet-release-el-6.noarch.rpm' diff --git a/data/puppetserver/osfamily/RedHat7.yaml b/data/puppetserver/osfamily/RedHat7.yaml index 190e17f9..bc2e337c 100644 --- a/data/puppetserver/osfamily/RedHat7.yaml +++ b/data/puppetserver/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- puppetserver::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppet-release-el-7.noarch.rpm' + repo_package_url: 'https://yum.puppetlabs.com/puppet/puppet-release-el-7.noarch.rpm' From c185310f9e36a144404e9732318cc8d9aba4ed43 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 11 Jan 2019 16:16:36 +0100 Subject: [PATCH 152/284] v0.3.2 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index af318f64..e279feb6 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.3.1", + "version": "0.3.2", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 1c38827cab6dfc4ef8cd4413f65024e5209273aa Mon Sep 17 00:00:00 2001 From: keith obrien Date: Tue, 29 Jan 2019 10:54:17 -0500 Subject: [PATCH 153/284] debian9 jre/jdk package fix Added the correct jre/jdk for Debian9. Placed them under operatingsystem. --- data/openjdk-jdk/operatingsystem/Debian9.yaml | 3 +++ data/openjdk-jre/operatingsystem/Debian9.yaml | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 data/openjdk-jdk/operatingsystem/Debian9.yaml create mode 100644 data/openjdk-jre/operatingsystem/Debian9.yaml diff --git a/data/openjdk-jdk/operatingsystem/Debian9.yaml b/data/openjdk-jdk/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..3c63bcd2 --- /dev/null +++ b/data/openjdk-jdk/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- + openjdk-jdk::settings: + package_name: 'openjdk-8-jdk' diff --git a/data/openjdk-jre/operatingsystem/Debian9.yaml b/data/openjdk-jre/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..a682bc33 --- /dev/null +++ b/data/openjdk-jre/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- + openjdk-jre::settings: + package_name: 'openjdk-8-jre-headless' From 8594663afcd00ed937fdf27ef9369c02111f9a3d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 5 Apr 2019 10:47:46 +0200 Subject: [PATCH 154/284] Updated docker data --- checksums.json | 658 ----------------------- data/docker/operatingsystem/CentOS.yaml | 4 +- data/docker/operatingsystem/CentOS7.yaml | 2 +- data/docker/operatingsystem/Debian.yaml | 7 +- data/docker/operatingsystem/Debian9.yaml | 1 - metadata.json | 3 +- 6 files changed, 8 insertions(+), 667 deletions(-) delete mode 100644 checksums.json diff --git a/checksums.json b/checksums.json deleted file mode 100644 index e9697ee7..00000000 --- a/checksums.json +++ /dev/null @@ -1,658 +0,0 @@ -{ - "README.md": "bfa2fb4516c74172d049adab33c13d3a", - "bin/moduledata_clone.sh": "e315d6e2ad1537ea6da6c71c2cb647a1", - "data/activemq/default.yaml": "e1b67aa096df1915e88069de7b7a8861", - "data/activemq/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/activemq/osfamily/Debian.yaml": "e6f9eabcacdaf7aad216d53d387284d6", - "data/activemq/osfamily/RedHat.yaml": "38cad6e0b59dded37993b84960899e2d", - "data/apache/default.yaml": "bb7ae7f56d7c8bb492e811486269edd2", - "data/apache/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/apache/osfamily/Darwin.yaml": "affda61d92e82735d3f7cc8a69962294", - "data/apache/osfamily/Debian.yaml": "d38340cf7459850f1e0e2513c1ae5211", - "data/apache/osfamily/FreeBSD.yaml": "a93350bb6b2160815bb76b4a0342ba9c", - "data/apache/osfamily/Linux.yaml": "0f355b35ae16acf847752cdcf9fd9fba", - "data/apache/osfamily/RedHat.yaml": "24550a57e4a665f8c5e8db35da986e58", - "data/apache/osfamily/Suse.yaml": "c5ab38437c45f0b62582e2c8d9469fe8", - "data/apparmor/default.yaml": "cb0091ff936ed7bd30236c7efe29dee0", - "data/apparmor/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/apparmor/osfamily/RedHat.yaml": "665f524170e4b9ba0b3d1adf81339635", - "data/apt/default.yaml": "a21c8eece698f78476f4181b2916100b", - "data/apt/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/autofs/default.yaml": "8223823770d44edacfb7003ea50b00a1", - "data/autofs/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/autofs/osfamily/Debian.yaml": "ae57da88c8e75970ba1af6efd263253a", - "data/autofs/osfamily/RedHat.yaml": "5e3d1d2d862e33898146d6e39c4f855e", - "data/awscli/default.yaml": "c579fe552ceb0088abc21c2f3bdf61eb", - "data/awscli/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/awscli/osfamily/RedHat.yaml": "42116f2dbb65651e9e40f58a8d2a63e1", - "data/bacula-client/default.yaml": "607c5a2b1bed8cab8893f0dd1727d1a7", - "data/bacula-client/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/bacula-client/osfamily/Debian.yaml": "8cf9bc5beff31c512034f6cf48b25fef", - "data/bacula-client/osfamily/RedHat.yaml": "c0fd9f25e700647349ebbd98388fd1b4", - "data/bash/default.yaml": "c730af6f8efc287955b145824fa49721", - "data/bash/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/bind/default.yaml": "d0c7346bc9815de909bba69daa17b37c", - "data/bind/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/bind/osfamily/Debian.yaml": "6b079faf6f70e533ad1ea4dce614bdb1", - "data/bind/osfamily/RedHat.yaml": "834c2a5daa217a13b032513b373faedf", - "data/bluepill/default.yaml": "fc3d990a7a16d8773575773ac99dc422", - "data/bluepill/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/bluepill/osfamily/Debian.yaml": "36df3ba9ce05063b4d7b2475e76ae832", - "data/bluepill/osfamily/RedHat.yaml": "8f09ae16353c38f14e99030e4189e797", - "data/bzip2/default.yaml": "16481258ff0262117fbb9dbf22ccb7ca", - "data/bzip2/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/ceilometer/default.yaml": "c771d1fc72c506288e4a410f36d7c09a", - "data/ceilometer/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/ceilometer/osfamily/Debian.yaml": "51e8262ed581e19600a4c1331531bc83", - "data/ceilometer/osfamily/RedHat.yaml": "94864af77df4036de3c6880907245cf9", - "data/ceph/default.yaml": "b94ec3925e6387efda1c8b1a20c0eb55", - "data/ceph/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/ceph/osfamily/Debian.yaml": "ee3354dab3b04ec04fd3bb315f86e679", - "data/ceph/osfamily/RedHat.yaml": "6ae7c289e13840c9482ab674056a41e8", - "data/cinder/default.yaml": "a2323b2aadf1715d59a774fff0bd62b8", - "data/cinder/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/cinder/osfamily/Debian.yaml": "8db83d5815143c693e1b8667989515eb", - "data/cinder/osfamily/RedHat.yaml": "7260d3bb1e65db2a82b5c26cc9669af9", - "data/clvm/default.yaml": "f7b0df2085b00557606b50860dfacb41", - "data/clvm/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/clvm/osfamily/Debian.yaml": "7aae8ef421a01189934261fc4591617d", - "data/clvm/osfamily/RedHat.yaml": "6940e020942a717815e9b0db905742e0", - "data/collectd/default.yaml": "5cce5811adbd703207ab50107b6bf5f9", - "data/collectd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/collectd/osfamily/Debian.yaml": "af94e0dd4be1e49736b7b190afb86ed1", - "data/collectd/osfamily/RedHat.yaml": "bcfc5bf88cc1b6cc16b210e90fa10eb5", - "data/corosync/default.yaml": "ad5ee90d834e68bb6c16d9fcb4670139", - "data/corosync/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/corosync/osfamily/Debian.yaml": "f6857bbe866dd001fe2884581c9fc081", - "data/corosync/osfamily/RedHat.yaml": "55aacb581740206ce2f9db7150eeba3e", - "data/cron/default.yaml": "2cdfecd932546e8d62a1bd65d2187e06", - "data/cron/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/ddclient/default.yaml": "8cb0fefbcb0b14e5f3726cefc739933d", - "data/ddclient/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/ddclient/osfamily/Debian.yaml": "2b5763d89b9e78cfae136ee4d6aaa3a2", - "data/ddclient/osfamily/RedHat.yaml": "cb322389b4a5f61f7c4d01f679af6497", - "data/default.yaml": "5960ec03d1f37852384b599f9eaa7585", - "data/dhcpd/default.yaml": "21fa0946cef9d69609a9c28eb94a0f08", - "data/dhcpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/dhcpd/osfamily/Debian.yaml": "9ce7dda623c179b3e2e9293f027484bd", - "data/dhcpd/osfamily/OpenBSD.yaml": "663f18daabe50affd31e1d1256c05693", - "data/dhcpd/osfamily/RedHat.yaml": "315f1e54a7a503f343aa7eb5b86c532d", - "data/dhcpd/osfamily/SuSE.yaml": "dec0742c4109b93845ced16ea40fd318", - "data/dkms/default.yaml": "02e86a426ac64c7e4d216c23d5a11871", - "data/dkms/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/dkms/osfamily/RedHat.yaml": "bc6a8d985cfe6b5e93ca0f819443c5bb", - "data/dnsmasq/default.yaml": "d91930a502460d5ac7ca6626542792b5", - "data/dnsmasq/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/dnsmasq/osfamily/Debian.yaml": "dabcc29290a10d044ba7aaad942b376b", - "data/dnsmasq/osfamily/RedHat.yaml": "b65c7b5bbf650c3baadfd59c318ff0e7", - "data/docker-engine/default.yaml": "3cfa818fc983734cedae8dfb6c3dacf9", - "data/docker-engine/hiera.yaml": "dc27f882df46ace5e3ed266ef3590fee", - "data/docker-engine/operatingsystem/CentOS.yaml": "3642afcacb44bf431fd8d9f6ef313957", - "data/docker-engine/operatingsystem/CentOS6.yaml": "317f5f140a49699c556b16dad54ade4b", - "data/docker-engine/operatingsystem/CentOS7.yaml": "f3c981683b75906b12d1de70f9d53eb1", - "data/docker-engine/operatingsystem/Darwin.yaml": "38d2eada4c0036a0cebc160988468c78", - "data/docker-engine/operatingsystem/Debian.yaml": "e3ba408e400b8bcf9fa2be061f06825c", - "data/docker-engine/operatingsystem/Debian7.yaml": "a4d21fc0fe2e7ec90086cd636b28fc66", - "data/docker-engine/operatingsystem/Debian8.yaml": "7b05cdef0af2f273041fe741990b67ef", - "data/docker-engine/operatingsystem/Debian9.yaml": "9035409e662a734798c21f871db2f5d2", - "data/docker-engine/operatingsystem/RedHat.yaml": "3642afcacb44bf431fd8d9f6ef313957", - "data/docker-engine/operatingsystem/Ubuntu.yaml": "e3ba408e400b8bcf9fa2be061f06825c", - "data/docker-engine/operatingsystem/Ubuntu12.04.yaml": "4fb7ce5d8fb7bf488b34fdf681bbeafb", - "data/docker-engine/operatingsystem/Ubuntu14.04.yaml": "7f807e10a3f91a4f06294dcf3519d097", - "data/docker-engine/operatingsystem/Ubuntu14.10.yaml": "cb56529fb0101ee9df3336d28f43972a", - "data/docker-engine/operatingsystem/Ubuntu15.04.yaml": "722ff6866bf23d499be3ff23a99aef96", - "data/docker-engine/operatingsystem/Ubuntu15.10.yaml": "fc6d0201709f919530b32e724b91e678", - "data/docker-engine/operatingsystem/Ubuntu16.04.yaml": "b730e0ebfb467038a6b59272d45a4927", - "data/dovecot/default.yaml": "2fc554e3307500b910f6e2d4c0d97064", - "data/dovecot/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/dovecot/osfamily/Debian.yaml": "d29cc79eccc8a8b7bfa4309542db25d6", - "data/dovecot/osfamily/FreeBSD.yaml": "50cb1cc306a99eb4aa91f2532f67fa71", - "data/dovecot/osfamily/RedHat.yaml": "1261138bee283d093ee6beba6141b11d", - "data/duply/default.yaml": "f434b4755c1fe38660c95088743c2af2", - "data/duply/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/elasticsearch/default.yaml": "a9d81aea7098911d28614cf64a8ac9af", - "data/elasticsearch/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/elasticsearch/osfamily/Debian.yaml": "4df17af14a19bf3645e9eb0d1e06f8d9", - "data/elasticsearch/osfamily/RedHat.yaml": "ff52faaf7da226022bd83604bae6f75f", - "data/epel/default.yaml": "1c1334803e78393c98b432639ba25541", - "data/epel/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/epel/osfamily/RedHat.yaml": "4631ac1e0871b315cd6fb47096e0487d", - "data/epel/osfamily/RedHat4.yaml": "7637a2d03f823b3be2aa1f50155530d2", - "data/epel/osfamily/RedHat5.yaml": "c76f5b5d7e056301f889d2f2a04db37e", - "data/epel/osfamily/RedHat6.yaml": "b783b153e5af3453ff24a223e8e2af20", - "data/epel/osfamily/RedHat7.yaml": "f9dae97ed56317518a1b8276d3bc080d", - "data/exim/default.yaml": "0e91c3c579ab34c952c11d9d7ceeff2b", - "data/exim/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/exim/osfamily/Debian.yaml": "e2f9da11e0a318c6bd5da56be021c771", - "data/exim/osfamily/RedHat.yaml": "683d3118df6d2b194143a7d4a1c74202", - "data/fabric/default.yaml": "8b65445e8cf384b782b984d21dec2c0c", - "data/fabric/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/fabric/osfamily/Darwin.yaml": "426c0f39216b54ea77348d29a898cad9", - "data/fabric/osfamily/Debian.yaml": "343ee54e61f8080b33fe1cf77febc7d9", - "data/fabric/osfamily/RedHat.yaml": "7945e50c465ba2f835348043dd41e4bb", - "data/fail2ban/default.yaml": "37a413421721f465718660d12b39c636", - "data/fail2ban/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/fail2ban/osfamily/Debian.yaml": "8638a70b201f296cebb00759f254ab1d", - "data/foreman/default.yaml": "7e65687cbcdac7f2a65b943428b23bc6", - "data/foreman/hiera.yaml": "ab996f8151aca9b984166789f4a7d1ef", - "data/foreman/operatingsystem/Debian8.yaml": "fbb7c350353d31175aaf84430e8ce727", - "data/foreman/operatingsystem/Ubuntu16.04.yaml": "d1793c127b70879d92d3752af3a067f0", - "data/foreman/osfamily/Debian.yaml": "dd79a1e80f9fc0d08a5a2ee061855cbe", - "data/foreman/osfamily/RedHat.yaml": "b4d8be9451fcf50e778cfd6bbd8276e9", - "data/foreman/osfamily/RedHat7.yaml": "d588af71218fe1be79f87e8a05ffd7d1", - "data/freeradius/default.yaml": "85df9e1f62eb8846cbc439073b820d6f", - "data/freeradius/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/freeradius/osfamily/Debian.yaml": "c5cfd093e30936659fe4ce0f2b6ad491", - "data/freeradius/osfamily/RedHat.yaml": "90c6ca5241945a12436f7262161a2d99", - "data/git/default.yaml": "59ad2fc76e24cb273062b1d0d8cce6bc", - "data/git/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/gitlab-ce/default.yaml": "164921fc0206d14f60801b2ce303100e", - "data/gitlab-ce/hiera.yaml": "edee7da7eaff769879bd909847177897", - "data/gitlab-ce/operatingsystem/Debian.yaml": "d3882528fe6175c3ee79a7c6ded3a805", - "data/gitlab-ce/operatingsystem/Debian7.yaml": "801b9456b8ac38d81cd0ea48366d1f20", - "data/gitlab-ce/operatingsystem/Debian8.yaml": "3a166edb22f4aeaff6625fc81fbe3970", - "data/gitlab-ce/operatingsystem/Debian9.yaml": "fda89122523320131fa78f7fb84690a4", - "data/gitlab-ce/operatingsystem/Ubuntu.yaml": "eb661511717264d5610f799c55c74806", - "data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml": "4000f24c55ddb3d3b7e0d1bcfbf9eacf", - "data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml": "a6b66234417e6bb1907c6e2ddb12831f", - "data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml": "bb4b5ee9525edc66ae56843e0d997a71", - "data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml": "920e69a420accf1f580a1111f9b09b15", - "data/gitlab-ce/osfamily/Debian.yaml": "7686dc15b282b3c209e96a6c534172f9", - "data/gitlab-ce/osfamily/RedHat.yaml": "cec19a08b78613cab83c9cbaf8be4fcb", - "data/gitlab-cli/default.yaml": "a6fbf27670abc1240e35062eeec239bf", - "data/gitlab-cli/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/gitlab-runner/default.yaml": "ad9796615c688015bf87d525cc2ce3be", - "data/gitlab-runner/hiera.yaml": "edee7da7eaff769879bd909847177897", - "data/gitlab-runner/osfamily/Debian.yaml": "cce4b80faddd546eb2c9e6805f398be7", - "data/gitlab-runner/osfamily/RedHat.yaml": "db189f791638ff4e20d04eca2cae64b1", - "data/glance/default.yaml": "01b3219a950fcad61633a01c71f185d5", - "data/glance/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/glance/osfamily/Debian.yaml": "57359c98e7a59364a5ba390fe559287a", - "data/glance/osfamily/RedHat.yaml": "c4db4cbbd50da329de6743e784e67820", - "data/go-server/default.yaml": "f720f05c33df2fd0275bff1198d1bd82", - "data/go-server/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/go-server/osfamily/Debian.yaml": "84f078e1b6bbcd00fc049c364eaad0f0", - "data/go-server/osfamily/RedHat.yaml": "1a6dd12fdaaeee71e53b89a8148b649e", - "data/graylog2/default.yaml": "25ace5e1246d5b2c83acb84e4cea1c42", - "data/graylog2/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/graylog2/osfamily/Debian.yaml": "ae7f3f88cc370aad62b1c0b9fde1c237", - "data/graylog2/osfamily/RedHat.yaml": "4cb63c2876e6c3d384a3de0a90ffceb9", - "data/haproxy/default.yaml": "66d0e6ecd6cfd2c8e63e213a5fd9e253", - "data/haproxy/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/haproxy/osfamily/Debian.yaml": "bbf562ea4519cd78f0c7b66f2b9a6f12", - "data/haproxy/osfamily/RedHat.yaml": "3dd53d213718f6638713714caf237d02", - "data/heartbeat/default.yaml": "3604e18fc9baa7ff108170c2883c759a", - "data/heartbeat/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/heartbeat/osfamily/Debian.yaml": "4c48e6895155739b43fc61e89f6d1624", - "data/heartbeat/osfamily/RedHat.yaml": "d4b6a3dc7f68aa8c0b2bb665b09c2fe2", - "data/hosts/default.yaml": "fe647cb517da72ff5d07ef7327f7e5d6", - "data/hosts/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/hosts/osfamily/FreeBSD.yaml": "b5d983a9abe0c440ac198737c1b4c118", - "data/icinga/default.yaml": "44991c749c0a08a3c159e933a4e7283f", - "data/icinga/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/icinga/osfamily/Debian.yaml": "f0da081f90a340b3ee74c0f526abd867", - "data/icinga/osfamily/RedHat.yaml": "01295a3c5297d6cfdbeca00e258a2222", - "data/icinga2/default.yaml": "4db7bbcc3c54007ab4ea6c75589f48e1", - "data/icinga2/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/icinga2/osfamily/Debian.yaml": "299ec9e44a4a98a1ae812beccf68c098", - "data/icinga2/osfamily/RedHat.yaml": "37dcfa100103a698755973a16b307560", - "data/icinga2/osfamily/RedHat5.yaml": "2e3e659ade1abc9cbb2499c6d78da853", - "data/icinga2/osfamily/RedHat6.yaml": "27fdfc754a4605298abd7a0c28e94b01", - "data/icinga2/osfamily/RedHat7.yaml": "58f1f9e358c3a40a7a9c0a3084624123", - "data/icingaweb2/default.yaml": "1fcc83301b9f5b77feb0e9b998e8daf4", - "data/icingaweb2/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/icingaweb2/osfamily/Debian.yaml": "945a2969c1488b5f7a4c85f3c1cb5250", - "data/icingaweb2/osfamily/RedHat.yaml": "17b13cb2c98a7ec4ae503d4d55cbe72f", - "data/icingaweb2/osfamily/RedHat5.yaml": "08555c5848e465c83668c8d61ac413cd", - "data/icingaweb2/osfamily/RedHat6.yaml": "a7d08c388b819ed5569cca7beb6ff2eb", - "data/icingaweb2/osfamily/RedHat7.yaml": "a0fb761ea7b5281ce8988b99b2c5e89f", - "data/iotop/default.yaml": "132445432d6890e94adc76ed7d6b1eb2", - "data/iotop/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/iptraf/default.yaml": "ce3106e2f38193b709dddf0d06c508a8", - "data/iptraf/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/iptraf/osfamily/RedHat.yaml": "0cfa17156da35eb15bbaa13c9124973f", - "data/jboss/default.yaml": "eb12ad7540b9304f8406eb117d9ca11e", - "data/jboss/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/jboss/osfamily/Debian.yaml": "8d7ad85845fc863dc9261c5442e84f07", - "data/jboss/osfamily/RedHat.yaml": "fa38da25ecae4b389e5e306a2babbbfd", - "data/jenkins/default.yaml": "e4df012487ce10a4a1e9f253d78422c0", - "data/jenkins/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/jenkins/osfamily/Debian.yaml": "e7feb3495aa00ba146e39403b4afdfcc", - "data/jenkins/osfamily/RedHat.yaml": "52da74588f46b3456477cc526f1929a9", - "data/keepalived/default.yaml": "ba2e758c40009e1a520cc4c3e8d7c225", - "data/keepalived/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/keepalived/osfamily/Debian.yaml": "4931588bba22fed290e9a2d9768a675f", - "data/keystone/default.yaml": "bbbfdb69364054838ec8d1ebdddd6c7a", - "data/keystone/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/keystone/osfamily/Debian.yaml": "f8349024578ea40fc12d6d3315bbfdba", - "data/keystone/osfamily/RedHat.yaml": "13d332e677b0a8a5e8549511aaa1c9eb", - "data/kibana/default.yaml": "7cef4a3517611b207989db0740afd910", - "data/kibana/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/kibana/osfamily/Debian.yaml": "64b2403f698736b1b6cd21ca21fb3f92", - "data/kibana/osfamily/RedHat.yaml": "293ab39b5f5fccea10a71e60445b796e", - "data/libvirt/default.yaml": "7adf4c4a2993dbd22165eef1ffa8b65b", - "data/libvirt/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/libvirt/osfamily/Debian.yaml": "cb8e32e14d551c0eb0c5e68866761e60", - "data/libvirt/osfamily/RedHat.yaml": "dba677fc326ed045239791b24c429b7b", - "data/lighttpd/default.yaml": "c86801c27ff1a27b442012a76258d72c", - "data/lighttpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/lighttpd/osfamily/Debian.yaml": "cd3bf9a9d1c8b2aab3b81d3f4a505acd", - "data/logrotate/default.yaml": "55ac106b18241aea2dcc0404ecc6605d", - "data/logrotate/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/logstash/default.yaml": "976f95bad6948c97268a79e137cd983e", - "data/logstash/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/logstash/osfamily/Debian.yaml": "6d340bc0588b9afa50e8987bf697baca", - "data/logstash/osfamily/RedHat.yaml": "cca4ff1754554f03b462ad5682033a1c", - "data/lsb/default.yaml": "9e6dd1422dd57dd408418d3e20b3b495", - "data/lsb/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/lsb/osfamily/Debian.yaml": "3981e50993fc114c27fffa6b722ff03a", - "data/lsb/osfamily/RedHat.yaml": "8ff67692a9a90f5920ec867b2ff949ce", - "data/lsb/osfamily/Suse.yaml": "88ed1f714eae6e95e4a49f8201344884", - "data/lsb-release/default.yaml": "1a6b5cc014baf8c22a7c073e69b8f511", - "data/lsb-release/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/lsb-release/osfamily/Debian.yaml": "1a6b5cc014baf8c22a7c073e69b8f511", - "data/lsb-release/osfamily/RedHat.yaml": "5b370d0896920841bc983aaf5b463596", - "data/lsof/default.yaml": "1d0f64da00b798a1ca86f31e060cf379", - "data/lsof/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mailx/default.yaml": "72c7c1f4515978922e0d92df444ed8bc", - "data/mailx/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mailx/osfamily/Debian.yaml": "0761663f5eaef5ce13a7e40f3e51760e", - "data/make/default.yaml": "abd69460c02b10c5c2193eea5ac724be", - "data/make/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/mariadb/default.yaml": "f10b6dc9d556b479177634e59df3385b", - "data/mariadb/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mariadb/osfamily/Debian.yaml": "b56dbdeda756522b8da01fb8c7864c6e", - "data/mariadb/osfamily/RedHat.yaml": "5cb6a41c2fde73d4591cb86dc9cf18ea", - "data/mcollective/default.yaml": "1a30df4e2f8e453824c312dd4b269ed0", - "data/mcollective/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mcollective/osfamily/Debian.yaml": "4371e5d8dc20a0ee1c3a46c2005acec3", - "data/mcollective/osfamily/RedHat.yaml": "708ac419f94f6e33c6963dbf393d07fc", - "data/mdadm/default.yaml": "5ed5153ca439d979e1b40c5e29973aac", - "data/mdadm/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/memcached/default.yaml": "f1bd046fcca7822d8cc5d80f74bcfb39", - "data/memcached/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/memcached/osfamily/Debian.yaml": "040efd7a386dbeaf90468fc72b215c0f", - "data/memcached/osfamily/RedHat.yaml": "8246accc1dfc08d65473810989753f80", - "data/mlocate/default.yaml": "1a9c70d0e0659e5daaff904d6c68bac5", - "data/mlocate/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mongodb/default.yaml": "addb23295909c1fbcef4802160496b3b", - "data/mongodb/hiera.yaml": "4e84057f31c34e481a09f2b6acb50fea", - "data/mongodb/osfamily/Debian.yaml": "569c5c2a7f1a5d768ade2f7d9b690431", - "data/mongodb/osfamily/RedHat.yaml": "68d559a8cae6abde51009e657eb4a1b3", - "data/mongodb/repo/mongodb-org-3.2-RedHat.yaml": "466e82085520a7a61852e91e405b8c2f", - "data/mongodb-mms/README.md": "074fa0fecf3d708f9db32fb13aa38ffd", - "data/mongodb-mms/default.yaml": "ca6724eccda44440f0055319f6d8510d", - "data/mongodb-mms/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mongodb-mms/osfamily/Debian.yaml": "98bef51e5d033c58044b20c77114c71b", - "data/mongodb-mms/osfamily/RedHat.yaml": "cbdbee9d88e085a34ae079e3c5d18511", - "data/mongodb-mms-automation-agent/README.md": "074fa0fecf3d708f9db32fb13aa38ffd", - "data/mongodb-mms-automation-agent/default.yaml": "84829fdbfae8fba14e20640c7a3a484f", - "data/mongodb-mms-automation-agent/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mongodb-mms-automation-agent/osfamily/Debian.yaml": "9b74a92ebb0383f36e69e138b315f71f", - "data/mongodb-mms-automation-agent/osfamily/RedHat.yaml": "54242aba1ec2d690e59a767d3d87ee62", - "data/mongodb-mms-backup-agent/README.md": "074fa0fecf3d708f9db32fb13aa38ffd", - "data/mongodb-mms-backup-agent/default.yaml": "62460cf29e09af371fa9fd3a10048e48", - "data/mongodb-mms-backup-agent/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mongodb-mms-backup-agent/osfamily/Debian.yaml": "ae963f5e9945a7d6c599dd6f47d601f3", - "data/mongodb-mms-backup-agent/osfamily/RedHat.yaml": "da6ee3b9459fac29e8dc623d1a84afd9", - "data/mongodb-mms-monitoring-agent/README.md": "074fa0fecf3d708f9db32fb13aa38ffd", - "data/mongodb-mms-monitoring-agent/default.yaml": "efa131dc27f03303906156530bd33a49", - "data/mongodb-mms-monitoring-agent/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml": "41dda90aa151ba14d43acc05e6d29f36", - "data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml": "cd0c36cb3f20abf2086851edba988544", - "data/monit/default.yaml": "3f2cb26070470862e4ad2059873f2765", - "data/monit/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/monit/osfamily/Debian.yaml": "3760071b703e8b06944751f026a644db", - "data/monit/osfamily/RedHat.yaml": "8a18c6b663825640fe74c6418c8c809c", - "data/motd/default.yaml": "241ffdb810ef29631ea1ec98f215f1e0", - "data/motd/hiera.yaml": "d14c34382dde51c57f6e985708b176ca", - "data/motd/lsbdistcodename/wheezy.yaml": "241ffdb810ef29631ea1ec98f215f1e0", - "data/motd/operatingsystem/Debian.yaml": "7a347b3a59a0b9f8c208dc3e46be72ed", - "data/motd/operatingsystem/Solaris.yaml": "d11945cd53ce77d73428987c19535536", - "data/msmtp/default.yaml": "e13cea09134251c454a06510c208fd05", - "data/msmtp/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/msmtp/osfamily/Debian.yaml": "7f73400590aa68894ac18710357f99d0", - "data/multipath/default.yaml": "0fda164e17f0da8ab2b19656a8ce545d", - "data/multipath/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/multipath/osfamily/Debian.yaml": "733809fb21e9755aab10d488870f4ac3", - "data/multipath/osfamily/RedHat.yaml": "940954ab8842a5fde8802f21d93ea238", - "data/munin/default.yaml": "427bd36ed7f83a5fd7b65cbc05b1da07", - "data/munin/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/munin/osfamily/Debian.yaml": "68de9ff6ee7368427908b60627ac5ae3", - "data/munin/osfamily/OpenBSD.yaml": "75022b8f23a95801106a2367601fb3ac", - "data/munin/osfamily/RedHat.yaml": "cdc4a0b23971e46eeea983777cffe478", - "data/munin-node/default.yaml": "70074d1922eb37b57c66e8440064c0bb", - "data/munin-node/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/munin-node/osfamily/Debian.yaml": "63879a166ed65f4a7d7ca873c88ac0fa", - "data/munin-node/osfamily/OpenBSD.yaml": "6ced4f8e710191d6b846450ad33fc10f", - "data/munin-node/osfamily/RedHat.yaml": "c2de39ef21f539eeb1524440aae8b78f", - "data/mysql/default.yaml": "23582e0d83b4096c314e969d23790fb8", - "data/mysql/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/mysql/osfamily/Debian.yaml": "850cd8ff000decb2e583c5daf5fbfa8e", - "data/mysql/osfamily/FreeBSD.yaml": "826710b8a39a7eb4dae8155e2248a011", - "data/mysql/osfamily/RedHat.yaml": "af36f4680b4f907b19b164df2bcb0fdf", - "data/nagios/default.yaml": "9761ef0cfbc5778c5f05a966f0d4343f", - "data/nagios/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/nagios/osfamily/Debian.yaml": "e2b77a681568d370d15188cda607fd40", - "data/nagios/osfamily/RedHat.yaml": "55a6f44bb5757eacf95fbcec0b49fea6", - "data/nagios-plugins/default.yaml": "e64789f409114cea49e61cd3fdb7175c", - "data/nagios-plugins/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/nagios-plugins/osfamily/RedHat.yaml": "62abd56c1b46813017740c7d9afbfabe", - "data/nagios-plugins/osfamily/Solaris.yaml": "a1e352bc0d3a7cfde091b6dffb2d8dcd", - "data/nano/default.yaml": "51fe8ac7ac9b3fb4768b459eac2d9679", - "data/nano/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/newrelic/default.yaml": "5cf0c4890d9ec6d83986c8eb690ad472", - "data/newrelic/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/newrelic/osfamily/Debian.yaml": "d596bd6dbf226d3236220173da096e71", - "data/newrelic/osfamily/RedHat.yaml": "8d71b17da3b708685bb06da1b3ba5125", - "data/nfs/default.yaml": "9eb078fd9c84cbf77d5f49cb23a969dd", - "data/nfs/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/nfs/osfamily/Debian.yaml": "9a0e31f8fd843cdc4d00c961df600d21", - "data/nfs/osfamily/RedHat.yaml": "c39ff02d38b89b9475be5693fc14fdfe", - "data/nfs-client/default.yaml": "bd9e74dba9d8439a2b13df4d27d5011d", - "data/nfs-client/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/nfs-client/osfamily/Debian.yaml": "046c9c425553a7c14ac85d458cd44c41", - "data/nfs-client/osfamily/RedHat.yaml": "4b77a23aa29ae9b0f3a0d89cdf83214d", - "data/nfs-client/osfamily/Suse.yaml": "3016ae00fe555ce9ea4d9b3e69b049a7", - "data/nfs-server/default.yaml": "f94079c29c95cb4ce5b94beaf2035cae", - "data/nfs-server/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/nfs-server/osfamily/Debian.yaml": "0c2cbffa97dd29d480eabad9b45d7df1", - "data/nfs-server/osfamily/RedHat.yaml": "41e3be25cc04fac747fe377ebd6d5e37", - "data/nfs-server/osfamily/RedHat6.yaml": "b35e2855e2950f8dd9528beb8d0ff81d", - "data/nfs-server/osfamily/Suse.yaml": "0c2cbffa97dd29d480eabad9b45d7df1", - "data/nginx/default.yaml": "94660f0b17b37582f669d7ed755993b6", - "data/nginx/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/nginx/osfamily/Darwin.yaml": "a5002561ba477470aa367bd69e148f8c", - "data/nginx/osfamily/Debian.yaml": "b85c24b63bdd43bba4b88f44957e2dc9", - "data/nova/default.yaml": "985849de07e90f2e3ae13c6529e99394", - "data/nova/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/nova/osfamily/Debian.yaml": "85a2876ca0c4918da454940b2dab166a", - "data/nova/osfamily/RedHat.yaml": "2ada4f8b2fc8d5b13b8012936fc01c09", - "data/nrpe/default.yaml": "a2be126e6101f6470518b4a72f3f3745", - "data/nrpe/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/nrpe/osfamily/Debian.yaml": "76d5366f80020fff37b227fbd48971b6", - "data/nrpe/osfamily/OpenBSD.yaml": "712f8efb78a642307fa45f8d13744886", - "data/nrpe/osfamily/RedHat.yaml": "886809b1a0e1efda9a32fd571f993f19", - "data/nrpe/osfamily/Solaris.yaml": "3fc7665f3d5ff8d8c3a1236216c0abb6", - "data/ntp/default.yaml": "4c14798705f7f3d8c16fdddb0f69b572", - "data/ntp/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/ntp/osfamily/Debian.yaml": "d231fa7e6a5f748f8077d07d0b135d40", - "data/ntp/osfamily/RedHat.yaml": "afb52d7e398c4871ecc7a476cd80d380", - "data/ntp/osfamily/Solaris": "b755c8bd5d8a4a7df0756656510aaa39", - "data/ntp/osfamily/SuSE.yaml": "8ce0df0e21c8df04ba4e0de2bce8ce84", - "data/ntpdate/default.yaml": "f25cf0ded1fe27eab5158e7db95d7c8e", - "data/ntpdate/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/octocatalog-diff/default.yaml": "fe163b4a25cc761b5cbcff4a4c3d7c6b", - "data/octocatalog-diff/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/octocatalog-diff/osfamily/Debian.yaml": "6fe5fd6a06b1a7f4c06dd45fa655bcec", - "data/openjdk-jdk/default.yaml": "64560de7d235bdf76514432195a76f2e", - "data/openjdk-jdk/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/openjdk-jdk/osfamily/Debian.yaml": "d35db4709c72d184ccb11fdebfe235ab", - "data/openjdk-jdk/osfamily/Debian10.04.yaml": "53b86fec571fbf97748d49c610efd87c", - "data/openjdk-jdk/osfamily/Debian10.10.yaml": "53b86fec571fbf97748d49c610efd87c", - "data/openjdk-jdk/osfamily/Debian15.04.yaml": "fed71ff721517378e54b3c6e47d50077", - "data/openjdk-jdk/osfamily/Debian15.10.yaml": "fed71ff721517378e54b3c6e47d50077", - "data/openjdk-jdk/osfamily/Debian5.yaml": "53b86fec571fbf97748d49c610efd87c", - "data/openjdk-jdk/osfamily/Debian6.yaml": "53b86fec571fbf97748d49c610efd87c", - "data/openjdk-jdk/osfamily/OpenBSD.yaml": "0798ff186d072f8d3b398933f5e5cb7f", - "data/openjdk-jdk/osfamily/RedHat6.yaml": "81c9a006952c1230e78d27350749e64f", - "data/openjdk-jdk/osfamily/RedHat7.yaml": "7cdff6d38de004eeb717ae1e32ffed61", - "data/openjdk-jdk/osfamily/Suse.yaml": "905147a0c369040f573e2539ac81cf65", - "data/openjdk-jre/default.yaml": "eddd4ef2dffbad8fc58651714ad3cb58", - "data/openjdk-jre/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/openjdk-jre/osfamily/Debian.yaml": "9430a6a8d982e8dec645981120bcd9ea", - "data/openjdk-jre/osfamily/Debian10.04.yaml": "b7d4a3f438adb949a94a444f5e658cdc", - "data/openjdk-jre/osfamily/Debian10.10.yaml": "b7d4a3f438adb949a94a444f5e658cdc", - "data/openjdk-jre/osfamily/Debian15.04.yaml": "18f3566f268bd7d32862247a880c41a5", - "data/openjdk-jre/osfamily/Debian15.10.yaml": "18f3566f268bd7d32862247a880c41a5", - "data/openjdk-jre/osfamily/Debian5.yaml": "b7d4a3f438adb949a94a444f5e658cdc", - "data/openjdk-jre/osfamily/Debian6.yaml": "b7d4a3f438adb949a94a444f5e658cdc", - "data/openjdk-jre/osfamily/OpenBSD.yaml": "18a947e8d08e1e127f13b58daf85379c", - "data/openjdk-jre/osfamily/RedHat6.yaml": "1241a0fa3715f1fd10d28445d6304350", - "data/openjdk-jre/osfamily/RedHat7.yaml": "c2e6efe94c4f8a4cf1c9df5a63c0340c", - "data/openjdk-jre/osfamily/Suse.yaml": "a9ecc84bda266b11f7b98ed1771fc5eb", - "data/openntpd/default.yaml": "ff925f8108bf6de41676c153b6d2ce30", - "data/openntpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/openntpd/osfamily/Debian.yaml": "6857064b8284c7cbafb384837e028cac", - "data/openntpd/osfamily/OpenBSD.yaml": "b25e804e7a95279b90a5df05d1acac68", - "data/openssh/default.yaml": "96c99540b5660fd4c32b7932de2f2fc1", - "data/openssh/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/openssh/osfamily/Debian.yaml": "066f91003d4db716869890fd74cdd36c", - "data/openssh/osfamily/OpenBSD.yaml": "6fb27acee04b0f212b5c0e7b714695b4", - "data/openssh/osfamily/RedHat.yaml": "60570de26d64e294db450b0054b253f2", - "data/openssh/osfamily/Solaris.yaml": "da68d34878576b089ece2b353edb1874", - "data/openssh/osfamily/Suse.yaml": "e73550127839b69346d5ed84e4d28bbc", - "data/openvpn/default.yaml": "68da7605271023f49c40eb2026433594", - "data/openvpn/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/openvpn/osfamily/Debian.yaml": "345c5b9030da89474a5490553825e111", - "data/openvpn/osfamily/RedHat.yaml": "c6960b8d9ec102bec30fccc4bbd531b6", - "data/openvswitch/default.yaml": "fbadeae690aadab514a7a1eef5d7b7b8", - "data/openvswitch/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/openvswitch/osfamily/Debian.yaml": "9133ab2db2a44a7e7bac0f048e767a05", - "data/openvswitch/osfamily/RedHat.yaml": "bb00cf290cf8898ab07d2dd8d3ffa8e5", - "data/orientdb/default.yaml": "6caec48e68f819fc5eb3be915acbfa95", - "data/orientdb/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/orientdb/osfamily/Debian.yaml": "c188eecfb86bc295bd923dbcfe507988", - "data/orientdb/osfamily/RedHat.yaml": "aee5ae054c02f13d6132209961d69595", - "data/pacemaker/default.yaml": "e9d380e649168a7972d8435602b54615", - "data/pacemaker/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/pacemaker/osfamily/Debian.yaml": "92f2701d089cffd7c84e7062855549e0", - "data/pacemaker/osfamily/RedHat.yaml": "a25defff4435ad97cac202fa9bd7dc73", - "data/pam/default.yaml": "344e8b662f95b5f73768eb17eca7dedd", - "data/pam/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/passenger/default.yaml": "768ae64d9a2b618a7910c09f9db41478", - "data/passenger/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/passenger/osfamily/Debian.yaml": "74c5354e3c81761d19716637ee1ff916", - "data/passenger/osfamily/RedHat.yaml": "ef9a4da783529ae17cbe2679d432d0e3", - "data/php/default.yaml": "80c1da105bfda38f9d133de799f8249c", - "data/php/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/php/osfamily/Debian.yaml": "ba58e09dca2d821a01b4fffdb5dd76f5", - "data/php/osfamily/RedHat.yaml": "13f7096b98896a2f65ea6bcd6931c96f", - "data/php/osfamily/SuSE.yaml": "ba58e09dca2d821a01b4fffdb5dd76f5", - "data/postfix/default.yaml": "c8ada8cec3d37d10588ab6e4f0b24636", - "data/postfix/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/postfix/osfamily/Debian.yaml": "973d9faa22acc6c8b73433ca38fcbd2c", - "data/postfix/osfamily/RedHat.yaml": "83b1a47587e18b986082f5fffdf3b8bf", - "data/postfix/osfamily/Suse.yaml": "dfcd979fae16ee03fa9aa81c9848812a", - "data/postgresql/default.yaml": "3c021d41422b9a13ecfe89af4581ef88", - "data/postgresql/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/postgresql/osfamily/Debian.yaml": "20cff54885ba8a7429c749176568b28d", - "data/postgresql/osfamily/RedHat.yaml": "7b396946b39e311e1c36117c2f00607b", - "data/profile/default.yaml": "eee438661f0e9636888bae4b84e8ef1f", - "data/profile/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/proftpd/default.yaml": "d571050bef3034fba727d05925210463", - "data/proftpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/proftpd/osfamily/Debian.yaml": "15b2f73341ecdf33cbcd785b372bfbda", - "data/proftpd/osfamily/RedHat.yaml": "c1176adfedf16d4dd61e7c87fc667171", - "data/puppet/default.yaml": "512e658237bf4317d0da95489f549631", - "data/puppet/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/puppet/osfamily/Debian.yaml": "2780fd559ee0e1b532ea9a7ffe1e96cf", - "data/puppet/osfamily/RedHat.yaml": "605971813ebd4d40542fbe9ee235b0f9", - "data/puppet-agent/default.yaml": "2d15fdcc73d872161d8097d0839cb23e", - "data/puppet-agent/hiera.yaml": "ab996f8151aca9b984166789f4a7d1ef", - "data/puppet-agent/operatingsystem/Centos6.yaml": "2afd2c2a15fdf57a4025f015453daec8", - "data/puppet-agent/operatingsystem/Debian6.yaml": "01b2b4f6421f3f3596292ec765e8597e", - "data/puppet-agent/operatingsystem/Debian7.yaml": "50cac0235f6df522e147d3f9aaf25f52", - "data/puppet-agent/operatingsystem/Debian8.yaml": "b091fa31f3d91bde452f8ecd975138be", - "data/puppet-agent/operatingsystem/Ubuntu12.04.yaml": "6019787587e52a0e4b39e37cf766b18e", - "data/puppet-agent/operatingsystem/Ubuntu14.04.yaml": "6540a0be4784a72b3757a054669e6ca9", - "data/puppet-agent/operatingsystem/Ubuntu16.04.yaml": "fdb3dfc2c2c9a0bda02c5c538a6651a3", - "data/puppet-agent/osfamily/Debian.yaml": "06b606a6ad2049d1bbea22d337ffd091", - "data/puppet-agent/osfamily/Linux.yaml": "b7fc4eeef70955c551c58adbc88cdd7f", - "data/puppet-agent/osfamily/RedHat.yaml": "c4c6e545059cba58c540675dd161cfc4", - "data/puppet-agent/osfamily/RedHat5.yaml": "b5010b5e27a2566336090cafbf425abf", - "data/puppet-agent/osfamily/RedHat6.yaml": "7611f5d66734db3c6fd36ffe5d2d1137", - "data/puppet-agent/osfamily/RedHat7.yaml": "563ac700233ca1c38beaf8dc75e5258c", - "data/puppet-agent/osfamily/Windows.yaml": "11fd64e3c2b882f275bc21e361597f38", - "data/puppetdb/default.yaml": "bc91d75b233d4c4379757d0f375a76e3", - "data/puppetdb/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/puppetdb/osfamily/Debian.yaml": "b5b28f0766f6df18a901c8888472635a", - "data/puppetdb/osfamily/RedHat.yaml": "6a29574e40aa1909d0865fea48bdadb2", - "data/puppetserver/default.yaml": "96f01ccdc8beb117207128b343998ce9", - "data/puppetserver/hiera.yaml": "ab996f8151aca9b984166789f4a7d1ef", - "data/puppetserver/operatingsystem/Debian6.yaml": "61f21484fa76ce8f2252b53fa088d3d6", - "data/puppetserver/operatingsystem/Debian7.yaml": "721a3d1d148b977931778bf152a45a11", - "data/puppetserver/operatingsystem/Debian8.yaml": "2aade63a965c8fe8cb67b5fcd5744908", - "data/puppetserver/operatingsystem/Ubuntu12.04.yaml": "005cea954e73dd6f83f936eac85db195", - "data/puppetserver/operatingsystem/Ubuntu14.04.yaml": "2d11a1f7e068e4d826e2153a2ddf88ee", - "data/puppetserver/osfamily/Debian.yaml": "dcbdab70c8cd78e3d43d8cdf9f4e4316", - "data/puppetserver/osfamily/RedHat.yaml": "d7b1620101ebd8261fbc183799050493", - "data/puppetserver/osfamily/RedHat6.yaml": "5bbae0407e931758fca7a7696baaed4e", - "data/puppetserver/osfamily/RedHat7.yaml": "2dd1d314e9b7812a0bb3a65b8337a5ad", - "data/pwgen/default.yaml": "db4ab2d9d820346c3a141adfaad690c4", - "data/pwgen/hiera.yaml": "3c00c0a5dd017f72694b642d099c1e74", - "data/pwgen/operatingsystem/OracleLinux.yaml": "1318808f5d9cc0b71712b2c06c7160bf", - "data/python-pip/default.yaml": "cf15680bd60b6cbe7e7ad0a82c23085a", - "data/python-pip/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/python-pip/osfamily/Debian.yaml": "cf15680bd60b6cbe7e7ad0a82c23085a", - "data/python-pip/osfamily/RedHat7.yaml": "e60ec774d6e4f4289cd2080b1bd3c5f7", - "data/quagga/default.yaml": "09d46408350413662ffc3728ef08b793", - "data/quagga/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/quagga/osfamily/Debian.yaml": "a08e060e6262caef173059d2db01ea75", - "data/quagga/osfamily/RedHat.yaml": "231d55f45f2b0d97fc48620da9b39a40", - "data/quantum/default.yaml": "90bca19ca020c21a078297bff9e329eb", - "data/quantum/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/quantum/osfamily/Debian.yaml": "bbbfc947fee80f04bfed530e23d2b959", - "data/quantum/osfamily/RedHat.yaml": "36735f35c626906672690ccc9a4c2baf", - "data/r10k/default.yaml": "57949502a0001eebb2085e0b2f3fa927", - "data/r10k/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/rabbitmq/default.yaml": "c09cabcc876764834ed05f3adb30d88a", - "data/rabbitmq/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/rabbitmq/osfamily/Debian.yaml": "48dcc8cf1da74375a7712bf21a848895", - "data/rabbitmq/osfamily/RedHat.yaml": "9415b7b86879fa1dfec5bceb05b30eb6", - "data/rails/default.yaml": "e8536599d352a4bcf588015084995b94", - "data/rails/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/rails/osfamily/Debian.yaml": "027f471b51687986dd87977978e4b9ea", - "data/rails/osfamily/RedHat.yaml": "8600ea6563655edbc7ec5291d2507836", - "data/redis/default.yaml": "bf17b55f6f5661d6d8c276295a2c2ee9", - "data/redis/hiera.yaml": "3b0ca91dda92b40370037f7669bc85ad", - "data/redis/operatingsystem/testos-0.0.1.yaml": "ec1ac97546037d7946126308c7d5d178", - "data/redis/operatingsystem/testos.yaml": "5d5d408e4aa30df8588c21dfedd1ed03", - "data/redis/osfamily/Debian.yaml": "90167aae4d72626cb487880151b9709e", - "data/redis/osfamily/RedHat.yaml": "3b30bca3827623f2363e267b27b9e009", - "data/redis/osfamily/test.yaml": "3890b346224ce501a6e5f724431e0852", - "data/rsync/default.yaml": "38dfa5af96e4eb9d71048b979b5003e3", - "data/rsync/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/rsync/osfamily/Debian.yaml": "e28471c52edc614e3dc3835c2d656981", - "data/rsync/osfamily/FreeBSD.yaml": "c7564c1ac1e5d266154ccc267b0cc4ce", - "data/rsync/osfamily/RedHat.yaml": "da526de2452c0ea8771df4ccce7e9580", - "data/rsyslog/default.yaml": "b4cdd6e581f6f6e7f218662fa731e43d", - "data/rsyslog/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/rsyslog/osfamily/Debian.yaml": "3ccdbd08bc021dc50819b593684d4b47", - "data/ruby/default.yaml": "5d878c416ad911d42243cf831e7e97af", - "data/ruby/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/ruby/osfamily/RedHat6.yaml": "818c489c88fad56f620caf757b51ec0c", - "data/ruby-dev/default.yaml": "5f271da72ea0b18de29ba7644f55d3f2", - "data/ruby-dev/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/ruby-dev/osfamily/Debian.yaml": "5f271da72ea0b18de29ba7644f55d3f2", - "data/ruby-dev/osfamily/RedHat.yaml": "e66554163a246158271fb7999e302d2c", - "data/ruby-dev/osfamily/Suse.yaml": "e66554163a246158271fb7999e302d2c", - "data/rundeck/default.yaml": "7ace3073099aba683ae21a68fc604763", - "data/rundeck/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/rundeck/osfamily/Debian.yaml": "c19d70902563caf01b16af4851291dd8", - "data/rundeck/osfamily/RedHat.yaml": "91e1fe20591d572282bc670c8c26f0ac", - "data/samba/default.yaml": "1abea9149d560c6a45e40e09482d7fe5", - "data/samba/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/samba/osfamily/Debian.yaml": "6d1b69090d5b0106c08629718d906d40", - "data/samba/osfamily/Suse.yaml": "2a357ddf3019ad16beaf7d87c385f4bb", - "data/sendmail/default.yaml": "57eea97ffdcc29657e9e971409f27a8d", - "data/sendmail/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/sendmail/osfamily/Debian.yaml": "0f7645803011967247c9c56a8b0adc63", - "data/sendmail/osfamily/RedHat.yaml": "d8150e85928d37798ce9eff28d341a63", - "data/snmpd/default.yaml": "91792c8c913ca9da9d135dd6afc3e424", - "data/snmpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/snmpd/osfamily/Debian.yaml": "028a516506554a22f6171a6d4eb90de7", - "data/snmpd/osfamily/OpenBSD.yaml": "95b706df50917f10506b238f50b3bb6b", - "data/snmpd/osfamily/RedHat.yaml": "c288ade52c781aa885adc92b5a905ee6", - "data/snmpd/osfamily/Solaris.yaml": "92d74c485c2b2f0861418668e058e0c8", - "data/snmpd/osfamily/Suse.yaml": "2e7155dfec85266d4f2a50500372cb13", - "data/squid/default.yaml": "31f7a3a1d37b05413d2a9522791013d4", - "data/squid/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/squid/osfamily/Debian.yaml": "9da8e82372f5756cfc8af36414598701", - "data/ssmtp/default.yaml": "00aac5257b5330cce7c9f611f54cae98", - "data/ssmtp/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/strace/default.yaml": "0d1e03791d216479cc0f596de3b6d269", - "data/strace/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/subversion/default.yaml": "400cacbe70ff8aab4b7334af8060ecba", - "data/subversion/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/sudo/default.yaml": "df1f7f08a7f6ba83d96c38209402e4e9", - "data/sudo/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/supervisor/default.yaml": "6dc4b59aacf293242a54d2dd35c685c7", - "data/supervisor/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/supervisor/osfamily/Debian.yaml": "1ebe753a26142c5612970c675a822a1d", - "data/supervisor/osfamily/Linux.yaml": "b4222a6ce52745fcd121782f555effb5", - "data/supervisor/osfamily/RedHat.yaml": "4afe9807f02b99b4096ba13b2ebd4fb6", - "data/supervisor/osfamily/RedHat6.yaml": "d7b6691a5c7af47b760b885feeec6931", - "data/sysdig/default.yaml": "667150252f3fbc11116192d1ad48a265", - "data/sysdig/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/sysdig/osfamily/Debian.yaml": "3cdb4a8941d940e350a0ce8ce1b19153", - "data/sysdig/osfamily/RedHat.yaml": "8780b8cfb74be10d6ff1f767719309ff", - "data/sysfs/default.yaml": "1dba03699dc4b6ff99e0162bc5806ac9", - "data/sysfs/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/sysklogd/default.yaml": "41b8ff1eaa42cae8f71c87265a6d42b9", - "data/sysklogd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/sysklogd/osfamily/Debian.yaml": "0a3826a930d60468ee2eb9785b401b14", - "data/syslog-ng/default.yaml": "4e7dd28e01669ef8897649386f2c986b", - "data/syslog-ng/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/syslog-ng/osfamily/Debian.yaml": "bbc2d4ab294adfdd3ab539c8a788ef76", - "data/syslog-ng/osfamily/RedHat.yaml": "39f937c5606512c30744ccb6adaf7218", - "data/sysstat/default.yaml": "2e8f8822e2573c26e2a417c1e40c3752", - "data/sysstat/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/sysstat/osfamily/Debian.yaml": "b2127f867cd0251e810b84720b1e4432", - "data/sysstat/osfamily/RedHat.yaml": "4feeefcdd6e61818cd73a9a8a6a49c70", - "data/tcpdump/default.yaml": "1a1d7459552326aa8d8a3757e308c2d0", - "data/tcpdump/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/telnet/default.yaml": "354fe9bbd50ae51cb31828f5361a4190", - "data/telnet/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/test/default.yaml": "90d9cd8c6a1a3d78d8bef26713b4d2eb", - "data/test/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/test/osfamily/Debian.yaml": "8ba7acf82265d11a730bc2ed77c5817e", - "data/test/osfamily/RedHat.yaml": "8b0fadf275cf312207187a7319a6a192", - "data/tftpd/default.yaml": "990439dd2b1e3e1835b1777692fffbc6", - "data/tftpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/tftpd/osfamily/Debian.yaml": "9f0d9fd3f41c05cd9101e6b6ada520de", - "data/tinc/default.yaml": "b858ca299bf364c279902efb0aa87929", - "data/tinc/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/tinc/osfamily/Debian.yaml": "24297271e84a521ab4d3954a01bd95db", - "data/tinc/osfamily/RedHat.yaml": "af9c29ab05edb7ca75b6b3904ddacdf9", - "data/trickle/default.yaml": "b7ce85086aa91ebe73a81c5a811f2a66", - "data/trickle/hiera.yaml": "3c00c0a5dd017f72694b642d099c1e74", - "data/trickle/operatingsystem/OracleLinux.yaml": "e81a05bdbe9fe384270dfb1a189f88e7", - "data/varnish/default.yaml": "167b7bdc964e554d1a2b674e0f5f6f81", - "data/varnish/hiera.yaml": "85c3fcafc7c3fda7672516ac13d8fd08", - "data/varnish/osfamily/Debian.yaml": "167fab60e41da0f4c9461837abe9818c", - "data/varnish/osfamily/RedHat.yaml": "2258d2d79389e4e68f70e8946f344a0b", - "data/varnish/osfamily/Suse12.yaml": "84c50c9d9e139f3b74cac9b0d2c77087", - "data/vim/default.yaml": "4b8c609464f13a7e6729734ead8cd8fe", - "data/vim/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/vim/osfamily/RedHat.yaml": "c4d48c5c0be80a4f9c8605145f3a3653", - "data/virtualbox/default.yaml": "055e0e858b5cf580aa507e0756edeaa0", - "data/virtualbox/hiera.yaml": "edee7da7eaff769879bd909847177897", - "data/virtualbox/operatingsystem/Debian7.yaml": "0b2baf08445466aa04054777c47a2f7b", - "data/virtualbox/operatingsystem/Debian8.yaml": "fc2673b68d7df76d75082b806f0d87ee", - "data/virtualbox/operatingsystem/Debian9.yaml": "a4916efad03a45d27787355f56758509", - "data/virtualbox/operatingsystem/Ubuntu12.04.yaml": "3b8d035fac82a62e680578d70e8c7ed9", - "data/virtualbox/operatingsystem/Ubuntu14.04.yaml": "910f5840256dc07b666f93e04fff9121", - "data/virtualbox/operatingsystem/Ubuntu14.10.yaml": "5a2d353b07d8346465e4cbc785f79873", - "data/virtualbox/operatingsystem/Ubuntu16.04.yaml": "4721028ed10b8639edae995746083f72", - "data/virtualbox/osfamily/Debian.yaml": "208a7814bbcbd7969f6bdb01c9a2c7ad", - "data/virtualbox/osfamily/RedHat.yaml": "586de868f23ea85949f4cad14648176d", - "data/vsftpd/default.yaml": "df3ba5da8dac7212418de9dd457e7ca4", - "data/vsftpd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/vsftpd/osfamily/Debian.yaml": "0061e7979a5af7a99d9fcd54aa6d6ea3", - "data/vsftpd/osfamily/RedHat.yaml": "9fa4fb0974f2bbd4ea5d4b2c51d6bd27", - "data/wpscan/default.yaml": "cf24bcb30b7036c1fc9fa36543daa9a1", - "data/wpscan/hiera.yaml": "3b0ca91dda92b40370037f7669bc85ad", - "data/xinetd/default.yaml": "19683b34fb799a6e6d21947148f516ea", - "data/xinetd/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/xinetd/osfamily/Debian.yaml": "acd012f3d1c5424738d086e26168720c", - "data/yum-cron/default.yaml": "5658cd9cb93f35c8bf3c65ab8c05db5b", - "data/yum-cron/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/zabbix-agent/default.yaml": "321c0b60c3702dad1864ce8bc7851553", - "data/zabbix-agent/hiera.yaml": "19813e81c91a4454c1c2743c41054278", - "data/zabbix-agent/osfamily/Debian.yaml": "0f9d28325dbe657b4798c394e4d17fcd", - "data/zabbix-agent/osfamily/RedHat.yaml": "2fb43d5892d605c2868db93b281cdbd3", - "data/zabbix-agent/osfamily/Suse.yaml": "044299383d425b42672a4a5a7c440d7a", - "metadata.json": "a4e7935753ef17b04190808872191f6f", - "templates/redis/test.conf.erb": "f09ca97a70ea07a22be01f43eff3e716" -} \ No newline at end of file diff --git a/data/docker/operatingsystem/CentOS.yaml b/data/docker/operatingsystem/CentOS.yaml index b3652ed2..e75dd20c 100644 --- a/data/docker/operatingsystem/CentOS.yaml +++ b/data/docker/operatingsystem/CentOS.yaml @@ -3,5 +3,5 @@ docker::settings: init_file_path: '/etc/sysconfig/docker' init_system: 'systemd' config_file_path: '/etc/sysconfig/docker' - key: '2C52609D' - key_url: 'http://yum.dockerproject.org/gpg' + key: '060A 61C5 1B55 8A7F 742B 77AA C52F EB6B 621E 9F35' + key_url: 'https://download.docker.com/linux/centos/gpg' diff --git a/data/docker/operatingsystem/CentOS7.yaml b/data/docker/operatingsystem/CentOS7.yaml index 6ebdf115..8d328c10 100644 --- a/data/docker/operatingsystem/CentOS7.yaml +++ b/data/docker/operatingsystem/CentOS7.yaml @@ -1,3 +1,3 @@ --- docker::settings: - repo_url: 'https://yum.dockerproject.org/repo/main/centos/7' + repo_url: 'https://download.docker.com/linux/centos/7/' diff --git a/data/docker/operatingsystem/Debian.yaml b/data/docker/operatingsystem/Debian.yaml index 31a8deaf..4663f18f 100644 --- a/data/docker/operatingsystem/Debian.yaml +++ b/data/docker/operatingsystem/Debian.yaml @@ -1,9 +1,8 @@ --- docker::settings: init_file_path: '/etc/default/docker' - repo_url: 'https://apt.dockerproject.org/repo' - key: '2C52609D' - key_url: 'http://apt.dockerproject.org/gpg' + repo_url: 'https://download.docker.com/linux/debian' + key: '0EBFCD88' + key_url: 'https://download.docker.com/linux/debian/gpg' apt_repos: 'stable' - apt_key_server: 'http://p80.pool.sks-keyservers.net' init_system: 'sysvinit' diff --git a/data/docker/operatingsystem/Debian9.yaml b/data/docker/operatingsystem/Debian9.yaml index 61e0cd8d..4e313e6b 100644 --- a/data/docker/operatingsystem/Debian9.yaml +++ b/data/docker/operatingsystem/Debian9.yaml @@ -1,4 +1,3 @@ --- docker::settings: - apt_release: 'debian-stretch' init_system: 'systemd' diff --git a/metadata.json b/metadata.json index e279feb6..ad104261 100644 --- a/metadata.json +++ b/metadata.json @@ -8,8 +8,9 @@ "project_page": "https://github.com/example42/tinydata", "issues_url": "https://github.com/example42/tinydata/issues", "dependencies": [ - + ], + "data_provider": null, "checksums": { }, "operatingsystem_support": [ From 082773d86bed7ab159b02246347b42e7d8bffb37 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 15 Apr 2019 09:32:12 +0200 Subject: [PATCH 155/284] Fixed docker data --- data/docker/default.yaml | 2 +- data/docker/operatingsystem/CentOS6.yaml | 2 +- data/docker/operatingsystem/CentOS7.yaml | 2 +- data/gitlab-cli/default.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/docker/default.yaml b/data/docker/default.yaml index 2710576c..f631f2cd 100644 --- a/data/docker/default.yaml +++ b/data/docker/default.yaml @@ -7,6 +7,6 @@ docker::settings: process_user: 'docker' process_group: 'docker' tcp_port: '2375' - compose_version: '1.16.0' + compose_version: '1.24.0' config_file_path: '/etc/docker/daemon.json' config_dir_path: '/etc/docker' diff --git a/data/docker/operatingsystem/CentOS6.yaml b/data/docker/operatingsystem/CentOS6.yaml index b58899b7..d160a47f 100644 --- a/data/docker/operatingsystem/CentOS6.yaml +++ b/data/docker/operatingsystem/CentOS6.yaml @@ -1,4 +1,4 @@ --- docker::settings: - repo_url: 'https://yum.dockerproject.org/repo/main/centos/6' + repo_url: 'https://yum.dockerproject.org/repo/main/centos/6/$basearch/stable' init_system: 'sysvinit' diff --git a/data/docker/operatingsystem/CentOS7.yaml b/data/docker/operatingsystem/CentOS7.yaml index 8d328c10..dcf220ba 100644 --- a/data/docker/operatingsystem/CentOS7.yaml +++ b/data/docker/operatingsystem/CentOS7.yaml @@ -1,3 +1,3 @@ --- docker::settings: - repo_url: 'https://download.docker.com/linux/centos/7/' + repo_url: 'https://download.docker.com/linux/centos/7/$basearch/stable' diff --git a/data/gitlab-cli/default.yaml b/data/gitlab-cli/default.yaml index 4b9f476d..332474ec 100644 --- a/data/gitlab-cli/default.yaml +++ b/data/gitlab-cli/default.yaml @@ -1,7 +1,7 @@ --- gitlab-cli::settings: package_name: 'gitlab' - package_provider: 'gem' + package_provider: 'puppet_gem' tp_prerequisites: - ruby - ruby-dev From 648ca44e556b1c5a758945e283c5ccd72d7c0673 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 17 Apr 2019 13:05:11 +0200 Subject: [PATCH 156/284] Added gitlab-ee , updated gitlab-ce to use directly upstream script --- data/gitlab-ce/hiera.yaml | 2 -- data/gitlab-ce/operatingsystem/Debian.yaml | 6 ------ data/gitlab-ce/operatingsystem/Debian7.yaml | 3 --- data/gitlab-ce/operatingsystem/Debian8.yaml | 3 --- data/gitlab-ce/operatingsystem/Debian9.yaml | 3 --- data/gitlab-ce/operatingsystem/Ubuntu.yaml | 3 --- data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml | 3 --- data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml | 3 --- data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml | 3 --- data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml | 3 --- data/gitlab-ce/osfamily/Debian.yaml | 10 +++++----- data/gitlab-ce/osfamily/RedHat.yaml | 8 ++++---- data/gitlab-ee/default.yaml | 7 +++++++ data/gitlab-ee/hiera.yaml | 6 ++++++ data/gitlab-ee/osfamily/Debian.yaml | 7 +++++++ data/gitlab-ee/osfamily/RedHat.yaml | 6 ++++++ 16 files changed, 35 insertions(+), 41 deletions(-) delete mode 100644 data/gitlab-ce/operatingsystem/Debian.yaml delete mode 100644 data/gitlab-ce/operatingsystem/Debian7.yaml delete mode 100644 data/gitlab-ce/operatingsystem/Debian8.yaml delete mode 100644 data/gitlab-ce/operatingsystem/Debian9.yaml delete mode 100644 data/gitlab-ce/operatingsystem/Ubuntu.yaml delete mode 100644 data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml delete mode 100644 data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml delete mode 100644 data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml delete mode 100644 data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/gitlab-ee/default.yaml create mode 100644 data/gitlab-ee/hiera.yaml create mode 100644 data/gitlab-ee/osfamily/Debian.yaml create mode 100644 data/gitlab-ee/osfamily/RedHat.yaml diff --git a/data/gitlab-ce/hiera.yaml b/data/gitlab-ce/hiera.yaml index 27062e71..19fa9ae9 100644 --- a/data/gitlab-ce/hiera.yaml +++ b/data/gitlab-ce/hiera.yaml @@ -1,7 +1,5 @@ --- :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/gitlab-ce/operatingsystem/Debian.yaml b/data/gitlab-ce/operatingsystem/Debian.yaml deleted file mode 100644 index a4ef7d70..00000000 --- a/data/gitlab-ce/operatingsystem/Debian.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- - gitlab-ce::settings: - package_prerequisites: - - debian-archive-keyring - - apt-transport-https - diff --git a/data/gitlab-ce/operatingsystem/Debian7.yaml b/data/gitlab-ce/operatingsystem/Debian7.yaml deleted file mode 100644 index af034a57..00000000 --- a/data/gitlab-ce/operatingsystem/Debian7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-ce::settings: - apt_release: 'wheezy' diff --git a/data/gitlab-ce/operatingsystem/Debian8.yaml b/data/gitlab-ce/operatingsystem/Debian8.yaml deleted file mode 100644 index df443d37..00000000 --- a/data/gitlab-ce/operatingsystem/Debian8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-ce::settings: - apt_release: 'jessie' diff --git a/data/gitlab-ce/operatingsystem/Debian9.yaml b/data/gitlab-ce/operatingsystem/Debian9.yaml deleted file mode 100644 index d95df4e6..00000000 --- a/data/gitlab-ce/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-ce::settings: - apt_release: 'stretch' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu.yaml b/data/gitlab-ce/operatingsystem/Ubuntu.yaml deleted file mode 100644 index ff3f1577..00000000 --- a/data/gitlab-ce/operatingsystem/Ubuntu.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-ce::settings: - repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce/ubuntu' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml b/data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml deleted file mode 100644 index 9ac5fcd1..00000000 --- a/data/gitlab-ce/operatingsystem/Ubuntu12.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-ce::settings: - apt_release: 'precise' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml b/data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml deleted file mode 100644 index 54234be0..00000000 --- a/data/gitlab-ce/operatingsystem/Ubuntu14.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-ce::settings: - apt_release: 'trusty' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml b/data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml deleted file mode 100644 index 4fbaf28c..00000000 --- a/data/gitlab-ce/operatingsystem/Ubuntu14.10.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-ce::settings: - apt_release: 'ubuntu-utopic' diff --git a/data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml b/data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml deleted file mode 100644 index 77b4eaea..00000000 --- a/data/gitlab-ce/operatingsystem/Ubuntu16.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - gitlab-ce::settings: - apt_release: 'xenial' diff --git a/data/gitlab-ce/osfamily/Debian.yaml b/data/gitlab-ce/osfamily/Debian.yaml index 76ddab9e..a56ad509 100644 --- a/data/gitlab-ce/osfamily/Debian.yaml +++ b/data/gitlab-ce/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - gitlab-ce::settings: - repo_url: 'http://packages.gitlab.com/gitlab/gitlab-ce/debian' - key: '14219A96E15E78F4' - key_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' - apt_repos: 'main' +gitlab-ce::settings: + exec_prerequisites: + gitlab-install: + command: 'curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | bash' + creates: '/etc/apt/sources.list.d/gitlab_gitlab-ce.list' diff --git a/data/gitlab-ce/osfamily/RedHat.yaml b/data/gitlab-ce/osfamily/RedHat.yaml index a7402779..afdeb628 100644 --- a/data/gitlab-ce/osfamily/RedHat.yaml +++ b/data/gitlab-ce/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- gitlab-ce::settings: - key: ~ # '14219A96E15E78F4' - repo_url: 'https://packages.gitlab.com/gitlab/gitlab-ce/el/$releasever/$basearch' - key_url: ~ # 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey' - + exec_prerequisites: + gitlab-install: + command: 'curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.rpm.sh | bash' + creates: '/etc/yum.repos.d/gitlab_gitlab-ce.repo' diff --git a/data/gitlab-ee/default.yaml b/data/gitlab-ee/default.yaml new file mode 100644 index 00000000..73fae00c --- /dev/null +++ b/data/gitlab-ee/default.yaml @@ -0,0 +1,7 @@ +--- + gitlab-ee::settings: + package_name: 'gitlab-ce' + service_name: 'gitlab-runsvdir' + config_file_path: '/etc/gitlab/gitlab.rb' + config_dir_path: '/etc/gitlab' + ssl_dir_path: '/etc/gitlab/ssl' diff --git a/data/gitlab-ee/hiera.yaml b/data/gitlab-ee/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/gitlab-ee/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/gitlab-ee/osfamily/Debian.yaml b/data/gitlab-ee/osfamily/Debian.yaml new file mode 100644 index 00000000..e8ae685e --- /dev/null +++ b/data/gitlab-ee/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- +gitlab-ee::settings: + exec_prerequisites: + gitlab-install: + command: 'curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.deb.sh | bash' + creates: '/etc/apt/sources.list.d/gitlab_gitlab-ee.list' + diff --git a/data/gitlab-ee/osfamily/RedHat.yaml b/data/gitlab-ee/osfamily/RedHat.yaml new file mode 100644 index 00000000..4e886fea --- /dev/null +++ b/data/gitlab-ee/osfamily/RedHat.yaml @@ -0,0 +1,6 @@ +--- + gitlab-ee::settings: + exec_prerequisites: + gitlab-install: + command: 'curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.rpm.sh | bash' + creates: '/etc/yum.repos.d/gitlab_gitlab-ee.repo' From d0d959a40767f554450c82e74c00e72ca988eb09 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 13 Jun 2019 11:34:09 +0200 Subject: [PATCH 157/284] Fix validate command for apache on Debian --- data/apache/osfamily/Debian.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/apache/osfamily/Debian.yaml b/data/apache/osfamily/Debian.yaml index 6785a639..cf4981c3 100644 --- a/data/apache/osfamily/Debian.yaml +++ b/data/apache/osfamily/Debian.yaml @@ -19,4 +19,5 @@ process_name: 'apache2' process_user: 'www-data' process_group: 'www-data' - + validate_cmd: + config: 'apache2 -t -f %' From 9ad22126ea125f2c041986f4c68689b46b102061 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 25 Jun 2019 10:45:58 +0200 Subject: [PATCH 158/284] Fixed gitlab-ee package_name --- data/gitlab-ee/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gitlab-ee/default.yaml b/data/gitlab-ee/default.yaml index 73fae00c..54d6fd7a 100644 --- a/data/gitlab-ee/default.yaml +++ b/data/gitlab-ee/default.yaml @@ -1,6 +1,6 @@ --- gitlab-ee::settings: - package_name: 'gitlab-ce' + package_name: 'gitlab-ee' service_name: 'gitlab-runsvdir' config_file_path: '/etc/gitlab/gitlab.rb' config_dir_path: '/etc/gitlab' From 142b3cdbf723c6e57446f4d0d3975cdbcee3ae13 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 10 Jul 2019 14:03:27 +0200 Subject: [PATCH 159/284] Added haveged and mailtitial data --- data/haveged/default.yaml | 3 +++ data/haveged/hiera.yaml | 5 +++++ data/multitail/default.yaml | 3 +++ data/multitail/hiera.yaml | 5 +++++ 4 files changed, 16 insertions(+) create mode 100644 data/haveged/default.yaml create mode 100644 data/haveged/hiera.yaml create mode 100644 data/multitail/default.yaml create mode 100644 data/multitail/hiera.yaml diff --git a/data/haveged/default.yaml b/data/haveged/default.yaml new file mode 100644 index 00000000..e8e8004f --- /dev/null +++ b/data/haveged/default.yaml @@ -0,0 +1,3 @@ +--- + haveged::settings: + package_name: 'haveged' diff --git a/data/haveged/hiera.yaml b/data/haveged/hiera.yaml new file mode 100644 index 00000000..c3397250 --- /dev/null +++ b/data/haveged/hiera.yaml @@ -0,0 +1,5 @@ +--- +:hierarchy: + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/multitail/default.yaml b/data/multitail/default.yaml new file mode 100644 index 00000000..f8deeac1 --- /dev/null +++ b/data/multitail/default.yaml @@ -0,0 +1,3 @@ +--- + multitail::settings: + package_name: 'multitail' diff --git a/data/multitail/hiera.yaml b/data/multitail/hiera.yaml new file mode 100644 index 00000000..c3397250 --- /dev/null +++ b/data/multitail/hiera.yaml @@ -0,0 +1,5 @@ +--- +:hierarchy: + - "%{title}/default" + - "default/%{operatingsystem}" + - default From 6f0913220e70ffa66319a6017e1922a7a0eb222a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 10 Jul 2019 14:10:31 +0200 Subject: [PATCH 160/284] Version 0.3.3 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index ad104261..0334ef3d 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.3.2", + "version": "0.3.3", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From cd4497b0fecabd34b330d38fc8d984d75f347b4a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 10 Jul 2019 14:13:16 +0200 Subject: [PATCH 161/284] pdk convert --- .gitattributes | 5 ++ .gitignore | 45 +++++++++------ .gitlab-ci.yml | 41 ++++++++++++++ .pdkignore | 42 ++++++++++++++ .puppet-lint.rc | 1 + .rspec | 2 + .rubocop.yml | 122 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 54 ++++++++++++++++++ .yardopts | 1 + Gemfile | 71 +++++++++++++++++++++++ Rakefile | 124 +++++++++++++++++++++-------------------- appveyor.yml | 55 ++++++++++++++++++ metadata.json | 12 ++-- spec/default_facts.yml | 7 +++ spec/spec_helper.rb | 47 ++++++++++++++++ 15 files changed, 546 insertions(+), 83 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitlab-ci.yml create mode 100644 .pdkignore create mode 100644 .puppet-lint.rc create mode 100644 .rspec create mode 100644 .rubocop.yml create mode 100644 .travis.yml create mode 100644 .yardopts create mode 100644 Gemfile create mode 100644 appveyor.yml create mode 100644 spec/default_facts.yml create mode 100644 spec/spec_helper.rb diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..9032a014 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +*.rb eol=lf +*.erb eol=lf +*.pp eol=lf +*.sh eol=lf +*.epp eol=lf diff --git a/.gitignore b/.gitignore index 812e47d4..2767022c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,27 @@ -/.idea -/.gradle -/.rvmrc -build -pkg/ -coverage/ -Session.vim -spec/fixtures -.*.sw[a-z] -Gemfile.lock -*.un~ -/.vagrant -/vagrant/modules/public -.coveralls.yml -.bundle/ -.yardoc/ -doc/ -vendor/ +.git/ +.*.sw[op] +.metadata +.yardoc +.yardwarns +*.iml +/.bundle/ +/.idea/ +/.vagrant/ +/coverage/ +/bin/ +/doc/ +/Gemfile.local +/Gemfile.lock +/junit/ +/log/ +/pkg/ +/spec/fixtures/manifests/ +/spec/fixtures/modules/ +/tmp/ +/vendor/ +/convert_report.txt +/update_report.txt +.DS_Store +.project +.envrc +/inventory.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..81e6d762 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,41 @@ +--- +stages: + - syntax + - unit + +cache: + paths: + - vendor/bundle + +before_script: + - bundle -v + - rm Gemfile.lock || true + - gem update --system $RUBYGEMS_VERSION + - gem --version + - bundle -v + - bundle install --without system_tests --path vendor/bundle --jobs $(nproc) + +syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.3-Puppet ~> 6: + stage: syntax + image: ruby:2.5.3 + script: + - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop + variables: + PUPPET_GEM_VERSION: '~> 6' + +parallel_spec-Ruby 2.5.3-Puppet ~> 6: + stage: unit + image: ruby:2.5.3 + script: + - bundle exec rake parallel_spec + variables: + PUPPET_GEM_VERSION: '~> 6' + +parallel_spec-Ruby 2.4.5-Puppet ~> 5: + stage: unit + image: ruby:2.4.5 + script: + - bundle exec rake parallel_spec + variables: + PUPPET_GEM_VERSION: '~> 5' + diff --git a/.pdkignore b/.pdkignore new file mode 100644 index 00000000..e6215cd0 --- /dev/null +++ b/.pdkignore @@ -0,0 +1,42 @@ +.git/ +.*.sw[op] +.metadata +.yardoc +.yardwarns +*.iml +/.bundle/ +/.idea/ +/.vagrant/ +/coverage/ +/bin/ +/doc/ +/Gemfile.local +/Gemfile.lock +/junit/ +/log/ +/pkg/ +/spec/fixtures/manifests/ +/spec/fixtures/modules/ +/tmp/ +/vendor/ +/convert_report.txt +/update_report.txt +.DS_Store +.project +.envrc +/inventory.yaml +/appveyor.yml +/.fixtures.yml +/Gemfile +/.gitattributes +/.gitignore +/.gitlab-ci.yml +/.pdkignore +/Rakefile +/rakelib/ +/.rspec +/.rubocop.yml +/.travis.yml +/.yardopts +/spec/ +/.vscode/ diff --git a/.puppet-lint.rc b/.puppet-lint.rc new file mode 100644 index 00000000..cc96ece0 --- /dev/null +++ b/.puppet-lint.rc @@ -0,0 +1 @@ +--relative diff --git a/.rspec b/.rspec new file mode 100644 index 00000000..16f9cdb0 --- /dev/null +++ b/.rspec @@ -0,0 +1,2 @@ +--color +--format documentation diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 00000000..f5a6c2a4 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,122 @@ +--- +require: rubocop-rspec +AllCops: + DisplayCopNames: true + TargetRubyVersion: '2.1' + Include: + - "./**/*.rb" + Exclude: + - bin/* + - ".vendor/**/*" + - "**/Gemfile" + - "**/Rakefile" + - pkg/**/* + - spec/fixtures/**/* + - vendor/**/* + - "**/Puppetfile" + - "**/Vagrantfile" + - "**/Guardfile" +Metrics/LineLength: + Description: People have wide screens, use them. + Max: 200 +GetText/DecorateString: + Description: We don't want to decorate test output. + Exclude: + - spec/* +RSpec/BeforeAfterAll: + Description: Beware of using after(:all) as it may cause state to leak between tests. + A necessary evil in acceptance testing. + Exclude: + - spec/acceptance/**/*.rb +RSpec/HookArgument: + Description: Prefer explicit :each argument, matching existing module's style + EnforcedStyle: each +Style/BlockDelimiters: + Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to + be consistent then. + EnforcedStyle: braces_for_chaining +Style/ClassAndModuleChildren: + Description: Compact style reduces the required amount of indentation. + EnforcedStyle: compact +Style/EmptyElse: + Description: Enforce against empty else clauses, but allow `nil` for clarity. + EnforcedStyle: empty +Style/FormatString: + Description: Following the main puppet project's style, prefer the % format format. + EnforcedStyle: percent +Style/FormatStringToken: + Description: Following the main puppet project's style, prefer the simpler template + tokens over annotated ones. + EnforcedStyle: template +Style/Lambda: + Description: Prefer the keyword for easier discoverability. + EnforcedStyle: literal +Style/RegexpLiteral: + Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168 + EnforcedStyle: percent_r +Style/TernaryParentheses: + Description: Checks for use of parentheses around ternary conditions. Enforce parentheses + on complex expressions for better readability, but seriously consider breaking + it up. + EnforcedStyle: require_parentheses_when_complex +Style/TrailingCommaInArguments: + Description: Prefer always trailing comma on multiline argument lists. This makes + diffs, and re-ordering nicer. + EnforcedStyleForMultiline: comma +Style/TrailingCommaInLiteral: + Description: Prefer always trailing comma on multiline literals. This makes diffs, + and re-ordering nicer. + EnforcedStyleForMultiline: comma +Style/SymbolArray: + Description: Using percent style obscures symbolic intent of array's contents. + EnforcedStyle: brackets +RSpec/MessageSpies: + EnforcedStyle: receive +Style/Documentation: + Exclude: + - lib/puppet/parser/functions/**/* + - spec/**/* +Style/WordArray: + EnforcedStyle: brackets +Style/CollectionMethods: + Enabled: true +Style/MethodCalledOnDoEndBlock: + Enabled: true +Style/StringMethods: + Enabled: true +Layout/EndOfLine: + Enabled: false +Layout/IndentHeredoc: + Enabled: false +Metrics/AbcSize: + Enabled: false +Metrics/BlockLength: + Enabled: false +Metrics/ClassLength: + Enabled: false +Metrics/CyclomaticComplexity: + Enabled: false +Metrics/MethodLength: + Enabled: false +Metrics/ModuleLength: + Enabled: false +Metrics/ParameterLists: + Enabled: false +Metrics/PerceivedComplexity: + Enabled: false +RSpec/DescribeClass: + Enabled: false +RSpec/ExampleLength: + Enabled: false +RSpec/MessageExpectation: + Enabled: false +RSpec/MultipleExpectations: + Enabled: false +RSpec/NestedGroups: + Enabled: false +Style/AsciiComments: + Enabled: false +Style/IfUnlessModifier: + Enabled: false +Style/SymbolProc: + Enabled: false diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..074a10fe --- /dev/null +++ b/.travis.yml @@ -0,0 +1,54 @@ +--- +dist: trusty +language: ruby +cache: bundler +before_install: + - bundle -v + - rm -f Gemfile.lock + - gem update --system $RUBYGEMS_VERSION + - gem --version + - bundle -v +script: + - 'bundle exec rake $CHECK' +bundler_args: --without system_tests +rvm: + - 2.5.3 +stages: + - static + - spec + - acceptance + - + if: tag =~ ^v\d + name: deploy +matrix: + fast_finish: true + include: + - + env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" + stage: static + - + env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec + rvm: 2.4.5 + stage: spec + - + env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec + rvm: 2.5.3 + stage: spec + - + env: DEPLOY_TO_FORGE=yes + stage: deploy +branches: + only: + - master + - /^v\d/ +notifications: + email: false +deploy: + provider: puppetforge + user: puppet + password: + secure: "" + on: + tags: true + all_branches: true + condition: "$DEPLOY_TO_FORGE = yes" diff --git a/.yardopts b/.yardopts new file mode 100644 index 00000000..29c933bc --- /dev/null +++ b/.yardopts @@ -0,0 +1 @@ +--markup markdown diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..cf2c3874 --- /dev/null +++ b/Gemfile @@ -0,0 +1,71 @@ +source ENV['GEM_SOURCE'] || 'https://rubygems.org' + +def location_for(place_or_version, fake_version = nil) + git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} + file_url_regex = %r{\Afile:\/\/(?.*)} + + if place_or_version && (git_url = place_or_version.match(git_url_regex)) + [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact + elsif place_or_version && (file_url = place_or_version.match(file_url_regex)) + ['>= 0', { path: File.expand_path(file_url[:path]), require: false }] + else + [place_or_version, { require: false }] + end +end + +ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments +minor_version = ruby_version_segments[0..1].join('.') + +group :development do + gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') + gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') + gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') + gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') + gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] +end + +puppet_version = ENV['PUPPET_GEM_VERSION'] +facter_version = ENV['FACTER_GEM_VERSION'] +hiera_version = ENV['HIERA_GEM_VERSION'] + +gems = {} + +gems['puppet'] = location_for(puppet_version) + +# If facter or hiera versions have been specified via the environment +# variables + +gems['facter'] = location_for(facter_version) if facter_version +gems['hiera'] = location_for(hiera_version) if hiera_version + +if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} + # If we're using a Puppet gem on Windows which handles its own win32-xxx gem + # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). + gems['win32-dir'] = ['<= 0.4.9', require: false] + gems['win32-eventlog'] = ['<= 0.6.5', require: false] + gems['win32-process'] = ['<= 0.7.5', require: false] + gems['win32-security'] = ['<= 0.2.5', require: false] + gems['win32-service'] = ['0.8.8', require: false] +end + +gems.each do |gem_name, gem_params| + gem gem_name, *gem_params +end + +# Evaluate Gemfile.local and ~/.gemfile if they exist +extra_gemfiles = [ + "#{__FILE__}.local", + File.join(Dir.home, '.gemfile'), +] + +extra_gemfiles.each do |gemfile| + if File.file?(gemfile) && File.readable?(gemfile) + eval(File.read(gemfile), binding) + end +end +# vim: syntax=ruby diff --git a/Rakefile b/Rakefile index 993c43c1..750ef467 100644 --- a/Rakefile +++ b/Rakefile @@ -1,72 +1,76 @@ require 'puppetlabs_spec_helper/rake_tasks' -require 'rspec/core/rake_task' -require 'puppet' +require 'puppet-syntax/tasks/puppet-syntax' +require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? +require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any? +require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any? -# abort if puppet version is to old -if Puppet::version < '4' - puts 'YOU MUST RUN THIS WITH PUPPET 4.x' - abort +def changelog_user + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = nil || JSON.load(File.read('metadata.json'))['author'] + raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator user:#{returnVal}" + returnVal end -exclude_paths = %w( - vendor/**/* - spec/**/* - modules/**/* - pkg/**/* - tests/**/* -) - -# the default lint task can not override the pattern configuration -Rake::Task[:lint].clear -PuppetLint::RakeTask.new(:lint) do |config| - # Pattern of files to ignore - config.ignore_paths = exclude_paths - # Pattern of files to check, defaults to `**/*.pp` - config.pattern = ['manifests/**/*.pp', 'site/**/*.pp'] - # List of checks to disable - config.disable_checks = ['140chars', 'relative', 'class_inherits_from_params_class', 'empty_string_assignment'] - # Should the task fail if there were any warnings, defaults to false - config.fail_on_warnings = true - # Print out the context for the problem, defaults to false - #config.with_context = true - # Log Format - #config.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}' +def changelog_project + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = nil || JSON.load(File.read('metadata.json'))['name'] + raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator project:#{returnVal}" + returnVal end -# beaker is designed to run same tests on multiple nodes -# we have another usecase: multiple tests on multiple os -Rake::Task[:beaker].clear -RSpec::Core::RakeTask.new(:beaker) do |config| - puts 'dont use beaker, use beaker_roles: or all_roles instead' - abort +def changelog_future_release + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version'] + raise "unable to find the future_release (version) in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator future_release:#{returnVal}" + returnVal end -# iterate over acceptance tests and create namespaced rake tasks -namespace :beaker_roles do - Dir.glob("spec/acceptance/*_spec.rb") do |acceptance_test| - test_name = acceptance_test.split('/').last.split('_spec').first - RSpec::Core::RakeTask.new(test_name) do |t| - t.rspec_opts = ['--color'] - t.pattern = acceptance_test - end - end -end +PuppetLint.configuration.send('disable_relative') -# find all rake tasks in beaker_roles namespace and run them in parallel -all_roles = [] -Rake.application.in_namespace(:beaker_roles) do |beaker_roles_namespace| - beaker_roles_namespace.tasks.each do |beaker_roles_tasks| - all_roles << beaker_roles_tasks +if Bundler.rubygems.find_name('github_changelog_generator').any? + GitHubChangelogGenerator::RakeTask.new :changelog do |config| + raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil? + config.user = "#{changelog_user}" + config.project = "#{changelog_project}" + config.future_release = "#{changelog_future_release}" + config.exclude_labels = ['maintenance'] + config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)." + config.add_pr_wo_labels = true + config.issues = false + config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM" + config.configure_sections = { + "Changed" => { + "prefix" => "### Changed", + "labels" => ["backwards-incompatible"], + }, + "Added" => { + "prefix" => "### Added", + "labels" => ["feature", "enhancement"], + }, + "Fixed" => { + "prefix" => "### Fixed", + "labels" => ["bugfix"], + }, + } + end +else + desc 'Generate a Changelog from GitHub' + task :changelog do + raise <= Gem::Version.new('2.2.2')" +EOM end end -multitask :all_roles => all_roles - -PuppetSyntax.exclude_paths = exclude_paths -# Blacksmith -begin - require 'puppet_blacksmith/rake_tasks' -rescue LoadError - puts "Blacksmith needed only to push to the Forge" -end -# vim: syntax=ruby diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..e10ba3bf --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,55 @@ +--- +version: 1.1.x.{build} +branches: + only: + - master +skip_commits: + message: /^\(?doc\)?.*/ +clone_depth: 10 +init: + - SET + - 'mkdir C:\ProgramData\PuppetLabs\code && exit 0' + - 'mkdir C:\ProgramData\PuppetLabs\facter && exit 0' + - 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0' + - 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0' +environment: + matrix: + - + RUBY_VERSION: 24-x64 + CHECK: syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop + - + PUPPET_GEM_VERSION: ~> 5.0 + RUBY_VERSION: 24 + CHECK: parallel_spec + - + PUPPET_GEM_VERSION: ~> 5.0 + RUBY_VERSION: 24-x64 + CHECK: parallel_spec + - + PUPPET_GEM_VERSION: ~> 6.0 + RUBY_VERSION: 25 + CHECK: parallel_spec + - + PUPPET_GEM_VERSION: ~> 6.0 + RUBY_VERSION: 25-x64 + CHECK: parallel_spec +matrix: + fast_finish: true +install: + - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% + - bundle install --jobs 4 --retry 2 --without system_tests + - type Gemfile.lock +build: off +test_script: + - bundle exec puppet -V + - ruby -v + - gem -v + - bundle -v + - bundle exec rake %CHECK% +notifications: + - provider: Email + to: + - nobody@nowhere.com + on_build_success: false + on_build_failure: false + on_build_status_changed: false diff --git a/metadata.json b/metadata.json index 0334ef3d..66f26cc2 100644 --- a/metadata.json +++ b/metadata.json @@ -8,11 +8,8 @@ "project_page": "https://github.com/example42/tinydata", "issues_url": "https://github.com/example42/tinydata/issues", "dependencies": [ - + ], - "data_provider": null, - "checksums": { - }, "operatingsystem_support": [ { "operatingsystem": "RedHat", @@ -75,5 +72,10 @@ "name": "puppet", "version_requirement": ">= 3.0.0 < 5.0.0" } - ] + ], + "checksums": { + }, + "pdk-version": "1.10.0", + "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git#1.10.0", + "template-ref": "1.10.0-0-gbba9ac3" } diff --git a/spec/default_facts.yml b/spec/default_facts.yml new file mode 100644 index 00000000..ea1e4808 --- /dev/null +++ b/spec/default_facts.yml @@ -0,0 +1,7 @@ +# Use default_module_facts.yml for module specific facts. +# +# Facts specified here will override the values provided by rspec-puppet-facts. +--- +ipaddress: "172.16.254.254" +is_pe: false +macaddress: "AA:AA:AA:AA:AA:AA" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 00000000..93b25ecb --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,47 @@ +require 'puppetlabs_spec_helper/module_spec_helper' +require 'rspec-puppet-facts' + +require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb')) + +include RspecPuppetFacts + +default_facts = { + puppetversion: Puppet.version, + facterversion: Facter.version, +} + +default_fact_files = [ + File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')), + File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')), +] + +default_fact_files.each do |f| + next unless File.exist?(f) && File.readable?(f) && File.size?(f) + + begin + default_facts.merge!(YAML.safe_load(File.read(f), [], [], true)) + rescue => e + RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" + end +end + +RSpec.configure do |c| + c.default_facts = default_facts + c.before :each do + # set to strictest setting for testing + # by default Puppet runs at warning level + Puppet.settings[:strict] = :warning + end + c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT'] + c.after(:suite) do + end +end + +def ensure_module_defined(module_name) + module_name.split('::').reduce(Object) do |last_module, next_module| + last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false) + last_module.const_get(next_module, false) + end +end + +# 'spec_overrides' from sync.yml will appear below this line From f0d378e16c1b2bdc47a75e8331f3a4579536ce26 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 27 Jul 2019 17:51:10 +0200 Subject: [PATCH 162/284] Cleanup of repo_package_provider defaults --- data/default/Debian.yaml | 3 +++ data/default/RedHat.yaml | 3 +++ data/epel/osfamily/RedHat.yaml | 1 - data/foreman/osfamily/RedHat.yaml | 1 - data/icinga2/osfamily/RedHat.yaml | 1 - data/icingaweb2/osfamily/RedHat.yaml | 1 - data/puppet-agent/osfamily/Debian.yaml | 1 - data/puppet-agent/osfamily/RedHat.yaml | 1 - data/puppetserver/osfamily/Debian.yaml | 1 - data/puppetserver/osfamily/RedHat.yaml | 1 - data/rundeck/osfamily/RedHat.yaml | 1 - data/scl/osfamily/RedHat.yaml | 4 ---- 12 files changed, 6 insertions(+), 13 deletions(-) create mode 100755 data/default/Debian.yaml create mode 100755 data/default/RedHat.yaml delete mode 100644 data/scl/osfamily/RedHat.yaml diff --git a/data/default/Debian.yaml b/data/default/Debian.yaml new file mode 100755 index 00000000..aad77fd5 --- /dev/null +++ b/data/default/Debian.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + repo_package_provider: dpkg diff --git a/data/default/RedHat.yaml b/data/default/RedHat.yaml new file mode 100755 index 00000000..ee0f805c --- /dev/null +++ b/data/default/RedHat.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + repo_package_provider: 'rpm' diff --git a/data/epel/osfamily/RedHat.yaml b/data/epel/osfamily/RedHat.yaml index 64b79fe9..86861d6c 100644 --- a/data/epel/osfamily/RedHat.yaml +++ b/data/epel/osfamily/RedHat.yaml @@ -1,5 +1,4 @@ --- epel::settings: repo_package_name: 'epel-release' - repo_package_provider: 'rpm' diff --git a/data/foreman/osfamily/RedHat.yaml b/data/foreman/osfamily/RedHat.yaml index 6bfe4912..01c95afc 100644 --- a/data/foreman/osfamily/RedHat.yaml +++ b/data/foreman/osfamily/RedHat.yaml @@ -2,4 +2,3 @@ foreman::settings: init_file_path: '/etc/sysconfig/foreman' repo_package_name: 'foreman-release' - repo_package_provider: 'rpm' diff --git a/data/icinga2/osfamily/RedHat.yaml b/data/icinga2/osfamily/RedHat.yaml index e490a1b0..be31df0c 100644 --- a/data/icinga2/osfamily/RedHat.yaml +++ b/data/icinga2/osfamily/RedHat.yaml @@ -4,5 +4,4 @@ config_file_owner: 'icinga' config_file_owner: 'icinga' config_file_mode: '0640' - repo_package_provider: 'rpm' repo_package_name: 'icinga-rpm-release' diff --git a/data/icingaweb2/osfamily/RedHat.yaml b/data/icingaweb2/osfamily/RedHat.yaml index 00219644..26e73347 100644 --- a/data/icingaweb2/osfamily/RedHat.yaml +++ b/data/icingaweb2/osfamily/RedHat.yaml @@ -4,7 +4,6 @@ config_file_owner: 'icinga' config_file_owner: 'icinga' config_file_mode: '0640' - repo_package_provider: 'rpm' repo_package_name: 'icinga-rpm-release' tp_prerequisites: - scl diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index 42b40e48..f61801de 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -1,6 +1,5 @@ --- puppet-agent::settings: - repo_package_provider: dpkg repo_url: 'http://apt.puppetlabs.com' key: 'EF8D349F' key_url: 'http://apt.puppetlabs.com/pubkey.gpg' diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index 876f1de3..f597b03d 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -1,5 +1,4 @@ --- puppet-agent::settings: repo_package_name: 'puppet-release' - repo_package_provider: 'rpm' dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppetserver/osfamily/Debian.yaml b/data/puppetserver/osfamily/Debian.yaml index 22528f1f..a5c4392c 100644 --- a/data/puppetserver/osfamily/Debian.yaml +++ b/data/puppetserver/osfamily/Debian.yaml @@ -6,5 +6,4 @@ key_url: 'http://apt.puppetlabs.com/pubkey.gpg' apt_repos: 'puppet5' apt_release: 'stable' - repo_package_provider: dpkg repo_package_name: 'puppet-release' diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 6b3f80b8..214c7680 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -2,5 +2,4 @@ puppetserver::settings: init_file_path: '/etc/sysconfig/puppetserver' repo_package_name: 'puppet-release' - repo_package_provider: 'rpm' dockerfile_prerequisites: 'RUN yum install -y wget' diff --git a/data/rundeck/osfamily/RedHat.yaml b/data/rundeck/osfamily/RedHat.yaml index 39f4ba6b..41a37579 100644 --- a/data/rundeck/osfamily/RedHat.yaml +++ b/data/rundeck/osfamily/RedHat.yaml @@ -2,4 +2,3 @@ rundeck::settings: repo_package_url: 'http://repo.rundeck.org/latest.rpm' repo_package_name: 'rundeck-repo' - repo_package_provider: 'rpm' diff --git a/data/scl/osfamily/RedHat.yaml b/data/scl/osfamily/RedHat.yaml deleted file mode 100644 index f15f3d9d..00000000 --- a/data/scl/osfamily/RedHat.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - scl::settings: - repo_package_provider: 'rpm' - From 4f30daec81ff5ce4828e2d3e6bda87fa67b4d597 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 27 Jul 2019 18:03:54 +0200 Subject: [PATCH 163/284] config_file_group reorganisation --- data/apache/osfamily/Darwin.yaml | 3 --- data/apache/osfamily/FreeBSD.yaml | 1 - data/default/FreeBSD.yaml | 3 +++ data/default/OpenBSD.yaml | 3 +++ data/default/Solaris.yaml | 3 +++ data/dhcpd/osfamily/OpenBSD.yaml | 1 - data/docker-engine/operatingsystem/Darwin.yaml | 1 - data/docker/operatingsystem/Darwin.yaml | 1 - data/fabric/osfamily/Darwin.yaml | 3 --- data/hosts/osfamily/FreeBSD.yaml | 3 --- data/munin-node/osfamily/OpenBSD.yaml | 1 - data/munin/osfamily/OpenBSD.yaml | 3 --- data/mysql/osfamily/FreeBSD.yaml | 1 - data/nginx/osfamily/Darwin.yaml | 3 --- data/nrpe/osfamily/OpenBSD.yaml | 1 - data/openssh/osfamily/OpenBSD.yaml | 2 -- data/rsync/osfamily/FreeBSD.yaml | 1 - data/snmpd/osfamily/OpenBSD.yaml | 1 - 18 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 data/apache/osfamily/Darwin.yaml create mode 100644 data/default/FreeBSD.yaml create mode 100644 data/default/OpenBSD.yaml create mode 100644 data/default/Solaris.yaml delete mode 100644 data/fabric/osfamily/Darwin.yaml delete mode 100644 data/hosts/osfamily/FreeBSD.yaml delete mode 100644 data/munin/osfamily/OpenBSD.yaml delete mode 100644 data/nginx/osfamily/Darwin.yaml diff --git a/data/apache/osfamily/Darwin.yaml b/data/apache/osfamily/Darwin.yaml deleted file mode 100644 index 3e86bad5..00000000 --- a/data/apache/osfamily/Darwin.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - apache::settings: - config_file_group: 'wheel' diff --git a/data/apache/osfamily/FreeBSD.yaml b/data/apache/osfamily/FreeBSD.yaml index af983969..639778ec 100644 --- a/data/apache/osfamily/FreeBSD.yaml +++ b/data/apache/osfamily/FreeBSD.yaml @@ -2,4 +2,3 @@ apache::settings: config_file_path: '/usr/local/etc/apache20/httpd.conf' config_dir_path: '/usr/local/etc/apache20' - config_file_group: 'wheel' diff --git a/data/default/FreeBSD.yaml b/data/default/FreeBSD.yaml new file mode 100644 index 00000000..14c9468b --- /dev/null +++ b/data/default/FreeBSD.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + config_file_group: 'wheel' diff --git a/data/default/OpenBSD.yaml b/data/default/OpenBSD.yaml new file mode 100644 index 00000000..14c9468b --- /dev/null +++ b/data/default/OpenBSD.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + config_file_group: 'wheel' diff --git a/data/default/Solaris.yaml b/data/default/Solaris.yaml new file mode 100644 index 00000000..968e01f9 --- /dev/null +++ b/data/default/Solaris.yaml @@ -0,0 +1,3 @@ +--- +default:settings: + config_file_group: 'bin' diff --git a/data/dhcpd/osfamily/OpenBSD.yaml b/data/dhcpd/osfamily/OpenBSD.yaml index 9c8fd670..de2ed017 100644 --- a/data/dhcpd/osfamily/OpenBSD.yaml +++ b/data/dhcpd/osfamily/OpenBSD.yaml @@ -2,7 +2,6 @@ dhcpd::settings: package_name: '' config_file_path: '/etc/dhcpd.conf' - config_file_group: 'wheel' config_dir_path: '' pid_file_path: '' data_dir_path: '' diff --git a/data/docker-engine/operatingsystem/Darwin.yaml b/data/docker-engine/operatingsystem/Darwin.yaml index 73650ab6..5369c027 100644 --- a/data/docker-engine/operatingsystem/Darwin.yaml +++ b/data/docker-engine/operatingsystem/Darwin.yaml @@ -1,5 +1,4 @@ --- docker-engine::settings: package_source: https://download.docker.com/mac/stable/Docker.dmg - config_file_group: 'wheel' diff --git a/data/docker/operatingsystem/Darwin.yaml b/data/docker/operatingsystem/Darwin.yaml index 4f95eb75..1276c316 100644 --- a/data/docker/operatingsystem/Darwin.yaml +++ b/data/docker/operatingsystem/Darwin.yaml @@ -1,5 +1,4 @@ --- docker::settings: package_source: https://download.docker.com/mac/stable/Docker.dmg - config_file_group: 'wheel' diff --git a/data/fabric/osfamily/Darwin.yaml b/data/fabric/osfamily/Darwin.yaml deleted file mode 100644 index 4aab2ba2..00000000 --- a/data/fabric/osfamily/Darwin.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - fabric::settings: - config_file_group: 'wheel' diff --git a/data/hosts/osfamily/FreeBSD.yaml b/data/hosts/osfamily/FreeBSD.yaml deleted file mode 100644 index 298fd4a5..00000000 --- a/data/hosts/osfamily/FreeBSD.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - hosts::settings: - config_file_group: 'wheel' diff --git a/data/munin-node/osfamily/OpenBSD.yaml b/data/munin-node/osfamily/OpenBSD.yaml index 40738198..cb6f1575 100644 --- a/data/munin-node/osfamily/OpenBSD.yaml +++ b/data/munin-node/osfamily/OpenBSD.yaml @@ -1,4 +1,3 @@ --- munin-node::settings: - config_file_group: 'wheel' log_file_path: '/var/log/munin/munin-node.log' diff --git a/data/munin/osfamily/OpenBSD.yaml b/data/munin/osfamily/OpenBSD.yaml deleted file mode 100644 index b666e958..00000000 --- a/data/munin/osfamily/OpenBSD.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - munin::settings: - config_file_group: 'wheel' diff --git a/data/mysql/osfamily/FreeBSD.yaml b/data/mysql/osfamily/FreeBSD.yaml index 7ca99522..406df2ca 100644 --- a/data/mysql/osfamily/FreeBSD.yaml +++ b/data/mysql/osfamily/FreeBSD.yaml @@ -3,5 +3,4 @@ package_name: 'databases/mysql56-server' service_name: 'mysql-server' config_file_path: '/etc/my.cnf' - config_file_group: 'wheel' diff --git a/data/nginx/osfamily/Darwin.yaml b/data/nginx/osfamily/Darwin.yaml deleted file mode 100644 index 27e7e90a..00000000 --- a/data/nginx/osfamily/Darwin.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - nginx::settings: - config_file_group: 'wheel' diff --git a/data/nrpe/osfamily/OpenBSD.yaml b/data/nrpe/osfamily/OpenBSD.yaml index 089c8989..b9fb0a11 100644 --- a/data/nrpe/osfamily/OpenBSD.yaml +++ b/data/nrpe/osfamily/OpenBSD.yaml @@ -1,6 +1,5 @@ --- nrpe::settings: process_user: '_nrpe' - config_file_group: 'wheel' pid_file_path: '/var/run/nrpe/nrpe.pid' service_name: 'nagios-nrpe-server' diff --git a/data/openssh/osfamily/OpenBSD.yaml b/data/openssh/osfamily/OpenBSD.yaml index c76ef102..fd68cd54 100644 --- a/data/openssh/osfamily/OpenBSD.yaml +++ b/data/openssh/osfamily/OpenBSD.yaml @@ -2,8 +2,6 @@ openssh::settings: package_name: '' service_name: 'sshd' - config_file_mode: '0644' - config_file_group: 'wheel' init_file_path: '' log_file_path: '/var/log/authlog' diff --git a/data/rsync/osfamily/FreeBSD.yaml b/data/rsync/osfamily/FreeBSD.yaml index 0ffe2cb1..8e216e4a 100644 --- a/data/rsync/osfamily/FreeBSD.yaml +++ b/data/rsync/osfamily/FreeBSD.yaml @@ -2,7 +2,6 @@ rsync::settings: service_name: 'rsyncd' config_file_path: '/usr/local/etc/rsyncd.conf' - config_file_group: 'wheel' process_name: 'rsync' process_group: 'wheel' tcp_port: '873' diff --git a/data/snmpd/osfamily/OpenBSD.yaml b/data/snmpd/osfamily/OpenBSD.yaml index ad975561..0c52adad 100644 --- a/data/snmpd/osfamily/OpenBSD.yaml +++ b/data/snmpd/osfamily/OpenBSD.yaml @@ -3,5 +3,4 @@ package_name: 'net-snmp' service_name: 'netsnmpd' config_file_path: '/etc/snmp/snmpd.conf' - config_file_group: 'wheel' config_dir_path: '/etc/snmp' From fdbb854fd74641f2c7cfa549aeec0f0182a0e4ca Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 27 Jul 2019 18:17:37 +0200 Subject: [PATCH 164/284] Added Vagrant data --- data/vagrant/default.yaml | 4 ++++ data/vagrant/hiera.yaml | 7 +++++++ data/vagrant/osfamily/Darwin.yaml | 2 ++ data/vagrant/osfamily/Debian.yaml | 2 ++ data/vagrant/osfamily/RedHat.yaml | 2 ++ data/vagrant/osfamily/Windows.yaml | 2 ++ 6 files changed, 19 insertions(+) create mode 100644 data/vagrant/default.yaml create mode 100644 data/vagrant/hiera.yaml create mode 100644 data/vagrant/osfamily/Darwin.yaml create mode 100644 data/vagrant/osfamily/Debian.yaml create mode 100644 data/vagrant/osfamily/RedHat.yaml create mode 100644 data/vagrant/osfamily/Windows.yaml diff --git a/data/vagrant/default.yaml b/data/vagrant/default.yaml new file mode 100644 index 00000000..4095b331 --- /dev/null +++ b/data/vagrant/default.yaml @@ -0,0 +1,4 @@ +--- +vagrant::settings: + package_name: 'vagrant' + process_name: 'vagrant' diff --git a/data/vagrant/hiera.yaml b/data/vagrant/hiera.yaml new file mode 100644 index 00000000..cb5d3884 --- /dev/null +++ b/data/vagrant/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}"%{operatingsystemmajrelease} + - "default/%{operatingsystem}" + - default diff --git a/data/vagrant/osfamily/Darwin.yaml b/data/vagrant/osfamily/Darwin.yaml new file mode 100644 index 00000000..ba0c3dcd --- /dev/null +++ b/data/vagrant/osfamily/Darwin.yaml @@ -0,0 +1,2 @@ +--- +vagrant::package_url: https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.dmg diff --git a/data/vagrant/osfamily/Debian.yaml b/data/vagrant/osfamily/Debian.yaml new file mode 100644 index 00000000..f3bd01b5 --- /dev/null +++ b/data/vagrant/osfamily/Debian.yaml @@ -0,0 +1,2 @@ +--- +vagrant::package_url: https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.deb diff --git a/data/vagrant/osfamily/RedHat.yaml b/data/vagrant/osfamily/RedHat.yaml new file mode 100644 index 00000000..b1c39d84 --- /dev/null +++ b/data/vagrant/osfamily/RedHat.yaml @@ -0,0 +1,2 @@ +--- +vagrant::package_url: https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.rpm diff --git a/data/vagrant/osfamily/Windows.yaml b/data/vagrant/osfamily/Windows.yaml new file mode 100644 index 00000000..48d57de6 --- /dev/null +++ b/data/vagrant/osfamily/Windows.yaml @@ -0,0 +1,2 @@ +--- +vagrant::package_url: https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.msi From c08bf0128d25af62bb15f342b9e1da28036e0ddd Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 27 Jul 2019 18:18:36 +0200 Subject: [PATCH 165/284] Added repo_package_provider defaults --- data/default/CentOS.yaml | 3 +++ data/default/Ubuntu.yaml | 3 +++ 2 files changed, 6 insertions(+) create mode 100755 data/default/CentOS.yaml create mode 100755 data/default/Ubuntu.yaml diff --git a/data/default/CentOS.yaml b/data/default/CentOS.yaml new file mode 100755 index 00000000..ee0f805c --- /dev/null +++ b/data/default/CentOS.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + repo_package_provider: 'rpm' diff --git a/data/default/Ubuntu.yaml b/data/default/Ubuntu.yaml new file mode 100755 index 00000000..aad77fd5 --- /dev/null +++ b/data/default/Ubuntu.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + repo_package_provider: dpkg From fc2167b89e659629cd23b4f089df8d891903d499 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 20 Aug 2019 00:27:52 +0200 Subject: [PATCH 166/284] Fixed sysdig prerquisites on Debian family --- data/sysdig/default.yaml | 6 ++---- data/sysdig/osfamily/Debian.yaml | 10 +++++----- data/sysdig/osfamily/RedHat.yaml | 10 ++++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/sysdig/default.yaml b/data/sysdig/default.yaml index 321f249b..ae259592 100644 --- a/data/sysdig/default.yaml +++ b/data/sysdig/default.yaml @@ -1,5 +1,3 @@ --- - sysdig::settings: - package_name: 'sysdig' - tp_prerequisites: - - dkms +sysdig::settings: + package_name: 'sysdig' diff --git a/data/sysdig/osfamily/Debian.yaml b/data/sysdig/osfamily/Debian.yaml index 4e81b755..b57d409e 100644 --- a/data/sysdig/osfamily/Debian.yaml +++ b/data/sysdig/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - sysdig::settings: - repo_url: 'http://download.draios.com/stable/deb' - key: 'F1C3BD80' - key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' - apt_release: 'stable-$(ARCH)/' +sysdig::settings: + repo_url: 'http://download.draios.com/stable/deb' + key: 'F1C3BD80' + key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' + apt_release: 'stable-$(ARCH)/' diff --git a/data/sysdig/osfamily/RedHat.yaml b/data/sysdig/osfamily/RedHat.yaml index 2f6cc6d4..86260ec9 100644 --- a/data/sysdig/osfamily/RedHat.yaml +++ b/data/sysdig/osfamily/RedHat.yaml @@ -1,5 +1,7 @@ --- - sysdig::settings: - repo_url: 'http://download.draios.com/stable/rpm/$basearch' - key: 'F1C3BD80' - key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' +sysdig::settings: + repo_url: 'http://download.draios.com/stable/rpm/$basearch' + key: 'F1C3BD80' + key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' +tp_prerequisites: + - dkms From 41945f596eab1b4f3088899d96d5e39e191c48dc Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 20 Aug 2019 00:29:44 +0200 Subject: [PATCH 167/284] Fixed indentation on sysdig data file for Redhat --- data/sysdig/osfamily/RedHat.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/sysdig/osfamily/RedHat.yaml b/data/sysdig/osfamily/RedHat.yaml index 86260ec9..85cccdc5 100644 --- a/data/sysdig/osfamily/RedHat.yaml +++ b/data/sysdig/osfamily/RedHat.yaml @@ -3,5 +3,5 @@ sysdig::settings: repo_url: 'http://download.draios.com/stable/rpm/$basearch' key: 'F1C3BD80' key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' -tp_prerequisites: - - dkms + tp_prerequisites: + - dkms From 539e12c09f7d073617e4c1c6963a93ea1c246141 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 30 Aug 2019 19:31:32 +0200 Subject: [PATCH 168/284] Corrected data for postfix and sysdig --- data/postfix/hiera.yaml | 2 ++ data/postfix/operatingsystem/Ubuntu14.04.yaml | 3 +++ data/postfix/osfamily/Suse.yaml | 2 +- data/sysdig/hiera.yaml | 2 ++ data/sysdig/operatingsystem/Ubuntu14.04.yaml | 3 +++ data/sysdig/osfamily/Debian.yaml | 2 +- data/sysdig/osfamily/Suse.yaml | 3 +++ 7 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 data/postfix/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/sysdig/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/sysdig/osfamily/Suse.yaml diff --git a/data/postfix/hiera.yaml b/data/postfix/hiera.yaml index 19fa9ae9..7d5ead52 100644 --- a/data/postfix/hiera.yaml +++ b/data/postfix/hiera.yaml @@ -1,5 +1,7 @@ --- :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/postfix/operatingsystem/Ubuntu14.04.yaml b/data/postfix/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..fbd5f722 --- /dev/null +++ b/data/postfix/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- +postfix::settings: + daemon_dir_path: '/usr/lib/postfix' diff --git a/data/postfix/osfamily/Suse.yaml b/data/postfix/osfamily/Suse.yaml index af31ed1a..9f7f6315 100644 --- a/data/postfix/osfamily/Suse.yaml +++ b/data/postfix/osfamily/Suse.yaml @@ -1,4 +1,4 @@ --- postfix::settings: setgid_group: 'maildrop' - daemon_dir_path: '/usr/lib/postfix' + daemon_dir_path: '/usr/lib/postfix/bin' diff --git a/data/sysdig/hiera.yaml b/data/sysdig/hiera.yaml index 19fa9ae9..7d5ead52 100644 --- a/data/sysdig/hiera.yaml +++ b/data/sysdig/hiera.yaml @@ -1,5 +1,7 @@ --- :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/sysdig/operatingsystem/Ubuntu14.04.yaml b/data/sysdig/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..435a9813 --- /dev/null +++ b/data/sysdig/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- +sysdig::settings: + key: 'F1C3BD80' diff --git a/data/sysdig/osfamily/Debian.yaml b/data/sysdig/osfamily/Debian.yaml index b57d409e..fa553af8 100644 --- a/data/sysdig/osfamily/Debian.yaml +++ b/data/sysdig/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- sysdig::settings: repo_url: 'http://download.draios.com/stable/deb' - key: 'F1C3BD80' + key: 'D27A 72F3 2D86 7DF9 300A 2415 7449 0FD6 EC51 E8C4' key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' apt_release: 'stable-$(ARCH)/' diff --git a/data/sysdig/osfamily/Suse.yaml b/data/sysdig/osfamily/Suse.yaml new file mode 100644 index 00000000..47e6716b --- /dev/null +++ b/data/sysdig/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- +sysdig::settings: + package_name: '' From e516948554e25d3f723d65be42e8532120b53f49 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 3 Oct 2019 20:26:14 +0200 Subject: [PATCH 169/284] Updated virtualbox and grafana data --- data/grafana/default.yaml | 1 + data/grafana/osfamily/Debian.yaml | 5 ++--- data/grafana/osfamily/RedHat.yaml | 3 +-- data/virtualbox/default.yaml | 2 +- data/virtualbox/operatingsystem/Debian7.yaml | 4 ++++ data/virtualbox/operatingsystem/Ubuntu14.04.yaml | 4 ++++ data/virtualbox/operatingsystem/Ubuntu14.10.yaml | 4 ++++ data/virtualbox/operatingsystem/Ubuntu15.04.yaml | 4 ++++ data/virtualbox/operatingsystem/Ubuntu15.10.yaml | 4 ++++ data/virtualbox/osfamily/Debian.yaml | 7 +++++-- 10 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 data/virtualbox/operatingsystem/Debian7.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu14.10.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu15.04.yaml create mode 100644 data/virtualbox/operatingsystem/Ubuntu15.10.yaml diff --git a/data/grafana/default.yaml b/data/grafana/default.yaml index 64466055..8ed8c18a 100644 --- a/data/grafana/default.yaml +++ b/data/grafana/default.yaml @@ -2,6 +2,7 @@ grafana::settings: package_name: 'grafana' service_name: 'grafana-server' + key_url: 'https://packages.grafana.com/gpg.key' config_file_path: '/etc/grafana/grafana.ini' custom_file_path: '/etc/grafana/custom.ini' ldap_file_path: '/etc/grafana/ldap.toml' diff --git a/data/grafana/osfamily/Debian.yaml b/data/grafana/osfamily/Debian.yaml index be66de8e..30725d93 100644 --- a/data/grafana/osfamily/Debian.yaml +++ b/data/grafana/osfamily/Debian.yaml @@ -1,10 +1,9 @@ --- grafana::settings: init_file_path: '/etc/default/grafana-server' - repo_url: 'https://packagecloud.io/grafana/stable/debian/' - apt_repos: 'stretch main' + repo_url: 'https://packages.grafana.com/oss/deb' + apt_repos: 'main' key: 'D59097AB' - key_url: 'https://packagecloud.io/gpg.key' package_prerequisites: - 'libfontconfig1' - 'adduser' diff --git a/data/grafana/osfamily/RedHat.yaml b/data/grafana/osfamily/RedHat.yaml index 75e2d048..8afd74fc 100644 --- a/data/grafana/osfamily/RedHat.yaml +++ b/data/grafana/osfamily/RedHat.yaml @@ -1,9 +1,8 @@ --- grafana::settings: init_file_path: '/etc/sysconfig/grafana-server' - repo_url: 'https://packagecloud.io/grafana/stable/el/7/$basearch' + repo_url: 'https://packages.grafana.com/oss/rpm' key: 'D59097AB' - key_url: 'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana' package_prerequisites: - 'initscripts' - 'fontconfig' diff --git a/data/virtualbox/default.yaml b/data/virtualbox/default.yaml index 209c79fa..21649e58 100644 --- a/data/virtualbox/default.yaml +++ b/data/virtualbox/default.yaml @@ -1,5 +1,5 @@ --- virtualbox::settings: - package_name: 'VirtualBox-5.2' + package_name: 'virtualbox-6.0' service_name: 'vboxdrv' config_dir_path: '/etc/vbox' diff --git a/data/virtualbox/operatingsystem/Debian7.yaml b/data/virtualbox/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..6d3bf48b --- /dev/null +++ b/data/virtualbox/operatingsystem/Debian7.yaml @@ -0,0 +1,4 @@ +--- + virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu14.04.yaml b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..6d3bf48b --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,4 @@ +--- + virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu14.10.yaml b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml new file mode 100644 index 00000000..6d3bf48b --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml @@ -0,0 +1,4 @@ +--- + virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu15.04.yaml b/data/virtualbox/operatingsystem/Ubuntu15.04.yaml new file mode 100644 index 00000000..6d3bf48b --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu15.04.yaml @@ -0,0 +1,4 @@ +--- + virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu15.10.yaml b/data/virtualbox/operatingsystem/Ubuntu15.10.yaml new file mode 100644 index 00000000..6d3bf48b --- /dev/null +++ b/data/virtualbox/operatingsystem/Ubuntu15.10.yaml @@ -0,0 +1,4 @@ +--- + virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/osfamily/Debian.yaml b/data/virtualbox/osfamily/Debian.yaml index b5c53881..b71a9085 100644 --- a/data/virtualbox/osfamily/Debian.yaml +++ b/data/virtualbox/osfamily/Debian.yaml @@ -1,7 +1,10 @@ --- virtualbox::settings: repo_url: 'https://download.virtualbox.org/virtualbox/debian' - key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' - key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + key: 'B9F8 D658 297A F3EF C18D 5CDF A2F6 83C5 2980 AECF' + key_url: 'https://www.virtualbox.org/download/oracle_vbox_2016.asc' apt_repos: 'contrib' + # Keys for Debian < 8 and Ubuntu < 16.04 + # key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + # key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' From 8288a6e66c5966670258a28e6dba5b89c28f9de7 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 4 Oct 2019 00:23:38 +0200 Subject: [PATCH 170/284] Updated default data and preparation for upstream_repo setting in mongo and puppet --- data/default.yaml | 1 + data/default/Debian10.yaml | 3 +++ data/default/Debian11.yaml | 3 +++ data/default/Debian5.yaml | 3 +++ data/default/Debian6.yaml | 3 +++ data/default/Ubuntu16.10.yaml | 3 +++ data/default/Ubuntu17.04.yaml | 3 +++ data/default/Ubuntu17.10.yaml | 3 +++ data/default/Ubuntu19.04.yaml | 3 +++ data/default/Ubuntu19.10.yaml | 3 +++ data/mongodb/hiera.yaml | 2 +- .../osfamily/RedHat.yaml} | 4 ++-- data/puppet-agent/osfamily/RedHat8.yaml | 3 +++ data/puppet/default.yaml | 1 + data/puppet/hiera.yaml | 6 +++-- data/puppet/upstream/default.yaml | 22 +++++++++++++++++++ .../upstream/operatingsystem/Centos6.yaml | 3 +++ .../upstream/operatingsystem/Debian10.yaml | 3 +++ .../upstream/operatingsystem/Debian7.yaml | 3 +++ .../upstream/operatingsystem/Debian8.yaml | 4 ++++ .../upstream/operatingsystem/Debian9.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu12.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu14.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu16.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu18.04.yaml | 3 +++ data/puppet/upstream/osfamily/Debian.yaml | 4 ++++ data/puppet/upstream/osfamily/Linux.yaml | 4 ++++ data/puppet/upstream/osfamily/RedHat.yaml | 4 ++++ data/puppet/upstream/osfamily/RedHat5.yaml | 3 +++ data/puppet/upstream/osfamily/RedHat6.yaml | 3 +++ data/puppet/upstream/osfamily/RedHat7.yaml | 3 +++ data/puppet/upstream/osfamily/RedHat8.yaml | 3 +++ data/puppet/upstream/osfamily/Windows.yaml | 16 ++++++++++++++ 33 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 data/default/Debian10.yaml create mode 100644 data/default/Debian11.yaml create mode 100644 data/default/Debian5.yaml create mode 100644 data/default/Debian6.yaml create mode 100644 data/default/Ubuntu16.10.yaml create mode 100644 data/default/Ubuntu17.04.yaml create mode 100644 data/default/Ubuntu17.10.yaml create mode 100644 data/default/Ubuntu19.04.yaml create mode 100644 data/default/Ubuntu19.10.yaml rename data/mongodb/{repo/mongodb-org-3.2-RedHat.yaml => upstream/osfamily/RedHat.yaml} (81%) create mode 100644 data/puppet-agent/osfamily/RedHat8.yaml create mode 100644 data/puppet/upstream/default.yaml create mode 100644 data/puppet/upstream/operatingsystem/Centos6.yaml create mode 100644 data/puppet/upstream/operatingsystem/Debian10.yaml create mode 100644 data/puppet/upstream/operatingsystem/Debian7.yaml create mode 100644 data/puppet/upstream/operatingsystem/Debian8.yaml create mode 100644 data/puppet/upstream/operatingsystem/Debian9.yaml create mode 100644 data/puppet/upstream/operatingsystem/Ubuntu12.04.yaml create mode 100644 data/puppet/upstream/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/puppet/upstream/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/puppet/upstream/operatingsystem/Ubuntu18.04.yaml create mode 100644 data/puppet/upstream/osfamily/Debian.yaml create mode 100644 data/puppet/upstream/osfamily/Linux.yaml create mode 100644 data/puppet/upstream/osfamily/RedHat.yaml create mode 100644 data/puppet/upstream/osfamily/RedHat5.yaml create mode 100644 data/puppet/upstream/osfamily/RedHat6.yaml create mode 100644 data/puppet/upstream/osfamily/RedHat7.yaml create mode 100644 data/puppet/upstream/osfamily/RedHat8.yaml create mode 100644 data/puppet/upstream/osfamily/Windows.yaml diff --git a/data/default.yaml b/data/default.yaml index 6751c582..a0bf052a 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -1,5 +1,6 @@ --- default::settings: + upstream_repo: false package_ensure: 'present' service_ensure: 'running' service_enable: true diff --git a/data/default/Debian10.yaml b/data/default/Debian10.yaml new file mode 100644 index 00000000..dd692da0 --- /dev/null +++ b/data/default/Debian10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'buster' diff --git a/data/default/Debian11.yaml b/data/default/Debian11.yaml new file mode 100644 index 00000000..b8656a48 --- /dev/null +++ b/data/default/Debian11.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'bullseye' diff --git a/data/default/Debian5.yaml b/data/default/Debian5.yaml new file mode 100644 index 00000000..5ff8102e --- /dev/null +++ b/data/default/Debian5.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'lenny' diff --git a/data/default/Debian6.yaml b/data/default/Debian6.yaml new file mode 100644 index 00000000..92098b73 --- /dev/null +++ b/data/default/Debian6.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'squeeze' diff --git a/data/default/Ubuntu16.10.yaml b/data/default/Ubuntu16.10.yaml new file mode 100644 index 00000000..16d243e2 --- /dev/null +++ b/data/default/Ubuntu16.10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'yakkety' diff --git a/data/default/Ubuntu17.04.yaml b/data/default/Ubuntu17.04.yaml new file mode 100644 index 00000000..4ce0aede --- /dev/null +++ b/data/default/Ubuntu17.04.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'zesty' diff --git a/data/default/Ubuntu17.10.yaml b/data/default/Ubuntu17.10.yaml new file mode 100644 index 00000000..509e6470 --- /dev/null +++ b/data/default/Ubuntu17.10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'artful' diff --git a/data/default/Ubuntu19.04.yaml b/data/default/Ubuntu19.04.yaml new file mode 100644 index 00000000..864f8715 --- /dev/null +++ b/data/default/Ubuntu19.04.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'disco' diff --git a/data/default/Ubuntu19.10.yaml b/data/default/Ubuntu19.10.yaml new file mode 100644 index 00000000..f13a4881 --- /dev/null +++ b/data/default/Ubuntu19.10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'eoan' diff --git a/data/mongodb/hiera.yaml b/data/mongodb/hiera.yaml index 3ce93e93..b83f857a 100644 --- a/data/mongodb/hiera.yaml +++ b/data/mongodb/hiera.yaml @@ -1,6 +1,6 @@ --- :hierarchy: - - "%{title}/repo/%{repo}-%{osfamily}" + - "%{title}/%{repo}/osfamily/%{osfamily}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/mongodb/repo/mongodb-org-3.2-RedHat.yaml b/data/mongodb/upstream/osfamily/RedHat.yaml similarity index 81% rename from data/mongodb/repo/mongodb-org-3.2-RedHat.yaml rename to data/mongodb/upstream/osfamily/RedHat.yaml index 8a95a985..06ba5a87 100644 --- a/data/mongodb/repo/mongodb-org-3.2-RedHat.yaml +++ b/data/mongodb/upstream/osfamily/RedHat.yaml @@ -1,7 +1,7 @@ --- mongodb::settings: - repo_url: 'https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.2/x86_64/' - key_url: 'https://www.mongodb.org/static/pgp/server-3.2.asc' + repo_url: 'https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.2/x86_64/' + key_url: 'https://www.mongodb.org/static/pgp/server-4.2.asc' package_name: 'mongodb-org' service_name: 'mongod' config_file_path: '/etc/mongod.conf' diff --git a/data/puppet-agent/osfamily/RedHat8.yaml b/data/puppet-agent/osfamily/RedHat8.yaml new file mode 100644 index 00000000..4d2f3488 --- /dev/null +++ b/data/puppet-agent/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- + puppet-agent::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-8.noarch.rpm' diff --git a/data/puppet/default.yaml b/data/puppet/default.yaml index 85e3f0ff..876fb078 100644 --- a/data/puppet/default.yaml +++ b/data/puppet/default.yaml @@ -1,5 +1,6 @@ --- puppet::settings: + upstream_repo: true package_name: 'puppet' service_name: 'puppet' config_file_path: '/etc/puppet/puppet.conf' diff --git a/data/puppet/hiera.yaml b/data/puppet/hiera.yaml index 19fa9ae9..a53d4aff 100644 --- a/data/puppet/hiera.yaml +++ b/data/puppet/hiera.yaml @@ -1,6 +1,8 @@ --- :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" - "default/%{operatingsystem}" - default diff --git a/data/puppet/upstream/default.yaml b/data/puppet/upstream/default.yaml new file mode 100644 index 00000000..50ed9f24 --- /dev/null +++ b/data/puppet/upstream/default.yaml @@ -0,0 +1,22 @@ +--- + puppet::settings: + package_name: 'puppet-agent' + service_name: 'puppet' + config_file_path: '/etc/puppetlabs/puppet/puppet.conf' + fileserver_file_path: '/etc/puppetlabs/puppet/fileserver.conf' + routes_file_path: '/etc/puppetlabs/puppet/routes.yaml' + autosign_file_path: '/etc/puppetlabs/puppet/autosign.conf' + auth_file_path: '/etc/puppetlabs/puppet/auth.conf' + puppetdb_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' + config_dir_path: '/etc/puppetlabs/puppet/' + code_dir_path: '/etc/puppetlabs/code' + environment_dir_path: '/etc/puppetlabs/code/environments' + pid_file_path: '/var/run/puppetlabs/agent.pid' + log_file_path: + - '/var/log/puppetlabs/puppet/puppet.log' + - '/var/log/puppetlabs/pxp-agent/pxp-agent.log' + - '/var/log/puppetlabs/mcollective-log' + log_dir_path: '/var/log/puppetlabs/puppet' + process_name: 'puppet' + process_user: 'root' + process_group: 'root' diff --git a/data/puppet/upstream/operatingsystem/Centos6.yaml b/data/puppet/upstream/operatingsystem/Centos6.yaml new file mode 100644 index 00000000..82443c6f --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Centos6.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + dockerfile_prerequisites: 'RUN yum install -y wget systemd' diff --git a/data/puppet/upstream/operatingsystem/Debian10.yaml b/data/puppet/upstream/operatingsystem/Debian10.yaml new file mode 100644 index 00000000..7ad25000 --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Debian10.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-buster.deb' diff --git a/data/puppet/upstream/operatingsystem/Debian7.yaml b/data/puppet/upstream/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..2489051c --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Debian7.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-wheezy.deb' diff --git a/data/puppet/upstream/operatingsystem/Debian8.yaml b/data/puppet/upstream/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..09f6bd14 --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Debian8.yaml @@ -0,0 +1,4 @@ +--- + puppet::settings: + repo_package_name: 'puppet-release' + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-jessie.deb' diff --git a/data/puppet/upstream/operatingsystem/Debian9.yaml b/data/puppet/upstream/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..b8d17a3d --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-stretch.deb' diff --git a/data/puppet/upstream/operatingsystem/Ubuntu12.04.yaml b/data/puppet/upstream/operatingsystem/Ubuntu12.04.yaml new file mode 100644 index 00000000..0f2b5cff --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Ubuntu12.04.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-pc1-precise.deb' diff --git a/data/puppet/upstream/operatingsystem/Ubuntu14.04.yaml b/data/puppet/upstream/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..846e6208 --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-trusty.deb' diff --git a/data/puppet/upstream/operatingsystem/Ubuntu16.04.yaml b/data/puppet/upstream/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..f1ce6db3 --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-xenial.deb' diff --git a/data/puppet/upstream/operatingsystem/Ubuntu18.04.yaml b/data/puppet/upstream/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..2a4ee6ae --- /dev/null +++ b/data/puppet/upstream/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://apt.puppetlabs.com/puppet-release-bionic.deb' diff --git a/data/puppet/upstream/osfamily/Debian.yaml b/data/puppet/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..f2a5f22d --- /dev/null +++ b/data/puppet/upstream/osfamily/Debian.yaml @@ -0,0 +1,4 @@ +--- + puppet::settings: + repo_package_name: 'puppet-release' + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet/upstream/osfamily/Linux.yaml b/data/puppet/upstream/osfamily/Linux.yaml new file mode 100644 index 00000000..407c04b9 --- /dev/null +++ b/data/puppet/upstream/osfamily/Linux.yaml @@ -0,0 +1,4 @@ +--- + puppet::settings: + package_name: '' + dockerfile_prerequisites: "RUN echo -e 'http://dl-3.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && echo -e 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk update && apk add shadow ruby less bash && gem install puppet --no-ri --no-rdoc " diff --git a/data/puppet/upstream/osfamily/RedHat.yaml b/data/puppet/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..220b15d8 --- /dev/null +++ b/data/puppet/upstream/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- + puppet::settings: + repo_package_name: 'puppet-release' + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppet/upstream/osfamily/RedHat5.yaml b/data/puppet/upstream/osfamily/RedHat5.yaml new file mode 100644 index 00000000..ed19dde3 --- /dev/null +++ b/data/puppet/upstream/osfamily/RedHat5.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-5.noarch.rpm' diff --git a/data/puppet/upstream/osfamily/RedHat6.yaml b/data/puppet/upstream/osfamily/RedHat6.yaml new file mode 100644 index 00000000..b0175fe3 --- /dev/null +++ b/data/puppet/upstream/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-6.noarch.rpm' diff --git a/data/puppet/upstream/osfamily/RedHat7.yaml b/data/puppet/upstream/osfamily/RedHat7.yaml new file mode 100644 index 00000000..a84da3fe --- /dev/null +++ b/data/puppet/upstream/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-7.noarch.rpm' diff --git a/data/puppet/upstream/osfamily/RedHat8.yaml b/data/puppet/upstream/osfamily/RedHat8.yaml new file mode 100644 index 00000000..a84da3fe --- /dev/null +++ b/data/puppet/upstream/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- + puppet::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-7.noarch.rpm' diff --git a/data/puppet/upstream/osfamily/Windows.yaml b/data/puppet/upstream/osfamily/Windows.yaml new file mode 100644 index 00000000..44556db4 --- /dev/null +++ b/data/puppet/upstream/osfamily/Windows.yaml @@ -0,0 +1,16 @@ +--- +# TODO: Verify and manage Windows versions older than 2008 + puppet::settings: + config_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\puppet.conf' + fileserver_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\fileserver.conf' + routes_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\routes.yaml' + autosign_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\autosign.conf' + auth_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\auth.conf' + config_dir_path: 'C:\ProgramData\PuppetLabs\puppet\etc' + code_dir_path: 'C:\ProgramData\PuppetLabs\code' + environment_dir_path: 'C:\ProgramData\PuppetLabs\code\environments' + pid_file_path: 'C:\ProgramData\PuppetLabs\var\run\agent.pid' + log_file_path: 'C:\ProgramData\PuppetLabs\var\log\puppet.log' + log_dir_path: 'C:\ProgramData\PuppetLabs\var\log' + process_user: 'LocalSystem' + process_group: 'LocalSystem' From 0646d8b24e9e3110eca386e31b5820a5fd77c614 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 15 Oct 2019 00:30:05 +0200 Subject: [PATCH 171/284] pdk convert --- .fixtures.yml | 11 +++++++++++ CHANGELOG.md | 11 +++++++++++ data/common.yaml | 1 + data/vagrant/hiera.yaml | 2 +- hiera.yaml | 10 ++++++++++ metadata.json | 33 ++++++++++++++++++--------------- 6 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 .fixtures.yml create mode 100644 CHANGELOG.md create mode 100644 data/common.yaml create mode 100644 hiera.yaml diff --git a/.fixtures.yml b/.fixtures.yml new file mode 100644 index 00000000..d086bf79 --- /dev/null +++ b/.fixtures.yml @@ -0,0 +1,11 @@ +--- +fixtures: + repositories: + "concat": "git://github.com/puppetlabs/puppetlabs-concat.git" + "vcsrepo": "git://github.com/puppetlabs/puppetlabs-vcsrepo.git" + "tp_profile": "git://github.com/example42/puppet-tp_profile.git" + "tp": "git://github.com/example42/puppet-tp.git" + "psick": "git://github.com/example42/puppet-psick.git" + "yumrepo": "https://github.com/puppetlabs/puppetlabs-yumrepo_core" + forge_modules: + stdlib: "puppetlabs/stdlib" diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..f3b99c94 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,11 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +## Release 0.3.3 + +**Features** + +**Bugfixes** + +**Known Issues** diff --git a/data/common.yaml b/data/common.yaml new file mode 100644 index 00000000..ed97d539 --- /dev/null +++ b/data/common.yaml @@ -0,0 +1 @@ +--- diff --git a/data/vagrant/hiera.yaml b/data/vagrant/hiera.yaml index cb5d3884..a6dec64c 100644 --- a/data/vagrant/hiera.yaml +++ b/data/vagrant/hiera.yaml @@ -2,6 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - - "default/%{operatingsystem}"%{operatingsystemmajrelease} + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/hiera.yaml b/hiera.yaml new file mode 100644 index 00000000..806d4489 --- /dev/null +++ b/hiera.yaml @@ -0,0 +1,10 @@ +--- +version: 5 + +defaults: # Used for any hierarchy level that omits these keys. + datadir: data # This path is relative to hiera.yaml's directory. + data_hash: yaml_data # Use the built-in YAML backend. + +hierarchy: + - name: 'common' + path: 'common.yaml' diff --git a/metadata.json b/metadata.json index 66f26cc2..2a6b684d 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.3.3", + "version": "0.4.0", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", @@ -15,28 +15,32 @@ "operatingsystem": "RedHat", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { "operatingsystem": "Scientific", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { @@ -51,7 +55,8 @@ "operatingsystemrelease": [ "6", "7", - "8" + "8", + "9" ] }, { @@ -59,23 +64,21 @@ "operatingsystemrelease": [ "10.04", "12.04", - "14.04" + "14.04", + "16.04", + "18.04" ] } ], "requirements": [ - { - "name": "pe", - "version_requirement": ">= 3.0.0 < 2016.4.0" - }, { "name": "puppet", - "version_requirement": ">= 3.0.0 < 5.0.0" + "version_requirement": ">= 3.0.0 < 8.0.0" } ], "checksums": { }, - "pdk-version": "1.10.0", - "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git#1.10.0", - "template-ref": "1.10.0-0-gbba9ac3" + "pdk-version": "1.14.0", + "template-url": "https://github.com/puppetlabs/pdk-templates#1.10.0", + "template-ref": "tags/1.10.0-0-gbba9ac3" } From 22f4f32860762c1d427570c6abe5712cd2ffbdb1 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 17 Oct 2019 01:35:09 +0200 Subject: [PATCH 172/284] No ntpdata package on RedHat 8 --- data/ntpdate/hiera.yaml | 1 + data/ntpdate/osfamily/RedHat8.yaml | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 data/ntpdate/osfamily/RedHat8.yaml diff --git a/data/ntpdate/hiera.yaml b/data/ntpdate/hiera.yaml index 19fa9ae9..a3944b3d 100644 --- a/data/ntpdate/hiera.yaml +++ b/data/ntpdate/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/ntpdate/osfamily/RedHat8.yaml b/data/ntpdate/osfamily/RedHat8.yaml new file mode 100644 index 00000000..2395c902 --- /dev/null +++ b/data/ntpdate/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- + ntpdate::settings: + package_name: '' From 811be774eb4dc065d7c987efa9b97bf2f80439df Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 17 Oct 2019 02:31:54 +0200 Subject: [PATCH 173/284] Fixed grafana on Debian --- data/grafana/osfamily/Debian.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/grafana/osfamily/Debian.yaml b/data/grafana/osfamily/Debian.yaml index 30725d93..132d72f7 100644 --- a/data/grafana/osfamily/Debian.yaml +++ b/data/grafana/osfamily/Debian.yaml @@ -3,6 +3,7 @@ init_file_path: '/etc/default/grafana-server' repo_url: 'https://packages.grafana.com/oss/deb' apt_repos: 'main' + apt_release: 'stable' key: 'D59097AB' package_prerequisites: - 'libfontconfig1' From 2bca2db43106c0be73dd1eb872867488e3720a58 Mon Sep 17 00:00:00 2001 From: bohmeike <39402925+bohmeike@users.noreply.github.com> Date: Tue, 17 Dec 2019 11:11:37 +0100 Subject: [PATCH 174/284] Change default path for RedHat The path for RedHat must '/etc/multipath.conf' --- data/multipath/osfamily/RedHat.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/multipath/osfamily/RedHat.yaml b/data/multipath/osfamily/RedHat.yaml index ad9a55a6..78d99be0 100644 --- a/data/multipath/osfamily/RedHat.yaml +++ b/data/multipath/osfamily/RedHat.yaml @@ -3,3 +3,4 @@ package_name: 'device-mapper-multipath' service_name: 'multipathd' init_file_path: '/etc/sysconfig/multipath' + config_file_path: '/etc/multipath.conf' From 8cb90e15e97075a921cb521ea5507291487ebbe5 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 9 Apr 2020 23:25:12 +0200 Subject: [PATCH 175/284] Added kubernetes data --- data/icinga2/osfamily/RedHat.yaml | 3 +++ data/kubernetes/default.yaml | 10 ++++++++++ data/kubernetes/hiera.yaml | 9 +++++++++ data/kubernetes/operatingsystem/Debian6.yaml | 3 +++ data/kubernetes/operatingsystem/Debian7.yaml | 3 +++ data/kubernetes/operatingsystem/Debian8.yaml | 3 +++ data/kubernetes/operatingsystem/Debian9.yaml | 3 +++ data/kubernetes/operatingsystem/Ubuntu12.04.yaml | 3 +++ data/kubernetes/operatingsystem/Ubuntu14.04.yaml | 3 +++ data/kubernetes/operatingsystem/Ubuntu16.04.yaml | 3 +++ data/kubernetes/operatingsystem/Ubuntu16.10.yaml | 3 +++ data/kubernetes/operatingsystem/Ubuntu18.04.yaml | 3 +++ data/kubernetes/osfamily/Debian.yaml | 7 +++++++ data/kubernetes/osfamily/RedHat.yaml | 7 +++++++ data/kubernetes/osfamily/RedHat6.yaml | 3 +++ data/kubernetes/osfamily/RedHat7.yaml | 3 +++ data/kubernetes/osfamily/RedHat8.yaml | 3 +++ 17 files changed, 72 insertions(+) create mode 100644 data/kubernetes/default.yaml create mode 100644 data/kubernetes/hiera.yaml create mode 100644 data/kubernetes/operatingsystem/Debian6.yaml create mode 100644 data/kubernetes/operatingsystem/Debian7.yaml create mode 100644 data/kubernetes/operatingsystem/Debian8.yaml create mode 100644 data/kubernetes/operatingsystem/Debian9.yaml create mode 100644 data/kubernetes/operatingsystem/Ubuntu12.04.yaml create mode 100644 data/kubernetes/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/kubernetes/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/kubernetes/operatingsystem/Ubuntu16.10.yaml create mode 100644 data/kubernetes/operatingsystem/Ubuntu18.04.yaml create mode 100644 data/kubernetes/osfamily/Debian.yaml create mode 100644 data/kubernetes/osfamily/RedHat.yaml create mode 100644 data/kubernetes/osfamily/RedHat6.yaml create mode 100644 data/kubernetes/osfamily/RedHat7.yaml create mode 100644 data/kubernetes/osfamily/RedHat8.yaml diff --git a/data/icinga2/osfamily/RedHat.yaml b/data/icinga2/osfamily/RedHat.yaml index be31df0c..508e34d2 100644 --- a/data/icinga2/osfamily/RedHat.yaml +++ b/data/icinga2/osfamily/RedHat.yaml @@ -5,3 +5,6 @@ config_file_owner: 'icinga' config_file_mode: '0640' repo_package_name: 'icinga-rpm-release' + tp_prerequisites: + - epel + diff --git a/data/kubernetes/default.yaml b/data/kubernetes/default.yaml new file mode 100644 index 00000000..3302687b --- /dev/null +++ b/data/kubernetes/default.yaml @@ -0,0 +1,10 @@ +--- +kubernetes::settings: + package_name: + - 'kubeadm' + - 'kubectl' + - 'kubelet' + service_name: 'kubelet' + config_file_path: '/etc/kubernetes/kubelet.conf' + config_dir_path: '/etc/kubernetes' + tcp_port: '10250' diff --git a/data/kubernetes/hiera.yaml b/data/kubernetes/hiera.yaml new file mode 100644 index 00000000..ed314e3d --- /dev/null +++ b/data/kubernetes/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/kubernetes/operatingsystem/Debian6.yaml b/data/kubernetes/operatingsystem/Debian6.yaml new file mode 100644 index 00000000..9cebfcb9 --- /dev/null +++ b/data/kubernetes/operatingsystem/Debian6.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-squeeze' diff --git a/data/kubernetes/operatingsystem/Debian7.yaml b/data/kubernetes/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..63fe17f2 --- /dev/null +++ b/data/kubernetes/operatingsystem/Debian7.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-wheezy' diff --git a/data/kubernetes/operatingsystem/Debian8.yaml b/data/kubernetes/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..04771efb --- /dev/null +++ b/data/kubernetes/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-jessie' diff --git a/data/kubernetes/operatingsystem/Debian9.yaml b/data/kubernetes/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..ec00426b --- /dev/null +++ b/data/kubernetes/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-stretch' diff --git a/data/kubernetes/operatingsystem/Ubuntu12.04.yaml b/data/kubernetes/operatingsystem/Ubuntu12.04.yaml new file mode 100644 index 00000000..b60e3763 --- /dev/null +++ b/data/kubernetes/operatingsystem/Ubuntu12.04.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-precise' diff --git a/data/kubernetes/operatingsystem/Ubuntu14.04.yaml b/data/kubernetes/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..daa7ccdd --- /dev/null +++ b/data/kubernetes/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-trusty' diff --git a/data/kubernetes/operatingsystem/Ubuntu16.04.yaml b/data/kubernetes/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..c8a630f9 --- /dev/null +++ b/data/kubernetes/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-xenial' diff --git a/data/kubernetes/operatingsystem/Ubuntu16.10.yaml b/data/kubernetes/operatingsystem/Ubuntu16.10.yaml new file mode 100644 index 00000000..e92f4ed4 --- /dev/null +++ b/data/kubernetes/operatingsystem/Ubuntu16.10.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-yakkety' diff --git a/data/kubernetes/operatingsystem/Ubuntu18.04.yaml b/data/kubernetes/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..7e8585bf --- /dev/null +++ b/data/kubernetes/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + apt_release: 'kubernetes-bionic' diff --git a/data/kubernetes/osfamily/Debian.yaml b/data/kubernetes/osfamily/Debian.yaml new file mode 100644 index 00000000..c0ea4ea4 --- /dev/null +++ b/data/kubernetes/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- +kubernetes::settings: + init_file_path: '/etc/default/kubelet' + repo_url: 'https://apt.kubernetes.io' + key: '54A6 47F9 048D 5688 D7DA 2ABE 6A03 0B21 BA07 F4FB' + key_url: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg' + apt_repos: 'main' diff --git a/data/kubernetes/osfamily/RedHat.yaml b/data/kubernetes/osfamily/RedHat.yaml new file mode 100644 index 00000000..0deedee4 --- /dev/null +++ b/data/kubernetes/osfamily/RedHat.yaml @@ -0,0 +1,7 @@ +--- +kubernetes::settings: + init_file_path: '/etc/sysconfig/kubelet' + key: 'A7317B0F' + key_url: 'https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg' + repo_filename: 'kubernetes' + repo_description: 'Kubernetes' diff --git a/data/kubernetes/osfamily/RedHat6.yaml b/data/kubernetes/osfamily/RedHat6.yaml new file mode 100644 index 00000000..62ff4afd --- /dev/null +++ b/data/kubernetes/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + repo_url: 'https://packages.cloud.google.com/yum/repos/kubernetes-el6-$basearch' diff --git a/data/kubernetes/osfamily/RedHat7.yaml b/data/kubernetes/osfamily/RedHat7.yaml new file mode 100644 index 00000000..b2b8eaa4 --- /dev/null +++ b/data/kubernetes/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + repo_url: 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch' diff --git a/data/kubernetes/osfamily/RedHat8.yaml b/data/kubernetes/osfamily/RedHat8.yaml new file mode 100644 index 00000000..a83bf199 --- /dev/null +++ b/data/kubernetes/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +kubernetes::settings: + repo_url: 'https://packages.cloud.google.com/yum/repos/kubernetes-el8-$basearch' From cdd3dec6e353f8ad77c4c13d3f30d63d40bdda02 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 10 Apr 2020 11:28:24 +0200 Subject: [PATCH 176/284] Added epel for rhel8 --- data/epel/osfamily/RedHat.yaml | 4 ++-- data/epel/osfamily/RedHat5.yaml | 4 ++-- data/epel/osfamily/RedHat6.yaml | 4 ++-- data/epel/osfamily/RedHat7.yaml | 4 ++-- data/epel/osfamily/RedHat8.yaml | 3 +++ 5 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 data/epel/osfamily/RedHat8.yaml diff --git a/data/epel/osfamily/RedHat.yaml b/data/epel/osfamily/RedHat.yaml index 86861d6c..1b4ca2fb 100644 --- a/data/epel/osfamily/RedHat.yaml +++ b/data/epel/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - epel::settings: - repo_package_name: 'epel-release' +epel::settings: + repo_package_name: 'epel-release' diff --git a/data/epel/osfamily/RedHat5.yaml b/data/epel/osfamily/RedHat5.yaml index 0b8bc02c..1fc5e1af 100644 --- a/data/epel/osfamily/RedHat5.yaml +++ b/data/epel/osfamily/RedHat5.yaml @@ -1,3 +1,3 @@ --- - epel::settings: - repo_package_url: 'http://dl.fedoraproject.org/pub/archive/epel/5/x86_64/epel-release-5-4.noarch.rpm' +epel::settings: + repo_package_url: 'https://dl.fedoraproject.org/pub/archive/epel/5/x86_64/epel-release-5-4.noarch.rpm' diff --git a/data/epel/osfamily/RedHat6.yaml b/data/epel/osfamily/RedHat6.yaml index 2e1f8083..323c6215 100644 --- a/data/epel/osfamily/RedHat6.yaml +++ b/data/epel/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- - epel::settings: - repo_package_url: 'http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm' +epel::settings: + repo_package_url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm' diff --git a/data/epel/osfamily/RedHat7.yaml b/data/epel/osfamily/RedHat7.yaml index 08d0c8dc..1e3f0fb5 100644 --- a/data/epel/osfamily/RedHat7.yaml +++ b/data/epel/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- - epel::settings: - repo_package_url: 'http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' +epel::settings: + repo_package_url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' diff --git a/data/epel/osfamily/RedHat8.yaml b/data/epel/osfamily/RedHat8.yaml new file mode 100644 index 00000000..5701f517 --- /dev/null +++ b/data/epel/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +epel::settings: + repo_package_url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm' From ef778a9402e5f02cd12d9c249c0567ad3873d714 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 13 Apr 2020 14:26:51 +0200 Subject: [PATCH 177/284] Enable powertools to install nagios plugins on RedHat8 --- data/nagios-plugins/hiera.yaml | 2 ++ data/nagios-plugins/osfamily/RedHat8.yaml | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 data/nagios-plugins/osfamily/RedHat8.yaml diff --git a/data/nagios-plugins/hiera.yaml b/data/nagios-plugins/hiera.yaml index 19fa9ae9..d34d2477 100644 --- a/data/nagios-plugins/hiera.yaml +++ b/data/nagios-plugins/hiera.yaml @@ -1,6 +1,8 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/nagios-plugins/osfamily/RedHat8.yaml b/data/nagios-plugins/osfamily/RedHat8.yaml new file mode 100644 index 00000000..308362b7 --- /dev/null +++ b/data/nagios-plugins/osfamily/RedHat8.yaml @@ -0,0 +1,6 @@ +--- + nagios-plugins::settings: + exec_prerequisites: + enable_powertools: + command: 'dnf config-manager --set-enabled PowerTools' + unless: "grep 'enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo 2>&1>/dev/null" From a0ca87824502c0e086b8a04f607acf7ef89d316b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 13 Apr 2020 14:27:21 +0200 Subject: [PATCH 178/284] Firewalld data --- data/firewalld/default.yaml | 12 ++++++++++++ data/firewalld/hiera.yaml | 7 +++++++ data/firewalld/osfamily/Debian.yaml | 3 +++ data/firewalld/osfamily/RedHat.yaml | 3 +++ 4 files changed, 25 insertions(+) create mode 100644 data/firewalld/default.yaml create mode 100644 data/firewalld/hiera.yaml create mode 100644 data/firewalld/osfamily/Debian.yaml create mode 100644 data/firewalld/osfamily/RedHat.yaml diff --git a/data/firewalld/default.yaml b/data/firewalld/default.yaml new file mode 100644 index 00000000..c14af43b --- /dev/null +++ b/data/firewalld/default.yaml @@ -0,0 +1,12 @@ +--- +firewalld::settings: + package_name: 'firewalld' + service_name: 'firewalld' + config_file_path: '/etc/firewalld/firewalld.conf' + config_dir_path: '/etc/firewalld' + log_file_path: '/var/log/firewalld' + pid_file_path: '/var/run/firewalld' + process_name: 'python' + process_args: 'firewalld' + process_user: 'root' + process_group: 'root' diff --git a/data/firewalld/hiera.yaml b/data/firewalld/hiera.yaml new file mode 100644 index 00000000..a6dec64c --- /dev/null +++ b/data/firewalld/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/firewalld/osfamily/Debian.yaml b/data/firewalld/osfamily/Debian.yaml new file mode 100644 index 00000000..c746cfa1 --- /dev/null +++ b/data/firewalld/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +firewalld::settings: + init_file_path: '/etc/default/firewalld' diff --git a/data/firewalld/osfamily/RedHat.yaml b/data/firewalld/osfamily/RedHat.yaml new file mode 100644 index 00000000..d873f84b --- /dev/null +++ b/data/firewalld/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +firewalld::settings: + init_file_path: '/etc/sysconfig/firewalld' From 6786f83dc92a2dfaf256cdd28d6103e4b457d12d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 25 Apr 2020 12:48:02 +0200 Subject: [PATCH 179/284] Ubuntu 20.04 default --- data/default/Ubuntu20.04.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/default/Ubuntu20.04.yaml diff --git a/data/default/Ubuntu20.04.yaml b/data/default/Ubuntu20.04.yaml new file mode 100644 index 00000000..72a40f06 --- /dev/null +++ b/data/default/Ubuntu20.04.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'focal' From 5f14cd7e5dea56d98e2e8df446d26adc5a4b7aea Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 13 May 2020 19:11:03 +0200 Subject: [PATCH 180/284] Added ius data --- data/ius/hiera.yaml | 7 +++++++ data/ius/osfamily/RedHat.yaml | 4 ++++ data/ius/osfamily/RedHat6.yaml | 3 +++ data/ius/osfamily/RedHat7.yaml | 3 +++ data/ius/osfamily/RedHat8.yaml | 4 ++++ 5 files changed, 21 insertions(+) create mode 100644 data/ius/hiera.yaml create mode 100644 data/ius/osfamily/RedHat.yaml create mode 100644 data/ius/osfamily/RedHat6.yaml create mode 100644 data/ius/osfamily/RedHat7.yaml create mode 100644 data/ius/osfamily/RedHat8.yaml diff --git a/data/ius/hiera.yaml b/data/ius/hiera.yaml new file mode 100644 index 00000000..a3944b3d --- /dev/null +++ b/data/ius/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ius/osfamily/RedHat.yaml b/data/ius/osfamily/RedHat.yaml new file mode 100644 index 00000000..1866eac3 --- /dev/null +++ b/data/ius/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +ius::settings: + repo_package_name: 'ius-release' + diff --git a/data/ius/osfamily/RedHat6.yaml b/data/ius/osfamily/RedHat6.yaml new file mode 100644 index 00000000..603bfffc --- /dev/null +++ b/data/ius/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +ius::settings: + repo_package_url: 'https://repo.ius.io/ius-release-el6.rpm' diff --git a/data/ius/osfamily/RedHat7.yaml b/data/ius/osfamily/RedHat7.yaml new file mode 100644 index 00000000..a82c740d --- /dev/null +++ b/data/ius/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +ius::settings: + repo_package_url: 'https://repo.ius.io/ius-release-el7.rpm' diff --git a/data/ius/osfamily/RedHat8.yaml b/data/ius/osfamily/RedHat8.yaml new file mode 100644 index 00000000..f890ff09 --- /dev/null +++ b/data/ius/osfamily/RedHat8.yaml @@ -0,0 +1,4 @@ +--- + ius::settings: + repo_package_url: 'https://repo.ius.io/ius-release-el8.rpm' + \ No newline at end of file From 95004e77cac0fff82eba14fd0da5fd58012d4a18 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 13 May 2020 19:22:31 +0200 Subject: [PATCH 181/284] Added elrepo data --- data/elrepo/hiera.yaml | 7 +++++++ data/elrepo/osfamily/RedHat.yaml | 4 ++++ data/elrepo/osfamily/RedHat6.yaml | 3 +++ data/elrepo/osfamily/RedHat7.yaml | 3 +++ data/elrepo/osfamily/RedHat8.yaml | 3 +++ 5 files changed, 20 insertions(+) create mode 100644 data/elrepo/hiera.yaml create mode 100644 data/elrepo/osfamily/RedHat.yaml create mode 100644 data/elrepo/osfamily/RedHat6.yaml create mode 100644 data/elrepo/osfamily/RedHat7.yaml create mode 100644 data/elrepo/osfamily/RedHat8.yaml diff --git a/data/elrepo/hiera.yaml b/data/elrepo/hiera.yaml new file mode 100644 index 00000000..a3944b3d --- /dev/null +++ b/data/elrepo/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/elrepo/osfamily/RedHat.yaml b/data/elrepo/osfamily/RedHat.yaml new file mode 100644 index 00000000..46b33c85 --- /dev/null +++ b/data/elrepo/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +elrepo::settings: + repo_package_name: 'elrepo-release' + diff --git a/data/elrepo/osfamily/RedHat6.yaml b/data/elrepo/osfamily/RedHat6.yaml new file mode 100644 index 00000000..b8ee08a9 --- /dev/null +++ b/data/elrepo/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +elrepo::settings: + repo_package_url: 'https://www.elrepo.org/elrepo-release-6.el6.elrepo.noarch.rpm' diff --git a/data/elrepo/osfamily/RedHat7.yaml b/data/elrepo/osfamily/RedHat7.yaml new file mode 100644 index 00000000..142ed240 --- /dev/null +++ b/data/elrepo/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +elrepo::settings: + repo_package_url: 'https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm' diff --git a/data/elrepo/osfamily/RedHat8.yaml b/data/elrepo/osfamily/RedHat8.yaml new file mode 100644 index 00000000..21342954 --- /dev/null +++ b/data/elrepo/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +elrepo::settings: + repo_package_url: 'https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm' From 0cc1f6d04825636b4e82d6f0b6963630c907abd2 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 13 May 2020 19:29:32 +0200 Subject: [PATCH 182/284] Added nux dextop data --- data/nux/hiera.yaml | 7 +++++++ data/nux/osfamily/RedHat.yaml | 5 +++++ data/nux/osfamily/RedHat6.yaml | 3 +++ data/nux/osfamily/RedHat7.yaml | 3 +++ 4 files changed, 18 insertions(+) create mode 100644 data/nux/hiera.yaml create mode 100644 data/nux/osfamily/RedHat.yaml create mode 100644 data/nux/osfamily/RedHat6.yaml create mode 100644 data/nux/osfamily/RedHat7.yaml diff --git a/data/nux/hiera.yaml b/data/nux/hiera.yaml new file mode 100644 index 00000000..a3944b3d --- /dev/null +++ b/data/nux/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nux/osfamily/RedHat.yaml b/data/nux/osfamily/RedHat.yaml new file mode 100644 index 00000000..a6046c3f --- /dev/null +++ b/data/nux/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- +nux::settings: + repo_package_name: 'nux-dextop-release' + tp_prerequisites: + - epel diff --git a/data/nux/osfamily/RedHat6.yaml b/data/nux/osfamily/RedHat6.yaml new file mode 100644 index 00000000..43cb3cda --- /dev/null +++ b/data/nux/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +nux::settings: + repo_package_url: 'http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm' diff --git a/data/nux/osfamily/RedHat7.yaml b/data/nux/osfamily/RedHat7.yaml new file mode 100644 index 00000000..6abc925b --- /dev/null +++ b/data/nux/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +nux::settings: + repo_package_url: 'https://repo.nux.io/nux-release-el7.rpm' From 5571dc311d82e0c170c29dd9d11146134ee4627c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 13 May 2020 19:32:42 +0200 Subject: [PATCH 183/284] Updated nux repo --- data/nux/osfamily/RedHat7.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/nux/osfamily/RedHat7.yaml b/data/nux/osfamily/RedHat7.yaml index 6abc925b..cd54284f 100644 --- a/data/nux/osfamily/RedHat7.yaml +++ b/data/nux/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- nux::settings: - repo_package_url: 'https://repo.nux.io/nux-release-el7.rpm' + repo_package_url: 'http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm' From fd5ebc15b4735d30cc11438d6e8bf02017d7b0d9 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 13 May 2020 21:35:03 +0200 Subject: [PATCH 184/284] Added rpmfusion repos --- data/ius/osfamily/RedHat8.yaml | 4 ---- data/rpmfusion-free/hiera.yaml | 9 +++++++++ data/rpmfusion-free/osfamily/CentOS8.yaml | 6 ++++++ data/rpmfusion-free/osfamily/RedHat.yaml | 5 +++++ data/rpmfusion-free/osfamily/RedHat6.yaml | 3 +++ data/rpmfusion-free/osfamily/RedHat7.yaml | 3 +++ data/rpmfusion-free/osfamily/RedHat8.yaml | 7 +++++++ data/rpmfusion-nonfree/hiera.yaml | 9 +++++++++ data/rpmfusion-nonfree/osfamily/CentOS8.yaml | 6 ++++++ data/rpmfusion-nonfree/osfamily/RedHat.yaml | 5 +++++ data/rpmfusion-nonfree/osfamily/RedHat6.yaml | 3 +++ data/rpmfusion-nonfree/osfamily/RedHat7.yaml | 3 +++ data/rpmfusion-nonfree/osfamily/RedHat8.yaml | 7 +++++++ 13 files changed, 66 insertions(+), 4 deletions(-) delete mode 100644 data/ius/osfamily/RedHat8.yaml create mode 100644 data/rpmfusion-free/hiera.yaml create mode 100644 data/rpmfusion-free/osfamily/CentOS8.yaml create mode 100644 data/rpmfusion-free/osfamily/RedHat.yaml create mode 100644 data/rpmfusion-free/osfamily/RedHat6.yaml create mode 100644 data/rpmfusion-free/osfamily/RedHat7.yaml create mode 100644 data/rpmfusion-free/osfamily/RedHat8.yaml create mode 100644 data/rpmfusion-nonfree/hiera.yaml create mode 100644 data/rpmfusion-nonfree/osfamily/CentOS8.yaml create mode 100644 data/rpmfusion-nonfree/osfamily/RedHat.yaml create mode 100644 data/rpmfusion-nonfree/osfamily/RedHat6.yaml create mode 100644 data/rpmfusion-nonfree/osfamily/RedHat7.yaml create mode 100644 data/rpmfusion-nonfree/osfamily/RedHat8.yaml diff --git a/data/ius/osfamily/RedHat8.yaml b/data/ius/osfamily/RedHat8.yaml deleted file mode 100644 index f890ff09..00000000 --- a/data/ius/osfamily/RedHat8.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - ius::settings: - repo_package_url: 'https://repo.ius.io/ius-release-el8.rpm' - \ No newline at end of file diff --git a/data/rpmfusion-free/hiera.yaml b/data/rpmfusion-free/hiera.yaml new file mode 100644 index 00000000..a0c5a21a --- /dev/null +++ b/data/rpmfusion-free/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rpmfusion-free/osfamily/CentOS8.yaml b/data/rpmfusion-free/osfamily/CentOS8.yaml new file mode 100644 index 00000000..9a3fecce --- /dev/null +++ b/data/rpmfusion-free/osfamily/CentOS8.yaml @@ -0,0 +1,6 @@ +--- +rpmfusion-free::settings: + exec_postinstall: + enable_pmfusion_free: + command: 'dnf config-manager --enable PowerTools' + unless: 'dnf repolist | grep PowerTools' \ No newline at end of file diff --git a/data/rpmfusion-free/osfamily/RedHat.yaml b/data/rpmfusion-free/osfamily/RedHat.yaml new file mode 100644 index 00000000..f37697a7 --- /dev/null +++ b/data/rpmfusion-free/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- +rpmfusion-free::settings: + repo_package_name: 'rpmfusion-free-release' + tp_prerequisites: + - epel diff --git a/data/rpmfusion-free/osfamily/RedHat6.yaml b/data/rpmfusion-free/osfamily/RedHat6.yaml new file mode 100644 index 00000000..d971df2b --- /dev/null +++ b/data/rpmfusion-free/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +rpmfusion-free::settings: + repo_package_url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm' diff --git a/data/rpmfusion-free/osfamily/RedHat7.yaml b/data/rpmfusion-free/osfamily/RedHat7.yaml new file mode 100644 index 00000000..ee01d1b3 --- /dev/null +++ b/data/rpmfusion-free/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +rpmfusion-free::settings: + repo_package_url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm' diff --git a/data/rpmfusion-free/osfamily/RedHat8.yaml b/data/rpmfusion-free/osfamily/RedHat8.yaml new file mode 100644 index 00000000..de406b40 --- /dev/null +++ b/data/rpmfusion-free/osfamily/RedHat8.yaml @@ -0,0 +1,7 @@ +--- +rpmfusion-free::settings: + repo_package_url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm' + exec_postinstall: + enable_pmfusion_free: + command: 'subscription-manager repos --enable "codeready-builder-for-rhel-8-$(uname -m)-rpms"' + unless: 'subscription-manager list --consumed | grep codeready-builder-for-rhel-8-$(uname -m)-rpms' \ No newline at end of file diff --git a/data/rpmfusion-nonfree/hiera.yaml b/data/rpmfusion-nonfree/hiera.yaml new file mode 100644 index 00000000..a0c5a21a --- /dev/null +++ b/data/rpmfusion-nonfree/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/rpmfusion-nonfree/osfamily/CentOS8.yaml b/data/rpmfusion-nonfree/osfamily/CentOS8.yaml new file mode 100644 index 00000000..bb3cdfc8 --- /dev/null +++ b/data/rpmfusion-nonfree/osfamily/CentOS8.yaml @@ -0,0 +1,6 @@ +--- +rpmfusion-nonfree::settings: + exec_postinstall: + enable_pmfusion_free: + command: 'dnf config-manager --enable PowerTools' + unless: 'dnf repolist | grep PowerTools' \ No newline at end of file diff --git a/data/rpmfusion-nonfree/osfamily/RedHat.yaml b/data/rpmfusion-nonfree/osfamily/RedHat.yaml new file mode 100644 index 00000000..b4c75cb9 --- /dev/null +++ b/data/rpmfusion-nonfree/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- +rpmfusion-nonfree::settings: + repo_package_name: 'rpmfusion-nonfree-release' + tp_prerequisites: + - epel diff --git a/data/rpmfusion-nonfree/osfamily/RedHat6.yaml b/data/rpmfusion-nonfree/osfamily/RedHat6.yaml new file mode 100644 index 00000000..d9133dc9 --- /dev/null +++ b/data/rpmfusion-nonfree/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +rpmfusion-nonfree::settings: + repo_package_url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-6.noarch.rpm' diff --git a/data/rpmfusion-nonfree/osfamily/RedHat7.yaml b/data/rpmfusion-nonfree/osfamily/RedHat7.yaml new file mode 100644 index 00000000..350eb7d7 --- /dev/null +++ b/data/rpmfusion-nonfree/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +rpmfusion-nonfree::settings: + repo_package_url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm' diff --git a/data/rpmfusion-nonfree/osfamily/RedHat8.yaml b/data/rpmfusion-nonfree/osfamily/RedHat8.yaml new file mode 100644 index 00000000..572eb167 --- /dev/null +++ b/data/rpmfusion-nonfree/osfamily/RedHat8.yaml @@ -0,0 +1,7 @@ +--- +rpmfusion-nonfree::settings: + repo_package_url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-8.noarch.rpm' + exec_postinstall: + enable_pmfusion_free: + command: 'subscription-manager repos --enable "codeready-builder-for-rhel-8-$(uname -m)-rpms"' + unless: 'subscription-manager list --consumed | grep codeready-builder-for-rhel-8-$(uname -m)-rpms' \ No newline at end of file From 3d7ed6acd50a71423ab6467bafd9658508326723 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 13 May 2020 22:55:50 +0200 Subject: [PATCH 185/284] Added remi repository --- data/remi/hiera.yaml | 9 +++++++++ data/remi/osfamily/CentOS6.yaml | 3 +++ data/remi/osfamily/CentOS7.yaml | 3 +++ data/remi/osfamily/RedHat.yaml | 5 +++++ data/remi/osfamily/RedHat6.yaml | 7 +++++++ data/remi/osfamily/RedHat7.yaml | 7 +++++++ data/remi/osfamily/RedHat8.yaml | 3 +++ 7 files changed, 37 insertions(+) create mode 100644 data/remi/hiera.yaml create mode 100644 data/remi/osfamily/CentOS6.yaml create mode 100644 data/remi/osfamily/CentOS7.yaml create mode 100644 data/remi/osfamily/RedHat.yaml create mode 100644 data/remi/osfamily/RedHat6.yaml create mode 100644 data/remi/osfamily/RedHat7.yaml create mode 100644 data/remi/osfamily/RedHat8.yaml diff --git a/data/remi/hiera.yaml b/data/remi/hiera.yaml new file mode 100644 index 00000000..a0c5a21a --- /dev/null +++ b/data/remi/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/remi/osfamily/CentOS6.yaml b/data/remi/osfamily/CentOS6.yaml new file mode 100644 index 00000000..eaa4ac33 --- /dev/null +++ b/data/remi/osfamily/CentOS6.yaml @@ -0,0 +1,3 @@ +--- +remi::settings: + repo_package_url: 'https://rpms.remirepo.net/enterprise/remi-release-6.rpm' diff --git a/data/remi/osfamily/CentOS7.yaml b/data/remi/osfamily/CentOS7.yaml new file mode 100644 index 00000000..ee1e40e1 --- /dev/null +++ b/data/remi/osfamily/CentOS7.yaml @@ -0,0 +1,3 @@ +--- +remi::settings: + repo_package_url: 'https://rpms.remirepo.net/enterprise/remi-release-7.rpm' diff --git a/data/remi/osfamily/RedHat.yaml b/data/remi/osfamily/RedHat.yaml new file mode 100644 index 00000000..2ca4818c --- /dev/null +++ b/data/remi/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- +remi::settings: + repo_package_name: 'remi-release' + tp_prerequisites: + - epel diff --git a/data/remi/osfamily/RedHat6.yaml b/data/remi/osfamily/RedHat6.yaml new file mode 100644 index 00000000..1e9e47f7 --- /dev/null +++ b/data/remi/osfamily/RedHat6.yaml @@ -0,0 +1,7 @@ +--- +remi::settings: + repo_package_url: 'https://rpms.remirepo.net/enterprise/remi-release-6.rpm' + exec_postinstall: + enable_server_optional_repo: + command: 'subscription-manager repos --enable=rhel-6-server-optional-rpms' + unless: 'subscription-manager list --consumed | grep rhel-6-server-optional-rpms' \ No newline at end of file diff --git a/data/remi/osfamily/RedHat7.yaml b/data/remi/osfamily/RedHat7.yaml new file mode 100644 index 00000000..2409baa3 --- /dev/null +++ b/data/remi/osfamily/RedHat7.yaml @@ -0,0 +1,7 @@ +--- +remi::settings: + repo_package_url: 'https://rpms.remirepo.net/enterprise/remi-release-7.rpm' + exec_postinstall: + enable_server_optional_repo: + command: 'subscription-manager repos --enable=rhel-7-server-optional-rpms' + unless: 'subscription-manager list --consumed | grep rhel-7-server-optional-rpms' \ No newline at end of file diff --git a/data/remi/osfamily/RedHat8.yaml b/data/remi/osfamily/RedHat8.yaml new file mode 100644 index 00000000..acae5c43 --- /dev/null +++ b/data/remi/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +remi::settings: + repo_package_url: 'https://rpms.remirepo.net/enterprise/remi-release-8.rpm' From a29c59ed4789f855aa6ee4a416f557ba8c210055 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 13 May 2020 22:56:05 +0200 Subject: [PATCH 186/284] Added ulyaoth repository --- data/ulyaoth/hiera.yaml | 7 +++++++ data/ulyaoth/osfamily/RedHat.yaml | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 data/ulyaoth/hiera.yaml create mode 100644 data/ulyaoth/osfamily/RedHat.yaml diff --git a/data/ulyaoth/hiera.yaml b/data/ulyaoth/hiera.yaml new file mode 100644 index 00000000..a3944b3d --- /dev/null +++ b/data/ulyaoth/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/ulyaoth/osfamily/RedHat.yaml b/data/ulyaoth/osfamily/RedHat.yaml new file mode 100644 index 00000000..3e38d01e --- /dev/null +++ b/data/ulyaoth/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +ulyaoth::settings: + repo_package_name: 'ulyaoth' + repo_package_url: 'https://downloads.ulyaoth.com/rpm/ulyaoth-latest.rhel.x86_64.rpm' From eb6b8d1c80a66a9d942d79ef8b6a0696efde7ddb Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 21 May 2020 20:27:02 +0200 Subject: [PATCH 187/284] Fixed openswan package on RedHat --- data/openswan/osfamily/RedHat.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/openswan/osfamily/RedHat.yaml diff --git a/data/openswan/osfamily/RedHat.yaml b/data/openswan/osfamily/RedHat.yaml new file mode 100644 index 00000000..64143d0f --- /dev/null +++ b/data/openswan/osfamily/RedHat.yaml @@ -0,0 +1,2 @@ +openswan::settings: + package_name: 'libreswan' \ No newline at end of file From 221ec0ca1b1dec00fc937365a398a0d1e43addbc Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 21 May 2020 20:27:45 +0200 Subject: [PATCH 188/284] Version 0.4.1 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 2a6b684d..6b76be55 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.0", + "version": "0.4.1", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 239f581413cf542d051f550eea68333ff859cb03 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 7 Aug 2020 12:07:58 +0200 Subject: [PATCH 189/284] Fixed default file name for windows --- data/default/{Windows.yaml => windows.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/default/{Windows.yaml => windows.yaml} (100%) diff --git a/data/default/Windows.yaml b/data/default/windows.yaml similarity index 100% rename from data/default/Windows.yaml rename to data/default/windows.yaml From 1e56b524dbdf0d1b5ae9795267eb97fa57dc11d9 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 22 Sep 2020 23:34:43 +0200 Subject: [PATCH 190/284] Separated data for passenger for apache and nginx --- data/apache/osfamily/RedHat.yaml | 2 +- data/nginx/osfamily/Debian.yaml | 4 ++++ data/passenger-apache/default.yaml | 3 +++ data/passenger-apache/hiera.yaml | 6 ++++++ data/passenger-apache/osfamily/Debian.yaml | 8 ++++++++ data/passenger-apache/osfamily/RedHat.yaml | 9 +++++++++ data/passenger-nginx/default.yaml | 3 +++ data/passenger-nginx/hiera.yaml | 6 ++++++ data/passenger-nginx/osfamily/Debian.yaml | 8 ++++++++ data/passenger-nginx/osfamily/RedHat.yaml | 10 ++++++++++ data/php-fpm/default.yaml | 11 +++++++++++ data/php-fpm/hiera.yaml | 6 ++++++ data/php-fpm/osfamily/Debian.yaml | 3 +++ data/php-fpm/osfamily/RedHat.yaml | 3 +++ 14 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 data/passenger-apache/default.yaml create mode 100644 data/passenger-apache/hiera.yaml create mode 100644 data/passenger-apache/osfamily/Debian.yaml create mode 100644 data/passenger-apache/osfamily/RedHat.yaml create mode 100644 data/passenger-nginx/default.yaml create mode 100644 data/passenger-nginx/hiera.yaml create mode 100644 data/passenger-nginx/osfamily/Debian.yaml create mode 100644 data/passenger-nginx/osfamily/RedHat.yaml create mode 100644 data/php-fpm/default.yaml create mode 100644 data/php-fpm/hiera.yaml create mode 100644 data/php-fpm/osfamily/Debian.yaml create mode 100644 data/php-fpm/osfamily/RedHat.yaml diff --git a/data/apache/osfamily/RedHat.yaml b/data/apache/osfamily/RedHat.yaml index 89d90fe1..64dd7286 100644 --- a/data/apache/osfamily/RedHat.yaml +++ b/data/apache/osfamily/RedHat.yaml @@ -9,7 +9,7 @@ init_file_path: '/etc/sysconfig/httpd' tcp_port: '80' pid_file_path: '/var/run/httpd.pid' - log_file_path: [ '/var/log/httpd/access.log' , '/var/log/httpd/error.log' ] + log_file_path: [ '/var/log/httpd/access_log' , '/var/log/httpd/error_log' ] log_dir_path: '/var/log/httpd' data_dir_path: '/var/www/html' process_name: 'httpd' diff --git a/data/nginx/osfamily/Debian.yaml b/data/nginx/osfamily/Debian.yaml index d4b5e24a..85c9d659 100644 --- a/data/nginx/osfamily/Debian.yaml +++ b/data/nginx/osfamily/Debian.yaml @@ -3,3 +3,7 @@ init_file_path: '/etc/default/nginx' process_user: 'www-data' process_group: 'www-data' + mods-available_dir_path: '/etc/nginx/modules-available' + mods-enabled_dir_path: '/etc/nginx/modules-enabled' + sites-available_dir_path: '/etc/nginx/sites-available' + sites-enabled_dir_path: '/etc/nginx/sites-enabled' diff --git a/data/passenger-apache/default.yaml b/data/passenger-apache/default.yaml new file mode 100644 index 00000000..0286b5f3 --- /dev/null +++ b/data/passenger-apache/default.yaml @@ -0,0 +1,3 @@ +--- + passenger-apache::settings: + package_name: 'passenger-apache' diff --git a/data/passenger-apache/hiera.yaml b/data/passenger-apache/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/passenger-apache/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/passenger-apache/osfamily/Debian.yaml b/data/passenger-apache/osfamily/Debian.yaml new file mode 100644 index 00000000..da4371d5 --- /dev/null +++ b/data/passenger-apache/osfamily/Debian.yaml @@ -0,0 +1,8 @@ +--- + passenger-apache::settings: + repo_url: 'https://oss-binaries.phusionpassenger.com/apt/passenger' + key: '561F9B9CAC40B2F7' + apt_repos: 'main' + apt_key_server: 'http://keyserver.ubuntu.com' + package_name: 'libapache2-mod-passenger' + diff --git a/data/passenger-apache/osfamily/RedHat.yaml b/data/passenger-apache/osfamily/RedHat.yaml new file mode 100644 index 00000000..b764eafa --- /dev/null +++ b/data/passenger-apache/osfamily/RedHat.yaml @@ -0,0 +1,9 @@ +--- +passenger-apache::settings: + repo_file_url: 'https://oss-binaries.phusionpassenger.com/yum/definitions/el-passenger.repo' + repo_file_name: 'passenger.repo' + package_name: 'mod_passenger' + tp_prerequisites: + - epel + package_prerequisites: + - pygpgme diff --git a/data/passenger-nginx/default.yaml b/data/passenger-nginx/default.yaml new file mode 100644 index 00000000..d2822317 --- /dev/null +++ b/data/passenger-nginx/default.yaml @@ -0,0 +1,3 @@ +--- + passenger-nginx::settings: + package_name: 'passenger-nginx' diff --git a/data/passenger-nginx/hiera.yaml b/data/passenger-nginx/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/passenger-nginx/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/passenger-nginx/osfamily/Debian.yaml b/data/passenger-nginx/osfamily/Debian.yaml new file mode 100644 index 00000000..ef8ba9d4 --- /dev/null +++ b/data/passenger-nginx/osfamily/Debian.yaml @@ -0,0 +1,8 @@ +--- +passenger-nginx::settings: + repo_url: 'https://oss-binaries.phusionpassenger.com/apt/passenger' + key: '561F9B9CAC40B2F7' + apt_repos: 'main' + apt_key_server: 'http://keyserver.ubuntu.com' + package_name: 'libnginx-mod-http-passenger' + \ No newline at end of file diff --git a/data/passenger-nginx/osfamily/RedHat.yaml b/data/passenger-nginx/osfamily/RedHat.yaml new file mode 100644 index 00000000..b3b5c1a5 --- /dev/null +++ b/data/passenger-nginx/osfamily/RedHat.yaml @@ -0,0 +1,10 @@ +--- +passenger-nginx::settings: + repo_file_url: 'https://oss-binaries.phusionpassenger.com/yum/definitions/el-passenger.repo' + repo_file_name: 'passenger.repo' + package_name: 'passenger' + tp_prerequisites: + - epel + package_prerequisites: + - pygpgme + diff --git a/data/php-fpm/default.yaml b/data/php-fpm/default.yaml new file mode 100644 index 00000000..9013fd1b --- /dev/null +++ b/data/php-fpm/default.yaml @@ -0,0 +1,11 @@ +--- + php-fpm::settings: + package_name: 'php-fpm' + service_name: 'php-fpm' + config_file_path: '/etc/php-fpm.conf' + config_dir_path: '/etc/php-fpm' + conf_dir_path: '/etc/php-fpm.d' + pid_file_path: '/var/run/php-fpm/php-fpm.pid' + log_file_path: '/var/log/php-fpm/error.log' + log_dir_path: '/var/log/php-fpm' + process_name: 'php-fpm' diff --git a/data/php-fpm/hiera.yaml b/data/php-fpm/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/php-fpm/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/php-fpm/osfamily/Debian.yaml b/data/php-fpm/osfamily/Debian.yaml new file mode 100644 index 00000000..b79ee1d1 --- /dev/null +++ b/data/php-fpm/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- + php-fpm::settings: + init_file_path: '/etc/default/php-fpm' diff --git a/data/php-fpm/osfamily/RedHat.yaml b/data/php-fpm/osfamily/RedHat.yaml new file mode 100644 index 00000000..1c14028a --- /dev/null +++ b/data/php-fpm/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- + php-fpm::settings: + init_file_path: '/etc/sysconfig/php-fpm' From 02d679ca290dc58bbccdac68a154c201dd3dc3df Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 28 Sep 2020 23:18:15 +0200 Subject: [PATCH 191/284] Added data for nodejs, yarn, passenger, hdm (tp v2.5.0 or later required) --- data/hdm/default.yaml | 8 ++++++++ data/hdm/hiera.yaml | 5 +++++ data/nodejs/default.yaml | 3 +++ data/nodejs/hiera.yaml | 6 ++++++ data/nodejs/upstream/default.yaml | 3 +++ data/nodejs/upstream/osfamily/Debian.yaml | 8 ++++++++ data/nodejs/upstream/osfamily/RedHat.yaml | 13 +++++++++++++ data/passenger-nginx/osfamily/RedHat.yaml | 6 ++++-- data/yarn/default.yaml | 3 +++ data/yarn/hiera.yaml | 6 ++++++ data/yarn/osfamily/Debian.yaml | 7 +++++++ data/yarn/osfamily/RedHat.yaml | 6 ++++++ 12 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 data/hdm/default.yaml create mode 100644 data/hdm/hiera.yaml create mode 100644 data/nodejs/default.yaml create mode 100644 data/nodejs/hiera.yaml create mode 100644 data/nodejs/upstream/default.yaml create mode 100644 data/nodejs/upstream/osfamily/Debian.yaml create mode 100644 data/nodejs/upstream/osfamily/RedHat.yaml create mode 100644 data/yarn/default.yaml create mode 100644 data/yarn/hiera.yaml create mode 100644 data/yarn/osfamily/Debian.yaml create mode 100644 data/yarn/osfamily/RedHat.yaml diff --git a/data/hdm/default.yaml b/data/hdm/default.yaml new file mode 100644 index 00000000..456cd0ff --- /dev/null +++ b/data/hdm/default.yaml @@ -0,0 +1,8 @@ +--- +hdm::settings: + git_source: 'https://github.com/example42/hdm' + config_file_path: '/etc/hdm/hdm.conf' + config_dir_path: '/etc/hdm' + tcp_port: '8042' + log_file_path: [ '/opt/hdm/log/production.log' ] + log_dir_path: '/opt/hdm/log' diff --git a/data/hdm/hiera.yaml b/data/hdm/hiera.yaml new file mode 100644 index 00000000..c3397250 --- /dev/null +++ b/data/hdm/hiera.yaml @@ -0,0 +1,5 @@ +--- +:hierarchy: + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nodejs/default.yaml b/data/nodejs/default.yaml new file mode 100644 index 00000000..55594295 --- /dev/null +++ b/data/nodejs/default.yaml @@ -0,0 +1,3 @@ +--- +nodejs::settings: + package_name: 'nodejs' diff --git a/data/nodejs/hiera.yaml b/data/nodejs/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/nodejs/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nodejs/upstream/default.yaml b/data/nodejs/upstream/default.yaml new file mode 100644 index 00000000..55594295 --- /dev/null +++ b/data/nodejs/upstream/default.yaml @@ -0,0 +1,3 @@ +--- +nodejs::settings: + package_name: 'nodejs' diff --git a/data/nodejs/upstream/osfamily/Debian.yaml b/data/nodejs/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..f71cd28f --- /dev/null +++ b/data/nodejs/upstream/osfamily/Debian.yaml @@ -0,0 +1,8 @@ +--- +nodejs::settings: + exec_prerequisites: + repo_setup: + command: 'curl -L https://deb.nodesource.com/setup_lts.x | bash' + unless: 'dpkg -qa | grep nodesource-release' + package_prerequisites: + - build-essential diff --git a/data/nodejs/upstream/osfamily/RedHat.yaml b/data/nodejs/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..1639e09f --- /dev/null +++ b/data/nodejs/upstream/osfamily/RedHat.yaml @@ -0,0 +1,13 @@ +--- +nodejs::settings: + exec_prerequisites: + repo_setup: + command: 'curl -L https://rpm.nodesource.com/setup_lts.x | bash' + unless: 'rpm -qa | grep nodesource-release' + package_prerequisites: + - gcc-c++ + - make + tp_prerequisites: + - epel + + diff --git a/data/passenger-nginx/osfamily/RedHat.yaml b/data/passenger-nginx/osfamily/RedHat.yaml index b3b5c1a5..fe642d24 100644 --- a/data/passenger-nginx/osfamily/RedHat.yaml +++ b/data/passenger-nginx/osfamily/RedHat.yaml @@ -1,10 +1,12 @@ --- passenger-nginx::settings: - repo_file_url: 'https://oss-binaries.phusionpassenger.com/yum/definitions/el-passenger.repo' + repo_url: https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch + key_url: https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt repo_file_name: 'passenger.repo' - package_name: 'passenger' + package_name: 'nginx-mod-http-passenger' tp_prerequisites: - epel package_prerequisites: - pygpgme + - nginx diff --git a/data/yarn/default.yaml b/data/yarn/default.yaml new file mode 100644 index 00000000..c88e7550 --- /dev/null +++ b/data/yarn/default.yaml @@ -0,0 +1,3 @@ +--- + yarn::settings: + package_name: 'yarn' diff --git a/data/yarn/hiera.yaml b/data/yarn/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/yarn/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/yarn/osfamily/Debian.yaml b/data/yarn/osfamily/Debian.yaml new file mode 100644 index 00000000..5f048e3e --- /dev/null +++ b/data/yarn/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- + yarn::settings: + repo_url: 'https://dl.yarnpkg.com/debian/' + key: 'D88E42B4' + key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/yarn/osfamily/RedHat.yaml b/data/yarn/osfamily/RedHat.yaml new file mode 100644 index 00000000..2b9eeda2 --- /dev/null +++ b/data/yarn/osfamily/RedHat.yaml @@ -0,0 +1,6 @@ +--- + yarn::settings: + repo_file_url_tofix: 'https://dl.yarnpkg.com/rpm/yarn.repo' + repo_description: 'Yarn Repository' + repo_url: 'https://dl.yarnpkg.com/rpm/' + key_url: 'https://dl.yarnpkg.com/rpm/pubkey.gpg' From edd369ae3f367360ec065e42a6bbd6d4a0b3d907 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 28 Sep 2020 23:19:22 +0200 Subject: [PATCH 192/284] Version bump --- CHANGELOG.md | 11 ----------- metadata.json | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index f3b99c94..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,11 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. - -## Release 0.3.3 - -**Features** - -**Bugfixes** - -**Known Issues** diff --git a/metadata.json b/metadata.json index 6b76be55..02559502 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.1", + "version": "0.4.2", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From cddeff510992e9c35abb0d65f6f6bf0526baf285 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 29 Sep 2020 13:35:02 +0200 Subject: [PATCH 193/284] Reconfigured sysdig and docker to have repo data as upstream repo --- data/docker/default.yaml | 4 ++-- data/docker/hiera.yaml | 5 +++-- data/docker/operatingsystem/Debian7.yaml | 3 --- data/docker/operatingsystem/Debian8.yaml | 3 --- data/docker/upstream/default.yaml | 4 ++++ data/docker/{ => upstream}/operatingsystem/CentOS.yaml | 0 data/docker/{ => upstream}/operatingsystem/CentOS6.yaml | 0 data/docker/{ => upstream}/operatingsystem/CentOS7.yaml | 0 data/docker/{ => upstream}/operatingsystem/Darwin.yaml | 0 data/docker/{ => upstream}/operatingsystem/Debian.yaml | 0 data/docker/{ => upstream}/operatingsystem/Debian9.yaml | 0 data/docker/{ => upstream}/operatingsystem/RedHat.yaml | 0 data/docker/{ => upstream}/operatingsystem/Ubuntu.yaml | 0 data/sysdig/default.yaml | 1 + data/sysdig/hiera.yaml | 7 ++++--- .../sysdig/{ => upstream}/operatingsystem/Ubuntu14.04.yaml | 0 data/sysdig/{ => upstream}/osfamily/Debian.yaml | 0 data/sysdig/{ => upstream}/osfamily/RedHat.yaml | 0 data/sysdig/{ => upstream}/osfamily/Suse.yaml | 0 19 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 data/docker/operatingsystem/Debian7.yaml delete mode 100644 data/docker/operatingsystem/Debian8.yaml create mode 100644 data/docker/upstream/default.yaml rename data/docker/{ => upstream}/operatingsystem/CentOS.yaml (100%) rename data/docker/{ => upstream}/operatingsystem/CentOS6.yaml (100%) rename data/docker/{ => upstream}/operatingsystem/CentOS7.yaml (100%) rename data/docker/{ => upstream}/operatingsystem/Darwin.yaml (100%) rename data/docker/{ => upstream}/operatingsystem/Debian.yaml (100%) rename data/docker/{ => upstream}/operatingsystem/Debian9.yaml (100%) rename data/docker/{ => upstream}/operatingsystem/RedHat.yaml (100%) rename data/docker/{ => upstream}/operatingsystem/Ubuntu.yaml (100%) rename data/sysdig/{ => upstream}/operatingsystem/Ubuntu14.04.yaml (100%) rename data/sysdig/{ => upstream}/osfamily/Debian.yaml (100%) rename data/sysdig/{ => upstream}/osfamily/RedHat.yaml (100%) rename data/sysdig/{ => upstream}/osfamily/Suse.yaml (100%) diff --git a/data/docker/default.yaml b/data/docker/default.yaml index f631f2cd..6c0e2fbd 100644 --- a/data/docker/default.yaml +++ b/data/docker/default.yaml @@ -1,12 +1,12 @@ --- docker::settings: - package_name: 'docker-ce' + upstream_repo: true + package_name: 'docker' service_name: 'docker' pid_file_path: '/var/run/docker.pid' process_name: 'docker' process_user: 'docker' process_group: 'docker' tcp_port: '2375' - compose_version: '1.24.0' config_file_path: '/etc/docker/daemon.json' config_dir_path: '/etc/docker' diff --git a/data/docker/hiera.yaml b/data/docker/hiera.yaml index 505fb3e9..401d06e4 100644 --- a/data/docker/hiera.yaml +++ b/data/docker/hiera.yaml @@ -1,7 +1,8 @@ --- :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/default" - "%{title}/default" - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" diff --git a/data/docker/operatingsystem/Debian7.yaml b/data/docker/operatingsystem/Debian7.yaml deleted file mode 100644 index 9b19bd45..00000000 --- a/data/docker/operatingsystem/Debian7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker::settings: - apt_release: 'debian-wheezy' diff --git a/data/docker/operatingsystem/Debian8.yaml b/data/docker/operatingsystem/Debian8.yaml deleted file mode 100644 index 23e278b7..00000000 --- a/data/docker/operatingsystem/Debian8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker::settings: - apt_release: 'debian-jessie' diff --git a/data/docker/upstream/default.yaml b/data/docker/upstream/default.yaml new file mode 100644 index 00000000..eeae2a18 --- /dev/null +++ b/data/docker/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +docker::settings: + package_name: 'docker-ce' + compose_version: '1.24.0' diff --git a/data/docker/operatingsystem/CentOS.yaml b/data/docker/upstream/operatingsystem/CentOS.yaml similarity index 100% rename from data/docker/operatingsystem/CentOS.yaml rename to data/docker/upstream/operatingsystem/CentOS.yaml diff --git a/data/docker/operatingsystem/CentOS6.yaml b/data/docker/upstream/operatingsystem/CentOS6.yaml similarity index 100% rename from data/docker/operatingsystem/CentOS6.yaml rename to data/docker/upstream/operatingsystem/CentOS6.yaml diff --git a/data/docker/operatingsystem/CentOS7.yaml b/data/docker/upstream/operatingsystem/CentOS7.yaml similarity index 100% rename from data/docker/operatingsystem/CentOS7.yaml rename to data/docker/upstream/operatingsystem/CentOS7.yaml diff --git a/data/docker/operatingsystem/Darwin.yaml b/data/docker/upstream/operatingsystem/Darwin.yaml similarity index 100% rename from data/docker/operatingsystem/Darwin.yaml rename to data/docker/upstream/operatingsystem/Darwin.yaml diff --git a/data/docker/operatingsystem/Debian.yaml b/data/docker/upstream/operatingsystem/Debian.yaml similarity index 100% rename from data/docker/operatingsystem/Debian.yaml rename to data/docker/upstream/operatingsystem/Debian.yaml diff --git a/data/docker/operatingsystem/Debian9.yaml b/data/docker/upstream/operatingsystem/Debian9.yaml similarity index 100% rename from data/docker/operatingsystem/Debian9.yaml rename to data/docker/upstream/operatingsystem/Debian9.yaml diff --git a/data/docker/operatingsystem/RedHat.yaml b/data/docker/upstream/operatingsystem/RedHat.yaml similarity index 100% rename from data/docker/operatingsystem/RedHat.yaml rename to data/docker/upstream/operatingsystem/RedHat.yaml diff --git a/data/docker/operatingsystem/Ubuntu.yaml b/data/docker/upstream/operatingsystem/Ubuntu.yaml similarity index 100% rename from data/docker/operatingsystem/Ubuntu.yaml rename to data/docker/upstream/operatingsystem/Ubuntu.yaml diff --git a/data/sysdig/default.yaml b/data/sysdig/default.yaml index ae259592..2ed32700 100644 --- a/data/sysdig/default.yaml +++ b/data/sysdig/default.yaml @@ -1,3 +1,4 @@ --- sysdig::settings: + upstream_repo: true package_name: 'sysdig' diff --git a/data/sysdig/hiera.yaml b/data/sysdig/hiera.yaml index 7d5ead52..1c820bbc 100644 --- a/data/sysdig/hiera.yaml +++ b/data/sysdig/hiera.yaml @@ -1,8 +1,9 @@ --- :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" - "%{title}/default" - "default/%{operatingsystem}" - default diff --git a/data/sysdig/operatingsystem/Ubuntu14.04.yaml b/data/sysdig/upstream/operatingsystem/Ubuntu14.04.yaml similarity index 100% rename from data/sysdig/operatingsystem/Ubuntu14.04.yaml rename to data/sysdig/upstream/operatingsystem/Ubuntu14.04.yaml diff --git a/data/sysdig/osfamily/Debian.yaml b/data/sysdig/upstream/osfamily/Debian.yaml similarity index 100% rename from data/sysdig/osfamily/Debian.yaml rename to data/sysdig/upstream/osfamily/Debian.yaml diff --git a/data/sysdig/osfamily/RedHat.yaml b/data/sysdig/upstream/osfamily/RedHat.yaml similarity index 100% rename from data/sysdig/osfamily/RedHat.yaml rename to data/sysdig/upstream/osfamily/RedHat.yaml diff --git a/data/sysdig/osfamily/Suse.yaml b/data/sysdig/upstream/osfamily/Suse.yaml similarity index 100% rename from data/sysdig/osfamily/Suse.yaml rename to data/sysdig/upstream/osfamily/Suse.yaml From 4f6e022d883e4e5791da9a2f2ace153010b08fa8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 30 Sep 2020 09:55:11 +0200 Subject: [PATCH 194/284] Testing undef vs empy string --- data/sysdig/upstream/osfamily/Suse.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sysdig/upstream/osfamily/Suse.yaml b/data/sysdig/upstream/osfamily/Suse.yaml index 47e6716b..cf7689a8 100644 --- a/data/sysdig/upstream/osfamily/Suse.yaml +++ b/data/sysdig/upstream/osfamily/Suse.yaml @@ -1,3 +1,3 @@ --- sysdig::settings: - package_name: '' + package_name: ~ From 13865f5e84d59349e1b937bb8d81a3eee6e69e31 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 5 Oct 2020 01:18:37 +0200 Subject: [PATCH 195/284] Added filebeat, wazuh-agent and wazuh-server. Updated elasticsearch and kibana --- data/elasticsearch/default.yaml | 29 ++++++------ data/elasticsearch/hiera.yaml | 4 ++ data/elasticsearch/osfamily/Debian.yaml | 9 ---- data/elasticsearch/osfamily/RedHat.yaml | 6 --- .../upstream/osfamily/Debian.yaml | 9 ++++ .../upstream/osfamily/RedHat.yaml | 6 +++ data/filebeat/default.yaml | 15 +++++++ data/filebeat/hiera.yaml | 10 +++++ data/filebeat/upstream/osfamily/Debian.yaml | 9 ++++ data/filebeat/upstream/osfamily/RedHat.yaml | 6 +++ data/kibana/default.yaml | 29 ++++++------ data/kibana/hiera.yaml | 4 ++ data/kibana/osfamily/Debian.yaml | 9 ---- data/kibana/osfamily/RedHat.yaml | 6 --- data/kibana/upstream/osfamily/Debian.yaml | 9 ++++ data/kibana/upstream/osfamily/RedHat.yaml | 6 +++ data/wazuh-agent/default.yaml | 5 +++ data/wazuh-agent/hiera.yaml | 9 ++++ .../wazuh-agent/upstream/osfamily/Debian.yaml | 7 +++ .../wazuh-agent/upstream/osfamily/RedHat.yaml | 5 +++ data/wazuh-agent/upstream/osfamily/Suse.yaml | 3 ++ data/wazuh-server/default.yaml | 44 +++++++++++++++++++ data/wazuh-server/hiera.yaml | 9 ++++ .../upstream/osfamily/Debian.yaml | 7 +++ .../upstream/osfamily/RedHat.yaml | 5 +++ data/wazuh-server/upstream/osfamily/Suse.yaml | 3 ++ 26 files changed, 207 insertions(+), 56 deletions(-) delete mode 100644 data/elasticsearch/osfamily/Debian.yaml delete mode 100644 data/elasticsearch/osfamily/RedHat.yaml create mode 100644 data/elasticsearch/upstream/osfamily/Debian.yaml create mode 100644 data/elasticsearch/upstream/osfamily/RedHat.yaml create mode 100644 data/filebeat/default.yaml create mode 100644 data/filebeat/hiera.yaml create mode 100644 data/filebeat/upstream/osfamily/Debian.yaml create mode 100644 data/filebeat/upstream/osfamily/RedHat.yaml delete mode 100644 data/kibana/osfamily/Debian.yaml delete mode 100644 data/kibana/osfamily/RedHat.yaml create mode 100644 data/kibana/upstream/osfamily/Debian.yaml create mode 100644 data/kibana/upstream/osfamily/RedHat.yaml create mode 100644 data/wazuh-agent/default.yaml create mode 100644 data/wazuh-agent/hiera.yaml create mode 100644 data/wazuh-agent/upstream/osfamily/Debian.yaml create mode 100644 data/wazuh-agent/upstream/osfamily/RedHat.yaml create mode 100644 data/wazuh-agent/upstream/osfamily/Suse.yaml create mode 100644 data/wazuh-server/default.yaml create mode 100644 data/wazuh-server/hiera.yaml create mode 100644 data/wazuh-server/upstream/osfamily/Debian.yaml create mode 100644 data/wazuh-server/upstream/osfamily/RedHat.yaml create mode 100644 data/wazuh-server/upstream/osfamily/Suse.yaml diff --git a/data/elasticsearch/default.yaml b/data/elasticsearch/default.yaml index 2eaa219b..49557681 100644 --- a/data/elasticsearch/default.yaml +++ b/data/elasticsearch/default.yaml @@ -1,14 +1,17 @@ --- - elasticsearch::settings: - package_name: 'elasticsearch' - service_name: 'elasticsearch' - config_file_path: '/etc/elasticsearch/elasticsearch.yml' - config_dir_path: '/etc/elasticsearch' - pid_file_path: '/var/run/elasticsearch.pid' - log_file_path: '/var/log/elasticsearch/elasticsearch.log' - log_dir_path: '/var/log/elasticsearch' - process_name: 'java' - process_extra_name: 'elasticsearch' - process_user: 'elasticsearch' - process_group: 'elasticsearch' - tcp_port: '9200' +elasticsearch::settings: + upstream_repo: true + package_name: 'elasticsearch' + service_name: 'elasticsearch' + config_file_path: '/etc/elasticsearch/elasticsearch.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/elasticsearch' + pid_file_path: '/var/run/elasticsearch.pid' + log_file_path: '/var/log/elasticsearch/elasticsearch.log' + log_dir_path: '/var/log/elasticsearch' + data_dir_path: '/var/lib/elasticsearch' + process_name: 'java' + process_extra_name: 'elasticsearch' + process_user: 'elasticsearch' + process_group: 'elasticsearch' + tcp_port: '9200' diff --git a/data/elasticsearch/hiera.yaml b/data/elasticsearch/hiera.yaml index 19fa9ae9..f140dde0 100644 --- a/data/elasticsearch/hiera.yaml +++ b/data/elasticsearch/hiera.yaml @@ -1,5 +1,9 @@ --- :hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/elasticsearch/osfamily/Debian.yaml b/data/elasticsearch/osfamily/Debian.yaml deleted file mode 100644 index c0016e54..00000000 --- a/data/elasticsearch/osfamily/Debian.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- - elasticsearch::settings: - init_file_path: '/etc/default/elasticsearch' - repo_url: 'http://packages.elastic.co/elasticsearch/2.x/debian' - key: 'D88E42B4' - key_url: 'https://packages.elastic.co/GPG-KEY-elasticsearch' - apt_repos: 'main' - apt_release: 'stable' - apt_key_server: 'http://pgp.mit.edu' diff --git a/data/elasticsearch/osfamily/RedHat.yaml b/data/elasticsearch/osfamily/RedHat.yaml deleted file mode 100644 index 6a95c3b5..00000000 --- a/data/elasticsearch/osfamily/RedHat.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- - elasticsearch::settings: - init_file_path: '/etc/sysconfig/elasticsearch' - repo_url: 'http://packages.elastic.co/elasticsearch/2.x/centos' - key: 'D88E42B4' - key_url: 'http://packages.elastic.co/GPG-KEY-elasticsearch' diff --git a/data/elasticsearch/upstream/osfamily/Debian.yaml b/data/elasticsearch/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..a1f6f426 --- /dev/null +++ b/data/elasticsearch/upstream/osfamily/Debian.yaml @@ -0,0 +1,9 @@ +--- +elasticsearch::settings: + init_file_path: '/etc/default/elasticsearch' + repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' + key: 'D88E42B4' + key_url: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' + apt_repos: 'main' + apt_release: 'stable' + apt_key_server: 'http://pgp.mit.edu' diff --git a/data/elasticsearch/upstream/osfamily/RedHat.yaml b/data/elasticsearch/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..a3c43ec2 --- /dev/null +++ b/data/elasticsearch/upstream/osfamily/RedHat.yaml @@ -0,0 +1,6 @@ +--- +elasticsearch::settings: + init_file_path: '/etc/sysconfig/elasticsearch' + repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + key: 'D88E42B4' + key_url: 'http://artifacts.elastic.co/GPG-KEY-elasticsearch' diff --git a/data/filebeat/default.yaml b/data/filebeat/default.yaml new file mode 100644 index 00000000..6b1c9f3c --- /dev/null +++ b/data/filebeat/default.yaml @@ -0,0 +1,15 @@ +--- +filebeat::settings: + upstream_repo: true + package_name: 'filebeat' + service_name: 'filebeat' + config_file_path: '/etc/filebeat/filebeat.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/filebeat' + pid_file_path: '/var/run/filebeat.pid' + log_file_path: '/var/log/filebeat/filebeat' + log_dir_path: '/var/log/filebeat' + home_dir_path: '/usr/share/filebeat' + data_dir_path: '/var/lib/filebeat' + process_name: 'filebeat' + tcp_port: '9200' diff --git a/data/filebeat/hiera.yaml b/data/filebeat/hiera.yaml new file mode 100644 index 00000000..f140dde0 --- /dev/null +++ b/data/filebeat/hiera.yaml @@ -0,0 +1,10 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/filebeat/upstream/osfamily/Debian.yaml b/data/filebeat/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..077cbddb --- /dev/null +++ b/data/filebeat/upstream/osfamily/Debian.yaml @@ -0,0 +1,9 @@ +--- +filebeat::settings: + init_file_path: '/etc/default/filebeat' + repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' + key: 'D88E42B4' + key_url: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' + apt_repos: 'main' + apt_release: 'stable' + apt_key_server: 'http://pgp.mit.edu' diff --git a/data/filebeat/upstream/osfamily/RedHat.yaml b/data/filebeat/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..416ba0c7 --- /dev/null +++ b/data/filebeat/upstream/osfamily/RedHat.yaml @@ -0,0 +1,6 @@ +--- +filebeat::settings: + init_file_path: '/etc/sysconfig/filebeat' + repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + key: 'D88E42B4' + key_url: 'http://artifacts.elastic.co/GPG-KEY-elasticsearch' diff --git a/data/kibana/default.yaml b/data/kibana/default.yaml index a00a6907..f19c93e7 100644 --- a/data/kibana/default.yaml +++ b/data/kibana/default.yaml @@ -1,14 +1,17 @@ --- - kibana::settings: - package_name: 'kibana' - service_name: 'kibana' - config_file_path: '/opt/kibana/config/kibana.yml' - config_dir_path: '/opt/kibana/config' - conf_dir_path: '/etc/kibana/config' - log_file_path: '/var/log/kibana/kibana.stderr' - log_dir_path: '/var/log/kibana' - process_name: 'node' - process_extra_name: 'kibana' - process_user: 'kibana' - process_group: 'root' - tcp_port: '5601' +kibana::settings: + upstream_repo: true + package_name: 'kibana' + service_name: 'kibana' + config_file_path: '/opt/kibana/config/kibana.yml' + config_file_format: 'yaml' + config_dir_path: '/opt/kibana/config' + conf_dir_path: '/etc/kibana/config' + log_file_path: '/var/log/kibana/kibana.stderr' + log_dir_path: '/var/log/kibana' + data_dir_path: '/var/lib/kibana' + process_name: 'node' + process_extra_name: 'kibana' + process_user: 'kibana' + process_group: 'root' + tcp_port: '5601' diff --git a/data/kibana/hiera.yaml b/data/kibana/hiera.yaml index 19fa9ae9..f140dde0 100644 --- a/data/kibana/hiera.yaml +++ b/data/kibana/hiera.yaml @@ -1,5 +1,9 @@ --- :hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/kibana/osfamily/Debian.yaml b/data/kibana/osfamily/Debian.yaml deleted file mode 100644 index d014e6e5..00000000 --- a/data/kibana/osfamily/Debian.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- - kibana::settings: - init_file_path: '/etc/default/kibana' - repo_url: 'http://packages.elastic.co/kibana/4.4/debian' - key: 'D88E42B4' - key_url: 'https://packages.elastic.co/GPG-KEY-elasticsearch' - apt_repos: 'main' - apt_release: 'stable' - apt_key_server: 'http://pgp.mit.edu' diff --git a/data/kibana/osfamily/RedHat.yaml b/data/kibana/osfamily/RedHat.yaml deleted file mode 100644 index d6934a44..00000000 --- a/data/kibana/osfamily/RedHat.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- - kibana::settings: - init_file_path: '/etc/sysconfig/kibana' - repo_url: 'http://packages.elastic.co/kibana/4.4/centos' - key: 'D88E42B4' - key_url: 'https://packages.elastic.co/GPG-KEY-elasticsearch' diff --git a/data/kibana/upstream/osfamily/Debian.yaml b/data/kibana/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..caf189df --- /dev/null +++ b/data/kibana/upstream/osfamily/Debian.yaml @@ -0,0 +1,9 @@ +--- +kibana::settings: + init_file_path: '/etc/default/kibana' + repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' + key: 'D88E42B4' + key_url: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' + apt_repos: 'main' + apt_release: 'stable' + apt_key_server: 'http://pgp.mit.edu' diff --git a/data/kibana/upstream/osfamily/RedHat.yaml b/data/kibana/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..62dff85a --- /dev/null +++ b/data/kibana/upstream/osfamily/RedHat.yaml @@ -0,0 +1,6 @@ +--- +kibana::settings: + init_file_path: '/etc/sysconfig/kibana' + repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + key: 'D88E42B4' + key_url: 'http://artifacts.elastic.co/GPG-KEY-elasticsearch' \ No newline at end of file diff --git a/data/wazuh-agent/default.yaml b/data/wazuh-agent/default.yaml new file mode 100644 index 00000000..a77cb632 --- /dev/null +++ b/data/wazuh-agent/default.yaml @@ -0,0 +1,5 @@ +--- +wazuh-agent::settings: + upstream_repo: true + package_name: 'wazuh-agent' + service_name: 'wazuh-agent' \ No newline at end of file diff --git a/data/wazuh-agent/hiera.yaml b/data/wazuh-agent/hiera.yaml new file mode 100644 index 00000000..1c820bbc --- /dev/null +++ b/data/wazuh-agent/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/wazuh-agent/upstream/osfamily/Debian.yaml b/data/wazuh-agent/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..80cd5e8a --- /dev/null +++ b/data/wazuh-agent/upstream/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- +wazuh-agent::settings: + repo_url: 'https://packages.wazuh.com/3.x/apt/' + key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' + key_url: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' + apt_release: 'stable' + apt_repos: 'main' \ No newline at end of file diff --git a/data/wazuh-agent/upstream/osfamily/RedHat.yaml b/data/wazuh-agent/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..9a4ed9c9 --- /dev/null +++ b/data/wazuh-agent/upstream/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- +wazuh-agent::settings: + repo_url: 'https://packages.wazuh.com/3.x/yum/' + key: 'F1C3BD80' + key_url: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' diff --git a/data/wazuh-agent/upstream/osfamily/Suse.yaml b/data/wazuh-agent/upstream/osfamily/Suse.yaml new file mode 100644 index 00000000..c44a421a --- /dev/null +++ b/data/wazuh-agent/upstream/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- +wazuh-agent::settings: + package_name: ~ diff --git a/data/wazuh-server/default.yaml b/data/wazuh-server/default.yaml new file mode 100644 index 00000000..ae395ac5 --- /dev/null +++ b/data/wazuh-server/default.yaml @@ -0,0 +1,44 @@ +--- +wazuh-server::settings: + upstream_repo: true + package_name: + - 'wazuh-manager' + - 'wazuh-api' + service_name: + - 'wazuh-manager' + - 'wazuh-api' + exec_postinstall: + filebeat_configuration: + command: 'curl -so /etc/filebeat/filebeat.yml https://raw.githubusercontent.com/wazuh/wazuh/v3.13.2/extensions/filebeat/7.x/filebeat.yml && chmod go+r /etc/filebeat/filebeat.yml' + creates: '/etc/filebeat/filebeat.yml' + require: Tp::Install[filebeat] + filebeat_alerts_configuration: + command: 'curl -so /etc/filebeat/wazuh-template.json https://raw.githubusercontent.com/wazuh/wazuh/v3.13.2/extensions/elasticsearch/7.x/wazuh-template.json && chmod go+r /etc/filebeat/wazuh-template.json' + creates: '/etc/filebeat/wazuh-template.json' + require: Tp::Install[filebeat] + filebeat_wazuh_module: + command: 'curl -s https://packages.wazuh.com/3.x/filebeat/wazuh-filebeat-0.1.tar.gz | sudo tar -xvz -C /usr/share/filebeat/module' + creates: '/usr/share/filebeat/module/wazuh' + require: Tp::Install[filebeat] + kibana_permissions: + command: 'chown -R kibana:kibana /usr/share/kibana/optimize ; chown -R kibana:kibana /usr/share/kibana/plugins' + refreshonly: true + subscribe: Tp::Install[kibana] + kibana_wazuh_plugin: + command: '/usr/share/kibana/bin/kibana-plugin install https://packages.wazuh.com/wazuhapp/wazuhapp-3.13.2_7.9.2.zip' + unless: '/usr/share/kibana/bin/kibana-plugin list | grep wazuh' + require: Tp::Install[kibana] + user: kibana + cwd: '/usr/share/kibana' + tp_prerequisites: + - nodejs + - elasticsearch + - filebeat + - kibana + package_prerequisites: + - curl + repo_filename: wazuh + log_dir_path: /var/ossec/logs + log_file_path: + - /var/ossec/logs/api.log + - /var/ossec/logs/ossec.log \ No newline at end of file diff --git a/data/wazuh-server/hiera.yaml b/data/wazuh-server/hiera.yaml new file mode 100644 index 00000000..1c820bbc --- /dev/null +++ b/data/wazuh-server/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/wazuh-server/upstream/osfamily/Debian.yaml b/data/wazuh-server/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..6ae92355 --- /dev/null +++ b/data/wazuh-server/upstream/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- +wazuh-server::settings: + repo_url: 'https://packages.wazuh.com/3.x/apt/' + key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' + key_url: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' + apt_release: 'stable' + apt_repos: 'main' \ No newline at end of file diff --git a/data/wazuh-server/upstream/osfamily/RedHat.yaml b/data/wazuh-server/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..426884ef --- /dev/null +++ b/data/wazuh-server/upstream/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- +wazuh-server::settings: + repo_url: 'https://packages.wazuh.com/3.x/yum/' + key: 'F1C3BD80' + key_url: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' diff --git a/data/wazuh-server/upstream/osfamily/Suse.yaml b/data/wazuh-server/upstream/osfamily/Suse.yaml new file mode 100644 index 00000000..27ce2eae --- /dev/null +++ b/data/wazuh-server/upstream/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- +wazuh-server::settings: + package_name: ~ From 8f0bac667e57a91e8f920d06a538bfdf08bdd264 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 7 Oct 2020 10:04:32 +0200 Subject: [PATCH 196/284] Refactoring of elastic stack repo --- data/elastic_repo/6.x/default.yaml | 4 +++ data/elastic_repo/6.x/osfamily/Debian.yaml | 5 ++++ data/elastic_repo/6.x/osfamily/RedHat.yaml | 4 +++ data/elastic_repo/7.x/default.yaml | 4 +++ data/elastic_repo/7.x/osfamily/Debian.yaml | 5 ++++ data/elastic_repo/7.x/osfamily/RedHat.yaml | 4 +++ data/elastic_repo/default.yaml | 5 ++++ data/elastic_repo/hiera.yaml | 10 +++++++ data/elastic_repo/upstream/default.yaml | 4 +++ .../upstream/osfamily/Debian.yaml | 5 ++++ .../upstream/osfamily/RedHat.yaml | 4 +++ data/elasticsearch/default.yaml | 2 ++ data/filebeat/default.yaml | 3 +- data/filebeat/hiera.yaml | 2 -- data/filebeat/osfamily/windows.yaml | 5 ++++ data/filebeat/upstream/osfamily/Debian.yaml | 6 ---- data/kibana/default.yaml | 7 +++-- data/kibana/upstream/osfamily/Debian.yaml | 6 ---- data/kibana/upstream/osfamily/RedHat.yaml | 3 -- data/logstash/default.yaml | 30 ++++++++++--------- data/logstash/osfamily/Debian.yaml | 11 ++----- data/logstash/osfamily/RedHat.yaml | 7 ++--- .../osfamily/{Windows.yaml => windows.yaml} | 0 .../osfamily/{Windows.yaml => windows.yaml} | 0 data/wazuh-server/default.yaml | 8 ++--- 25 files changed, 93 insertions(+), 51 deletions(-) create mode 100644 data/elastic_repo/6.x/default.yaml create mode 100644 data/elastic_repo/6.x/osfamily/Debian.yaml create mode 100644 data/elastic_repo/6.x/osfamily/RedHat.yaml create mode 100644 data/elastic_repo/7.x/default.yaml create mode 100644 data/elastic_repo/7.x/osfamily/Debian.yaml create mode 100644 data/elastic_repo/7.x/osfamily/RedHat.yaml create mode 100644 data/elastic_repo/default.yaml create mode 100644 data/elastic_repo/hiera.yaml create mode 100644 data/elastic_repo/upstream/default.yaml create mode 100644 data/elastic_repo/upstream/osfamily/Debian.yaml create mode 100644 data/elastic_repo/upstream/osfamily/RedHat.yaml create mode 100644 data/filebeat/osfamily/windows.yaml rename data/puppet-agent/osfamily/{Windows.yaml => windows.yaml} (100%) rename data/puppet/upstream/osfamily/{Windows.yaml => windows.yaml} (100%) diff --git a/data/elastic_repo/6.x/default.yaml b/data/elastic_repo/6.x/default.yaml new file mode 100644 index 00000000..a189e83f --- /dev/null +++ b/data/elastic_repo/6.x/default.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_filename: elastic-6.x + repo_description: 'Elastic repository for 6.x packages' diff --git a/data/elastic_repo/6.x/osfamily/Debian.yaml b/data/elastic_repo/6.x/osfamily/Debian.yaml new file mode 100644 index 00000000..cedd4457 --- /dev/null +++ b/data/elastic_repo/6.x/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- +elastic_repo::settings: + repo_url: 'http://artifacts.elastic.co/packages/6.x/apt' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/elastic_repo/6.x/osfamily/RedHat.yaml b/data/elastic_repo/6.x/osfamily/RedHat.yaml new file mode 100644 index 00000000..e2be4791 --- /dev/null +++ b/data/elastic_repo/6.x/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_url: 'http://artifacts.elastic.co/packages/6.x/yum' + diff --git a/data/elastic_repo/7.x/default.yaml b/data/elastic_repo/7.x/default.yaml new file mode 100644 index 00000000..9cc7c368 --- /dev/null +++ b/data/elastic_repo/7.x/default.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_filename: elastic-7.x + repo_description: 'Elastic repository for 7.x packages' diff --git a/data/elastic_repo/7.x/osfamily/Debian.yaml b/data/elastic_repo/7.x/osfamily/Debian.yaml new file mode 100644 index 00000000..9cdca979 --- /dev/null +++ b/data/elastic_repo/7.x/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- +elastic_repo::settings: + repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/elastic_repo/7.x/osfamily/RedHat.yaml b/data/elastic_repo/7.x/osfamily/RedHat.yaml new file mode 100644 index 00000000..9ad7a7e3 --- /dev/null +++ b/data/elastic_repo/7.x/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + diff --git a/data/elastic_repo/default.yaml b/data/elastic_repo/default.yaml new file mode 100644 index 00000000..18e460e3 --- /dev/null +++ b/data/elastic_repo/default.yaml @@ -0,0 +1,5 @@ +--- +elastic_repo::settings: + upstream_repo: true + key: '4609 5ACC 8548 582C 1A26 99A9 D27D 666C D88E 42B4' + key_url: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' \ No newline at end of file diff --git a/data/elastic_repo/hiera.yaml b/data/elastic_repo/hiera.yaml new file mode 100644 index 00000000..6c3adfb5 --- /dev/null +++ b/data/elastic_repo/hiera.yaml @@ -0,0 +1,10 @@ +--- +:hierarchy: + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/elastic_repo/upstream/default.yaml b/data/elastic_repo/upstream/default.yaml new file mode 100644 index 00000000..9cc7c368 --- /dev/null +++ b/data/elastic_repo/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_filename: elastic-7.x + repo_description: 'Elastic repository for 7.x packages' diff --git a/data/elastic_repo/upstream/osfamily/Debian.yaml b/data/elastic_repo/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..9cdca979 --- /dev/null +++ b/data/elastic_repo/upstream/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- +elastic_repo::settings: + repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/elastic_repo/upstream/osfamily/RedHat.yaml b/data/elastic_repo/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..9ad7a7e3 --- /dev/null +++ b/data/elastic_repo/upstream/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + diff --git a/data/elasticsearch/default.yaml b/data/elasticsearch/default.yaml index 49557681..ddbb2727 100644 --- a/data/elasticsearch/default.yaml +++ b/data/elasticsearch/default.yaml @@ -15,3 +15,5 @@ elasticsearch::settings: process_user: 'elasticsearch' process_group: 'elasticsearch' tcp_port: '9200' + tp_prerequisites: + elastic_repo: {} diff --git a/data/filebeat/default.yaml b/data/filebeat/default.yaml index 6b1c9f3c..5f3766d8 100644 --- a/data/filebeat/default.yaml +++ b/data/filebeat/default.yaml @@ -12,4 +12,5 @@ filebeat::settings: home_dir_path: '/usr/share/filebeat' data_dir_path: '/var/lib/filebeat' process_name: 'filebeat' - tcp_port: '9200' + tp_prerequisites: + elastic_repo: {} diff --git a/data/filebeat/hiera.yaml b/data/filebeat/hiera.yaml index f140dde0..990b9755 100644 --- a/data/filebeat/hiera.yaml +++ b/data/filebeat/hiera.yaml @@ -1,7 +1,5 @@ --- :hierarchy: - - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/upstream/operatingsystem/%{operatingsystem}" - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" diff --git a/data/filebeat/osfamily/windows.yaml b/data/filebeat/osfamily/windows.yaml new file mode 100644 index 00000000..1e87ffd0 --- /dev/null +++ b/data/filebeat/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +# TODO: Verify and manage Windows versions older than 2008 +filebeat::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\filebeat\tools\filebeat.yml' + diff --git a/data/filebeat/upstream/osfamily/Debian.yaml b/data/filebeat/upstream/osfamily/Debian.yaml index 077cbddb..1169abfa 100644 --- a/data/filebeat/upstream/osfamily/Debian.yaml +++ b/data/filebeat/upstream/osfamily/Debian.yaml @@ -1,9 +1,3 @@ --- filebeat::settings: init_file_path: '/etc/default/filebeat' - repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' - key: 'D88E42B4' - key_url: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' - apt_repos: 'main' - apt_release: 'stable' - apt_key_server: 'http://pgp.mit.edu' diff --git a/data/kibana/default.yaml b/data/kibana/default.yaml index f19c93e7..1a83c435 100644 --- a/data/kibana/default.yaml +++ b/data/kibana/default.yaml @@ -3,15 +3,18 @@ kibana::settings: upstream_repo: true package_name: 'kibana' service_name: 'kibana' - config_file_path: '/opt/kibana/config/kibana.yml' + config_file_path: '/etc/kibana/kibana.yml' config_file_format: 'yaml' - config_dir_path: '/opt/kibana/config' + config_dir_path: '/etc/kibana' conf_dir_path: '/etc/kibana/config' log_file_path: '/var/log/kibana/kibana.stderr' log_dir_path: '/var/log/kibana' data_dir_path: '/var/lib/kibana' + home_dir_path: '/usr/share/kibana' process_name: 'node' process_extra_name: 'kibana' process_user: 'kibana' process_group: 'root' tcp_port: '5601' + tp_prerequisites: + elastic_repo: {} diff --git a/data/kibana/upstream/osfamily/Debian.yaml b/data/kibana/upstream/osfamily/Debian.yaml index caf189df..ead0831e 100644 --- a/data/kibana/upstream/osfamily/Debian.yaml +++ b/data/kibana/upstream/osfamily/Debian.yaml @@ -1,9 +1,3 @@ --- kibana::settings: init_file_path: '/etc/default/kibana' - repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' - key: 'D88E42B4' - key_url: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' - apt_repos: 'main' - apt_release: 'stable' - apt_key_server: 'http://pgp.mit.edu' diff --git a/data/kibana/upstream/osfamily/RedHat.yaml b/data/kibana/upstream/osfamily/RedHat.yaml index 62dff85a..91896b74 100644 --- a/data/kibana/upstream/osfamily/RedHat.yaml +++ b/data/kibana/upstream/osfamily/RedHat.yaml @@ -1,6 +1,3 @@ --- kibana::settings: init_file_path: '/etc/sysconfig/kibana' - repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' - key: 'D88E42B4' - key_url: 'http://artifacts.elastic.co/GPG-KEY-elasticsearch' \ No newline at end of file diff --git a/data/logstash/default.yaml b/data/logstash/default.yaml index a9e93770..814382eb 100644 --- a/data/logstash/default.yaml +++ b/data/logstash/default.yaml @@ -1,15 +1,17 @@ --- - logstash::settings: - package_name: 'logstash' - service_name: 'logstash' - config_file_path: '/etc/logstash/conf.d/logstash.conf' - config_dir_path: '/etc/logstash' - conf_dir_path: '/etc/logstash/conf.d' - pid_file_path: '/var/run/logstash.pid' - log_file_path: '/var/log/logstash/logstash.log' - log_dir_path: '/var/log/logstash' - process_name: 'java' - process_extra_name: 'logstash' - process_user: 'logstash' - process_group: 'logstash' - tcp_port: '9292' +logstash::settings: + package_name: 'logstash' + service_name: 'logstash' + config_file_path: '/etc/logstash/conf.d/logstash.conf' + config_dir_path: '/etc/logstash' + conf_dir_path: '/etc/logstash/conf.d' + pid_file_path: '/var/run/logstash.pid' + log_file_path: '/var/log/logstash/logstash.log' + log_dir_path: '/var/log/logstash' + process_name: 'java' + process_extra_name: 'logstash' + process_user: 'logstash' + process_group: 'logstash' + tcp_port: '9292' + tp_prerequisites: + elastic_repo: {} diff --git a/data/logstash/osfamily/Debian.yaml b/data/logstash/osfamily/Debian.yaml index 573ff306..9dedb5bd 100644 --- a/data/logstash/osfamily/Debian.yaml +++ b/data/logstash/osfamily/Debian.yaml @@ -1,9 +1,4 @@ --- - logstash::settings: - init_file_path: '/etc/default/logstash' - repo_url: 'http://packages.elastic.co/logstash/2.2/debian' - key: 'D88E42B4' - key_url: 'https://packages.elastic.co/GPG-KEY-elasticsearch' - apt_repos: 'main' - apt_release: 'stable' - apt_key_server: 'http://pgp.mit.edu' +logstash::settings: + init_file_path: '/etc/default/logstash' + diff --git a/data/logstash/osfamily/RedHat.yaml b/data/logstash/osfamily/RedHat.yaml index 726d86a1..91def226 100644 --- a/data/logstash/osfamily/RedHat.yaml +++ b/data/logstash/osfamily/RedHat.yaml @@ -1,6 +1,3 @@ --- - logstash::settings: - init_file_path: '/etc/sysconfig/logstash' - repo_url: 'http://packages.elastic.co/logstash/2.2/centos' - key: 'D88E42B4' - key_url: 'https://packages.elastic.co/GPG-KEY-elasticsearch' +logstash::settings: + init_file_path: '/etc/sysconfig/logstash' diff --git a/data/puppet-agent/osfamily/Windows.yaml b/data/puppet-agent/osfamily/windows.yaml similarity index 100% rename from data/puppet-agent/osfamily/Windows.yaml rename to data/puppet-agent/osfamily/windows.yaml diff --git a/data/puppet/upstream/osfamily/Windows.yaml b/data/puppet/upstream/osfamily/windows.yaml similarity index 100% rename from data/puppet/upstream/osfamily/Windows.yaml rename to data/puppet/upstream/osfamily/windows.yaml diff --git a/data/wazuh-server/default.yaml b/data/wazuh-server/default.yaml index ae395ac5..8a469459 100644 --- a/data/wazuh-server/default.yaml +++ b/data/wazuh-server/default.yaml @@ -31,10 +31,10 @@ wazuh-server::settings: user: kibana cwd: '/usr/share/kibana' tp_prerequisites: - - nodejs - - elasticsearch - - filebeat - - kibana + nodejs: {} + elasticsearch: {} + filebeat: {} + kibana: {} package_prerequisites: - curl repo_filename: wazuh From f2f80ff416e00606fcc3e810f58f9e8de260a6b7 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 7 Oct 2020 10:17:35 +0200 Subject: [PATCH 197/284] Retuned elastic stack --- data/elasticsearch/default.yaml | 3 +-- data/elasticsearch/osfamily/Debian.yaml | 3 +++ data/elasticsearch/osfamily/RedHat.yaml | 3 +++ data/elasticsearch/osfamily/windows.yaml | 4 ++++ data/elasticsearch/upstream/default.yaml | 4 ++++ data/elasticsearch/upstream/osfamily/Debian.yaml | 9 --------- data/elasticsearch/upstream/osfamily/RedHat.yaml | 6 ------ data/filebeat/default.yaml | 3 +-- data/filebeat/{upstream => }/osfamily/Debian.yaml | 0 data/filebeat/osfamily/RedHat.yaml | 3 +++ data/filebeat/osfamily/windows.yaml | 1 - data/filebeat/upstream/default.yaml | 4 ++++ data/filebeat/upstream/osfamily/RedHat.yaml | 6 ------ data/kibana/default.yaml | 3 +-- data/kibana/{upstream => }/osfamily/Debian.yaml | 0 data/kibana/{upstream => }/osfamily/RedHat.yaml | 0 data/kibana/upstream/default.yaml | 4 ++++ 17 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 data/elasticsearch/osfamily/Debian.yaml create mode 100644 data/elasticsearch/osfamily/RedHat.yaml create mode 100644 data/elasticsearch/osfamily/windows.yaml create mode 100644 data/elasticsearch/upstream/default.yaml delete mode 100644 data/elasticsearch/upstream/osfamily/Debian.yaml delete mode 100644 data/elasticsearch/upstream/osfamily/RedHat.yaml rename data/filebeat/{upstream => }/osfamily/Debian.yaml (100%) create mode 100644 data/filebeat/osfamily/RedHat.yaml create mode 100644 data/filebeat/upstream/default.yaml delete mode 100644 data/filebeat/upstream/osfamily/RedHat.yaml rename data/kibana/{upstream => }/osfamily/Debian.yaml (100%) rename data/kibana/{upstream => }/osfamily/RedHat.yaml (100%) create mode 100644 data/kibana/upstream/default.yaml diff --git a/data/elasticsearch/default.yaml b/data/elasticsearch/default.yaml index ddbb2727..5d5c0555 100644 --- a/data/elasticsearch/default.yaml +++ b/data/elasticsearch/default.yaml @@ -15,5 +15,4 @@ elasticsearch::settings: process_user: 'elasticsearch' process_group: 'elasticsearch' tcp_port: '9200' - tp_prerequisites: - elastic_repo: {} + diff --git a/data/elasticsearch/osfamily/Debian.yaml b/data/elasticsearch/osfamily/Debian.yaml new file mode 100644 index 00000000..42cc54bb --- /dev/null +++ b/data/elasticsearch/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +elasticsearch::settings: + init_file_path: '/etc/default/elasticsearch' diff --git a/data/elasticsearch/osfamily/RedHat.yaml b/data/elasticsearch/osfamily/RedHat.yaml new file mode 100644 index 00000000..eaf2fd11 --- /dev/null +++ b/data/elasticsearch/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +elasticsearch::settings: + init_file_path: '/etc/sysconfig/elasticsearch' diff --git a/data/elasticsearch/osfamily/windows.yaml b/data/elasticsearch/osfamily/windows.yaml new file mode 100644 index 00000000..5fc9e3fd --- /dev/null +++ b/data/elasticsearch/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +elasticsearch::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\elasticsearch\tools\filebeat.yml' + diff --git a/data/elasticsearch/upstream/default.yaml b/data/elasticsearch/upstream/default.yaml new file mode 100644 index 00000000..dce800e8 --- /dev/null +++ b/data/elasticsearch/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +elasticsearch::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/elasticsearch/upstream/osfamily/Debian.yaml b/data/elasticsearch/upstream/osfamily/Debian.yaml deleted file mode 100644 index a1f6f426..00000000 --- a/data/elasticsearch/upstream/osfamily/Debian.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -elasticsearch::settings: - init_file_path: '/etc/default/elasticsearch' - repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' - key: 'D88E42B4' - key_url: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' - apt_repos: 'main' - apt_release: 'stable' - apt_key_server: 'http://pgp.mit.edu' diff --git a/data/elasticsearch/upstream/osfamily/RedHat.yaml b/data/elasticsearch/upstream/osfamily/RedHat.yaml deleted file mode 100644 index a3c43ec2..00000000 --- a/data/elasticsearch/upstream/osfamily/RedHat.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -elasticsearch::settings: - init_file_path: '/etc/sysconfig/elasticsearch' - repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' - key: 'D88E42B4' - key_url: 'http://artifacts.elastic.co/GPG-KEY-elasticsearch' diff --git a/data/filebeat/default.yaml b/data/filebeat/default.yaml index 5f3766d8..c6a9cad7 100644 --- a/data/filebeat/default.yaml +++ b/data/filebeat/default.yaml @@ -12,5 +12,4 @@ filebeat::settings: home_dir_path: '/usr/share/filebeat' data_dir_path: '/var/lib/filebeat' process_name: 'filebeat' - tp_prerequisites: - elastic_repo: {} + diff --git a/data/filebeat/upstream/osfamily/Debian.yaml b/data/filebeat/osfamily/Debian.yaml similarity index 100% rename from data/filebeat/upstream/osfamily/Debian.yaml rename to data/filebeat/osfamily/Debian.yaml diff --git a/data/filebeat/osfamily/RedHat.yaml b/data/filebeat/osfamily/RedHat.yaml new file mode 100644 index 00000000..f2f0f034 --- /dev/null +++ b/data/filebeat/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +filebeat::settings: + init_file_path: '/etc/sysconfig/filebeat' diff --git a/data/filebeat/osfamily/windows.yaml b/data/filebeat/osfamily/windows.yaml index 1e87ffd0..bce4bea0 100644 --- a/data/filebeat/osfamily/windows.yaml +++ b/data/filebeat/osfamily/windows.yaml @@ -1,5 +1,4 @@ --- -# TODO: Verify and manage Windows versions older than 2008 filebeat::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\filebeat\tools\filebeat.yml' diff --git a/data/filebeat/upstream/default.yaml b/data/filebeat/upstream/default.yaml new file mode 100644 index 00000000..6d0c835f --- /dev/null +++ b/data/filebeat/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +filebeat::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/filebeat/upstream/osfamily/RedHat.yaml b/data/filebeat/upstream/osfamily/RedHat.yaml deleted file mode 100644 index 416ba0c7..00000000 --- a/data/filebeat/upstream/osfamily/RedHat.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -filebeat::settings: - init_file_path: '/etc/sysconfig/filebeat' - repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' - key: 'D88E42B4' - key_url: 'http://artifacts.elastic.co/GPG-KEY-elasticsearch' diff --git a/data/kibana/default.yaml b/data/kibana/default.yaml index 1a83c435..eabbd253 100644 --- a/data/kibana/default.yaml +++ b/data/kibana/default.yaml @@ -16,5 +16,4 @@ kibana::settings: process_user: 'kibana' process_group: 'root' tcp_port: '5601' - tp_prerequisites: - elastic_repo: {} + diff --git a/data/kibana/upstream/osfamily/Debian.yaml b/data/kibana/osfamily/Debian.yaml similarity index 100% rename from data/kibana/upstream/osfamily/Debian.yaml rename to data/kibana/osfamily/Debian.yaml diff --git a/data/kibana/upstream/osfamily/RedHat.yaml b/data/kibana/osfamily/RedHat.yaml similarity index 100% rename from data/kibana/upstream/osfamily/RedHat.yaml rename to data/kibana/osfamily/RedHat.yaml diff --git a/data/kibana/upstream/default.yaml b/data/kibana/upstream/default.yaml new file mode 100644 index 00000000..2959cc99 --- /dev/null +++ b/data/kibana/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +kibana::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file From e416d1810edb8a52acccecc4879e81f08ffec40d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 12 Oct 2020 13:20:56 +0200 Subject: [PATCH 198/284] FIxed multipath on Suse. Updated Logstash --- data/logstash/default.yaml | 3 +-- data/logstash/upstream/default.yaml | 4 ++++ data/multipath/osfamily/Suse.yaml | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 data/logstash/upstream/default.yaml create mode 100644 data/multipath/osfamily/Suse.yaml diff --git a/data/logstash/default.yaml b/data/logstash/default.yaml index 814382eb..3f26a569 100644 --- a/data/logstash/default.yaml +++ b/data/logstash/default.yaml @@ -1,5 +1,6 @@ --- logstash::settings: + upstream_repo: true package_name: 'logstash' service_name: 'logstash' config_file_path: '/etc/logstash/conf.d/logstash.conf' @@ -13,5 +14,3 @@ logstash::settings: process_user: 'logstash' process_group: 'logstash' tcp_port: '9292' - tp_prerequisites: - elastic_repo: {} diff --git a/data/logstash/upstream/default.yaml b/data/logstash/upstream/default.yaml new file mode 100644 index 00000000..1f091efe --- /dev/null +++ b/data/logstash/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +logstash::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/multipath/osfamily/Suse.yaml b/data/multipath/osfamily/Suse.yaml new file mode 100644 index 00000000..bfa7fb93 --- /dev/null +++ b/data/multipath/osfamily/Suse.yaml @@ -0,0 +1,4 @@ +--- + multipath::settings: + package_name: 'multipath-tools' + service_name: 'multipath-tools' \ No newline at end of file From 2c4411e3aabea0d2669b43c2b73fc637a7d78a1d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 12 Oct 2020 13:21:09 +0200 Subject: [PATCH 199/284] Elastic stack data --- data/apm-server/default.yaml | 15 +++++++++++++++ data/apm-server/hiera.yaml | 8 ++++++++ data/apm-server/osfamily/Debian.yaml | 3 +++ data/apm-server/osfamily/RedHat.yaml | 3 +++ data/apm-server/osfamily/windows.yaml | 4 ++++ data/apm-server/upstream/default.yaml | 4 ++++ data/auditbeat/default.yaml | 15 +++++++++++++++ data/auditbeat/hiera.yaml | 8 ++++++++ data/auditbeat/osfamily/Debian.yaml | 3 +++ data/auditbeat/osfamily/RedHat.yaml | 3 +++ data/auditbeat/osfamily/windows.yaml | 4 ++++ data/auditbeat/upstream/default.yaml | 4 ++++ data/default/windows.yaml | 4 ++++ data/elastic-agent/default.yaml | 15 +++++++++++++++ data/elastic-agent/hiera.yaml | 8 ++++++++ data/elastic-agent/osfamily/Debian.yaml | 3 +++ data/elastic-agent/osfamily/RedHat.yaml | 3 +++ data/elastic-agent/osfamily/windows.yaml | 4 ++++ data/elastic-agent/upstream/default.yaml | 4 ++++ data/enterprise-search/default.yaml | 15 +++++++++++++++ data/enterprise-search/hiera.yaml | 8 ++++++++ data/enterprise-search/osfamily/Debian.yaml | 3 +++ data/enterprise-search/osfamily/RedHat.yaml | 3 +++ data/enterprise-search/osfamily/windows.yaml | 4 ++++ data/enterprise-search/upstream/default.yaml | 4 ++++ data/heartbeat-elastic/default.yaml | 15 +++++++++++++++ data/heartbeat-elastic/hiera.yaml | 8 ++++++++ data/heartbeat-elastic/osfamily/Debian.yaml | 3 +++ data/heartbeat-elastic/osfamily/RedHat.yaml | 3 +++ data/heartbeat-elastic/osfamily/windows.yaml | 4 ++++ data/heartbeat-elastic/upstream/default.yaml | 4 ++++ data/journalbeat/default.yaml | 15 +++++++++++++++ data/journalbeat/hiera.yaml | 8 ++++++++ data/journalbeat/osfamily/Debian.yaml | 3 +++ data/journalbeat/osfamily/RedHat.yaml | 3 +++ data/journalbeat/osfamily/windows.yaml | 4 ++++ data/journalbeat/upstream/default.yaml | 4 ++++ data/metricbeat/default.yaml | 15 +++++++++++++++ data/metricbeat/hiera.yaml | 8 ++++++++ data/metricbeat/osfamily/Debian.yaml | 3 +++ data/metricbeat/osfamily/RedHat.yaml | 3 +++ data/metricbeat/osfamily/windows.yaml | 4 ++++ data/metricbeat/upstream/default.yaml | 4 ++++ data/packetbeat/default.yaml | 15 +++++++++++++++ data/packetbeat/hiera.yaml | 8 ++++++++ data/packetbeat/osfamily/Debian.yaml | 3 +++ data/packetbeat/osfamily/RedHat.yaml | 3 +++ data/packetbeat/osfamily/windows.yaml | 4 ++++ data/packetbeat/upstream/default.yaml | 4 ++++ data/wazuh-agent/upstream/osfamily/RedHat.yaml | 2 +- 50 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 data/apm-server/default.yaml create mode 100644 data/apm-server/hiera.yaml create mode 100644 data/apm-server/osfamily/Debian.yaml create mode 100644 data/apm-server/osfamily/RedHat.yaml create mode 100644 data/apm-server/osfamily/windows.yaml create mode 100644 data/apm-server/upstream/default.yaml create mode 100644 data/auditbeat/default.yaml create mode 100644 data/auditbeat/hiera.yaml create mode 100644 data/auditbeat/osfamily/Debian.yaml create mode 100644 data/auditbeat/osfamily/RedHat.yaml create mode 100644 data/auditbeat/osfamily/windows.yaml create mode 100644 data/auditbeat/upstream/default.yaml create mode 100644 data/elastic-agent/default.yaml create mode 100644 data/elastic-agent/hiera.yaml create mode 100644 data/elastic-agent/osfamily/Debian.yaml create mode 100644 data/elastic-agent/osfamily/RedHat.yaml create mode 100644 data/elastic-agent/osfamily/windows.yaml create mode 100644 data/elastic-agent/upstream/default.yaml create mode 100644 data/enterprise-search/default.yaml create mode 100644 data/enterprise-search/hiera.yaml create mode 100644 data/enterprise-search/osfamily/Debian.yaml create mode 100644 data/enterprise-search/osfamily/RedHat.yaml create mode 100644 data/enterprise-search/osfamily/windows.yaml create mode 100644 data/enterprise-search/upstream/default.yaml create mode 100644 data/heartbeat-elastic/default.yaml create mode 100644 data/heartbeat-elastic/hiera.yaml create mode 100644 data/heartbeat-elastic/osfamily/Debian.yaml create mode 100644 data/heartbeat-elastic/osfamily/RedHat.yaml create mode 100644 data/heartbeat-elastic/osfamily/windows.yaml create mode 100644 data/heartbeat-elastic/upstream/default.yaml create mode 100644 data/journalbeat/default.yaml create mode 100644 data/journalbeat/hiera.yaml create mode 100644 data/journalbeat/osfamily/Debian.yaml create mode 100644 data/journalbeat/osfamily/RedHat.yaml create mode 100644 data/journalbeat/osfamily/windows.yaml create mode 100644 data/journalbeat/upstream/default.yaml create mode 100644 data/metricbeat/default.yaml create mode 100644 data/metricbeat/hiera.yaml create mode 100644 data/metricbeat/osfamily/Debian.yaml create mode 100644 data/metricbeat/osfamily/RedHat.yaml create mode 100644 data/metricbeat/osfamily/windows.yaml create mode 100644 data/metricbeat/upstream/default.yaml create mode 100644 data/packetbeat/default.yaml create mode 100644 data/packetbeat/hiera.yaml create mode 100644 data/packetbeat/osfamily/Debian.yaml create mode 100644 data/packetbeat/osfamily/RedHat.yaml create mode 100644 data/packetbeat/osfamily/windows.yaml create mode 100644 data/packetbeat/upstream/default.yaml diff --git a/data/apm-server/default.yaml b/data/apm-server/default.yaml new file mode 100644 index 00000000..6a0fa32b --- /dev/null +++ b/data/apm-server/default.yaml @@ -0,0 +1,15 @@ +--- +apm-server::settings: + upstream_repo: true + package_name: 'apm-server' + service_name: 'apm-server' + config_file_path: '/etc/apm-server/apm-server.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/apm-server' + pid_file_path: '/var/run/apm-server.pid' + log_file_path: '/var/log/apm-server/apm-server' + log_dir_path: '/var/log/apm-server' + home_dir_path: '/usr/share/apm-server' + data_dir_path: '/var/lib/apm-server' + process_name: 'apm-server' + diff --git a/data/apm-server/hiera.yaml b/data/apm-server/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/apm-server/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/apm-server/osfamily/Debian.yaml b/data/apm-server/osfamily/Debian.yaml new file mode 100644 index 00000000..477f8af2 --- /dev/null +++ b/data/apm-server/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +apm-server::settings: + init_file_path: '/etc/default/apm-server' diff --git a/data/apm-server/osfamily/RedHat.yaml b/data/apm-server/osfamily/RedHat.yaml new file mode 100644 index 00000000..d7e2c6aa --- /dev/null +++ b/data/apm-server/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +apm-server::settings: + init_file_path: '/etc/sysconfig/apm-server' diff --git a/data/apm-server/osfamily/windows.yaml b/data/apm-server/osfamily/windows.yaml new file mode 100644 index 00000000..015a39c4 --- /dev/null +++ b/data/apm-server/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +apm-server::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\apm-server\tools\apm-server.yml' + diff --git a/data/apm-server/upstream/default.yaml b/data/apm-server/upstream/default.yaml new file mode 100644 index 00000000..b23d4324 --- /dev/null +++ b/data/apm-server/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +apm-server::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/auditbeat/default.yaml b/data/auditbeat/default.yaml new file mode 100644 index 00000000..9f643d99 --- /dev/null +++ b/data/auditbeat/default.yaml @@ -0,0 +1,15 @@ +--- +auditbeat::settings: + upstream_repo: true + package_name: 'auditbeat' + service_name: 'auditbeat' + config_file_path: '/etc/auditbeat/auditbeat.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/auditbeat' + pid_file_path: '/var/run/auditbeat.pid' + log_file_path: '/var/log/auditbeat/auditbeat' + log_dir_path: '/var/log/auditbeat' + home_dir_path: '/usr/share/auditbeat' + data_dir_path: '/var/lib/auditbeat' + process_name: 'auditbeat' + diff --git a/data/auditbeat/hiera.yaml b/data/auditbeat/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/auditbeat/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/auditbeat/osfamily/Debian.yaml b/data/auditbeat/osfamily/Debian.yaml new file mode 100644 index 00000000..8d6d1f07 --- /dev/null +++ b/data/auditbeat/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +auditbeat::settings: + init_file_path: '/etc/default/auditbeat' diff --git a/data/auditbeat/osfamily/RedHat.yaml b/data/auditbeat/osfamily/RedHat.yaml new file mode 100644 index 00000000..23915d57 --- /dev/null +++ b/data/auditbeat/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +auditbeat::settings: + init_file_path: '/etc/sysconfig/auditbeat' diff --git a/data/auditbeat/osfamily/windows.yaml b/data/auditbeat/osfamily/windows.yaml new file mode 100644 index 00000000..008effaf --- /dev/null +++ b/data/auditbeat/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +auditbeat::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\auditbeat\tools\auditbeat.yml' + diff --git a/data/auditbeat/upstream/default.yaml b/data/auditbeat/upstream/default.yaml new file mode 100644 index 00000000..3e26ec5e --- /dev/null +++ b/data/auditbeat/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +auditbeat::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/default/windows.yaml b/data/default/windows.yaml index ec9ed18d..0b5375d6 100644 --- a/data/default/windows.yaml +++ b/data/default/windows.yaml @@ -1,3 +1,7 @@ --- default::settings: package_provider: 'chocolatey' + config_file_owner: 'BUILTIN\Administrators' + config_file_group: 'NT AUTHORITY\SYSTEM' + config_dir_owner: 'BUILTIN\Administrators' + config_dir_group: 'NT AUTHORITY\SYSTEM' diff --git a/data/elastic-agent/default.yaml b/data/elastic-agent/default.yaml new file mode 100644 index 00000000..d0f09e9d --- /dev/null +++ b/data/elastic-agent/default.yaml @@ -0,0 +1,15 @@ +--- +elastic-agent::settings: + upstream_repo: true + package_name: 'elastic-agent' + service_name: 'elastic-agent' + config_file_path: '/etc/elastic-agent/elastic-agent.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/elastic-agent' + pid_file_path: '/var/run/elastic-agent.pid' + log_file_path: '/var/log/elastic-agent/elastic-agent' + log_dir_path: '/var/log/elastic-agent' + home_dir_path: '/usr/share/elastic-agent' + data_dir_path: '/var/lib/elastic-agent' + process_name: 'elastic-agent' + diff --git a/data/elastic-agent/hiera.yaml b/data/elastic-agent/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/elastic-agent/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/elastic-agent/osfamily/Debian.yaml b/data/elastic-agent/osfamily/Debian.yaml new file mode 100644 index 00000000..aa8d4477 --- /dev/null +++ b/data/elastic-agent/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +elastic-agent::settings: + init_file_path: '/etc/default/elastic-agent' diff --git a/data/elastic-agent/osfamily/RedHat.yaml b/data/elastic-agent/osfamily/RedHat.yaml new file mode 100644 index 00000000..7cc697a2 --- /dev/null +++ b/data/elastic-agent/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +elastic-agent::settings: + init_file_path: '/etc/sysconfig/elastic-agent' diff --git a/data/elastic-agent/osfamily/windows.yaml b/data/elastic-agent/osfamily/windows.yaml new file mode 100644 index 00000000..2107d47c --- /dev/null +++ b/data/elastic-agent/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +elastic-agent::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\elastic-agent\tools\elastic-agent.yml' + diff --git a/data/elastic-agent/upstream/default.yaml b/data/elastic-agent/upstream/default.yaml new file mode 100644 index 00000000..55b765c6 --- /dev/null +++ b/data/elastic-agent/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +elastic-agent::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/enterprise-search/default.yaml b/data/enterprise-search/default.yaml new file mode 100644 index 00000000..3ef0f763 --- /dev/null +++ b/data/enterprise-search/default.yaml @@ -0,0 +1,15 @@ +--- +enterprise-search::settings: + upstream_repo: true + package_name: 'enterprise-search' + service_name: 'enterprise-search' + config_file_path: '/etc/enterprise-search/enterprise-search.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/enterprise-search' + pid_file_path: '/var/run/enterprise-search.pid' + log_file_path: '/var/log/enterprise-search/enterprise-search' + log_dir_path: '/var/log/enterprise-search' + home_dir_path: '/usr/share/enterprise-search' + data_dir_path: '/var/lib/enterprise-search' + process_name: 'enterprise-search' + diff --git a/data/enterprise-search/hiera.yaml b/data/enterprise-search/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/enterprise-search/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/enterprise-search/osfamily/Debian.yaml b/data/enterprise-search/osfamily/Debian.yaml new file mode 100644 index 00000000..a1b14a35 --- /dev/null +++ b/data/enterprise-search/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +enterprise-search::settings: + init_file_path: '/etc/default/enterprise-search' diff --git a/data/enterprise-search/osfamily/RedHat.yaml b/data/enterprise-search/osfamily/RedHat.yaml new file mode 100644 index 00000000..94e58770 --- /dev/null +++ b/data/enterprise-search/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +enterprise-search::settings: + init_file_path: '/etc/sysconfig/enterprise-search' diff --git a/data/enterprise-search/osfamily/windows.yaml b/data/enterprise-search/osfamily/windows.yaml new file mode 100644 index 00000000..2bc00b88 --- /dev/null +++ b/data/enterprise-search/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +enterprise-search::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\enterprise-search\tools\enterprise-search.yml' + diff --git a/data/enterprise-search/upstream/default.yaml b/data/enterprise-search/upstream/default.yaml new file mode 100644 index 00000000..9cd09eb5 --- /dev/null +++ b/data/enterprise-search/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +enterprise-search::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/heartbeat-elastic/default.yaml b/data/heartbeat-elastic/default.yaml new file mode 100644 index 00000000..740dcebc --- /dev/null +++ b/data/heartbeat-elastic/default.yaml @@ -0,0 +1,15 @@ +--- +heartbeat-elastic::settings: + upstream_repo: true + package_name: 'heartbeat-elastic' + service_name: 'heartbeat-elastic' + config_file_path: '/etc/heartbeat-elastic/heartbeat-elastic.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/heartbeat-elastic' + pid_file_path: '/var/run/heartbeat-elastic.pid' + log_file_path: '/var/log/heartbeat-elastic/heartbeat-elastic' + log_dir_path: '/var/log/heartbeat-elastic' + home_dir_path: '/usr/share/heartbeat-elastic' + data_dir_path: '/var/lib/heartbeat-elastic' + process_name: 'heartbeat-elastic' + diff --git a/data/heartbeat-elastic/hiera.yaml b/data/heartbeat-elastic/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/heartbeat-elastic/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/heartbeat-elastic/osfamily/Debian.yaml b/data/heartbeat-elastic/osfamily/Debian.yaml new file mode 100644 index 00000000..fd8cd355 --- /dev/null +++ b/data/heartbeat-elastic/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +heartbeat-elastic::settings: + init_file_path: '/etc/default/heartbeat-elastic' diff --git a/data/heartbeat-elastic/osfamily/RedHat.yaml b/data/heartbeat-elastic/osfamily/RedHat.yaml new file mode 100644 index 00000000..60700155 --- /dev/null +++ b/data/heartbeat-elastic/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +heartbeat-elastic::settings: + init_file_path: '/etc/sysconfig/heartbeat-elastic' diff --git a/data/heartbeat-elastic/osfamily/windows.yaml b/data/heartbeat-elastic/osfamily/windows.yaml new file mode 100644 index 00000000..ad0fb925 --- /dev/null +++ b/data/heartbeat-elastic/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +heartbeat-elastic::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\heartbeat-elastic\tools\heartbeat-elastic.yml' + diff --git a/data/heartbeat-elastic/upstream/default.yaml b/data/heartbeat-elastic/upstream/default.yaml new file mode 100644 index 00000000..0409d210 --- /dev/null +++ b/data/heartbeat-elastic/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +heartbeat-elastic::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/journalbeat/default.yaml b/data/journalbeat/default.yaml new file mode 100644 index 00000000..f1d8d303 --- /dev/null +++ b/data/journalbeat/default.yaml @@ -0,0 +1,15 @@ +--- +journalbeat::settings: + upstream_repo: true + package_name: 'journalbeat' + service_name: 'journalbeat' + config_file_path: '/etc/journalbeat/journalbeat.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/journalbeat' + pid_file_path: '/var/run/journalbeat.pid' + log_file_path: '/var/log/journalbeat/journalbeat' + log_dir_path: '/var/log/journalbeat' + home_dir_path: '/usr/share/journalbeat' + data_dir_path: '/var/lib/journalbeat' + process_name: 'journalbeat' + diff --git a/data/journalbeat/hiera.yaml b/data/journalbeat/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/journalbeat/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/journalbeat/osfamily/Debian.yaml b/data/journalbeat/osfamily/Debian.yaml new file mode 100644 index 00000000..788da1bd --- /dev/null +++ b/data/journalbeat/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +journalbeat::settings: + init_file_path: '/etc/default/journalbeat' diff --git a/data/journalbeat/osfamily/RedHat.yaml b/data/journalbeat/osfamily/RedHat.yaml new file mode 100644 index 00000000..3cfa2e5d --- /dev/null +++ b/data/journalbeat/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +journalbeat::settings: + init_file_path: '/etc/sysconfig/journalbeat' diff --git a/data/journalbeat/osfamily/windows.yaml b/data/journalbeat/osfamily/windows.yaml new file mode 100644 index 00000000..7011a18d --- /dev/null +++ b/data/journalbeat/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +journalbeat::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\journalbeat\tools\journalbeat.yml' + diff --git a/data/journalbeat/upstream/default.yaml b/data/journalbeat/upstream/default.yaml new file mode 100644 index 00000000..b6fe2561 --- /dev/null +++ b/data/journalbeat/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +journalbeat::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/metricbeat/default.yaml b/data/metricbeat/default.yaml new file mode 100644 index 00000000..10e3d098 --- /dev/null +++ b/data/metricbeat/default.yaml @@ -0,0 +1,15 @@ +--- +metricbeat::settings: + upstream_repo: true + package_name: 'metricbeat' + service_name: 'metricbeat' + config_file_path: '/etc/metricbeat/metricbeat.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/metricbeat' + pid_file_path: '/var/run/metricbeat.pid' + log_file_path: '/var/log/metricbeat/metricbeat' + log_dir_path: '/var/log/metricbeat' + home_dir_path: '/usr/share/metricbeat' + data_dir_path: '/var/lib/metricbeat' + process_name: 'metricbeat' + diff --git a/data/metricbeat/hiera.yaml b/data/metricbeat/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/metricbeat/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/metricbeat/osfamily/Debian.yaml b/data/metricbeat/osfamily/Debian.yaml new file mode 100644 index 00000000..f4a394a0 --- /dev/null +++ b/data/metricbeat/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +metricbeat::settings: + init_file_path: '/etc/default/metricbeat' diff --git a/data/metricbeat/osfamily/RedHat.yaml b/data/metricbeat/osfamily/RedHat.yaml new file mode 100644 index 00000000..9c6d07c4 --- /dev/null +++ b/data/metricbeat/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +metricbeat::settings: + init_file_path: '/etc/sysconfig/metricbeat' diff --git a/data/metricbeat/osfamily/windows.yaml b/data/metricbeat/osfamily/windows.yaml new file mode 100644 index 00000000..56c56b72 --- /dev/null +++ b/data/metricbeat/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +metricbeat::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\metricbeat\tools\metricbeat.yml' + diff --git a/data/metricbeat/upstream/default.yaml b/data/metricbeat/upstream/default.yaml new file mode 100644 index 00000000..d185ecf5 --- /dev/null +++ b/data/metricbeat/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +metricbeat::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/packetbeat/default.yaml b/data/packetbeat/default.yaml new file mode 100644 index 00000000..1e564526 --- /dev/null +++ b/data/packetbeat/default.yaml @@ -0,0 +1,15 @@ +--- +packetbeat::settings: + upstream_repo: true + package_name: 'packetbeat' + service_name: 'packetbeat' + config_file_path: '/etc/packetbeat/packetbeat.yml' + config_file_format: 'yaml' + config_dir_path: '/etc/packetbeat' + pid_file_path: '/var/run/packetbeat.pid' + log_file_path: '/var/log/packetbeat/packetbeat' + log_dir_path: '/var/log/packetbeat' + home_dir_path: '/usr/share/packetbeat' + data_dir_path: '/var/lib/packetbeat' + process_name: 'packetbeat' + diff --git a/data/packetbeat/hiera.yaml b/data/packetbeat/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/packetbeat/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/packetbeat/osfamily/Debian.yaml b/data/packetbeat/osfamily/Debian.yaml new file mode 100644 index 00000000..4ef3dca1 --- /dev/null +++ b/data/packetbeat/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +packetbeat::settings: + init_file_path: '/etc/default/packetbeat' diff --git a/data/packetbeat/osfamily/RedHat.yaml b/data/packetbeat/osfamily/RedHat.yaml new file mode 100644 index 00000000..b2293b05 --- /dev/null +++ b/data/packetbeat/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +packetbeat::settings: + init_file_path: '/etc/sysconfig/packetbeat' diff --git a/data/packetbeat/osfamily/windows.yaml b/data/packetbeat/osfamily/windows.yaml new file mode 100644 index 00000000..987da4b1 --- /dev/null +++ b/data/packetbeat/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +packetbeat::settings: + config_file_path: 'C:\ProgramData\chocolatey\lib\packetbeat\tools\packetbeat.yml' + diff --git a/data/packetbeat/upstream/default.yaml b/data/packetbeat/upstream/default.yaml new file mode 100644 index 00000000..eab8eeed --- /dev/null +++ b/data/packetbeat/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +packetbeat::settings: + tp_prerequisites: + elastic_repo: {} \ No newline at end of file diff --git a/data/wazuh-agent/upstream/osfamily/RedHat.yaml b/data/wazuh-agent/upstream/osfamily/RedHat.yaml index 9a4ed9c9..22e72ccf 100644 --- a/data/wazuh-agent/upstream/osfamily/RedHat.yaml +++ b/data/wazuh-agent/upstream/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- wazuh-agent::settings: repo_url: 'https://packages.wazuh.com/3.x/yum/' - key: 'F1C3BD80' + key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' key_url: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' From 117474f5ad8b8f0e9d5cbd505947856b906c5a75 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 12 Oct 2020 13:21:48 +0200 Subject: [PATCH 200/284] Version 0.4.3 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 02559502..46936828 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.2", + "version": "0.4.3", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 7038f7eb5d3b45e33fe8138ddc2511359e4d4f38 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 16 Oct 2020 10:44:07 +0200 Subject: [PATCH 201/284] Fixing details on elastic and wazuh --- data/elastic_repo/default.yaml | 2 +- data/heartbeat-elastic/default.yaml | 16 ++++++++-------- data/wazuh-agent/default.yaml | 8 +++++++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/data/elastic_repo/default.yaml b/data/elastic_repo/default.yaml index 18e460e3..6e4c7f56 100644 --- a/data/elastic_repo/default.yaml +++ b/data/elastic_repo/default.yaml @@ -1,5 +1,5 @@ --- elastic_repo::settings: upstream_repo: true - key: '4609 5ACC 8548 582C 1A26 99A9 D27D 666C D88E 42B4' + key: '4609 5ACC 8548 582C 1A26 99A9 D27D 666C D88E 42B4' key_url: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' \ No newline at end of file diff --git a/data/heartbeat-elastic/default.yaml b/data/heartbeat-elastic/default.yaml index 740dcebc..b3354e0d 100644 --- a/data/heartbeat-elastic/default.yaml +++ b/data/heartbeat-elastic/default.yaml @@ -3,13 +3,13 @@ heartbeat-elastic::settings: upstream_repo: true package_name: 'heartbeat-elastic' service_name: 'heartbeat-elastic' - config_file_path: '/etc/heartbeat-elastic/heartbeat-elastic.yml' + config_file_path: '/etc/heartbeat/heartbeat.yml' config_file_format: 'yaml' - config_dir_path: '/etc/heartbeat-elastic' - pid_file_path: '/var/run/heartbeat-elastic.pid' - log_file_path: '/var/log/heartbeat-elastic/heartbeat-elastic' - log_dir_path: '/var/log/heartbeat-elastic' - home_dir_path: '/usr/share/heartbeat-elastic' - data_dir_path: '/var/lib/heartbeat-elastic' - process_name: 'heartbeat-elastic' + config_dir_path: '/etc/heartbeat' + pid_file_path: '/var/run/heartbeat.pid' + log_file_path: '/var/log/heartbeat/heartbeat' + log_dir_path: '/var/log/heartbeat' + home_dir_path: '/usr/share/heartbeat' + data_dir_path: '/var/lib/heartbeat' + process_name: 'heartbeat' diff --git a/data/wazuh-agent/default.yaml b/data/wazuh-agent/default.yaml index a77cb632..d2d44511 100644 --- a/data/wazuh-agent/default.yaml +++ b/data/wazuh-agent/default.yaml @@ -2,4 +2,10 @@ wazuh-agent::settings: upstream_repo: true package_name: 'wazuh-agent' - service_name: 'wazuh-agent' \ No newline at end of file + service_name: 'wazuh-agent' + config_file_path: '/var/ossec/etc/ossec.conf' + config_dir_path: '/var/ossec/etc' + home_dir_path: '/var/ossec' + process_name: 'ossec-agentd' + process_user: 'ossec' + process_group: 'ossec' From 18824e04006de454d15f44921cddf5a5a8f0023f Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 19 Oct 2020 11:23:37 +0200 Subject: [PATCH 202/284] Added data for all the Hashicorp applications --- data/boundary/default.yaml | 6 ++++++ data/boundary/hiera.yaml | 8 ++++++++ data/boundary/upstream/default.yaml | 4 ++++ data/consul-enterprise/default.yaml | 15 +++++++++++++++ data/consul-enterprise/hiera.yaml | 8 ++++++++ data/consul-enterprise/upstream/default.yaml | 4 ++++ data/consul/default.yaml | 14 ++++++++++++++ data/consul/hiera.yaml | 8 ++++++++ data/consul/upstream/default.yaml | 4 ++++ data/hashicorp_repo/default.yaml | 4 ++++ data/hashicorp_repo/hiera.yaml | 9 +++++++++ data/hashicorp_repo/upstream/default.yaml | 4 ++++ .../hashicorp_repo/upstream/osfamily/Amazon.yaml | 5 +++++ .../hashicorp_repo/upstream/osfamily/Debian.yaml | 7 +++++++ .../hashicorp_repo/upstream/osfamily/Fedora.yaml | 5 +++++ .../hashicorp_repo/upstream/osfamily/RedHat.yaml | 4 ++++ data/nomad-enterprise/default.yaml | 16 ++++++++++++++++ data/nomad-enterprise/hiera.yaml | 8 ++++++++ data/nomad-enterprise/upstream/default.yaml | 4 ++++ data/nomad/default.yaml | 14 ++++++++++++++ data/nomad/hiera.yaml | 8 ++++++++ data/nomad/upstream/default.yaml | 4 ++++ data/packer/default.yaml | 6 ++++++ data/packer/hiera.yaml | 8 ++++++++ data/packer/upstream/default.yaml | 4 ++++ data/terraform/default.yaml | 6 ++++++ data/terraform/hiera.yaml | 8 ++++++++ data/terraform/upstream/default.yaml | 4 ++++ data/vagrant/default.yaml | 3 +++ data/vagrant/hiera.yaml | 3 ++- data/vagrant/osfamily/Darwin.yaml | 2 -- data/vagrant/osfamily/Debian.yaml | 2 -- data/vagrant/osfamily/RedHat.yaml | 2 -- data/vagrant/osfamily/Windows.yaml | 2 -- data/vagrant/upstream/default.yaml | 4 ++++ data/vault-enterprise/default.yaml | 12 ++++++++++++ data/vault-enterprise/hiera.yaml | 8 ++++++++ data/vault-enterprise/upstream/default.yaml | 4 ++++ data/vault/default.yaml | 12 ++++++++++++ data/vault/hiera.yaml | 8 ++++++++ data/vault/upstream/default.yaml | 4 ++++ data/waypoint/default.yaml | 6 ++++++ data/waypoint/hiera.yaml | 8 ++++++++ data/waypoint/upstream/default.yaml | 4 ++++ 44 files changed, 274 insertions(+), 9 deletions(-) create mode 100644 data/boundary/default.yaml create mode 100644 data/boundary/hiera.yaml create mode 100644 data/boundary/upstream/default.yaml create mode 100644 data/consul-enterprise/default.yaml create mode 100644 data/consul-enterprise/hiera.yaml create mode 100644 data/consul-enterprise/upstream/default.yaml create mode 100644 data/consul/default.yaml create mode 100644 data/consul/hiera.yaml create mode 100644 data/consul/upstream/default.yaml create mode 100644 data/hashicorp_repo/default.yaml create mode 100644 data/hashicorp_repo/hiera.yaml create mode 100644 data/hashicorp_repo/upstream/default.yaml create mode 100644 data/hashicorp_repo/upstream/osfamily/Amazon.yaml create mode 100644 data/hashicorp_repo/upstream/osfamily/Debian.yaml create mode 100644 data/hashicorp_repo/upstream/osfamily/Fedora.yaml create mode 100644 data/hashicorp_repo/upstream/osfamily/RedHat.yaml create mode 100644 data/nomad-enterprise/default.yaml create mode 100644 data/nomad-enterprise/hiera.yaml create mode 100644 data/nomad-enterprise/upstream/default.yaml create mode 100644 data/nomad/default.yaml create mode 100644 data/nomad/hiera.yaml create mode 100644 data/nomad/upstream/default.yaml create mode 100644 data/packer/default.yaml create mode 100644 data/packer/hiera.yaml create mode 100644 data/packer/upstream/default.yaml create mode 100644 data/terraform/default.yaml create mode 100644 data/terraform/hiera.yaml create mode 100644 data/terraform/upstream/default.yaml delete mode 100644 data/vagrant/osfamily/Darwin.yaml delete mode 100644 data/vagrant/osfamily/Debian.yaml delete mode 100644 data/vagrant/osfamily/RedHat.yaml delete mode 100644 data/vagrant/osfamily/Windows.yaml create mode 100644 data/vagrant/upstream/default.yaml create mode 100644 data/vault-enterprise/default.yaml create mode 100644 data/vault-enterprise/hiera.yaml create mode 100644 data/vault-enterprise/upstream/default.yaml create mode 100644 data/vault/default.yaml create mode 100644 data/vault/hiera.yaml create mode 100644 data/vault/upstream/default.yaml create mode 100644 data/waypoint/default.yaml create mode 100644 data/waypoint/hiera.yaml create mode 100644 data/waypoint/upstream/default.yaml diff --git a/data/boundary/default.yaml b/data/boundary/default.yaml new file mode 100644 index 00000000..20b250e9 --- /dev/null +++ b/data/boundary/default.yaml @@ -0,0 +1,6 @@ +--- +boundary::settings: + upstream_repo: true + package_name: 'boundary' + process_name: 'boundary' + diff --git a/data/boundary/hiera.yaml b/data/boundary/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/boundary/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/boundary/upstream/default.yaml b/data/boundary/upstream/default.yaml new file mode 100644 index 00000000..2ffac159 --- /dev/null +++ b/data/boundary/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +boundary::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/consul-enterprise/default.yaml b/data/consul-enterprise/default.yaml new file mode 100644 index 00000000..eebef0d5 --- /dev/null +++ b/data/consul-enterprise/default.yaml @@ -0,0 +1,15 @@ +--- +consul-enterprise::settings: + upstream_repo: true + package_name: 'consul-enterprise' + process_name: 'consul' + service_name: 'consul' + config_file_path: '/etc/consul.d/consul.hcl' + config_dir_path: '/etc/consul.d' + data_dir_path: '/opt/consul' + config_file_format: 'hcl' + tcp_port: + - 8301 + - 8500 + - 8600 + diff --git a/data/consul-enterprise/hiera.yaml b/data/consul-enterprise/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/consul-enterprise/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/consul-enterprise/upstream/default.yaml b/data/consul-enterprise/upstream/default.yaml new file mode 100644 index 00000000..fb7ce456 --- /dev/null +++ b/data/consul-enterprise/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +consul-enterprise::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/consul/default.yaml b/data/consul/default.yaml new file mode 100644 index 00000000..f0399864 --- /dev/null +++ b/data/consul/default.yaml @@ -0,0 +1,14 @@ +--- +consul::settings: + upstream_repo: true + package_name: 'consul' + process_name: 'consul' + service_name: 'consul' + config_file_path: '/etc/consul.d/consul.hcl' + config_dir_path: '/etc/consul.d' + data_dir_path: '/opt/consul' + config_file_format: 'hcl' + tcp_port: + - 8301 + - 8500 + - 8600 diff --git a/data/consul/hiera.yaml b/data/consul/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/consul/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/consul/upstream/default.yaml b/data/consul/upstream/default.yaml new file mode 100644 index 00000000..763ef168 --- /dev/null +++ b/data/consul/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +consul::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/hashicorp_repo/default.yaml b/data/hashicorp_repo/default.yaml new file mode 100644 index 00000000..54ad037e --- /dev/null +++ b/data/hashicorp_repo/default.yaml @@ -0,0 +1,4 @@ +--- +hashicorp_repo::settings: + upstream_repo: true + \ No newline at end of file diff --git a/data/hashicorp_repo/hiera.yaml b/data/hashicorp_repo/hiera.yaml new file mode 100644 index 00000000..ff587716 --- /dev/null +++ b/data/hashicorp_repo/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/hashicorp_repo/upstream/default.yaml b/data/hashicorp_repo/upstream/default.yaml new file mode 100644 index 00000000..98244d54 --- /dev/null +++ b/data/hashicorp_repo/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +hashicorp_repo::settings: + repo_filename: hashicorp + repo_description: 'Hashicorp Stable - $basearch' diff --git a/data/hashicorp_repo/upstream/osfamily/Amazon.yaml b/data/hashicorp_repo/upstream/osfamily/Amazon.yaml new file mode 100644 index 00000000..85613e3d --- /dev/null +++ b/data/hashicorp_repo/upstream/osfamily/Amazon.yaml @@ -0,0 +1,5 @@ +--- +hashicorp_repo::settings: + repo_url: 'https://rpm.releases.hashicorp.com/AmazonLinux/$releasever/$basearch/stable' + key_url: 'https://rpm.releases.hashicorp.com/gpg' + diff --git a/data/hashicorp_repo/upstream/osfamily/Debian.yaml b/data/hashicorp_repo/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..aa37f948 --- /dev/null +++ b/data/hashicorp_repo/upstream/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- +hashicorp_repo::settings: + repo_url: 'https://apt.releases.hashicorp.com' + apt_repos: 'main' + apt_release: 'stable' + key_url: 'https://apt.releases.hashicorp.com/gpg' + key: 'E8A0 32E0 94D8 EB4E A189 D270 DA41 8C88 A321 9F7B' diff --git a/data/hashicorp_repo/upstream/osfamily/Fedora.yaml b/data/hashicorp_repo/upstream/osfamily/Fedora.yaml new file mode 100644 index 00000000..8da57ec9 --- /dev/null +++ b/data/hashicorp_repo/upstream/osfamily/Fedora.yaml @@ -0,0 +1,5 @@ +--- +hashicorp_repo::settings: + repo_url: https://rpm.releases.hashicorp.com/fedora/$releasever/$basearch/stable + key_url: 'https://rpm.releases.hashicorp.com/gpg' + diff --git a/data/hashicorp_repo/upstream/osfamily/RedHat.yaml b/data/hashicorp_repo/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..f7e878d0 --- /dev/null +++ b/data/hashicorp_repo/upstream/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +hashicorp_repo::settings: + repo_url: 'https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable' + key_url: 'https://rpm.releases.hashicorp.com/gpg' diff --git a/data/nomad-enterprise/default.yaml b/data/nomad-enterprise/default.yaml new file mode 100644 index 00000000..bef6aeae --- /dev/null +++ b/data/nomad-enterprise/default.yaml @@ -0,0 +1,16 @@ +--- +nomad-enterprise::settings: + upstream_repo: true + package_name: 'nomad-enterprise' + process_name: 'nomad' + service_name: 'nomad' + config_file_path: '/etc/nomad.d/nomad.hcl' + config_dir_path: '/etc/nomad.d' + data_dir_path: '/opt/nomad' + config_file_format: 'hcl' + tcp_port: + - 4646 + - 4647 + - 4648 + + diff --git a/data/nomad-enterprise/hiera.yaml b/data/nomad-enterprise/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/nomad-enterprise/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nomad-enterprise/upstream/default.yaml b/data/nomad-enterprise/upstream/default.yaml new file mode 100644 index 00000000..1b533aae --- /dev/null +++ b/data/nomad-enterprise/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +nomad-enterprise::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/nomad/default.yaml b/data/nomad/default.yaml new file mode 100644 index 00000000..e2a09225 --- /dev/null +++ b/data/nomad/default.yaml @@ -0,0 +1,14 @@ +--- +nomad::settings: + upstream_repo: true + package_name: 'nomad' + process_name: 'nomad' + service_name: 'nomad' + config_file_path: '/etc/nomad.d/nomad.hcl' + config_dir_path: '/etc/nomad.d' + data_dir_path: '/opt/nomad' + config_file_format: 'hcl' + tcp_port: + - 4646 + - 4647 + - 4648 diff --git a/data/nomad/hiera.yaml b/data/nomad/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/nomad/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/nomad/upstream/default.yaml b/data/nomad/upstream/default.yaml new file mode 100644 index 00000000..d9032685 --- /dev/null +++ b/data/nomad/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +nomad::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/packer/default.yaml b/data/packer/default.yaml new file mode 100644 index 00000000..80e2476b --- /dev/null +++ b/data/packer/default.yaml @@ -0,0 +1,6 @@ +--- +packer::settings: + upstream_repo: true + package_name: 'packer' + process_name: 'packer' + diff --git a/data/packer/hiera.yaml b/data/packer/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/packer/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/packer/upstream/default.yaml b/data/packer/upstream/default.yaml new file mode 100644 index 00000000..e9500357 --- /dev/null +++ b/data/packer/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +packer::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/terraform/default.yaml b/data/terraform/default.yaml new file mode 100644 index 00000000..f3e16217 --- /dev/null +++ b/data/terraform/default.yaml @@ -0,0 +1,6 @@ +--- +terraform::settings: + upstream_repo: true + package_name: 'terraform' + process_name: 'terraform' + diff --git a/data/terraform/hiera.yaml b/data/terraform/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/terraform/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/terraform/upstream/default.yaml b/data/terraform/upstream/default.yaml new file mode 100644 index 00000000..05631edc --- /dev/null +++ b/data/terraform/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +terraform::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/vagrant/default.yaml b/data/vagrant/default.yaml index 4095b331..2ce837cf 100644 --- a/data/vagrant/default.yaml +++ b/data/vagrant/default.yaml @@ -1,4 +1,7 @@ --- vagrant::settings: + upstream_repo: true package_name: 'vagrant' process_name: 'vagrant' + home_dir_path: '/opt/vagrant' + diff --git a/data/vagrant/hiera.yaml b/data/vagrant/hiera.yaml index a6dec64c..990b9755 100644 --- a/data/vagrant/hiera.yaml +++ b/data/vagrant/hiera.yaml @@ -1,7 +1,8 @@ --- :hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/vagrant/osfamily/Darwin.yaml b/data/vagrant/osfamily/Darwin.yaml deleted file mode 100644 index ba0c3dcd..00000000 --- a/data/vagrant/osfamily/Darwin.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -vagrant::package_url: https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.dmg diff --git a/data/vagrant/osfamily/Debian.yaml b/data/vagrant/osfamily/Debian.yaml deleted file mode 100644 index f3bd01b5..00000000 --- a/data/vagrant/osfamily/Debian.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -vagrant::package_url: https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.deb diff --git a/data/vagrant/osfamily/RedHat.yaml b/data/vagrant/osfamily/RedHat.yaml deleted file mode 100644 index b1c39d84..00000000 --- a/data/vagrant/osfamily/RedHat.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -vagrant::package_url: https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.rpm diff --git a/data/vagrant/osfamily/Windows.yaml b/data/vagrant/osfamily/Windows.yaml deleted file mode 100644 index 48d57de6..00000000 --- a/data/vagrant/osfamily/Windows.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -vagrant::package_url: https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.msi diff --git a/data/vagrant/upstream/default.yaml b/data/vagrant/upstream/default.yaml new file mode 100644 index 00000000..fa573992 --- /dev/null +++ b/data/vagrant/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +vagrant::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/vault-enterprise/default.yaml b/data/vault-enterprise/default.yaml new file mode 100644 index 00000000..65cea939 --- /dev/null +++ b/data/vault-enterprise/default.yaml @@ -0,0 +1,12 @@ +--- +vault-enterprise::settings: + upstream_repo: true + package_name: 'vault-enterprise' + process_name: 'vault' + service_name: 'vault' + config_file_path: '/etc/vault.d/vault.hcl' + config_dir_path: '/etc/vault.d' + data_dir_path: '/opt/vault' + config_file_format: 'hcl' + tcp_port: 8200 + diff --git a/data/vault-enterprise/hiera.yaml b/data/vault-enterprise/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/vault-enterprise/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/vault-enterprise/upstream/default.yaml b/data/vault-enterprise/upstream/default.yaml new file mode 100644 index 00000000..8e885ab9 --- /dev/null +++ b/data/vault-enterprise/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +vault-enterprise::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/vault/default.yaml b/data/vault/default.yaml new file mode 100644 index 00000000..3496b25b --- /dev/null +++ b/data/vault/default.yaml @@ -0,0 +1,12 @@ +--- +vault::settings: + upstream_repo: true + package_name: 'vault' + process_name: 'vault' + service_name: 'vault' + config_file_path: '/etc/vault.d/vault.hcl' + config_dir_path: '/etc/vault.d' + data_dir_path: '/opt/vault' + config_file_format: 'hcl' + tcp_port: 8200 + diff --git a/data/vault/hiera.yaml b/data/vault/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/vault/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/vault/upstream/default.yaml b/data/vault/upstream/default.yaml new file mode 100644 index 00000000..35358eff --- /dev/null +++ b/data/vault/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +vault::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/waypoint/default.yaml b/data/waypoint/default.yaml new file mode 100644 index 00000000..1365beef --- /dev/null +++ b/data/waypoint/default.yaml @@ -0,0 +1,6 @@ +--- +waypoint::settings: + upstream_repo: true + package_name: 'waypoint' + process_name: 'waypoint' + diff --git a/data/waypoint/hiera.yaml b/data/waypoint/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/waypoint/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/waypoint/upstream/default.yaml b/data/waypoint/upstream/default.yaml new file mode 100644 index 00000000..3c39472c --- /dev/null +++ b/data/waypoint/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +waypoint::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file From ec8b76e4eee62bcd75ddae9aa4f696cd1317f571 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 23 Oct 2020 19:37:27 +0200 Subject: [PATCH 203/284] Ubuntu 20.10 --- data/common.yaml | 1 - data/default/Ubuntu20.10.yaml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 data/common.yaml create mode 100644 data/default/Ubuntu20.10.yaml diff --git a/data/common.yaml b/data/common.yaml deleted file mode 100644 index ed97d539..00000000 --- a/data/common.yaml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/data/default/Ubuntu20.10.yaml b/data/default/Ubuntu20.10.yaml new file mode 100644 index 00000000..beea88bd --- /dev/null +++ b/data/default/Ubuntu20.10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'groovy' From 0ccfd5aa9e0f2232c3c96b1477d96f7ba53bbd5b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 19 Jan 2021 09:02:20 +0100 Subject: [PATCH 204/284] Updated mongodb data --- data/mongodb/default.yaml | 24 ++++++++++--------- data/mongodb/hiera.yaml | 4 ++++ data/mongodb/upstream/default.yaml | 14 +++++++++++ .../upstream/operatingsystem/Darwin.yaml | 6 +++++ .../upstream/operatingsystem/Debian10.yaml | 3 +++ .../upstream/operatingsystem/Debian9.yaml | 3 +++ .../upstream/operatingsystem/SLES12.yaml | 4 ++++ .../upstream/operatingsystem/SLES15.yaml | 4 ++++ .../upstream/operatingsystem/Ubuntu.yaml | 4 ++++ .../upstream/operatingsystem/Ubuntu16.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu18.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu20.04.yaml | 3 +++ .../upstream/operatingsystem/windows.yaml | 3 +++ data/mongodb/upstream/osfamily/Debian.yaml | 4 ++++ data/mongodb/upstream/osfamily/RedHat.yaml | 13 ++-------- 15 files changed, 73 insertions(+), 22 deletions(-) create mode 100644 data/mongodb/upstream/default.yaml create mode 100644 data/mongodb/upstream/operatingsystem/Darwin.yaml create mode 100644 data/mongodb/upstream/operatingsystem/Debian10.yaml create mode 100644 data/mongodb/upstream/operatingsystem/Debian9.yaml create mode 100644 data/mongodb/upstream/operatingsystem/SLES12.yaml create mode 100644 data/mongodb/upstream/operatingsystem/SLES15.yaml create mode 100644 data/mongodb/upstream/operatingsystem/Ubuntu.yaml create mode 100644 data/mongodb/upstream/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/mongodb/upstream/operatingsystem/Ubuntu18.04.yaml create mode 100644 data/mongodb/upstream/operatingsystem/Ubuntu20.04.yaml create mode 100644 data/mongodb/upstream/operatingsystem/windows.yaml create mode 100644 data/mongodb/upstream/osfamily/Debian.yaml diff --git a/data/mongodb/default.yaml b/data/mongodb/default.yaml index 4160a6f7..301c5e05 100644 --- a/data/mongodb/default.yaml +++ b/data/mongodb/default.yaml @@ -1,12 +1,14 @@ --- - mongodb::settings: - package_name: 'mongodb-server' - service_name: 'mongodb' - config_file_path: '/etc/mongodb.conf' - pid_file_path: '/var/run/mongodb.pid' - log_file_path: '/var/log/mongodb/mongodb.log' - log_dir_path: '/var/log/mongodb' - process_name: 'mongod' - process_user: 'mongodb' - process_group: 'mongodb' - tcp_port: '27017' +mongodb::settings: + upstream_repo: true + package_name: 'mongodb-server' + service_name: 'mongodb' + config_file_path: '/etc/mongodb.conf' + pid_file_path: '/var/run/mongodb.pid' + log_file_path: '/var/log/mongodb/mongodb.log' + log_dir_path: '/var/log/mongodb' + data_dir_path: '/var/lib/mongodb' + process_name: 'mongod' + process_user: 'mongodb' + process_group: 'mongodb' + tcp_port: '27017' diff --git a/data/mongodb/hiera.yaml b/data/mongodb/hiera.yaml index b83f857a..02df7e88 100644 --- a/data/mongodb/hiera.yaml +++ b/data/mongodb/hiera.yaml @@ -1,7 +1,11 @@ --- :hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/mongodb/upstream/default.yaml b/data/mongodb/upstream/default.yaml new file mode 100644 index 00000000..3edd30b5 --- /dev/null +++ b/data/mongodb/upstream/default.yaml @@ -0,0 +1,14 @@ +--- +mongodb::settings: + package_name: 'mongodb-org' + service_name: 'mongod' + config_file_path: '/etc/mongod.conf' + pid_file_path: '/var/run/mongodb.pid' + log_file_path: '/var/log/mongodb/mongod.log' + process_user: 'mongod' + process_group: 'mongod' + key: '2069 1EEC 3521 6C63 CAF6 6CE1 6564 08E3 90CF B1F5' + key_url: 'https://www.mongodb.org/static/pgp/server-4.4.asc' + repo_filename: mongodb-org-4.4 + repo_description: 'MongoDB Repository' + data_dir_path: '/var/lib/mongo' diff --git a/data/mongodb/upstream/operatingsystem/Darwin.yaml b/data/mongodb/upstream/operatingsystem/Darwin.yaml new file mode 100644 index 00000000..88ee9336 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/Darwin.yaml @@ -0,0 +1,6 @@ +--- +mongodb::settings: + package_name: 'mongodb-community@4.4' + service_name: 'mongodb-community@4.4' + brew_tab: 'mongodb/brew' + config_file_path: '/usr/local/etc/mongod.conf' diff --git a/data/mongodb/upstream/operatingsystem/Debian10.yaml b/data/mongodb/upstream/operatingsystem/Debian10.yaml new file mode 100644 index 00000000..3d2916d5 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/Debian10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'buster/mongodb-org/4.4' \ No newline at end of file diff --git a/data/mongodb/upstream/operatingsystem/Debian9.yaml b/data/mongodb/upstream/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..62bc0cbd --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'stretch/mongodb-org/4.4' diff --git a/data/mongodb/upstream/operatingsystem/SLES12.yaml b/data/mongodb/upstream/operatingsystem/SLES12.yaml new file mode 100644 index 00000000..86ed3b26 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/SLES12.yaml @@ -0,0 +1,4 @@ +--- +mongodb::settings: + zypper_repofile_url: 'https://repo.mongodb.org/zypper/suse/12/mongodb-org/4.4/x86_64/' + repo_name: 'mongodb' \ No newline at end of file diff --git a/data/mongodb/upstream/operatingsystem/SLES15.yaml b/data/mongodb/upstream/operatingsystem/SLES15.yaml new file mode 100644 index 00000000..ea0837fd --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/SLES15.yaml @@ -0,0 +1,4 @@ +--- +mongodb::settings: + zypper_repofile_url: 'https://repo.mongodb.org/zypper/suse/15/mongodb-org/4.4/x86_64/' + repo_name: 'mongodb' \ No newline at end of file diff --git a/data/mongodb/upstream/operatingsystem/Ubuntu.yaml b/data/mongodb/upstream/operatingsystem/Ubuntu.yaml new file mode 100644 index 00000000..42156de0 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/Ubuntu.yaml @@ -0,0 +1,4 @@ +--- +mongodb::settings: + repo_url: 'http://repo.mongodb.org/apt/ubuntu' + apt_repos: 'multiverse' diff --git a/data/mongodb/upstream/operatingsystem/Ubuntu16.04.yaml b/data/mongodb/upstream/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..1cc7df29 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- +mongodb::settings: + apt_release: 'xenial/mongodb-org/4.4' \ No newline at end of file diff --git a/data/mongodb/upstream/operatingsystem/Ubuntu18.04.yaml b/data/mongodb/upstream/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..3b051351 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,3 @@ +--- +mongodb::settings: + apt_release: 'bionic/mongodb-org/4.4' \ No newline at end of file diff --git a/data/mongodb/upstream/operatingsystem/Ubuntu20.04.yaml b/data/mongodb/upstream/operatingsystem/Ubuntu20.04.yaml new file mode 100644 index 00000000..ebb985d4 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/Ubuntu20.04.yaml @@ -0,0 +1,3 @@ +--- +mongodb::settings: + apt_release: 'focal/mongodb-org/4.4' \ No newline at end of file diff --git a/data/mongodb/upstream/operatingsystem/windows.yaml b/data/mongodb/upstream/operatingsystem/windows.yaml new file mode 100644 index 00000000..983f7580 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/windows.yaml @@ -0,0 +1,3 @@ +--- +mongodb::settings: + package_name: 'mongodb' diff --git a/data/mongodb/upstream/osfamily/Debian.yaml b/data/mongodb/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..8ee06846 --- /dev/null +++ b/data/mongodb/upstream/osfamily/Debian.yaml @@ -0,0 +1,4 @@ +--- +mongodb::settings: + repo_url: 'http://repo.mongodb.org/apt/debian' + apt_repos: 'main' diff --git a/data/mongodb/upstream/osfamily/RedHat.yaml b/data/mongodb/upstream/osfamily/RedHat.yaml index 06ba5a87..82c7a157 100644 --- a/data/mongodb/upstream/osfamily/RedHat.yaml +++ b/data/mongodb/upstream/osfamily/RedHat.yaml @@ -1,12 +1,3 @@ --- - mongodb::settings: - repo_url: 'https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.2/x86_64/' - key_url: 'https://www.mongodb.org/static/pgp/server-4.2.asc' - package_name: 'mongodb-org' - service_name: 'mongod' - config_file_path: '/etc/mongod.conf' - pid_file_path: '/var/run/mongodb/mongod.pid' - log_file_path: '/var/log/mongodb/mongod.log' - data_dir_path: '/var/lib/mongo' - process_user: 'mongod' - process_group: 'mongod' +mongodb::settings: + repo_url: 'https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.4/x86_64/' From 1981711f41e234b6c4ea41549ee31dd441a6d09f Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 19 Jan 2021 09:58:22 +0100 Subject: [PATCH 205/284] Added pgbouncer data --- data/pgbouncer/default.yaml | 14 ++++++++++++++ data/pgbouncer/hiera.yaml | 7 +++++++ data/pgbouncer/osfamily/Debian.yaml | 8 ++++++++ data/pgbouncer/osfamily/RedHat.yaml | 5 +++++ 4 files changed, 34 insertions(+) create mode 100644 data/pgbouncer/default.yaml create mode 100644 data/pgbouncer/hiera.yaml create mode 100644 data/pgbouncer/osfamily/Debian.yaml create mode 100644 data/pgbouncer/osfamily/RedHat.yaml diff --git a/data/pgbouncer/default.yaml b/data/pgbouncer/default.yaml new file mode 100644 index 00000000..cecb3658 --- /dev/null +++ b/data/pgbouncer/default.yaml @@ -0,0 +1,14 @@ +--- +pgbouncer::settings: + package_name: 'pgbouncer' + service_name: 'pgbouncer' + config_file_path: '/etc/pgbouncer/pgbouncer.ini' + userlist_file_path: '/etc/pgbouncer/userlist.txt' + config_dir_path: '/etc/pgbouncer' + pid_file_path: '/var/run/pgbouncer/pgbouncer.pid' + log_file_path: '/var/log/pgbouncer/pgbouncer.log' + log_dir_path: '/var/log/pgbouncer' + process_name: 'pgbouncer' + process_user: 'pgbouncer' + process_group: 'pgbouncer' + tcp_port: '6432' diff --git a/data/pgbouncer/hiera.yaml b/data/pgbouncer/hiera.yaml new file mode 100644 index 00000000..a6dec64c --- /dev/null +++ b/data/pgbouncer/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/pgbouncer/osfamily/Debian.yaml b/data/pgbouncer/osfamily/Debian.yaml new file mode 100644 index 00000000..97087200 --- /dev/null +++ b/data/pgbouncer/osfamily/Debian.yaml @@ -0,0 +1,8 @@ +--- +pgbouncer::settings: + log_file_path: '/var/log/postgresql/pgbouncer.log' + log_dir_path: '/var/log/postgresql' + init_file_path: '/etc/default/pgbouncer' + process_user: 'postgres' + process_group: 'postgres' + pid_file_path: '/var/run/postgresql/pgbouncer.pid' diff --git a/data/pgbouncer/osfamily/RedHat.yaml b/data/pgbouncer/osfamily/RedHat.yaml new file mode 100644 index 00000000..bcf1732f --- /dev/null +++ b/data/pgbouncer/osfamily/RedHat.yaml @@ -0,0 +1,5 @@ +--- +pgbouncer::settings: + init_file_path: '/etc/sysconfig/pgbouncer' + tp_prerequisites: + - epel \ No newline at end of file From fc8f2d9fb1dfd1dc2a5ec65413440732953bef00 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 19 Jan 2021 10:08:31 +0100 Subject: [PATCH 206/284] Added config_file_format to pgbouncer --- data/pgbouncer/default.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/pgbouncer/default.yaml b/data/pgbouncer/default.yaml index cecb3658..0270fac8 100644 --- a/data/pgbouncer/default.yaml +++ b/data/pgbouncer/default.yaml @@ -3,6 +3,7 @@ pgbouncer::settings: package_name: 'pgbouncer' service_name: 'pgbouncer' config_file_path: '/etc/pgbouncer/pgbouncer.ini' + config_file_format: 'inifile_with_stanzas' userlist_file_path: '/etc/pgbouncer/userlist.txt' config_dir_path: '/etc/pgbouncer' pid_file_path: '/var/run/pgbouncer/pgbouncer.pid' @@ -11,4 +12,4 @@ pgbouncer::settings: process_name: 'pgbouncer' process_user: 'pgbouncer' process_group: 'pgbouncer' - tcp_port: '6432' + tcp_port: '6432' \ No newline at end of file From 65761b1896dae59fe8d982ed5042d697b7c97119 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 19 Jan 2021 10:38:40 +0100 Subject: [PATCH 207/284] Fixed mongodb settings --- data/mongodb/hiera.yaml | 8 ++++---- data/mongodb/upstream/default.yaml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/mongodb/hiera.yaml b/data/mongodb/hiera.yaml index 02df7e88..2c0b348b 100644 --- a/data/mongodb/hiera.yaml +++ b/data/mongodb/hiera.yaml @@ -1,9 +1,9 @@ --- :hierarchy: - - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" - - "%{title}/%{repo}/osfamily/%{osfamily}" - - "%{title}/%{repo}/default" + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}%{operatingsystemmajrelease}" diff --git a/data/mongodb/upstream/default.yaml b/data/mongodb/upstream/default.yaml index 3edd30b5..977e3363 100644 --- a/data/mongodb/upstream/default.yaml +++ b/data/mongodb/upstream/default.yaml @@ -5,10 +5,10 @@ mongodb::settings: config_file_path: '/etc/mongod.conf' pid_file_path: '/var/run/mongodb.pid' log_file_path: '/var/log/mongodb/mongod.log' - process_user: 'mongod' - process_group: 'mongod' + process_user: 'mongodb' + process_group: 'mongodb' key: '2069 1EEC 3521 6C63 CAF6 6CE1 6564 08E3 90CF B1F5' key_url: 'https://www.mongodb.org/static/pgp/server-4.4.asc' repo_filename: mongodb-org-4.4 repo_description: 'MongoDB Repository' - data_dir_path: '/var/lib/mongo' + data_dir_path: '/var/lib/mongodb' From 0601497e7a622378c2000613a0b7968a00250023 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 19 Jan 2021 12:55:01 +0100 Subject: [PATCH 208/284] Pgbouncer corrections --- data/pgbouncer/default.yaml | 3 +++ data/pgbouncer/osfamily/Debian.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/data/pgbouncer/default.yaml b/data/pgbouncer/default.yaml index 0270fac8..93cfcb34 100644 --- a/data/pgbouncer/default.yaml +++ b/data/pgbouncer/default.yaml @@ -4,6 +4,9 @@ pgbouncer::settings: service_name: 'pgbouncer' config_file_path: '/etc/pgbouncer/pgbouncer.ini' config_file_format: 'inifile_with_stanzas' + config_file_owner: 'pgbouncer' + config_file_group: 'pgbouncer' + config_file_mode: '0640' userlist_file_path: '/etc/pgbouncer/userlist.txt' config_dir_path: '/etc/pgbouncer' pid_file_path: '/var/run/pgbouncer/pgbouncer.pid' diff --git a/data/pgbouncer/osfamily/Debian.yaml b/data/pgbouncer/osfamily/Debian.yaml index 97087200..67857fdd 100644 --- a/data/pgbouncer/osfamily/Debian.yaml +++ b/data/pgbouncer/osfamily/Debian.yaml @@ -5,4 +5,6 @@ pgbouncer::settings: init_file_path: '/etc/default/pgbouncer' process_user: 'postgres' process_group: 'postgres' + config_file_owner: 'postgres' + config_file_group: 'postgres' pid_file_path: '/var/run/postgresql/pgbouncer.pid' From 95dd91ed1fcdd89d0b8f16597d290267c8bda3f9 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 20 Jan 2021 13:00:14 +0100 Subject: [PATCH 209/284] Test on mongodb hiera.yaml (requires tp 3.1.1) --- data/mongodb/default.yaml | 1 - data/mongodb/hiera.yaml | 8 ++++---- data/pgbouncer/default.yaml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/data/mongodb/default.yaml b/data/mongodb/default.yaml index 301c5e05..fed2289b 100644 --- a/data/mongodb/default.yaml +++ b/data/mongodb/default.yaml @@ -1,6 +1,5 @@ --- mongodb::settings: - upstream_repo: true package_name: 'mongodb-server' service_name: 'mongodb' config_file_path: '/etc/mongodb.conf' diff --git a/data/mongodb/hiera.yaml b/data/mongodb/hiera.yaml index 2c0b348b..02df7e88 100644 --- a/data/mongodb/hiera.yaml +++ b/data/mongodb/hiera.yaml @@ -1,9 +1,9 @@ --- :hierarchy: - - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/upstream/operatingsystem/%{operatingsystem}" - - "%{title}/upstream/osfamily/%{osfamily}" - - "%{title}/upstream/default" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}%{operatingsystemmajrelease}" diff --git a/data/pgbouncer/default.yaml b/data/pgbouncer/default.yaml index 93cfcb34..504d5fcc 100644 --- a/data/pgbouncer/default.yaml +++ b/data/pgbouncer/default.yaml @@ -6,7 +6,7 @@ pgbouncer::settings: config_file_format: 'inifile_with_stanzas' config_file_owner: 'pgbouncer' config_file_group: 'pgbouncer' - config_file_mode: '0640' + config_file_mode: '0600' userlist_file_path: '/etc/pgbouncer/userlist.txt' config_dir_path: '/etc/pgbouncer' pid_file_path: '/var/run/pgbouncer/pgbouncer.pid' From 2eb94d7c91bf2a4160e4c5de4a544cf9600d577c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 25 Jan 2021 16:11:52 +0100 Subject: [PATCH 210/284] Workaround fro nasio-plugins errors on Rhel8 --- data/nagios-plugins/osfamily/RedHat8.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/nagios-plugins/osfamily/RedHat8.yaml b/data/nagios-plugins/osfamily/RedHat8.yaml index 308362b7..297bb477 100644 --- a/data/nagios-plugins/osfamily/RedHat8.yaml +++ b/data/nagios-plugins/osfamily/RedHat8.yaml @@ -1,5 +1,5 @@ --- - nagios-plugins::settings: + nagios-plugins::settings_broken: exec_prerequisites: enable_powertools: command: 'dnf config-manager --set-enabled PowerTools' From ef7579a93dacd8f68c8de2e4f7dc49c36a44b2f1 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 25 Jan 2021 16:14:46 +0100 Subject: [PATCH 211/284] Release 0.4.4 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 46936828..6b01cfe4 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.3", + "version": "0.4.4", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 44673f87a3f05f7697208b05fde6331085105d16 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 2 Feb 2021 15:01:04 +0100 Subject: [PATCH 212/284] Update default.yaml --- data/rabbitmq/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/rabbitmq/default.yaml b/data/rabbitmq/default.yaml index da415b63..63930afa 100644 --- a/data/rabbitmq/default.yaml +++ b/data/rabbitmq/default.yaml @@ -6,7 +6,7 @@ config_dir_path: '/etc/rabbitmq' pid_file_path: '/var/run/rabbitmq.pid' log_file_path: '/var/log/rabbitmq/rabbitmq.log' - log_dir_path: '/privater/log/rabbitmq' + log_dir_path: '/var/log/rabbitmq' process_name: 'beam' process_name: 'rabbitmq' process_user: 'rabbitmq' From c589a082b28e4e277120dc8162bd241f3b379ea2 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 2 Feb 2021 15:02:24 +0100 Subject: [PATCH 213/284] Update default.yaml --- data/rabbitmq/default.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/data/rabbitmq/default.yaml b/data/rabbitmq/default.yaml index 63930afa..26980acf 100644 --- a/data/rabbitmq/default.yaml +++ b/data/rabbitmq/default.yaml @@ -7,7 +7,6 @@ pid_file_path: '/var/run/rabbitmq.pid' log_file_path: '/var/log/rabbitmq/rabbitmq.log' log_dir_path: '/var/log/rabbitmq' - process_name: 'beam' process_name: 'rabbitmq' process_user: 'rabbitmq' process_group: 'rabbitmq' From d1585c6cc7b04e65a62c801237ff8364c18eac2d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 3 Feb 2021 19:18:29 +0100 Subject: [PATCH 214/284] Added puppet_repo. Refactored puppet data --- data/pdk/default.yaml | 5 ++ data/pdk/hiera.yaml | 5 ++ data/puppet-agent/default.yaml | 44 +++++++++-------- data/puppet-agent/hiera.yaml | 1 - .../puppet-agent/operatingsystem/Centos6.yaml | 3 -- .../puppet-agent/operatingsystem/Debian7.yaml | 5 -- .../puppet-agent/operatingsystem/Debian8.yaml | 5 -- .../puppet-agent/operatingsystem/Debian9.yaml | 5 -- .../operatingsystem/Ubuntu12.04.yaml | 3 -- .../operatingsystem/Ubuntu14.04.yaml | 5 -- .../operatingsystem/Ubuntu16.04.yaml | 5 -- .../operatingsystem/Ubuntu18.04.yaml | 5 -- data/puppet-agent/osfamily/Debian.yaml | 9 +--- data/puppet-agent/osfamily/Linux.yaml | 4 -- data/puppet-agent/osfamily/RedHat.yaml | 5 +- data/puppet-agent/osfamily/RedHat5.yaml | 3 -- data/puppet-agent/osfamily/RedHat6.yaml | 3 -- data/puppet-agent/osfamily/RedHat7.yaml | 3 -- data/puppet-agent/osfamily/RedHat8.yaml | 3 -- data/puppet/default.yaml | 22 ++++----- data/puppet/osfamily/Debian.yaml | 4 +- data/puppet/osfamily/RedHat.yaml | 4 +- data/puppet/upstream/default.yaml | 44 +++++++++-------- .../upstream/operatingsystem/Centos6.yaml | 3 -- .../upstream/operatingsystem/Debian10.yaml | 3 -- .../upstream/operatingsystem/Debian7.yaml | 3 -- .../upstream/operatingsystem/Debian8.yaml | 4 -- .../upstream/operatingsystem/Debian9.yaml | 3 -- .../upstream/operatingsystem/Ubuntu12.04.yaml | 3 -- .../upstream/operatingsystem/Ubuntu14.04.yaml | 3 -- .../upstream/operatingsystem/Ubuntu16.04.yaml | 3 -- .../upstream/operatingsystem/Ubuntu18.04.yaml | 3 -- data/puppet/upstream/osfamily/Debian.yaml | 4 -- data/puppet/upstream/osfamily/Linux.yaml | 6 +-- data/puppet/upstream/osfamily/RedHat.yaml | 4 -- data/puppet/upstream/osfamily/RedHat5.yaml | 3 -- data/puppet/upstream/osfamily/RedHat6.yaml | 3 -- data/puppet/upstream/osfamily/RedHat7.yaml | 3 -- data/puppet/upstream/osfamily/RedHat8.yaml | 3 -- data/puppet/upstream/osfamily/windows.yaml | 29 ++++++----- data/puppet_repo/default.yaml | 3 ++ data/puppet_repo/hiera.yaml | 9 ++++ data/puppet_repo/upstream/default.yaml | 3 ++ .../upstream/operatingsystem/Debian10.yaml | 3 ++ .../upstream/operatingsystem/Debian7.yaml | 3 ++ .../upstream/operatingsystem/Debian8.yaml | 3 ++ .../upstream/operatingsystem/Debian9.yaml | 3 ++ .../upstream/operatingsystem/Fedora30.yaml | 3 ++ .../upstream/operatingsystem/Fedora31.yaml | 3 ++ .../upstream/operatingsystem/Fedora32.yaml | 3 ++ .../upstream/operatingsystem/Ubuntu14.04.yaml | 3 ++ .../upstream/operatingsystem/Ubuntu16.04.yaml | 3 ++ .../upstream/operatingsystem/Ubuntu18.04.yaml | 3 ++ .../upstream/operatingsystem/Ubuntu20.04.yaml | 3 ++ .../upstream/osfamily/RedHat5.yaml | 3 ++ .../upstream/osfamily/RedHat6.yaml | 3 ++ .../upstream/osfamily/RedHat7.yaml | 3 ++ .../upstream/osfamily/RedHat8.yaml | 3 ++ .../puppet_repo/upstream/osfamily/Suse11.yaml | 3 ++ .../puppet_repo/upstream/osfamily/Suse12.yaml | 3 ++ .../puppet_repo/upstream/osfamily/Suse15.yaml | 3 ++ data/puppetdb-termini/default.yaml | 2 + data/puppetdb/default.yaml | 42 ++++++++-------- data/puppetdb/hiera.yaml | 3 ++ data/puppetdb/osfamily/Debian.yaml | 4 +- data/puppetdb/osfamily/RedHat.yaml | 4 +- data/puppetserver/default.yaml | 49 ++++++++++--------- data/puppetserver/hiera.yaml | 2 +- .../puppetserver/operatingsystem/Debian7.yaml | 4 -- .../puppetserver/operatingsystem/Debian8.yaml | 4 -- .../puppetserver/operatingsystem/Debian9.yaml | 4 -- .../operatingsystem/Ubuntu12.04.yaml | 4 -- .../operatingsystem/Ubuntu14.04.yaml | 4 -- .../operatingsystem/Ubuntu16.04.yaml | 4 -- .../operatingsystem/Ubuntu18.04.yaml | 4 -- data/puppetserver/osfamily/Debian.yaml | 10 +--- data/puppetserver/osfamily/RedHat.yaml | 7 ++- data/puppetserver/osfamily/RedHat6.yaml | 3 -- data/puppetserver/osfamily/RedHat7.yaml | 3 -- 79 files changed, 223 insertions(+), 281 deletions(-) create mode 100644 data/pdk/default.yaml create mode 100644 data/pdk/hiera.yaml delete mode 100644 data/puppet-agent/operatingsystem/Centos6.yaml delete mode 100644 data/puppet-agent/operatingsystem/Debian7.yaml delete mode 100644 data/puppet-agent/operatingsystem/Debian8.yaml delete mode 100644 data/puppet-agent/operatingsystem/Debian9.yaml delete mode 100644 data/puppet-agent/operatingsystem/Ubuntu12.04.yaml delete mode 100644 data/puppet-agent/operatingsystem/Ubuntu14.04.yaml delete mode 100644 data/puppet-agent/operatingsystem/Ubuntu16.04.yaml delete mode 100644 data/puppet-agent/operatingsystem/Ubuntu18.04.yaml delete mode 100644 data/puppet-agent/osfamily/Linux.yaml delete mode 100644 data/puppet-agent/osfamily/RedHat5.yaml delete mode 100644 data/puppet-agent/osfamily/RedHat6.yaml delete mode 100644 data/puppet-agent/osfamily/RedHat7.yaml delete mode 100644 data/puppet-agent/osfamily/RedHat8.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Centos6.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Debian10.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Debian7.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Debian8.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Debian9.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Ubuntu12.04.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Ubuntu14.04.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Ubuntu16.04.yaml delete mode 100644 data/puppet/upstream/operatingsystem/Ubuntu18.04.yaml delete mode 100644 data/puppet/upstream/osfamily/Debian.yaml delete mode 100644 data/puppet/upstream/osfamily/RedHat.yaml delete mode 100644 data/puppet/upstream/osfamily/RedHat5.yaml delete mode 100644 data/puppet/upstream/osfamily/RedHat6.yaml delete mode 100644 data/puppet/upstream/osfamily/RedHat7.yaml delete mode 100644 data/puppet/upstream/osfamily/RedHat8.yaml create mode 100644 data/puppet_repo/default.yaml create mode 100644 data/puppet_repo/hiera.yaml create mode 100644 data/puppet_repo/upstream/default.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Debian10.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Debian7.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Debian8.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Debian9.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Fedora30.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Fedora31.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Fedora32.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Ubuntu18.04.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Ubuntu20.04.yaml create mode 100644 data/puppet_repo/upstream/osfamily/RedHat5.yaml create mode 100644 data/puppet_repo/upstream/osfamily/RedHat6.yaml create mode 100644 data/puppet_repo/upstream/osfamily/RedHat7.yaml create mode 100644 data/puppet_repo/upstream/osfamily/RedHat8.yaml create mode 100644 data/puppet_repo/upstream/osfamily/Suse11.yaml create mode 100644 data/puppet_repo/upstream/osfamily/Suse12.yaml create mode 100644 data/puppet_repo/upstream/osfamily/Suse15.yaml delete mode 100644 data/puppetserver/operatingsystem/Debian7.yaml delete mode 100644 data/puppetserver/operatingsystem/Debian8.yaml delete mode 100644 data/puppetserver/operatingsystem/Debian9.yaml delete mode 100644 data/puppetserver/operatingsystem/Ubuntu12.04.yaml delete mode 100644 data/puppetserver/operatingsystem/Ubuntu14.04.yaml delete mode 100644 data/puppetserver/operatingsystem/Ubuntu16.04.yaml delete mode 100644 data/puppetserver/operatingsystem/Ubuntu18.04.yaml delete mode 100644 data/puppetserver/osfamily/RedHat6.yaml delete mode 100644 data/puppetserver/osfamily/RedHat7.yaml diff --git a/data/pdk/default.yaml b/data/pdk/default.yaml new file mode 100644 index 00000000..5fff6f2c --- /dev/null +++ b/data/pdk/default.yaml @@ -0,0 +1,5 @@ +--- +pdk::settings: + package_name: 'pdk' + tp_prerequisites: + puppet_repo: {} \ No newline at end of file diff --git a/data/pdk/hiera.yaml b/data/pdk/hiera.yaml new file mode 100644 index 00000000..dfd3d93f --- /dev/null +++ b/data/pdk/hiera.yaml @@ -0,0 +1,5 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml index f15e974a..9df555c9 100644 --- a/data/puppet-agent/default.yaml +++ b/data/puppet-agent/default.yaml @@ -1,22 +1,24 @@ --- - puppet-agent::settings: - package_name: 'puppet-agent' - service_name: 'puppet' - config_file_path: '/etc/puppetlabs/puppet/puppet.conf' - fileserver_file_path: '/etc/puppetlabs/puppet/fileserver.conf' - routes_file_path: '/etc/puppetlabs/puppet/routes.yaml' - autosign_file_path: '/etc/puppetlabs/puppet/autosign.conf' - auth_file_path: '/etc/puppetlabs/puppet/auth.conf' - puppetdb_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' - config_dir_path: '/etc/puppetlabs/puppet/' - code_dir_path: '/etc/puppetlabs/code' - environment_dir_path: '/etc/puppetlabs/code/environments' - pid_file_path: '/var/run/puppetlabs/agent.pid' - log_file_path: - - '/var/log/puppetlabs/puppet/puppet.log' - - '/var/log/puppetlabs/pxp-agent/pxp-agent.log' - - '/var/log/puppetlabs/mcollective-log' - log_dir_path: '/var/log/puppetlabs/puppet' - process_name: 'puppet' - process_user: 'root' - process_group: 'root' +puppet-agent::settings: + package_name: 'puppet-agent' + service_name: 'puppet' + config_file_path: '/etc/puppetlabs/puppet/puppet.conf' + fileserver_file_path: '/etc/puppetlabs/puppet/fileserver.conf' + routes_file_path: '/etc/puppetlabs/puppet/routes.yaml' + autosign_file_path: '/etc/puppetlabs/puppet/autosign.conf' + auth_file_path: '/etc/puppetlabs/puppet/auth.conf' + puppetdb_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' + config_dir_path: '/etc/puppetlabs/puppet/' + code_dir_path: '/etc/puppetlabs/code' + environment_dir_path: '/etc/puppetlabs/code/environments' + pid_file_path: '/var/run/puppetlabs/agent.pid' + log_file_path: + - '/var/log/puppetlabs/puppet/puppet.log' + - '/var/log/puppetlabs/pxp-agent/pxp-agent.log' + - '/var/log/puppetlabs/mcollective-log' + log_dir_path: '/var/log/puppetlabs/puppet' + process_name: 'puppet' + process_user: 'root' + process_group: 'root' + tp_prerequisites: + puppet_repo: {} \ No newline at end of file diff --git a/data/puppet-agent/hiera.yaml b/data/puppet-agent/hiera.yaml index 037b0e42..a3944b3d 100644 --- a/data/puppet-agent/hiera.yaml +++ b/data/puppet-agent/hiera.yaml @@ -1,6 +1,5 @@ --- :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" diff --git a/data/puppet-agent/operatingsystem/Centos6.yaml b/data/puppet-agent/operatingsystem/Centos6.yaml deleted file mode 100644 index 71fdaf33..00000000 --- a/data/puppet-agent/operatingsystem/Centos6.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet-agent::settings: - dockerfile_prerequisites: 'RUN yum install -y wget systemd' diff --git a/data/puppet-agent/operatingsystem/Debian7.yaml b/data/puppet-agent/operatingsystem/Debian7.yaml deleted file mode 100644 index e2fd5e2d..00000000 --- a/data/puppet-agent/operatingsystem/Debian7.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - puppet-agent::settings: - repo_package_name: 'puppet-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-wheezy.deb' - apt_release: 'wheezy' diff --git a/data/puppet-agent/operatingsystem/Debian8.yaml b/data/puppet-agent/operatingsystem/Debian8.yaml deleted file mode 100644 index 348ed32c..00000000 --- a/data/puppet-agent/operatingsystem/Debian8.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - puppet-agent::settings: - repo_package_name: 'puppet-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-jessie.deb' - apt_release: 'jessie' diff --git a/data/puppet-agent/operatingsystem/Debian9.yaml b/data/puppet-agent/operatingsystem/Debian9.yaml deleted file mode 100644 index 89813871..00000000 --- a/data/puppet-agent/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - puppet-agent::settings: - repo_package_name: 'puppet-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-stretch.deb' - apt_release: 'stretch' diff --git a/data/puppet-agent/operatingsystem/Ubuntu12.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu12.04.yaml deleted file mode 100644 index a4d786b3..00000000 --- a/data/puppet-agent/operatingsystem/Ubuntu12.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet-agent::settings: - apt_release: 'precise' diff --git a/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml deleted file mode 100644 index f0246669..00000000 --- a/data/puppet-agent/operatingsystem/Ubuntu14.04.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - puppet-agent::settings: - repo_package_name: 'puppet-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-trusty.deb' - apt_release: 'trusty' diff --git a/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml deleted file mode 100644 index e080cd66..00000000 --- a/data/puppet-agent/operatingsystem/Ubuntu16.04.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - puppet-agent::settings: - repo_package_name: 'puppet-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-xenial.deb' - apt_release: 'xenial' diff --git a/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml b/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml deleted file mode 100644 index 18661e62..00000000 --- a/data/puppet-agent/operatingsystem/Ubuntu18.04.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- - puppet-agent::settings: - repo_package_name: 'puppet-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-bionic.deb' - apt_release: 'bionic' diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index f61801de..5c372856 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -1,8 +1,3 @@ --- - puppet-agent::settings: - repo_url: 'http://apt.puppetlabs.com' - key: 'EF8D349F' - key_url: 'http://apt.puppetlabs.com/pubkey.gpg' - apt_repos: 'puppet5' - apt_release: 'stable' - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' +puppet-agent::settings: + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet-agent/osfamily/Linux.yaml b/data/puppet-agent/osfamily/Linux.yaml deleted file mode 100644 index 4fcd591b..00000000 --- a/data/puppet-agent/osfamily/Linux.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppet-agent::settings: - package_name: '' - dockerfile_prerequisites: "RUN echo -e 'http://dl-3.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && echo -e 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk update && apk add shadow ruby less bash && gem install puppet --no-ri --no-rdoc " diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index f597b03d..3192be0d 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -1,4 +1,3 @@ --- - puppet-agent::settings: - repo_package_name: 'puppet-release' - dockerfile_prerequisites: 'RUN yum install -y wget which' +puppet-agent::settings: + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppet-agent/osfamily/RedHat5.yaml b/data/puppet-agent/osfamily/RedHat5.yaml deleted file mode 100644 index 9728a3f9..00000000 --- a/data/puppet-agent/osfamily/RedHat5.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet-agent::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-5.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat6.yaml b/data/puppet-agent/osfamily/RedHat6.yaml deleted file mode 100644 index 1be15485..00000000 --- a/data/puppet-agent/osfamily/RedHat6.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet-agent::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-6.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat7.yaml b/data/puppet-agent/osfamily/RedHat7.yaml deleted file mode 100644 index 5534eaab..00000000 --- a/data/puppet-agent/osfamily/RedHat7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet-agent::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-7.noarch.rpm' diff --git a/data/puppet-agent/osfamily/RedHat8.yaml b/data/puppet-agent/osfamily/RedHat8.yaml deleted file mode 100644 index 4d2f3488..00000000 --- a/data/puppet-agent/osfamily/RedHat8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet-agent::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-8.noarch.rpm' diff --git a/data/puppet/default.yaml b/data/puppet/default.yaml index 876fb078..dcb57328 100644 --- a/data/puppet/default.yaml +++ b/data/puppet/default.yaml @@ -1,12 +1,12 @@ --- - puppet::settings: - upstream_repo: true - package_name: 'puppet' - service_name: 'puppet' - config_file_path: '/etc/puppet/puppet.conf' - config_dir_path: '/etc/puppet' - pid_file_path: '/var/run/puppet/puppet.pid' - log_dir_path: '/var/log/puppet' - process_name: 'puppet' - process_user: 'root' - process_group: 'root' +puppet::settings: + upstream_repo: true + package_name: 'puppet' + service_name: 'puppet' + config_file_path: '/etc/puppet/puppet.conf' + config_dir_path: '/etc/puppet' + pid_file_path: '/var/run/puppet/puppet.pid' + log_dir_path: '/var/log/puppet' + process_name: 'puppet' + process_user: 'root' + process_group: 'root' diff --git a/data/puppet/osfamily/Debian.yaml b/data/puppet/osfamily/Debian.yaml index 7faee609..876f0ba9 100644 --- a/data/puppet/osfamily/Debian.yaml +++ b/data/puppet/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - puppet::settings: - init_file_path: '/etc/default/puppet' +puppet::settings: + init_file_path: '/etc/default/puppet' diff --git a/data/puppet/osfamily/RedHat.yaml b/data/puppet/osfamily/RedHat.yaml index e757181c..e9c2c7e6 100644 --- a/data/puppet/osfamily/RedHat.yaml +++ b/data/puppet/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - puppet::settings: - init_file_path: '/etc/sysconfig/puppet' +puppet::settings: + init_file_path: '/etc/sysconfig/puppet' diff --git a/data/puppet/upstream/default.yaml b/data/puppet/upstream/default.yaml index 50ed9f24..d24562c7 100644 --- a/data/puppet/upstream/default.yaml +++ b/data/puppet/upstream/default.yaml @@ -1,22 +1,24 @@ --- - puppet::settings: - package_name: 'puppet-agent' - service_name: 'puppet' - config_file_path: '/etc/puppetlabs/puppet/puppet.conf' - fileserver_file_path: '/etc/puppetlabs/puppet/fileserver.conf' - routes_file_path: '/etc/puppetlabs/puppet/routes.yaml' - autosign_file_path: '/etc/puppetlabs/puppet/autosign.conf' - auth_file_path: '/etc/puppetlabs/puppet/auth.conf' - puppetdb_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' - config_dir_path: '/etc/puppetlabs/puppet/' - code_dir_path: '/etc/puppetlabs/code' - environment_dir_path: '/etc/puppetlabs/code/environments' - pid_file_path: '/var/run/puppetlabs/agent.pid' - log_file_path: - - '/var/log/puppetlabs/puppet/puppet.log' - - '/var/log/puppetlabs/pxp-agent/pxp-agent.log' - - '/var/log/puppetlabs/mcollective-log' - log_dir_path: '/var/log/puppetlabs/puppet' - process_name: 'puppet' - process_user: 'root' - process_group: 'root' +puppet::settings: + package_name: 'puppet-agent' + service_name: 'puppet' + config_file_path: '/etc/puppetlabs/puppet/puppet.conf' + fileserver_file_path: '/etc/puppetlabs/puppet/fileserver.conf' + routes_file_path: '/etc/puppetlabs/puppet/routes.yaml' + autosign_file_path: '/etc/puppetlabs/puppet/autosign.conf' + auth_file_path: '/etc/puppetlabs/puppet/auth.conf' + puppetdb_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' + config_dir_path: '/etc/puppetlabs/puppet/' + code_dir_path: '/etc/puppetlabs/code' + environment_dir_path: '/etc/puppetlabs/code/environments' + pid_file_path: '/var/run/puppetlabs/agent.pid' + log_file_path: + - '/var/log/puppetlabs/puppet/puppet.log' + - '/var/log/puppetlabs/pxp-agent/pxp-agent.log' + - '/var/log/puppetlabs/mcollective-log' + log_dir_path: '/var/log/puppetlabs/puppet' + process_name: 'puppet' + process_user: 'root' + process_group: 'root' + tp_prerequisites: + puppet_repo: {} \ No newline at end of file diff --git a/data/puppet/upstream/operatingsystem/Centos6.yaml b/data/puppet/upstream/operatingsystem/Centos6.yaml deleted file mode 100644 index 82443c6f..00000000 --- a/data/puppet/upstream/operatingsystem/Centos6.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - dockerfile_prerequisites: 'RUN yum install -y wget systemd' diff --git a/data/puppet/upstream/operatingsystem/Debian10.yaml b/data/puppet/upstream/operatingsystem/Debian10.yaml deleted file mode 100644 index 7ad25000..00000000 --- a/data/puppet/upstream/operatingsystem/Debian10.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-buster.deb' diff --git a/data/puppet/upstream/operatingsystem/Debian7.yaml b/data/puppet/upstream/operatingsystem/Debian7.yaml deleted file mode 100644 index 2489051c..00000000 --- a/data/puppet/upstream/operatingsystem/Debian7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet5-release-wheezy.deb' diff --git a/data/puppet/upstream/operatingsystem/Debian8.yaml b/data/puppet/upstream/operatingsystem/Debian8.yaml deleted file mode 100644 index 09f6bd14..00000000 --- a/data/puppet/upstream/operatingsystem/Debian8.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppet::settings: - repo_package_name: 'puppet-release' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-jessie.deb' diff --git a/data/puppet/upstream/operatingsystem/Debian9.yaml b/data/puppet/upstream/operatingsystem/Debian9.yaml deleted file mode 100644 index b8d17a3d..00000000 --- a/data/puppet/upstream/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-stretch.deb' diff --git a/data/puppet/upstream/operatingsystem/Ubuntu12.04.yaml b/data/puppet/upstream/operatingsystem/Ubuntu12.04.yaml deleted file mode 100644 index 0f2b5cff..00000000 --- a/data/puppet/upstream/operatingsystem/Ubuntu12.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-pc1-precise.deb' diff --git a/data/puppet/upstream/operatingsystem/Ubuntu14.04.yaml b/data/puppet/upstream/operatingsystem/Ubuntu14.04.yaml deleted file mode 100644 index 846e6208..00000000 --- a/data/puppet/upstream/operatingsystem/Ubuntu14.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-trusty.deb' diff --git a/data/puppet/upstream/operatingsystem/Ubuntu16.04.yaml b/data/puppet/upstream/operatingsystem/Ubuntu16.04.yaml deleted file mode 100644 index f1ce6db3..00000000 --- a/data/puppet/upstream/operatingsystem/Ubuntu16.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-xenial.deb' diff --git a/data/puppet/upstream/operatingsystem/Ubuntu18.04.yaml b/data/puppet/upstream/operatingsystem/Ubuntu18.04.yaml deleted file mode 100644 index 2a4ee6ae..00000000 --- a/data/puppet/upstream/operatingsystem/Ubuntu18.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-bionic.deb' diff --git a/data/puppet/upstream/osfamily/Debian.yaml b/data/puppet/upstream/osfamily/Debian.yaml deleted file mode 100644 index f2a5f22d..00000000 --- a/data/puppet/upstream/osfamily/Debian.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppet::settings: - repo_package_name: 'puppet-release' - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet/upstream/osfamily/Linux.yaml b/data/puppet/upstream/osfamily/Linux.yaml index 407c04b9..e40a569d 100644 --- a/data/puppet/upstream/osfamily/Linux.yaml +++ b/data/puppet/upstream/osfamily/Linux.yaml @@ -1,4 +1,4 @@ --- - puppet::settings: - package_name: '' - dockerfile_prerequisites: "RUN echo -e 'http://dl-3.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && echo -e 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk update && apk add shadow ruby less bash && gem install puppet --no-ri --no-rdoc " +puppet::settings: + package_name: '' + dockerfile_prerequisites: "RUN echo -e 'http://dl-3.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && echo -e 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk update && apk add shadow ruby less bash && gem install puppet --no-ri --no-rdoc " diff --git a/data/puppet/upstream/osfamily/RedHat.yaml b/data/puppet/upstream/osfamily/RedHat.yaml deleted file mode 100644 index 220b15d8..00000000 --- a/data/puppet/upstream/osfamily/RedHat.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppet::settings: - repo_package_name: 'puppet-release' - dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppet/upstream/osfamily/RedHat5.yaml b/data/puppet/upstream/osfamily/RedHat5.yaml deleted file mode 100644 index ed19dde3..00000000 --- a/data/puppet/upstream/osfamily/RedHat5.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-5.noarch.rpm' diff --git a/data/puppet/upstream/osfamily/RedHat6.yaml b/data/puppet/upstream/osfamily/RedHat6.yaml deleted file mode 100644 index b0175fe3..00000000 --- a/data/puppet/upstream/osfamily/RedHat6.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-6.noarch.rpm' diff --git a/data/puppet/upstream/osfamily/RedHat7.yaml b/data/puppet/upstream/osfamily/RedHat7.yaml deleted file mode 100644 index a84da3fe..00000000 --- a/data/puppet/upstream/osfamily/RedHat7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-7.noarch.rpm' diff --git a/data/puppet/upstream/osfamily/RedHat8.yaml b/data/puppet/upstream/osfamily/RedHat8.yaml deleted file mode 100644 index a84da3fe..00000000 --- a/data/puppet/upstream/osfamily/RedHat8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppet::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-7.noarch.rpm' diff --git a/data/puppet/upstream/osfamily/windows.yaml b/data/puppet/upstream/osfamily/windows.yaml index 44556db4..c95f4747 100644 --- a/data/puppet/upstream/osfamily/windows.yaml +++ b/data/puppet/upstream/osfamily/windows.yaml @@ -1,16 +1,15 @@ --- -# TODO: Verify and manage Windows versions older than 2008 - puppet::settings: - config_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\puppet.conf' - fileserver_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\fileserver.conf' - routes_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\routes.yaml' - autosign_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\autosign.conf' - auth_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\auth.conf' - config_dir_path: 'C:\ProgramData\PuppetLabs\puppet\etc' - code_dir_path: 'C:\ProgramData\PuppetLabs\code' - environment_dir_path: 'C:\ProgramData\PuppetLabs\code\environments' - pid_file_path: 'C:\ProgramData\PuppetLabs\var\run\agent.pid' - log_file_path: 'C:\ProgramData\PuppetLabs\var\log\puppet.log' - log_dir_path: 'C:\ProgramData\PuppetLabs\var\log' - process_user: 'LocalSystem' - process_group: 'LocalSystem' +puppet::settings: + config_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\puppet.conf' + fileserver_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\fileserver.conf' + routes_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\routes.yaml' + autosign_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\autosign.conf' + auth_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\auth.conf' + config_dir_path: 'C:\ProgramData\PuppetLabs\puppet\etc' + code_dir_path: 'C:\ProgramData\PuppetLabs\code' + environment_dir_path: 'C:\ProgramData\PuppetLabs\code\environments' + pid_file_path: 'C:\ProgramData\PuppetLabs\var\run\agent.pid' + log_file_path: 'C:\ProgramData\PuppetLabs\var\log\puppet.log' + log_dir_path: 'C:\ProgramData\PuppetLabs\var\log' + process_user: 'LocalSystem' + process_group: 'LocalSystem' diff --git a/data/puppet_repo/default.yaml b/data/puppet_repo/default.yaml new file mode 100644 index 00000000..1926ce59 --- /dev/null +++ b/data/puppet_repo/default.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + upstream_repo: true diff --git a/data/puppet_repo/hiera.yaml b/data/puppet_repo/hiera.yaml new file mode 100644 index 00000000..efaec5bc --- /dev/null +++ b/data/puppet_repo/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/puppet_repo/upstream/default.yaml b/data/puppet_repo/upstream/default.yaml new file mode 100644 index 00000000..acfcd1b0 --- /dev/null +++ b/data/puppet_repo/upstream/default.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_name: 'puppet-release' diff --git a/data/puppet_repo/upstream/operatingsystem/Debian10.yaml b/data/puppet_repo/upstream/operatingsystem/Debian10.yaml new file mode 100644 index 00000000..8ecfe2b6 --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Debian10.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet-release-buster.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Debian7.yaml b/data/puppet_repo/upstream/operatingsystem/Debian7.yaml new file mode 100644 index 00000000..56fd5b51 --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Debian7.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppets.com/puppet-release-wheezy.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Debian8.yaml b/data/puppet_repo/upstream/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..843340fa --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet6-release-jessie.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Debian9.yaml b/data/puppet_repo/upstream/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..8756a388 --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet-release-stretch.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Fedora30.yaml b/data/puppet_repo/upstream/operatingsystem/Fedora30.yaml new file mode 100644 index 00000000..62ac2a9e --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Fedora30.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-fedora-30.noarch.rpm' diff --git a/data/puppet_repo/upstream/operatingsystem/Fedora31.yaml b/data/puppet_repo/upstream/operatingsystem/Fedora31.yaml new file mode 100644 index 00000000..c7bd0803 --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Fedora31.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-fedora-31.noarch.rpm' diff --git a/data/puppet_repo/upstream/operatingsystem/Fedora32.yaml b/data/puppet_repo/upstream/operatingsystem/Fedora32.yaml new file mode 100644 index 00000000..f170ff9e --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Fedora32.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-fedora-32.noarch.rpm' diff --git a/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml b/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..9294b163 --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet6-release-trusty.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Ubuntu16.04.yaml b/data/puppet_repo/upstream/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..b2a8edad --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet-release-xenial.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Ubuntu18.04.yaml b/data/puppet_repo/upstream/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..717cc743 --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet-release-bionic.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Ubuntu20.04.yaml b/data/puppet_repo/upstream/operatingsystem/Ubuntu20.04.yaml new file mode 100644 index 00000000..c68048da --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu20.04.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet-release-focal.deb' diff --git a/data/puppet_repo/upstream/osfamily/RedHat5.yaml b/data/puppet_repo/upstream/osfamily/RedHat5.yaml new file mode 100644 index 00000000..eb0036fe --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/RedHat5.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-5.noarch.rpm' diff --git a/data/puppet_repo/upstream/osfamily/RedHat6.yaml b/data/puppet_repo/upstream/osfamily/RedHat6.yaml new file mode 100644 index 00000000..43c820ef --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-6.noarch.rpm' diff --git a/data/puppet_repo/upstream/osfamily/RedHat7.yaml b/data/puppet_repo/upstream/osfamily/RedHat7.yaml new file mode 100644 index 00000000..4b590dbf --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-7.noarch.rpm' diff --git a/data/puppet_repo/upstream/osfamily/RedHat8.yaml b/data/puppet_repo/upstream/osfamily/RedHat8.yaml new file mode 100644 index 00000000..b19eec8e --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-8.noarch.rpm' diff --git a/data/puppet_repo/upstream/osfamily/Suse11.yaml b/data/puppet_repo/upstream/osfamily/Suse11.yaml new file mode 100644 index 00000000..8976c7a2 --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/Suse11.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-sles-11.noarch.rpm' diff --git a/data/puppet_repo/upstream/osfamily/Suse12.yaml b/data/puppet_repo/upstream/osfamily/Suse12.yaml new file mode 100644 index 00000000..0a15b5f2 --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/Suse12.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-sles-12.noarch.rpm' diff --git a/data/puppet_repo/upstream/osfamily/Suse15.yaml b/data/puppet_repo/upstream/osfamily/Suse15.yaml new file mode 100644 index 00000000..09b062b9 --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/Suse15.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-sles-15.noarch.rpm' diff --git a/data/puppetdb-termini/default.yaml b/data/puppetdb-termini/default.yaml index d484e564..e9e732f5 100644 --- a/data/puppetdb-termini/default.yaml +++ b/data/puppetdb-termini/default.yaml @@ -3,3 +3,5 @@ puppetdb-termini::settings: package_name: 'puppetdb-termini' config_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' config_dir_path: '/etc/puppetlabs/puppet' + tp_prerequisites: + puppet_repo: {} \ No newline at end of file diff --git a/data/puppetdb/default.yaml b/data/puppetdb/default.yaml index 29feb5c9..de3bcc98 100644 --- a/data/puppetdb/default.yaml +++ b/data/puppetdb/default.yaml @@ -1,21 +1,23 @@ --- - puppetdb::settings: - package_name: 'puppetdb' - service_name: 'puppetdb' - config_file_path: '/etc/puppetlabs/puppetsdb/bootstrap.cfg' - config_dir_path: '/etc/puppetlabs/puppetdb' - conf_dir_path: '/etc/puppetlabs/puppetdb/conf.d' - install_dir_path: '/opt/puppetlabs/server/apps/puppetdb' - pid_file_path: '/var/run/puppetlabs/puppetdb/puppetdb.pid' - config_dir_owner: 'puppetdb' - config_dir_group: 'puppetdb' - config_dir_mode: '0640' - log_dir_path: '/var/log/puppetlabs/puppetdb' - process_name: 'java' - process_extra_name: 'puppetdb' - process_user: 'puppetdb' - process_group: 'puppetdb' - tcp_port: '8080' - log_file_path: - - '/var/log/puppetlabs/puppetdb/puppetdb.log' - - '/var/log/puppetlabs/puppetdb/puppetdb-accesss.log' +puppetdb::settings: + package_name: 'puppetdb' + service_name: 'puppetdb' + config_file_path: '/etc/puppetlabs/puppetsdb/bootstrap.cfg' + config_dir_path: '/etc/puppetlabs/puppetdb' + conf_dir_path: '/etc/puppetlabs/puppetdb/conf.d' + install_dir_path: '/opt/puppetlabs/server/apps/puppetdb' + pid_file_path: '/var/run/puppetlabs/puppetdb/puppetdb.pid' + config_dir_owner: 'puppetdb' + config_dir_group: 'puppetdb' + config_dir_mode: '0640' + log_dir_path: '/var/log/puppetlabs/puppetdb' + process_name: 'java' + process_extra_name: 'puppetdb' + process_user: 'puppetdb' + process_group: 'puppetdb' + tcp_port: '8080' + log_file_path: + - '/var/log/puppetlabs/puppetdb/puppetdb.log' + - '/var/log/puppetlabs/puppetdb/puppetdb-accesss.log' + tp_prerequisites: + puppet_repo: {} \ No newline at end of file diff --git a/data/puppetdb/hiera.yaml b/data/puppetdb/hiera.yaml index 19fa9ae9..e0a304ab 100644 --- a/data/puppetdb/hiera.yaml +++ b/data/puppetdb/hiera.yaml @@ -1,6 +1,9 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default + diff --git a/data/puppetdb/osfamily/Debian.yaml b/data/puppetdb/osfamily/Debian.yaml index 03a4b528..a5050c36 100644 --- a/data/puppetdb/osfamily/Debian.yaml +++ b/data/puppetdb/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - puppetdb::settings: - init_file_path: '/etc/default/puppetdb' +puppetdb::settings: + init_file_path: '/etc/default/puppetdb' diff --git a/data/puppetdb/osfamily/RedHat.yaml b/data/puppetdb/osfamily/RedHat.yaml index 18f2c4ce..4c9650ed 100644 --- a/data/puppetdb/osfamily/RedHat.yaml +++ b/data/puppetdb/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - puppetdb::settings: - init_file_path: '/etc/sysconfig/puppetdb' +puppetdb::settings: + init_file_path: '/etc/sysconfig/puppetdb' diff --git a/data/puppetserver/default.yaml b/data/puppetserver/default.yaml index 6e9d43bd..bbc9dde0 100644 --- a/data/puppetserver/default.yaml +++ b/data/puppetserver/default.yaml @@ -1,25 +1,26 @@ --- - puppetserver::settings: - package_name: 'puppetserver' - service_name: 'puppetserver' - config_file_path: '/etc/puppetlabs/puppetserver/puppetserver.conf' - config_dir_path: '/etc/puppetlabs/puppetserver' - conf_dir_path: '/etc/puppetlabs/puppetserver/conf.d' - code_dir_path: '/etc/puppetlabs/code' - environment_dir_path: '/etc/puppetlabs/code/environments' - install_dir_path: '/opt/puppetlabs/server/apps/puppetserver' - pid_file_path: '/var/run/puppetlabs/puppetserver/puppetserver.pid' - log_dir_path: '/var/log/puppetlabs/puppetserver' - process_name: 'puppet' - process_user: 'puppet' - process_group: 'puppet' - config_dir_owner: 'puppet' - config_dir_group: 'puppet' - config_dir_mode: '0750' - nodaemon_args: 'foreground' - log_file_path: - - '/var/log/puppetlabs/puppetserver/puppetserver.log' - - '/var/log/puppetlabs/puppetserver/masterhttp.log' - - '/var/log/puppetlabs/puppetserver/puppetserver-access.log' - - '/var/log/puppetlabs/puppetserver/file-sync-access.log' - +puppetserver::settings: + package_name: 'puppetserver' + service_name: 'puppetserver' + config_file_path: '/etc/puppetlabs/puppetserver/puppetserver.conf' + config_dir_path: '/etc/puppetlabs/puppetserver' + conf_dir_path: '/etc/puppetlabs/puppetserver/conf.d' + code_dir_path: '/etc/puppetlabs/code' + environment_dir_path: '/etc/puppetlabs/code/environments' + install_dir_path: '/opt/puppetlabs/server/apps/puppetserver' + pid_file_path: '/var/run/puppetlabs/puppetserver/puppetserver.pid' + log_dir_path: '/var/log/puppetlabs/puppetserver' + process_name: 'puppet' + process_user: 'puppet' + process_group: 'puppet' + config_dir_owner: 'puppet' + config_dir_group: 'puppet' + config_dir_mode: '0750' + nodaemon_args: 'foreground' + log_file_path: + - '/var/log/puppetlabs/puppetserver/puppetserver.log' + - '/var/log/puppetlabs/puppetserver/masterhttp.log' + - '/var/log/puppetlabs/puppetserver/puppetserver-access.log' + - '/var/log/puppetlabs/puppetserver/file-sync-access.log' + tp_prerequisites: + puppet_repo: {} \ No newline at end of file diff --git a/data/puppetserver/hiera.yaml b/data/puppetserver/hiera.yaml index 037b0e42..d34d2477 100644 --- a/data/puppetserver/hiera.yaml +++ b/data/puppetserver/hiera.yaml @@ -1,8 +1,8 @@ --- :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/puppetserver/operatingsystem/Debian7.yaml b/data/puppetserver/operatingsystem/Debian7.yaml deleted file mode 100644 index e606bf81..00000000 --- a/data/puppetserver/operatingsystem/Debian7.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppetserver::settings: - apt_release: 'wheezy' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-wheezy.deb' diff --git a/data/puppetserver/operatingsystem/Debian8.yaml b/data/puppetserver/operatingsystem/Debian8.yaml deleted file mode 100644 index c73421f2..00000000 --- a/data/puppetserver/operatingsystem/Debian8.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppetserver::settings: - apt_release: 'jessie' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-jessie.deb' diff --git a/data/puppetserver/operatingsystem/Debian9.yaml b/data/puppetserver/operatingsystem/Debian9.yaml deleted file mode 100644 index ff06096e..00000000 --- a/data/puppetserver/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppetserver::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-stretch.deb' - apt_release: 'stretch' diff --git a/data/puppetserver/operatingsystem/Ubuntu12.04.yaml b/data/puppetserver/operatingsystem/Ubuntu12.04.yaml deleted file mode 100644 index 6ed7ae94..00000000 --- a/data/puppetserver/operatingsystem/Ubuntu12.04.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppetserver::settings: - apt_release: 'precise' - diff --git a/data/puppetserver/operatingsystem/Ubuntu14.04.yaml b/data/puppetserver/operatingsystem/Ubuntu14.04.yaml deleted file mode 100644 index eb3d764e..00000000 --- a/data/puppetserver/operatingsystem/Ubuntu14.04.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppetserver::settings: - apt_release: 'trusty' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-trusty.deb' diff --git a/data/puppetserver/operatingsystem/Ubuntu16.04.yaml b/data/puppetserver/operatingsystem/Ubuntu16.04.yaml deleted file mode 100644 index e5cbdc59..00000000 --- a/data/puppetserver/operatingsystem/Ubuntu16.04.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppetserver::settings: - apt_release: 'xenial' - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-xenial.deb' diff --git a/data/puppetserver/operatingsystem/Ubuntu18.04.yaml b/data/puppetserver/operatingsystem/Ubuntu18.04.yaml deleted file mode 100644 index 0b2ba542..00000000 --- a/data/puppetserver/operatingsystem/Ubuntu18.04.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - puppetserver::settings: - repo_package_url: 'https://apt.puppetlabs.com/puppet-release-bionic.deb' - apt_release: 'bionic' diff --git a/data/puppetserver/osfamily/Debian.yaml b/data/puppetserver/osfamily/Debian.yaml index a5c4392c..b80ebbcb 100644 --- a/data/puppetserver/osfamily/Debian.yaml +++ b/data/puppetserver/osfamily/Debian.yaml @@ -1,9 +1,3 @@ --- - puppetserver::settings: - init_file_path: '/etc/default/puppetserver' - repo_url: 'http://apt.puppetlabs.com' - key: 'EF8D349F' - key_url: 'http://apt.puppetlabs.com/pubkey.gpg' - apt_repos: 'puppet5' - apt_release: 'stable' - repo_package_name: 'puppet-release' +puppetserver::settings: + init_file_path: '/etc/default/puppetserver' diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 214c7680..6c4c1d86 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -1,5 +1,4 @@ --- - puppetserver::settings: - init_file_path: '/etc/sysconfig/puppetserver' - repo_package_name: 'puppet-release' - dockerfile_prerequisites: 'RUN yum install -y wget' +puppetserver::settings: + init_file_path: '/etc/sysconfig/puppetserver' + dockerfile_prerequisites: 'RUN yum install -y wget' diff --git a/data/puppetserver/osfamily/RedHat6.yaml b/data/puppetserver/osfamily/RedHat6.yaml deleted file mode 100644 index 94d26624..00000000 --- a/data/puppetserver/osfamily/RedHat6.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppetserver::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppet/puppet-release-el-6.noarch.rpm' diff --git a/data/puppetserver/osfamily/RedHat7.yaml b/data/puppetserver/osfamily/RedHat7.yaml deleted file mode 100644 index bc2e337c..00000000 --- a/data/puppetserver/osfamily/RedHat7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - puppetserver::settings: - repo_package_url: 'https://yum.puppetlabs.com/puppet/puppet-release-el-7.noarch.rpm' From 16f414501f6d0d091e3fee0eb93331292a14078c Mon Sep 17 00:00:00 2001 From: Florus Both Date: Tue, 23 Feb 2021 16:15:44 +0100 Subject: [PATCH 215/284] add upstream repo for pgbouncer Debian --- data/pgbouncer/hiera.yaml | 4 ++++ data/pgbouncer/upstream/operatingsystem/Debian10.yaml | 6 ++++++ data/pgbouncer/upstream/operatingsystem/Debian9.yaml | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 data/pgbouncer/upstream/operatingsystem/Debian10.yaml create mode 100644 data/pgbouncer/upstream/operatingsystem/Debian9.yaml diff --git a/data/pgbouncer/hiera.yaml b/data/pgbouncer/hiera.yaml index a6dec64c..2c0b348b 100644 --- a/data/pgbouncer/hiera.yaml +++ b/data/pgbouncer/hiera.yaml @@ -1,5 +1,9 @@ --- :hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}%{operatingsystemmajrelease}" diff --git a/data/pgbouncer/upstream/operatingsystem/Debian10.yaml b/data/pgbouncer/upstream/operatingsystem/Debian10.yaml new file mode 100644 index 00000000..cf3b4f13 --- /dev/null +++ b/data/pgbouncer/upstream/operatingsystem/Debian10.yaml @@ -0,0 +1,6 @@ +--- +pgbouncer::settings: + repo_url: 'http://apt.postgresql.org/pub/repos/apt' + key: 'B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8' + key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' + apt_release: 'buster-pgdg main' \ No newline at end of file diff --git a/data/pgbouncer/upstream/operatingsystem/Debian9.yaml b/data/pgbouncer/upstream/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..26663991 --- /dev/null +++ b/data/pgbouncer/upstream/operatingsystem/Debian9.yaml @@ -0,0 +1,6 @@ +--- +pgbouncer::settings: + repo_url: 'http://apt.postgresql.org/pub/repos/apt' + key: 'B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8' + key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' + apt_release: 'stretch-pgdg main' \ No newline at end of file From 662d1e71024055dc677bdf9cf4073d929cc67b5c Mon Sep 17 00:00:00 2001 From: Florus Both Date: Wed, 24 Feb 2021 09:13:35 +0100 Subject: [PATCH 216/284] add redhat --- data/pgbouncer/default.yaml | 2 +- data/pgbouncer/hiera.yaml | 1 + data/pgbouncer/upstream/default.yaml | 4 ++++ data/pgbouncer/upstream/operatingsystem/Debian10.yaml | 4 +--- data/pgbouncer/upstream/operatingsystem/Debian9.yaml | 5 ++--- data/pgbouncer/upstream/osfamily/RedHat7.yaml | 5 +++++ data/pgbouncer/upstream/osfamily/RedHat8.yaml | 5 +++++ 7 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 data/pgbouncer/upstream/default.yaml create mode 100644 data/pgbouncer/upstream/osfamily/RedHat7.yaml create mode 100644 data/pgbouncer/upstream/osfamily/RedHat8.yaml diff --git a/data/pgbouncer/default.yaml b/data/pgbouncer/default.yaml index 504d5fcc..f25c3ac1 100644 --- a/data/pgbouncer/default.yaml +++ b/data/pgbouncer/default.yaml @@ -15,4 +15,4 @@ pgbouncer::settings: process_name: 'pgbouncer' process_user: 'pgbouncer' process_group: 'pgbouncer' - tcp_port: '6432' \ No newline at end of file + tcp_port: '6432' diff --git a/data/pgbouncer/hiera.yaml b/data/pgbouncer/hiera.yaml index 2c0b348b..2487351e 100644 --- a/data/pgbouncer/hiera.yaml +++ b/data/pgbouncer/hiera.yaml @@ -2,6 +2,7 @@ :hierarchy: - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" diff --git a/data/pgbouncer/upstream/default.yaml b/data/pgbouncer/upstream/default.yaml new file mode 100644 index 00000000..1c2948f2 --- /dev/null +++ b/data/pgbouncer/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +pgbouncer::settings: + key: 'B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8' + key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' diff --git a/data/pgbouncer/upstream/operatingsystem/Debian10.yaml b/data/pgbouncer/upstream/operatingsystem/Debian10.yaml index cf3b4f13..50285c8a 100644 --- a/data/pgbouncer/upstream/operatingsystem/Debian10.yaml +++ b/data/pgbouncer/upstream/operatingsystem/Debian10.yaml @@ -1,6 +1,4 @@ --- pgbouncer::settings: repo_url: 'http://apt.postgresql.org/pub/repos/apt' - key: 'B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8' - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' - apt_release: 'buster-pgdg main' \ No newline at end of file + apt_release: 'buster-pgdg main' diff --git a/data/pgbouncer/upstream/operatingsystem/Debian9.yaml b/data/pgbouncer/upstream/operatingsystem/Debian9.yaml index 26663991..041919a7 100644 --- a/data/pgbouncer/upstream/operatingsystem/Debian9.yaml +++ b/data/pgbouncer/upstream/operatingsystem/Debian9.yaml @@ -1,6 +1,5 @@ --- pgbouncer::settings: repo_url: 'http://apt.postgresql.org/pub/repos/apt' - key: 'B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8' - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' - apt_release: 'stretch-pgdg main' \ No newline at end of file + apt_release: 'stretch-pgdg main' + \ No newline at end of file diff --git a/data/pgbouncer/upstream/osfamily/RedHat7.yaml b/data/pgbouncer/upstream/osfamily/RedHat7.yaml new file mode 100644 index 00000000..9b6e2999 --- /dev/null +++ b/data/pgbouncer/upstream/osfamily/RedHat7.yaml @@ -0,0 +1,5 @@ +--- +pgbouncer::settings: + repo_package_url: 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm' + repo_package_name: 'pgdp-redhat-repo' + repo_filename: 'pgdg-redhat-all' diff --git a/data/pgbouncer/upstream/osfamily/RedHat8.yaml b/data/pgbouncer/upstream/osfamily/RedHat8.yaml new file mode 100644 index 00000000..0c5202ed --- /dev/null +++ b/data/pgbouncer/upstream/osfamily/RedHat8.yaml @@ -0,0 +1,5 @@ +--- +pgbouncer::settings: + repo_package_url: 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm' + repo_package_name: 'pgdg-redhat-repo' + repo_filename: 'pgdg-redhat-all' From 8ae20a7dedb3cdb97ab5700935832484abc2a942 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 7 May 2021 21:52:08 +0200 Subject: [PATCH 217/284] Added nagios-plugins data for Debian --- data/nagios-plugins/osfamily/Debian.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/nagios-plugins/osfamily/Debian.yaml diff --git a/data/nagios-plugins/osfamily/Debian.yaml b/data/nagios-plugins/osfamily/Debian.yaml new file mode 100644 index 00000000..0055b53a --- /dev/null +++ b/data/nagios-plugins/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +nagios-plugins::settings: + package_name: 'monitoring-plugins' From cb1b204537b217edf52e8952ded3434304ae7b4d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 7 May 2021 22:26:20 +0200 Subject: [PATCH 218/284] Version 0.4.5 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 6b01cfe4..8d292fd5 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.4", + "version": "0.4.5", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 3657cfe63df9bdba3f09c57541f4f6442c820cc8 Mon Sep 17 00:00:00 2001 From: Florus Both Date: Fri, 22 Oct 2021 14:38:13 +0200 Subject: [PATCH 219/284] fix upstream repo for hashicorp on debian --- data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml | 4 ++++ data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml create mode 100644 data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml diff --git a/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml b/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml new file mode 100644 index 00000000..0c733d8f --- /dev/null +++ b/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml @@ -0,0 +1,4 @@ +--- +pgbouncer::settings: + repo_url: 'https://apt.releases.hashicorp.com' + apt_release: 'buster main' diff --git a/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml b/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..13b6210d --- /dev/null +++ b/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml @@ -0,0 +1,4 @@ +--- +pgbouncer::settings: + repo_url: 'https://apt.releases.hashicorp.com' + apt_release: 'stretch main' From 134628e8fc817debc26ff0cef074c1b90fc4a069 Mon Sep 17 00:00:00 2001 From: Florus Both Date: Fri, 22 Oct 2021 15:54:34 +0200 Subject: [PATCH 220/284] fix silly mistakes --- data/hashicorp_repo/hiera.yaml | 2 ++ data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml | 2 +- data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/hashicorp_repo/hiera.yaml b/data/hashicorp_repo/hiera.yaml index ff587716..eb223b18 100644 --- a/data/hashicorp_repo/hiera.yaml +++ b/data/hashicorp_repo/hiera.yaml @@ -1,5 +1,7 @@ --- :hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" - "%{title}/upstream/osfamily/%{operatingsystem}" - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" diff --git a/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml b/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml index 0c733d8f..42327f31 100644 --- a/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml +++ b/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml @@ -1,4 +1,4 @@ --- -pgbouncer::settings: +hashicorp_repo::settings: repo_url: 'https://apt.releases.hashicorp.com' apt_release: 'buster main' diff --git a/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml b/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml index 13b6210d..6843d500 100644 --- a/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml +++ b/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml @@ -1,4 +1,4 @@ --- -pgbouncer::settings: +hashicorp_repo::settings: repo_url: 'https://apt.releases.hashicorp.com' apt_release: 'stretch main' From 4ef6cbac535e4ce040e8a2e54442b59c8ffdb55c Mon Sep 17 00:00:00 2001 From: Florus Both Date: Tue, 4 Jan 2022 13:24:05 +0100 Subject: [PATCH 221/284] debian11 iptraf pkg is called iptraf-ng --- data/iptraf/hiera.yaml | 2 ++ data/iptraf/operatingsystem/Debian-11.yaml | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 data/iptraf/operatingsystem/Debian-11.yaml diff --git a/data/iptraf/hiera.yaml b/data/iptraf/hiera.yaml index 19fa9ae9..d3a8bd3b 100644 --- a/data/iptraf/hiera.yaml +++ b/data/iptraf/hiera.yaml @@ -1,5 +1,7 @@ --- :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}-%{operatingsystemrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/iptraf/operatingsystem/Debian-11.yaml b/data/iptraf/operatingsystem/Debian-11.yaml new file mode 100644 index 00000000..b67cd214 --- /dev/null +++ b/data/iptraf/operatingsystem/Debian-11.yaml @@ -0,0 +1,3 @@ +--- + iptraf::settings: + package_name: 'iptraf-ng' From d2c7590b59b53ec32cebf0de1b23776f24430863 Mon Sep 17 00:00:00 2001 From: Florus Both Date: Wed, 12 Jan 2022 14:36:07 +0100 Subject: [PATCH 222/284] fix to check on major os release version only --- data/iptraf/hiera.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/iptraf/hiera.yaml b/data/iptraf/hiera.yaml index d3a8bd3b..2f2233a0 100644 --- a/data/iptraf/hiera.yaml +++ b/data/iptraf/hiera.yaml @@ -1,6 +1,6 @@ --- :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}-%{operatingsystemrelease}" + - "%{title}/operatingsystem/%{operatingsystem}-%{operatingsystemmajrelease}" - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" From 499fdf1bfa31885c5c8ed3e9f75028ca76eb1f4b Mon Sep 17 00:00:00 2001 From: Florus Both Date: Thu, 7 Apr 2022 08:35:11 +0200 Subject: [PATCH 223/284] add Debian11 repo for mongodb --- data/mongodb/upstream/operatingsystem/Debian11.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/mongodb/upstream/operatingsystem/Debian11.yaml diff --git a/data/mongodb/upstream/operatingsystem/Debian11.yaml b/data/mongodb/upstream/operatingsystem/Debian11.yaml new file mode 100644 index 00000000..3d2916d5 --- /dev/null +++ b/data/mongodb/upstream/operatingsystem/Debian11.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'buster/mongodb-org/4.4' \ No newline at end of file From 9587f2677f130fc44a27173fa644bb41feee9968 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 25 Sep 2021 22:15:03 +0200 Subject: [PATCH 224/284] Zeek data --- data/zeek/default.yaml | 11 +++++++++++ data/zeek/hiera.yaml | 8 ++++++++ data/zeek/upstream/default.yaml | 3 +++ data/zeek/upstream/operatingsystem/CentOS.yaml | 4 ++++ data/zeek/upstream/operatingsystem/CentOS7.yaml | 3 +++ data/zeek/upstream/operatingsystem/CentOS8.yaml | 3 +++ data/zeek/upstream/operatingsystem/Darwin.yaml | 4 ++++ data/zeek/upstream/operatingsystem/Debian.yaml | 8 ++++++++ data/zeek/upstream/operatingsystem/Debian10.yaml | 4 ++++ data/zeek/upstream/operatingsystem/Debian9.yaml | 3 +++ data/zeek/upstream/operatingsystem/Fedora29.yaml | 3 +++ data/zeek/upstream/operatingsystem/Fedora30.yaml | 3 +++ data/zeek/upstream/operatingsystem/Fedora31.yaml | 3 +++ data/zeek/upstream/operatingsystem/Fedora32.yaml | 3 +++ data/zeek/upstream/operatingsystem/Raspbian10.yaml | 4 ++++ data/zeek/upstream/operatingsystem/RedHat.yaml | 6 ++++++ data/zeek/upstream/operatingsystem/RedHat7.yaml | 3 +++ data/zeek/upstream/operatingsystem/RedHat8.yaml | 3 +++ data/zeek/upstream/operatingsystem/Ubuntu.yaml | 9 +++++++++ data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml | 4 ++++ data/zeek/upstream/operatingsystem/Ubuntu18.10.yaml | 4 ++++ data/zeek/upstream/operatingsystem/Ubuntu19.04.yaml | 4 ++++ data/zeek/upstream/operatingsystem/Ubuntu19.10.yaml | 4 ++++ data/zeek/upstream/operatingsystem/Ubuntu20.04.yaml | 4 ++++ data/zeek/upstream/osfamily/Debian.yaml | 3 +++ 25 files changed, 111 insertions(+) create mode 100644 data/zeek/default.yaml create mode 100644 data/zeek/hiera.yaml create mode 100644 data/zeek/upstream/default.yaml create mode 100644 data/zeek/upstream/operatingsystem/CentOS.yaml create mode 100644 data/zeek/upstream/operatingsystem/CentOS7.yaml create mode 100644 data/zeek/upstream/operatingsystem/CentOS8.yaml create mode 100644 data/zeek/upstream/operatingsystem/Darwin.yaml create mode 100644 data/zeek/upstream/operatingsystem/Debian.yaml create mode 100644 data/zeek/upstream/operatingsystem/Debian10.yaml create mode 100644 data/zeek/upstream/operatingsystem/Debian9.yaml create mode 100644 data/zeek/upstream/operatingsystem/Fedora29.yaml create mode 100644 data/zeek/upstream/operatingsystem/Fedora30.yaml create mode 100644 data/zeek/upstream/operatingsystem/Fedora31.yaml create mode 100644 data/zeek/upstream/operatingsystem/Fedora32.yaml create mode 100644 data/zeek/upstream/operatingsystem/Raspbian10.yaml create mode 100644 data/zeek/upstream/operatingsystem/RedHat.yaml create mode 100644 data/zeek/upstream/operatingsystem/RedHat7.yaml create mode 100644 data/zeek/upstream/operatingsystem/RedHat8.yaml create mode 100644 data/zeek/upstream/operatingsystem/Ubuntu.yaml create mode 100644 data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml create mode 100644 data/zeek/upstream/operatingsystem/Ubuntu18.10.yaml create mode 100644 data/zeek/upstream/operatingsystem/Ubuntu19.04.yaml create mode 100644 data/zeek/upstream/operatingsystem/Ubuntu19.10.yaml create mode 100644 data/zeek/upstream/operatingsystem/Ubuntu20.04.yaml create mode 100644 data/zeek/upstream/osfamily/Debian.yaml diff --git a/data/zeek/default.yaml b/data/zeek/default.yaml new file mode 100644 index 00000000..5868a09a --- /dev/null +++ b/data/zeek/default.yaml @@ -0,0 +1,11 @@ +--- +zeek::settings: + upstream_repo: true + package_name: 'zeek' + service_name: 'zeek' + pid_file_path: '/var/run/zeek.pid' + process_name: 'zeek' + process_user: 'zeek' + process_group: 'zeek' + config_file_path: '/etc/zeek/daemon.json' + config_dir_path: '/etc/zeek' diff --git a/data/zeek/hiera.yaml b/data/zeek/hiera.yaml new file mode 100644 index 00000000..8752ef1d --- /dev/null +++ b/data/zeek/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/default" + - default diff --git a/data/zeek/upstream/default.yaml b/data/zeek/upstream/default.yaml new file mode 100644 index 00000000..443a68c5 --- /dev/null +++ b/data/zeek/upstream/default.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + package_name: 'zeek' diff --git a/data/zeek/upstream/operatingsystem/CentOS.yaml b/data/zeek/upstream/operatingsystem/CentOS.yaml new file mode 100644 index 00000000..764df914 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/CentOS.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + init_file_path: '/etc/sysconfig/zeek' + init_system: 'systemd' diff --git a/data/zeek/upstream/operatingsystem/CentOS7.yaml b/data/zeek/upstream/operatingsystem/CentOS7.yaml new file mode 100644 index 00000000..0eee7888 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/CentOS7.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/CentOS_7/security:zeek.repo' diff --git a/data/zeek/upstream/operatingsystem/CentOS8.yaml b/data/zeek/upstream/operatingsystem/CentOS8.yaml new file mode 100644 index 00000000..fbefebdb --- /dev/null +++ b/data/zeek/upstream/operatingsystem/CentOS8.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/CentOS_8/security:zeek.repo' diff --git a/data/zeek/upstream/operatingsystem/Darwin.yaml b/data/zeek/upstream/operatingsystem/Darwin.yaml new file mode 100644 index 00000000..4f9b3a95 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Darwin.yaml @@ -0,0 +1,4 @@ +--- + zeek::settings: + package_source: https://download.zeek.com/mac/stable/Docker.dmg + diff --git a/data/zeek/upstream/operatingsystem/Debian.yaml b/data/zeek/upstream/operatingsystem/Debian.yaml new file mode 100644 index 00000000..73af3666 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Debian.yaml @@ -0,0 +1,8 @@ +--- +zeek::settings: + init_file_path: '/etc/default/zeek' + repo_url: 'https://download.zeek.com/linux/debian' + key: '0EBFCD88' + key_url: 'https://download.zeek.com/linux/debian/gpg' + apt_repos: 'stable' + init_system: 'sysvinit' diff --git a/data/zeek/upstream/operatingsystem/Debian10.yaml b/data/zeek/upstream/operatingsystem/Debian10.yaml new file mode 100644 index 00000000..881eb53a --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Debian10.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + repo_url: 'http://download.opensuse.org/repositories/security:/zeek/Debian_10/' + key_url: 'https://download.opensuse.org/repositories/security:zeek/Debian_10/Release.key' diff --git a/data/zeek/upstream/operatingsystem/Debian9.yaml b/data/zeek/upstream/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..00689383 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + init_system: 'systemd' diff --git a/data/zeek/upstream/operatingsystem/Fedora29.yaml b/data/zeek/upstream/operatingsystem/Fedora29.yaml new file mode 100644 index 00000000..0efec7ae --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Fedora29.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/Fedora_29/security:zeek.repo' diff --git a/data/zeek/upstream/operatingsystem/Fedora30.yaml b/data/zeek/upstream/operatingsystem/Fedora30.yaml new file mode 100644 index 00000000..670035e3 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Fedora30.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/Fedora_30/security:zeek.repo' diff --git a/data/zeek/upstream/operatingsystem/Fedora31.yaml b/data/zeek/upstream/operatingsystem/Fedora31.yaml new file mode 100644 index 00000000..f0431e2a --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Fedora31.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/Fedora_31/security:zeek.repo' diff --git a/data/zeek/upstream/operatingsystem/Fedora32.yaml b/data/zeek/upstream/operatingsystem/Fedora32.yaml new file mode 100644 index 00000000..dbe50061 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Fedora32.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/Fedora_32/security:zeek.repo' diff --git a/data/zeek/upstream/operatingsystem/Raspbian10.yaml b/data/zeek/upstream/operatingsystem/Raspbian10.yaml new file mode 100644 index 00000000..7ff69e90 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Raspbian10.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + repo_url: 'http://download.opensuse.org/repositories/security:/zeek/Raspbian_10/' + key_url: 'https://download.opensuse.org/repositories/security:zeek/Raspbian_10/Release.key' diff --git a/data/zeek/upstream/operatingsystem/RedHat.yaml b/data/zeek/upstream/operatingsystem/RedHat.yaml new file mode 100644 index 00000000..e53aa333 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/RedHat.yaml @@ -0,0 +1,6 @@ +--- +zeek::settings: + init_file_path: '/etc/sysconfig/zeek' + config_file_path: '/etc/sysconfig/zeek' + key: '2C52609D' + key_url: 'http://yum.zeekproject.org/gpg' diff --git a/data/zeek/upstream/operatingsystem/RedHat7.yaml b/data/zeek/upstream/operatingsystem/RedHat7.yaml new file mode 100644 index 00000000..0eee7888 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/CentOS_7/security:zeek.repo' diff --git a/data/zeek/upstream/operatingsystem/RedHat8.yaml b/data/zeek/upstream/operatingsystem/RedHat8.yaml new file mode 100644 index 00000000..fbefebdb --- /dev/null +++ b/data/zeek/upstream/operatingsystem/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +zeek::settings: + repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/CentOS_8/security:zeek.repo' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu.yaml b/data/zeek/upstream/operatingsystem/Ubuntu.yaml new file mode 100644 index 00000000..72a06bc6 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Ubuntu.yaml @@ -0,0 +1,9 @@ +--- +zeek::settings: + init_file_path: '/etc/default/zeek' + repo_url: 'https://download.zeek.com/linux/ubuntu' + key: '9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88' + key_url: 'https://download.zeek.com/linux/ubuntu/gpg' + apt_repos: 'stable' + apt_key_server: 'http://p80.pool.sks-keyservers.net' + init_system: 'systemd' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml b/data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..4e2b5228 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + repo_url: 'http://download.opensuse.org/repositories/security:/zeek/xUbuntu_18.04/' + key_url: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_18.04/Release.key' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu18.10.yaml b/data/zeek/upstream/operatingsystem/Ubuntu18.10.yaml new file mode 100644 index 00000000..f47f5c24 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Ubuntu18.10.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + repo_url: 'http://download.opensuse.org/repositories/security:/zeek/xUbuntu_18.10/' + key_url: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_18.10/Release.key' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu19.04.yaml b/data/zeek/upstream/operatingsystem/Ubuntu19.04.yaml new file mode 100644 index 00000000..3b57e7ee --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Ubuntu19.04.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + repo_url: 'http://download.opensuse.org/repositories/security:/zeek/xUbuntu_19.04/' + key_url: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_19.04/Release.key' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu19.10.yaml b/data/zeek/upstream/operatingsystem/Ubuntu19.10.yaml new file mode 100644 index 00000000..fdbf2018 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Ubuntu19.10.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + repo_url: 'http://download.opensuse.org/repositories/security:/zeek/xUbuntu_19.10/' + key_url: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_19.10/Release.key' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu20.04.yaml b/data/zeek/upstream/operatingsystem/Ubuntu20.04.yaml new file mode 100644 index 00000000..48f088d2 --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Ubuntu20.04.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + repo_url: 'http://download.opensuse.org/repositories/security:/zeek/xUbuntu_20.04/' + key_url: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_20.04/Release.key' \ No newline at end of file diff --git a/data/zeek/upstream/osfamily/Debian.yaml b/data/zeek/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..18e614fb --- /dev/null +++ b/data/zeek/upstream/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +zeek:settings: + key: '' From 9f721039e6c54d98c4add2df34041cc372cb3c26 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 25 Sep 2021 22:15:57 +0200 Subject: [PATCH 225/284] Docker for mac --- data/docker/upstream/operatingsystem/Darwin.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/docker/upstream/operatingsystem/Darwin.yaml b/data/docker/upstream/operatingsystem/Darwin.yaml index 1276c316..2b0e9c76 100644 --- a/data/docker/upstream/operatingsystem/Darwin.yaml +++ b/data/docker/upstream/operatingsystem/Darwin.yaml @@ -1,4 +1,4 @@ --- docker::settings: - package_source: https://download.docker.com/mac/stable/Docker.dmg - + package_name: docker + From 86481c439e39b658c189ca06bbfc795c3a82cc12 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 7 May 2022 23:49:20 +0200 Subject: [PATCH 226/284] cron --- data/cron/default.yaml | 8 ++++---- data/cron/hiera.yaml | 1 + data/cron/osfamily/Fedora.yaml | 3 +++ data/docker/upstream/operatingsystem/Fedora.yaml | 3 +++ 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 data/cron/osfamily/Fedora.yaml create mode 100644 data/docker/upstream/operatingsystem/Fedora.yaml diff --git a/data/cron/default.yaml b/data/cron/default.yaml index fbb1d222..8dfced64 100644 --- a/data/cron/default.yaml +++ b/data/cron/default.yaml @@ -1,5 +1,5 @@ --- - cron::settings: - config_file_path: '/etc/crontab' - config_dir_path: '/etc/cron.d' - conf_dir_path: '/etc/cron.d' +cron::settings: + config_file_path: '/etc/crontab' + config_dir_path: '/etc/cron.d' + conf_dir_path: '/etc/cron.d' diff --git a/data/cron/hiera.yaml b/data/cron/hiera.yaml index 19fa9ae9..13f2e8fd 100644 --- a/data/cron/hiera.yaml +++ b/data/cron/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: + - "%{title}/osfamily/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/cron/osfamily/Fedora.yaml b/data/cron/osfamily/Fedora.yaml new file mode 100644 index 00000000..b631f022 --- /dev/null +++ b/data/cron/osfamily/Fedora.yaml @@ -0,0 +1,3 @@ +--- +cron::settings: + package_name: 'cronie' diff --git a/data/docker/upstream/operatingsystem/Fedora.yaml b/data/docker/upstream/operatingsystem/Fedora.yaml new file mode 100644 index 00000000..b55a0d1b --- /dev/null +++ b/data/docker/upstream/operatingsystem/Fedora.yaml @@ -0,0 +1,3 @@ +--- +docker::settings: + repo_url: 'https://download.docker.com/linux/fedora/docker-ce.repo' From eaca24530b9dbeee8a6ffbece1665fe5778330cb Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 7 May 2022 23:57:12 +0200 Subject: [PATCH 227/284] New OSes defaults. puppet-agent linked to puppet. added bolt --- data/bolt/default.yaml | 5 ++++ data/bolt/hiera.yaml | 5 ++++ data/default/AlmaLinux.yaml | 3 +++ data/default/Rocky.yaml | 3 +++ data/default/Ubuntu21.04.yaml | 3 +++ data/default/Ubuntu21.10.yaml | 3 +++ data/default/Ubuntu22.04.yaml | 3 +++ data/puppet-agent | 1 + data/puppet-agent/default.yaml | 24 ------------------- data/puppet-agent/hiera.yaml | 7 ------ data/puppet-agent/osfamily/Debian.yaml | 3 --- data/puppet-agent/osfamily/RedHat.yaml | 3 --- data/puppet-agent/osfamily/windows.yaml | 16 ------------- data/puppet/osfamily/Debian.yaml | 1 + data/puppet/osfamily/RedHat.yaml | 1 + .../upstream/operatingsystem/Debian11.yaml | 3 +++ .../upstream/operatingsystem/Debian7.yaml | 2 +- .../upstream/operatingsystem/Debian8.yaml | 2 +- .../upstream/operatingsystem/Fedora34.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu14.04.yaml | 2 +- .../upstream/operatingsystem/Ubuntu22.04.yaml | 3 +++ .../upstream/osfamily/RedHat9.yaml | 3 +++ pdk.yaml | 2 ++ 23 files changed, 45 insertions(+), 56 deletions(-) create mode 100644 data/bolt/default.yaml create mode 100644 data/bolt/hiera.yaml create mode 100755 data/default/AlmaLinux.yaml create mode 100755 data/default/Rocky.yaml create mode 100644 data/default/Ubuntu21.04.yaml create mode 100644 data/default/Ubuntu21.10.yaml create mode 100644 data/default/Ubuntu22.04.yaml create mode 120000 data/puppet-agent delete mode 100644 data/puppet-agent/default.yaml delete mode 100644 data/puppet-agent/hiera.yaml delete mode 100644 data/puppet-agent/osfamily/Debian.yaml delete mode 100644 data/puppet-agent/osfamily/RedHat.yaml delete mode 100644 data/puppet-agent/osfamily/windows.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Debian11.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Fedora34.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Ubuntu22.04.yaml create mode 100644 data/puppet_repo/upstream/osfamily/RedHat9.yaml create mode 100644 pdk.yaml diff --git a/data/bolt/default.yaml b/data/bolt/default.yaml new file mode 100644 index 00000000..ad979f6b --- /dev/null +++ b/data/bolt/default.yaml @@ -0,0 +1,5 @@ +--- +pdk::settings: + package_name: 'puppet-bolt' + tp_prerequisites: + puppet_repo: {} \ No newline at end of file diff --git a/data/bolt/hiera.yaml b/data/bolt/hiera.yaml new file mode 100644 index 00000000..dfd3d93f --- /dev/null +++ b/data/bolt/hiera.yaml @@ -0,0 +1,5 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/default/AlmaLinux.yaml b/data/default/AlmaLinux.yaml new file mode 100755 index 00000000..ee0f805c --- /dev/null +++ b/data/default/AlmaLinux.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + repo_package_provider: 'rpm' diff --git a/data/default/Rocky.yaml b/data/default/Rocky.yaml new file mode 100755 index 00000000..ee0f805c --- /dev/null +++ b/data/default/Rocky.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + repo_package_provider: 'rpm' diff --git a/data/default/Ubuntu21.04.yaml b/data/default/Ubuntu21.04.yaml new file mode 100644 index 00000000..4350f1be --- /dev/null +++ b/data/default/Ubuntu21.04.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'hirsute' diff --git a/data/default/Ubuntu21.10.yaml b/data/default/Ubuntu21.10.yaml new file mode 100644 index 00000000..7ddfc825 --- /dev/null +++ b/data/default/Ubuntu21.10.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'impish' diff --git a/data/default/Ubuntu22.04.yaml b/data/default/Ubuntu22.04.yaml new file mode 100644 index 00000000..f77845dc --- /dev/null +++ b/data/default/Ubuntu22.04.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + apt_release: 'jammy' diff --git a/data/puppet-agent b/data/puppet-agent new file mode 120000 index 00000000..faa33291 --- /dev/null +++ b/data/puppet-agent @@ -0,0 +1 @@ +puppet \ No newline at end of file diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml deleted file mode 100644 index 9df555c9..00000000 --- a/data/puppet-agent/default.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -puppet-agent::settings: - package_name: 'puppet-agent' - service_name: 'puppet' - config_file_path: '/etc/puppetlabs/puppet/puppet.conf' - fileserver_file_path: '/etc/puppetlabs/puppet/fileserver.conf' - routes_file_path: '/etc/puppetlabs/puppet/routes.yaml' - autosign_file_path: '/etc/puppetlabs/puppet/autosign.conf' - auth_file_path: '/etc/puppetlabs/puppet/auth.conf' - puppetdb_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' - config_dir_path: '/etc/puppetlabs/puppet/' - code_dir_path: '/etc/puppetlabs/code' - environment_dir_path: '/etc/puppetlabs/code/environments' - pid_file_path: '/var/run/puppetlabs/agent.pid' - log_file_path: - - '/var/log/puppetlabs/puppet/puppet.log' - - '/var/log/puppetlabs/pxp-agent/pxp-agent.log' - - '/var/log/puppetlabs/mcollective-log' - log_dir_path: '/var/log/puppetlabs/puppet' - process_name: 'puppet' - process_user: 'root' - process_group: 'root' - tp_prerequisites: - puppet_repo: {} \ No newline at end of file diff --git a/data/puppet-agent/hiera.yaml b/data/puppet-agent/hiera.yaml deleted file mode 100644 index a3944b3d..00000000 --- a/data/puppet-agent/hiera.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -:hierarchy: - - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - "default/%{operatingsystem}" - - default diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml deleted file mode 100644 index 5c372856..00000000 --- a/data/puppet-agent/osfamily/Debian.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -puppet-agent::settings: - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml deleted file mode 100644 index 3192be0d..00000000 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -puppet-agent::settings: - dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppet-agent/osfamily/windows.yaml b/data/puppet-agent/osfamily/windows.yaml deleted file mode 100644 index a41ed441..00000000 --- a/data/puppet-agent/osfamily/windows.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# TODO: Verify and manage Windows versions older than 2008 - puppet-agent::settings: - config_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\puppet.conf' - fileserver_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\fileserver.conf' - routes_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\routes.yaml' - autosign_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\autosign.conf' - auth_file_path: 'C:\ProgramData\PuppetLabs\puppet\etc\auth.conf' - config_dir_path: 'C:\ProgramData\PuppetLabs\puppet\etc' - code_dir_path: 'C:\ProgramData\PuppetLabs\code' - environment_dir_path: 'C:\ProgramData\PuppetLabs\code\environments' - pid_file_path: 'C:\ProgramData\PuppetLabs\var\run\agent.pid' - log_file_path: 'C:\ProgramData\PuppetLabs\var\log\puppet.log' - log_dir_path: 'C:\ProgramData\PuppetLabs\var\log' - process_user: 'LocalSystem' - process_group: 'LocalSystem' diff --git a/data/puppet/osfamily/Debian.yaml b/data/puppet/osfamily/Debian.yaml index 876f0ba9..4c345068 100644 --- a/data/puppet/osfamily/Debian.yaml +++ b/data/puppet/osfamily/Debian.yaml @@ -1,3 +1,4 @@ --- puppet::settings: init_file_path: '/etc/default/puppet' + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet/osfamily/RedHat.yaml b/data/puppet/osfamily/RedHat.yaml index e9c2c7e6..bbdd2f2c 100644 --- a/data/puppet/osfamily/RedHat.yaml +++ b/data/puppet/osfamily/RedHat.yaml @@ -1,3 +1,4 @@ --- puppet::settings: init_file_path: '/etc/sysconfig/puppet' + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppet_repo/upstream/operatingsystem/Debian11.yaml b/data/puppet_repo/upstream/operatingsystem/Debian11.yaml new file mode 100644 index 00000000..006cf23c --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Debian11.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet-release-bullseye.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Debian7.yaml b/data/puppet_repo/upstream/operatingsystem/Debian7.yaml index 56fd5b51..a5c0377a 100644 --- a/data/puppet_repo/upstream/operatingsystem/Debian7.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Debian7.yaml @@ -1,3 +1,3 @@ --- puppet_repo::settings: - repo_package_url: 'https://apt.puppets.com/puppet-release-wheezy.deb' + repo_package_url: 'http://apt.puppet.com/eol-releases/puppetlabs-release-wheezy.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Debian8.yaml b/data/puppet_repo/upstream/operatingsystem/Debian8.yaml index 843340fa..1bfc4db9 100644 --- a/data/puppet_repo/upstream/operatingsystem/Debian8.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Debian8.yaml @@ -1,3 +1,3 @@ --- puppet_repo::settings: - repo_package_url: 'https://apt.puppet.com/puppet6-release-jessie.deb' + repo_package_url: 'http://apt.puppet.com/eol-releases/puppetlabs-release-jessie.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Fedora34.yaml b/data/puppet_repo/upstream/operatingsystem/Fedora34.yaml new file mode 100644 index 00000000..05235617 --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Fedora34.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-fedora-34.noarch.rpm' diff --git a/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml b/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml index 9294b163..caacc4b6 100644 --- a/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,3 @@ --- puppet_repo::settings: - repo_package_url: 'https://apt.puppet.com/puppet6-release-trusty.deb' + repo_package_url: 'http://apt.puppet.com/eol-releases/puppetlabs-release-trusty.deb' diff --git a/data/puppet_repo/upstream/operatingsystem/Ubuntu22.04.yaml b/data/puppet_repo/upstream/operatingsystem/Ubuntu22.04.yaml new file mode 100644 index 00000000..93d3ec78 --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu22.04.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet-release-jammy.deb' diff --git a/data/puppet_repo/upstream/osfamily/RedHat9.yaml b/data/puppet_repo/upstream/osfamily/RedHat9.yaml new file mode 100644 index 00000000..53de43a3 --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/RedHat9.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-9.noarch.rpm' diff --git a/pdk.yaml b/pdk.yaml new file mode 100644 index 00000000..4bef4bd0 --- /dev/null +++ b/pdk.yaml @@ -0,0 +1,2 @@ +--- +ignore: [] From 1401b19fe098cc32f45413c60e40908c69b71d24 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 8 May 2022 09:38:29 +0200 Subject: [PATCH 228/284] Darwinism --- data/docker/upstream/operatingsystem/Darwin.yaml | 6 +++--- data/pdk/hiera.yaml | 4 +++- data/pe-client-tools/default.yaml | 5 +++++ data/pe-client-tools/hiera.yaml | 7 +++++++ data/puppet_repo/hiera.yaml | 1 + data/puppet_repo/upstream/osfamily/Darwin.yaml | 4 ++++ 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 data/pe-client-tools/default.yaml create mode 100644 data/pe-client-tools/hiera.yaml create mode 100644 data/puppet_repo/upstream/osfamily/Darwin.yaml diff --git a/data/docker/upstream/operatingsystem/Darwin.yaml b/data/docker/upstream/operatingsystem/Darwin.yaml index 2b0e9c76..3174e2cd 100644 --- a/data/docker/upstream/operatingsystem/Darwin.yaml +++ b/data/docker/upstream/operatingsystem/Darwin.yaml @@ -1,4 +1,4 @@ --- - docker::settings: - package_name: docker - +docker::settings: + package_name: docker + service_name: com.docker.vmnetd diff --git a/data/pdk/hiera.yaml b/data/pdk/hiera.yaml index dfd3d93f..28673c23 100644 --- a/data/pdk/hiera.yaml +++ b/data/pdk/hiera.yaml @@ -2,4 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - - default + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default \ No newline at end of file diff --git a/data/pe-client-tools/default.yaml b/data/pe-client-tools/default.yaml new file mode 100644 index 00000000..322e8af2 --- /dev/null +++ b/data/pe-client-tools/default.yaml @@ -0,0 +1,5 @@ +--- +pe-client-tools::settings: + package_name: 'pe-client-tools' + tp_prerequisites: + puppet_repo: {} \ No newline at end of file diff --git a/data/pe-client-tools/hiera.yaml b/data/pe-client-tools/hiera.yaml new file mode 100644 index 00000000..28673c23 --- /dev/null +++ b/data/pe-client-tools/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default \ No newline at end of file diff --git a/data/puppet_repo/hiera.yaml b/data/puppet_repo/hiera.yaml index efaec5bc..b0798f73 100644 --- a/data/puppet_repo/hiera.yaml +++ b/data/puppet_repo/hiera.yaml @@ -4,6 +4,7 @@ - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/%{repo}/osfamily/%{osfamily}" - "%{title}/%{repo}/default" + - "%{title}/default" - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/puppet_repo/upstream/osfamily/Darwin.yaml b/data/puppet_repo/upstream/osfamily/Darwin.yaml new file mode 100644 index 00000000..559bfbdc --- /dev/null +++ b/data/puppet_repo/upstream/osfamily/Darwin.yaml @@ -0,0 +1,4 @@ +--- +puppet_repo::settings: + brew_tap: 'puppetlabs/puppet' + package_provider: tap \ No newline at end of file From 7380439e7b0641c0697beeddde2d7a7196e313b1 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 18 May 2022 18:17:45 +0200 Subject: [PATCH 229/284] Replaced puppet-agent symlink with cloned data --- .fixtures.yml | 11 +++++---- README.md | 2 +- .../upstream/operatingsystem/Darwin.yaml | 1 + data/puppet-agent | 1 - data/puppet-agent/default.yaml | 12 ++++++++++ data/puppet-agent/hiera.yaml | 8 +++++++ data/puppet-agent/osfamily/Debian.yaml | 4 ++++ data/puppet-agent/osfamily/RedHat.yaml | 4 ++++ data/puppet-agent/upstream/default.yaml | 24 +++++++++++++++++++ .../puppet-agent/upstream/osfamily/Linux.yaml | 4 ++++ .../upstream/osfamily/windows.yaml | 15 ++++++++++++ 11 files changed, 79 insertions(+), 7 deletions(-) delete mode 120000 data/puppet-agent create mode 100644 data/puppet-agent/default.yaml create mode 100644 data/puppet-agent/hiera.yaml create mode 100644 data/puppet-agent/osfamily/Debian.yaml create mode 100644 data/puppet-agent/osfamily/RedHat.yaml create mode 100644 data/puppet-agent/upstream/default.yaml create mode 100644 data/puppet-agent/upstream/osfamily/Linux.yaml create mode 100644 data/puppet-agent/upstream/osfamily/windows.yaml diff --git a/.fixtures.yml b/.fixtures.yml index d086bf79..b6b10061 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,11 +1,12 @@ --- fixtures: repositories: - "concat": "git://github.com/puppetlabs/puppetlabs-concat.git" - "vcsrepo": "git://github.com/puppetlabs/puppetlabs-vcsrepo.git" - "tp_profile": "git://github.com/example42/puppet-tp_profile.git" - "tp": "git://github.com/example42/puppet-tp.git" - "psick": "git://github.com/example42/puppet-psick.git" + "concat": "https://github.com/puppetlabs/puppetlabs-concat.git" + "vcsrepo": "https://github.com/puppetlabs/puppetlabs-vcsrepo.git" + "tp_profile": "https://github.com/example42/puppet-tp_profile.git" + "psick_profile": "https://github.com/example42/psick_profile.git" + "tp": "https://github.com/example42/puppet-tp.git" + "psick": "https://github.com/example42/puppet-psick.git" "yumrepo": "https://github.com/puppetlabs/puppetlabs-yumrepo_core" forge_modules: stdlib: "puppetlabs/stdlib" diff --git a/README.md b/README.md index ff906edd..07035e2b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ A sample ```hiera.yaml``` is like this: - default ``` -so the lookup is done, if ```$title == 'mariadb'``` and ```$::osfamily == 'RedHat'``` in these files: +so the lookup is done, if ```$title == 'mariadb'``` and ```$facts['os']['family'] == 'RedHat'``` in these files: tinydata/data/mariadb/osfamily/RedHat.yaml tinydata/data/mariadb/default.yaml diff --git a/data/docker/upstream/operatingsystem/Darwin.yaml b/data/docker/upstream/operatingsystem/Darwin.yaml index 3174e2cd..d64b3afd 100644 --- a/data/docker/upstream/operatingsystem/Darwin.yaml +++ b/data/docker/upstream/operatingsystem/Darwin.yaml @@ -2,3 +2,4 @@ docker::settings: package_name: docker service_name: com.docker.vmnetd + diff --git a/data/puppet-agent b/data/puppet-agent deleted file mode 120000 index faa33291..00000000 --- a/data/puppet-agent +++ /dev/null @@ -1 +0,0 @@ -puppet \ No newline at end of file diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml new file mode 100644 index 00000000..05d82c4c --- /dev/null +++ b/data/puppet-agent/default.yaml @@ -0,0 +1,12 @@ +--- +puppet-agent::settings: + upstream_repo: true + package_name: 'puppet-agent' + service_name: 'puppet-agent' + config_file_path: '/etc/puppet-agent/puppet-agent.conf' + config_dir_path: '/etc/puppet-agent' + pid_file_path: '/var/run/puppet-agent/puppet-agent.pid' + log_dir_path: '/var/log/puppet-agent' + process_name: 'puppet-agent' + process_user: 'root' + process_group: 'root' diff --git a/data/puppet-agent/hiera.yaml b/data/puppet-agent/hiera.yaml new file mode 100644 index 00000000..a53d4aff --- /dev/null +++ b/data/puppet-agent/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml new file mode 100644 index 00000000..49afa346 --- /dev/null +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -0,0 +1,4 @@ +--- +puppet-agent::settings: + init_file_path: '/etc/default/puppet-agent' + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml new file mode 100644 index 00000000..f0afb12f --- /dev/null +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +puppet-agent::settings: + init_file_path: '/etc/sysconfig/puppet-agent' + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/puppet-agent/upstream/default.yaml b/data/puppet-agent/upstream/default.yaml new file mode 100644 index 00000000..8bad3325 --- /dev/null +++ b/data/puppet-agent/upstream/default.yaml @@ -0,0 +1,24 @@ +--- +puppet-agent::settings: + package_name: 'puppet-agent-agent' + service_name: 'puppet-agent' + config_file_path: '/etc/puppet-agentlabs/puppet-agent/puppet-agent.conf' + fileserver_file_path: '/etc/puppet-agentlabs/puppet-agent/fileserver.conf' + routes_file_path: '/etc/puppet-agentlabs/puppet-agent/routes.yaml' + autosign_file_path: '/etc/puppet-agentlabs/puppet-agent/autosign.conf' + auth_file_path: '/etc/puppet-agentlabs/puppet-agent/auth.conf' + puppet-agentdb_file_path: '/etc/puppet-agentlabs/puppet-agent/puppet-agentdb.conf' + config_dir_path: '/etc/puppet-agentlabs/puppet-agent/' + code_dir_path: '/etc/puppet-agentlabs/code' + environment_dir_path: '/etc/puppet-agentlabs/code/environments' + pid_file_path: '/var/run/puppet-agentlabs/agent.pid' + log_file_path: + - '/var/log/puppet-agentlabs/puppet-agent/puppet-agent.log' + - '/var/log/puppet-agentlabs/pxp-agent/pxp-agent.log' + - '/var/log/puppet-agentlabs/mcollective-log' + log_dir_path: '/var/log/puppet-agentlabs/puppet-agent' + process_name: 'puppet-agent' + process_user: 'root' + process_group: 'root' + tp_prerequisites: + puppet-agent_repo: {} \ No newline at end of file diff --git a/data/puppet-agent/upstream/osfamily/Linux.yaml b/data/puppet-agent/upstream/osfamily/Linux.yaml new file mode 100644 index 00000000..966a903b --- /dev/null +++ b/data/puppet-agent/upstream/osfamily/Linux.yaml @@ -0,0 +1,4 @@ +--- +puppet-agent::settings: + package_name: '' + dockerfile_prerequisites: "RUN echo -e 'http://dl-3.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && echo -e 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk update && apk add shadow ruby less bash && gem install puppet-agent --no-ri --no-rdoc " diff --git a/data/puppet-agent/upstream/osfamily/windows.yaml b/data/puppet-agent/upstream/osfamily/windows.yaml new file mode 100644 index 00000000..d1c5fcfd --- /dev/null +++ b/data/puppet-agent/upstream/osfamily/windows.yaml @@ -0,0 +1,15 @@ +--- +puppet-agent::settings: + config_file_path: 'C:\ProgramData\PuppetLabs\puppet-agent\etc\puppet-agent.conf' + fileserver_file_path: 'C:\ProgramData\PuppetLabs\puppet-agent\etc\fileserver.conf' + routes_file_path: 'C:\ProgramData\PuppetLabs\puppet-agent\etc\routes.yaml' + autosign_file_path: 'C:\ProgramData\PuppetLabs\puppet-agent\etc\autosign.conf' + auth_file_path: 'C:\ProgramData\PuppetLabs\puppet-agent\etc\auth.conf' + config_dir_path: 'C:\ProgramData\PuppetLabs\puppet-agent\etc' + code_dir_path: 'C:\ProgramData\PuppetLabs\code' + environment_dir_path: 'C:\ProgramData\PuppetLabs\code\environments' + pid_file_path: 'C:\ProgramData\PuppetLabs\var\run\agent.pid' + log_file_path: 'C:\ProgramData\PuppetLabs\var\log\puppet-agent.log' + log_dir_path: 'C:\ProgramData\PuppetLabs\var\log' + process_user: 'LocalSystem' + process_group: 'LocalSystem' From ddf53d46786828a82f44d0788c60bec2b69bbc97 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 22 May 2022 09:52:27 +0200 Subject: [PATCH 230/284] Standardised init_system setting --- .github/CONTRIBUTING.md | 39 ++++++++++--------- .github/ISSUE_TEMPLATE.md | 14 ++----- .github/PULL_REQUEST_TEMPLATE.md | 13 +++---- .github/workflows/pr.yml | 39 +++++++++++++++++++ .github/workflows/release.yml | 25 ++++++++++++ data/default/AlmaLinux.yaml | 1 + data/default/CentOS.yaml | 1 + data/default/CentOS6.yaml | 3 ++ data/default/Darwin.yaml | 1 + data/default/Debian.yaml | 1 + data/default/Debian10.yaml | 1 + data/default/Debian11.yaml | 1 + data/default/Debian9.yaml | 1 + data/default/OracleLinux.yaml | 4 ++ data/default/RedHat.yaml | 1 + data/default/Rocky.yaml | 1 + data/default/Ubuntu.yaml | 1 + .../docker-engine/operatingsystem/CentOS.yaml | 1 - .../operatingsystem/CentOS6.yaml | 1 - .../docker-engine/operatingsystem/Debian.yaml | 1 - .../operatingsystem/Debian9.yaml | 1 - .../docker-engine/operatingsystem/Ubuntu.yaml | 1 - .../operatingsystem/Ubuntu12.04.yaml | 1 - .../operatingsystem/Ubuntu14.04.yaml | 4 -- .../operatingsystem/Ubuntu14.10.yaml | 4 -- .../upstream/operatingsystem/CentOS.yaml | 1 - .../upstream/operatingsystem/CentOS6.yaml | 1 - .../upstream/operatingsystem/Debian.yaml | 1 - .../upstream/operatingsystem/Debian9.yaml | 3 -- .../upstream/operatingsystem/Ubuntu.yaml | 1 - data/nagios-plugins/default.yaml | 4 +- data/nagios-plugins/osfamily/RedHat.yaml | 8 ++-- data/nagios-plugins/osfamily/RedHat8.yaml | 10 ++--- data/nagios-plugins/osfamily/Solaris.yaml | 4 +- .../zeek/upstream/operatingsystem/CentOS.yaml | 1 - .../zeek/upstream/operatingsystem/Debian.yaml | 1 - .../upstream/operatingsystem/Debian9.yaml | 3 -- .../zeek/upstream/operatingsystem/Ubuntu.yaml | 1 - 38 files changed, 124 insertions(+), 76 deletions(-) create mode 100644 .github/workflows/pr.yml create mode 100644 .github/workflows/release.yml create mode 100644 data/default/CentOS6.yaml create mode 100755 data/default/OracleLinux.yaml delete mode 100644 data/docker-engine/operatingsystem/Ubuntu14.04.yaml delete mode 100644 data/docker-engine/operatingsystem/Ubuntu14.10.yaml delete mode 100644 data/docker/upstream/operatingsystem/Debian9.yaml delete mode 100644 data/zeek/upstream/operatingsystem/Debian9.yaml diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b4e98be9..e3f4bf7f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,31 +1,32 @@ ## How to Contribute to This Project -#### **Did You Find a Bug?** +### Bug found - * **Ensure the bug was not already reported** by searching on GitHub under **Issues**. - * If you're unable to find an open issue addressing the problem, **open a new one**. Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring. +- **Ensure the bug was not already reported** by searching on GitHub under **Issues**. +- If you're unable to find an open issue addressing the problem, **open a new one**. Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring. -#### **Did You Write a Patch That Fixes a Bug?** +### Submit a patch - * Open a new GitHub pull request with the patch. - 1. Fork this project - 1. Create your feature branch: `git checkout -b my-new-feature` - 1. Commit your changes: `git commit -am 'Add some feature'` - 1. Push to the branch: `git push origin my-new-feature` - 1. Submit a pull request via GitHub's web interface - * Ensure the PR description clearly describes the problem and its solution. Include the relevant issue number if applicable. +- Open a new GitHub pull request with the patch. + 1. Fork this project + 2. Create your feature branch: `git checkout -b my-new-feature` + 3. Commit your changes: `git commit -am 'Add some feature'` + 4. Push to the branch: `git push origin my-new-feature` + 5. Submit a pull request via GitHub's web interface -#### **Do You Intend to Add a New Feature or Change an Existing One?** +- Ensure the PR description clearly describes the problem and its solution. Include the relevant issue number if applicable. - * Suggest your change as a **new issue** using the label `enhancement` **BEFORE** you start writing code. +### Request feature -#### **Do You Want to Sponsor Open Source Development?** +- Suggest your change as a **new issue** using the label `enhancement` **BEFORE** you start writing code. + +### Sponsor Open Source Development If you need express resolution of a bug or new features you can consider the opportunity of **sponsoring** the relevant development. - - * Open an issue on GitHub (of type `bug` or `enhancement`) with the details of what you want - * Contact [example42](http://www.example42.com/#contact) referring the issue you created - * Tell us how you want to sponsor the development (sending money, gifts or offering services) - * If we agree on the conditions we will place your [company] name in the module's Sponsors List + +- Open an issue on GitHub (of type `bug` or `enhancement`) with the details of what you want +- Contact [example42](https://www.example42.com/) referring the issue you created +- Tell us how you want to sponsor the development (sending money, gifts or offering services) +- If we agree on the conditions we will place your company name in the module's Sponsors List Thanks for contributing! :heart: diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 1d8c11a6..0a265656 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,19 +1,13 @@ -## Expected Behavior - +## Expected Behavior ## Actual Behavior - ## Steps to Reproduce the Problem - 1. - 1. - 1. - ## Specifications Please add this info: - 1. Output of ```facter -p``` on the failing node (at least the OS related facts) - 1. Version of Puppet and of the module - 1. The relevant Puppet code and eventually Hiera data +1. Output of `facter -p` on the failing node (at least the OS related facts) +2. Version of Puppet and of the module +3. The relevant Puppet code and eventually Hiera data diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8b0f8099..51b6c800 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,12 +1,11 @@ ## Before submitting your PR - 1. Open an **issue** and refer to its number in your PR title - 1. If it's a bug and you have the solution, go on with the PR! - 1. If it's an enhancement, please wait for our feedback before starting to work on it - 1. Please run ```puppet-lint``` on your code and ensure it's compliant +1. Open an **issue** and refer to its number in your PR title +2. If it's a bug and you have the solution, go on with the PR! +3. If it's an enhancement, please wait for our feedback before starting to work on it +4. Please run `puppet-lint` on your code and ensure it's compliant ## After submitting your PR - 1. Verify Travis checks and eventually fix the errors - 1. Feel free to ping us if we don't reply promptly - +1. Verify Travis checks and eventually fix the errors +2. Feel free to ping us if we don't reply promptly diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 00000000..9d4257d8 --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,39 @@ +--- +name: PR tests + +on: pull_request + +jobs: + static: + name: 'Syntax validation' + runs-on: ubuntu-latest + timeout-minutes: 10 + container: puppet/puppet-dev-tools:4.x + steps: + - uses: actions/checkout@v2 + - name: Run static validations + run: /usr/local/bin/pdk bundle exec rake validate lint check + env: + BUNDLE_WITHOUT: development:system_tests:release + + unit: + name: 'Unit tests' + runs-on: ubuntu-latest + timeout-minutes: 60 + container: puppet/puppet-dev-tools:4.x + steps: + - uses: actions/checkout@v2 + - name: Run unit tests on current puppet +# run: /usr/local/bin/pdk bundle exec rake spec + run: /usr/local/bin/pdk test unit + env: + BUNDLE_WITHOUT: development:system_tests:release + - name: Run unit tests on Puppet 6 + run: /usr/local/bin/pdk test unit --puppet-version=6 + env: + BUNDLE_WITHOUT: development:system_tests:release + - name: Run unit tests on Puppet 5 + run: /usr/local/bin/pdk test unit --puppet-version=5 + env: + BUNDLE_WITHOUT: development:system_tests:release + continue-on-error: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..805ece35 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,25 @@ +--- +name: Release + +on: + push: + tags: + - '*' + +env: + BUNDLE_WITHOUT: development:test:system_tests + +jobs: + deploy: + name: 'Deploy to forge' + runs-on: ubuntu-latest + if: github.repository_owner == 'example42' + container: puppet/puppet-dev-tools:4.x + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Publish to the Forge + run: /usr/local/bin/pdk bundle exec rake module:push + env: + BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}' + BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}' diff --git a/data/default/AlmaLinux.yaml b/data/default/AlmaLinux.yaml index ee0f805c..60d78539 100755 --- a/data/default/AlmaLinux.yaml +++ b/data/default/AlmaLinux.yaml @@ -1,3 +1,4 @@ --- default::settings: repo_package_provider: 'rpm' + init_system: 'systemd' diff --git a/data/default/CentOS.yaml b/data/default/CentOS.yaml index ee0f805c..60d78539 100755 --- a/data/default/CentOS.yaml +++ b/data/default/CentOS.yaml @@ -1,3 +1,4 @@ --- default::settings: repo_package_provider: 'rpm' + init_system: 'systemd' diff --git a/data/default/CentOS6.yaml b/data/default/CentOS6.yaml new file mode 100644 index 00000000..b068eedf --- /dev/null +++ b/data/default/CentOS6.yaml @@ -0,0 +1,3 @@ +--- +default::settings: + init_system: 'sysvinit' diff --git a/data/default/Darwin.yaml b/data/default/Darwin.yaml index e642e9ea..7bde0272 100644 --- a/data/default/Darwin.yaml +++ b/data/default/Darwin.yaml @@ -2,3 +2,4 @@ default::settings: config_file_group: 'wheel' package_provider: 'homebrew' + init_systemd: 'launchd' \ No newline at end of file diff --git a/data/default/Debian.yaml b/data/default/Debian.yaml index aad77fd5..51b3a8ce 100755 --- a/data/default/Debian.yaml +++ b/data/default/Debian.yaml @@ -1,3 +1,4 @@ --- default::settings: repo_package_provider: dpkg + init_system: 'sysvinit' \ No newline at end of file diff --git a/data/default/Debian10.yaml b/data/default/Debian10.yaml index dd692da0..37e26324 100644 --- a/data/default/Debian10.yaml +++ b/data/default/Debian10.yaml @@ -1,3 +1,4 @@ --- default::settings: apt_release: 'buster' + init_system: 'systemd' diff --git a/data/default/Debian11.yaml b/data/default/Debian11.yaml index b8656a48..bce05e45 100644 --- a/data/default/Debian11.yaml +++ b/data/default/Debian11.yaml @@ -1,3 +1,4 @@ --- default::settings: apt_release: 'bullseye' + init_system: 'systemd' \ No newline at end of file diff --git a/data/default/Debian9.yaml b/data/default/Debian9.yaml index c4bb6bc9..4836a15c 100644 --- a/data/default/Debian9.yaml +++ b/data/default/Debian9.yaml @@ -1,3 +1,4 @@ --- default::settings: apt_release: 'stretch' + init_system: 'systemd' diff --git a/data/default/OracleLinux.yaml b/data/default/OracleLinux.yaml new file mode 100755 index 00000000..60d78539 --- /dev/null +++ b/data/default/OracleLinux.yaml @@ -0,0 +1,4 @@ +--- +default::settings: + repo_package_provider: 'rpm' + init_system: 'systemd' diff --git a/data/default/RedHat.yaml b/data/default/RedHat.yaml index ee0f805c..60d78539 100755 --- a/data/default/RedHat.yaml +++ b/data/default/RedHat.yaml @@ -1,3 +1,4 @@ --- default::settings: repo_package_provider: 'rpm' + init_system: 'systemd' diff --git a/data/default/Rocky.yaml b/data/default/Rocky.yaml index ee0f805c..60d78539 100755 --- a/data/default/Rocky.yaml +++ b/data/default/Rocky.yaml @@ -1,3 +1,4 @@ --- default::settings: repo_package_provider: 'rpm' + init_system: 'systemd' diff --git a/data/default/Ubuntu.yaml b/data/default/Ubuntu.yaml index aad77fd5..0ab744e5 100755 --- a/data/default/Ubuntu.yaml +++ b/data/default/Ubuntu.yaml @@ -1,3 +1,4 @@ --- default::settings: repo_package_provider: dpkg + init_system: 'systemd' diff --git a/data/docker-engine/operatingsystem/CentOS.yaml b/data/docker-engine/operatingsystem/CentOS.yaml index 54d0729c..05945325 100644 --- a/data/docker-engine/operatingsystem/CentOS.yaml +++ b/data/docker-engine/operatingsystem/CentOS.yaml @@ -1,7 +1,6 @@ --- docker-engine::settings: init_file_path: '/etc/sysconfig/docker' - init_system: 'systemd' config_file_path: '/etc/sysconfig/docker' key: '2C52609D' key_url: 'http://yum.dockerproject.org/gpg' diff --git a/data/docker-engine/operatingsystem/CentOS6.yaml b/data/docker-engine/operatingsystem/CentOS6.yaml index 4d376007..c827a0d1 100644 --- a/data/docker-engine/operatingsystem/CentOS6.yaml +++ b/data/docker-engine/operatingsystem/CentOS6.yaml @@ -1,4 +1,3 @@ --- docker-engine::settings: repo_url: 'https://yum.dockerproject.org/repo/main/centos/6' - init_system: 'sysvinit' diff --git a/data/docker-engine/operatingsystem/Debian.yaml b/data/docker-engine/operatingsystem/Debian.yaml index b08d3fa7..7e289e1c 100644 --- a/data/docker-engine/operatingsystem/Debian.yaml +++ b/data/docker-engine/operatingsystem/Debian.yaml @@ -7,4 +7,3 @@ docker-engine::settings: key_url: 'http://apt.dockerproject.org/gpg' apt_repos: 'main' apt_key_server: 'http://p80.pool.sks-keyservers.net' - init_system: 'sysvinit' diff --git a/data/docker-engine/operatingsystem/Debian9.yaml b/data/docker-engine/operatingsystem/Debian9.yaml index 218beca5..79a9f7c9 100644 --- a/data/docker-engine/operatingsystem/Debian9.yaml +++ b/data/docker-engine/operatingsystem/Debian9.yaml @@ -1,4 +1,3 @@ --- docker-engine::settings: apt_release: 'debian-stretch' - init_system: 'systemd' diff --git a/data/docker-engine/operatingsystem/Ubuntu.yaml b/data/docker-engine/operatingsystem/Ubuntu.yaml index f564c5c1..7e289e1c 100644 --- a/data/docker-engine/operatingsystem/Ubuntu.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu.yaml @@ -7,4 +7,3 @@ docker-engine::settings: key_url: 'http://apt.dockerproject.org/gpg' apt_repos: 'main' apt_key_server: 'http://p80.pool.sks-keyservers.net' - init_system: 'systemd' diff --git a/data/docker-engine/operatingsystem/Ubuntu12.04.yaml b/data/docker-engine/operatingsystem/Ubuntu12.04.yaml index b90faeab..bbd3e213 100644 --- a/data/docker-engine/operatingsystem/Ubuntu12.04.yaml +++ b/data/docker-engine/operatingsystem/Ubuntu12.04.yaml @@ -1,4 +1,3 @@ --- docker-engine::settings: apt_release: 'ubuntu-precise' - init_system: 'upstart' diff --git a/data/docker-engine/operatingsystem/Ubuntu14.04.yaml b/data/docker-engine/operatingsystem/Ubuntu14.04.yaml deleted file mode 100644 index 0d1d9763..00000000 --- a/data/docker-engine/operatingsystem/Ubuntu14.04.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -docker-engine::settings: - apt_release: 'ubuntu-trusty' - init_system: 'upstart' diff --git a/data/docker-engine/operatingsystem/Ubuntu14.10.yaml b/data/docker-engine/operatingsystem/Ubuntu14.10.yaml deleted file mode 100644 index 2c0ad65f..00000000 --- a/data/docker-engine/operatingsystem/Ubuntu14.10.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - docker::settings: - apt_release: 'ubuntu-utopic' - init_system: 'upstart' diff --git a/data/docker/upstream/operatingsystem/CentOS.yaml b/data/docker/upstream/operatingsystem/CentOS.yaml index e75dd20c..41c9bdd2 100644 --- a/data/docker/upstream/operatingsystem/CentOS.yaml +++ b/data/docker/upstream/operatingsystem/CentOS.yaml @@ -1,7 +1,6 @@ --- docker::settings: init_file_path: '/etc/sysconfig/docker' - init_system: 'systemd' config_file_path: '/etc/sysconfig/docker' key: '060A 61C5 1B55 8A7F 742B 77AA C52F EB6B 621E 9F35' key_url: 'https://download.docker.com/linux/centos/gpg' diff --git a/data/docker/upstream/operatingsystem/CentOS6.yaml b/data/docker/upstream/operatingsystem/CentOS6.yaml index d160a47f..bff7a9da 100644 --- a/data/docker/upstream/operatingsystem/CentOS6.yaml +++ b/data/docker/upstream/operatingsystem/CentOS6.yaml @@ -1,4 +1,3 @@ --- docker::settings: repo_url: 'https://yum.dockerproject.org/repo/main/centos/6/$basearch/stable' - init_system: 'sysvinit' diff --git a/data/docker/upstream/operatingsystem/Debian.yaml b/data/docker/upstream/operatingsystem/Debian.yaml index 4663f18f..904f9097 100644 --- a/data/docker/upstream/operatingsystem/Debian.yaml +++ b/data/docker/upstream/operatingsystem/Debian.yaml @@ -5,4 +5,3 @@ docker::settings: key: '0EBFCD88' key_url: 'https://download.docker.com/linux/debian/gpg' apt_repos: 'stable' - init_system: 'sysvinit' diff --git a/data/docker/upstream/operatingsystem/Debian9.yaml b/data/docker/upstream/operatingsystem/Debian9.yaml deleted file mode 100644 index 4e313e6b..00000000 --- a/data/docker/upstream/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker::settings: - init_system: 'systemd' diff --git a/data/docker/upstream/operatingsystem/Ubuntu.yaml b/data/docker/upstream/operatingsystem/Ubuntu.yaml index 5256b9f3..a77deeba 100644 --- a/data/docker/upstream/operatingsystem/Ubuntu.yaml +++ b/data/docker/upstream/operatingsystem/Ubuntu.yaml @@ -6,4 +6,3 @@ docker::settings: key_url: 'https://download.docker.com/linux/ubuntu/gpg' apt_repos: 'stable' apt_key_server: 'http://p80.pool.sks-keyservers.net' - init_system: 'systemd' diff --git a/data/nagios-plugins/default.yaml b/data/nagios-plugins/default.yaml index a79cf938..241fca28 100644 --- a/data/nagios-plugins/default.yaml +++ b/data/nagios-plugins/default.yaml @@ -1,3 +1,3 @@ --- - nagios-plugins::settings: - package_name: 'nagios-plugins' +nagios-plugins::settings: + package_name: 'nagios-plugins' diff --git a/data/nagios-plugins/osfamily/RedHat.yaml b/data/nagios-plugins/osfamily/RedHat.yaml index 84f7f324..1ac1482c 100644 --- a/data/nagios-plugins/osfamily/RedHat.yaml +++ b/data/nagios-plugins/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - nagios-plugins::settings: - package_name: 'nagios-plugins-all' - tp_prerequisites: - - epel +nagios-plugins::settings: + package_name: 'nagios-plugins-all' + tp_prerequisites: + - epel diff --git a/data/nagios-plugins/osfamily/RedHat8.yaml b/data/nagios-plugins/osfamily/RedHat8.yaml index 297bb477..af100556 100644 --- a/data/nagios-plugins/osfamily/RedHat8.yaml +++ b/data/nagios-plugins/osfamily/RedHat8.yaml @@ -1,6 +1,6 @@ --- - nagios-plugins::settings_broken: - exec_prerequisites: - enable_powertools: - command: 'dnf config-manager --set-enabled PowerTools' - unless: "grep 'enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo 2>&1>/dev/null" +nagios-plugins::settings_broken: + exec_prerequisites: + enable_powertools: + command: 'dnf config-manager --set-enabled PowerTools' + unless: "grep 'enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo 2>&1>/dev/null" diff --git a/data/nagios-plugins/osfamily/Solaris.yaml b/data/nagios-plugins/osfamily/Solaris.yaml index 1428a3f7..64dfe463 100644 --- a/data/nagios-plugins/osfamily/Solaris.yaml +++ b/data/nagios-plugins/osfamily/Solaris.yaml @@ -1,3 +1,3 @@ --- - nagios-plugins::settings: - package_name: 'nagios_plugins' +nagios-plugins::settings: + package_name: 'nagios_plugins' diff --git a/data/zeek/upstream/operatingsystem/CentOS.yaml b/data/zeek/upstream/operatingsystem/CentOS.yaml index 764df914..79251401 100644 --- a/data/zeek/upstream/operatingsystem/CentOS.yaml +++ b/data/zeek/upstream/operatingsystem/CentOS.yaml @@ -1,4 +1,3 @@ --- zeek::settings: init_file_path: '/etc/sysconfig/zeek' - init_system: 'systemd' diff --git a/data/zeek/upstream/operatingsystem/Debian.yaml b/data/zeek/upstream/operatingsystem/Debian.yaml index 73af3666..13039430 100644 --- a/data/zeek/upstream/operatingsystem/Debian.yaml +++ b/data/zeek/upstream/operatingsystem/Debian.yaml @@ -5,4 +5,3 @@ zeek::settings: key: '0EBFCD88' key_url: 'https://download.zeek.com/linux/debian/gpg' apt_repos: 'stable' - init_system: 'sysvinit' diff --git a/data/zeek/upstream/operatingsystem/Debian9.yaml b/data/zeek/upstream/operatingsystem/Debian9.yaml deleted file mode 100644 index 00689383..00000000 --- a/data/zeek/upstream/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -zeek::settings: - init_system: 'systemd' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu.yaml b/data/zeek/upstream/operatingsystem/Ubuntu.yaml index 72a06bc6..480cf3ce 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu.yaml @@ -6,4 +6,3 @@ zeek::settings: key_url: 'https://download.zeek.com/linux/ubuntu/gpg' apt_repos: 'stable' apt_key_server: 'http://p80.pool.sks-keyservers.net' - init_system: 'systemd' From b98cf8966629f94bc2fadd8d9293a563db9f630e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 22 May 2022 10:33:47 +0200 Subject: [PATCH 231/284] Release 0.4.6 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 8d292fd5..1f934502 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.5", + "version": "0.4.6", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 37d93c5c5ec62546ffbd137e936ef2c23ee3721d Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 24 May 2022 17:51:03 +0200 Subject: [PATCH 232/284] Added common pip packages --- data/jupyterlab/default.yaml | 5 +++++ data/jupyterlab/hiera.yaml | 6 ++++++ data/kedro/default.yaml | 5 +++++ data/kedro/hiera.yaml | 6 ++++++ data/keras/default.yaml | 5 +++++ data/keras/hiera.yaml | 6 ++++++ data/metaflow/default.yaml | 5 +++++ data/metaflow/hiera.yaml | 6 ++++++ data/mlflow/default.yaml | 5 +++++ data/mlflow/hiera.yaml | 6 ++++++ data/mlrun/default.yaml | 5 +++++ data/mlrun/hiera.yaml | 6 ++++++ data/notebook/default.yaml | 5 +++++ data/notebook/hiera.yaml | 6 ++++++ data/pytorch/default.yaml | 8 ++++++++ data/pytorch/hiera.yaml | 6 ++++++ data/scikit-learn/default.yaml | 5 +++++ data/scikit-learn/hiera.yaml | 6 ++++++ data/scikit-learn/osfamily/Debian.yaml | 7 +++++++ data/scikit-learn/osfamily/RedHat.yaml | 4 ++++ data/tensorflow/default.yaml | 5 +++++ data/tensorflow/hiera.yaml | 6 ++++++ data/zenml/default.yaml | 5 +++++ data/zenml/hiera.yaml | 6 ++++++ 24 files changed, 135 insertions(+) create mode 100644 data/jupyterlab/default.yaml create mode 100644 data/jupyterlab/hiera.yaml create mode 100644 data/kedro/default.yaml create mode 100644 data/kedro/hiera.yaml create mode 100644 data/keras/default.yaml create mode 100644 data/keras/hiera.yaml create mode 100644 data/metaflow/default.yaml create mode 100644 data/metaflow/hiera.yaml create mode 100644 data/mlflow/default.yaml create mode 100644 data/mlflow/hiera.yaml create mode 100644 data/mlrun/default.yaml create mode 100644 data/mlrun/hiera.yaml create mode 100644 data/notebook/default.yaml create mode 100644 data/notebook/hiera.yaml create mode 100644 data/pytorch/default.yaml create mode 100644 data/pytorch/hiera.yaml create mode 100644 data/scikit-learn/default.yaml create mode 100644 data/scikit-learn/hiera.yaml create mode 100644 data/scikit-learn/osfamily/Debian.yaml create mode 100644 data/scikit-learn/osfamily/RedHat.yaml create mode 100644 data/tensorflow/default.yaml create mode 100644 data/tensorflow/hiera.yaml create mode 100644 data/zenml/default.yaml create mode 100644 data/zenml/hiera.yaml diff --git a/data/jupyterlab/default.yaml b/data/jupyterlab/default.yaml new file mode 100644 index 00000000..16469305 --- /dev/null +++ b/data/jupyterlab/default.yaml @@ -0,0 +1,5 @@ +--- +jupyterlab: + package_name: jupyterlab + package_provider: 'pip' + diff --git a/data/jupyterlab/hiera.yaml b/data/jupyterlab/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/jupyterlab/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/kedro/default.yaml b/data/kedro/default.yaml new file mode 100644 index 00000000..2148ae51 --- /dev/null +++ b/data/kedro/default.yaml @@ -0,0 +1,5 @@ +--- +kedro: + package_name: kedro + package_provider: 'pip' + diff --git a/data/kedro/hiera.yaml b/data/kedro/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/kedro/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/keras/default.yaml b/data/keras/default.yaml new file mode 100644 index 00000000..e35d94de --- /dev/null +++ b/data/keras/default.yaml @@ -0,0 +1,5 @@ +--- +keras: + package_name: keras + package_provider: 'pip' + diff --git a/data/keras/hiera.yaml b/data/keras/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/keras/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/metaflow/default.yaml b/data/metaflow/default.yaml new file mode 100644 index 00000000..25a909ae --- /dev/null +++ b/data/metaflow/default.yaml @@ -0,0 +1,5 @@ +--- +metaflow: + package_name: metaflow + package_provider: 'pip' + diff --git a/data/metaflow/hiera.yaml b/data/metaflow/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/metaflow/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mlflow/default.yaml b/data/mlflow/default.yaml new file mode 100644 index 00000000..476e961d --- /dev/null +++ b/data/mlflow/default.yaml @@ -0,0 +1,5 @@ +--- +mlflow: + package_name: mlflow + package_provider: 'pip' + diff --git a/data/mlflow/hiera.yaml b/data/mlflow/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/mlflow/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/mlrun/default.yaml b/data/mlrun/default.yaml new file mode 100644 index 00000000..16e4bff1 --- /dev/null +++ b/data/mlrun/default.yaml @@ -0,0 +1,5 @@ +--- +mlrun: + package_name: mlrun + package_provider: 'pip' + diff --git a/data/mlrun/hiera.yaml b/data/mlrun/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/mlrun/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/notebook/default.yaml b/data/notebook/default.yaml new file mode 100644 index 00000000..5dbda45c --- /dev/null +++ b/data/notebook/default.yaml @@ -0,0 +1,5 @@ +--- +notebook: + package_name: notebook + package_provider: 'pip' + diff --git a/data/notebook/hiera.yaml b/data/notebook/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/notebook/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/pytorch/default.yaml b/data/pytorch/default.yaml new file mode 100644 index 00000000..883b285f --- /dev/null +++ b/data/pytorch/default.yaml @@ -0,0 +1,8 @@ +--- +pytorch: + package_name: + - 'torch' + - 'torchvision' + - 'torchaudio' + package_provider: 'pip' + diff --git a/data/pytorch/hiera.yaml b/data/pytorch/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/pytorch/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/scikit-learn/default.yaml b/data/scikit-learn/default.yaml new file mode 100644 index 00000000..163db1fc --- /dev/null +++ b/data/scikit-learn/default.yaml @@ -0,0 +1,5 @@ +--- +scikit-learn: + package_name: 'scikit-learn' + package_provider: 'pip' + diff --git a/data/scikit-learn/hiera.yaml b/data/scikit-learn/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/scikit-learn/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/scikit-learn/osfamily/Debian.yaml b/data/scikit-learn/osfamily/Debian.yaml new file mode 100644 index 00000000..c2fa007f --- /dev/null +++ b/data/scikit-learn/osfamily/Debian.yaml @@ -0,0 +1,7 @@ +--- +scikit-learn: + package_name: + - 'python3-sklearn' + - 'python3-sklearn-lib' + - 'python3-sklearn-doc' + package_provider: 'apt' diff --git a/data/scikit-learn/osfamily/RedHat.yaml b/data/scikit-learn/osfamily/RedHat.yaml new file mode 100644 index 00000000..0bef5ae6 --- /dev/null +++ b/data/scikit-learn/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +scikit-learn: + package_name: python3-scikit-learn + package_provider: 'yum' diff --git a/data/tensorflow/default.yaml b/data/tensorflow/default.yaml new file mode 100644 index 00000000..e2ca68f0 --- /dev/null +++ b/data/tensorflow/default.yaml @@ -0,0 +1,5 @@ +--- +tensorflow: + package_name: tensorflow + package_provider: 'pip' + diff --git a/data/tensorflow/hiera.yaml b/data/tensorflow/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/tensorflow/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/zenml/default.yaml b/data/zenml/default.yaml new file mode 100644 index 00000000..80454417 --- /dev/null +++ b/data/zenml/default.yaml @@ -0,0 +1,5 @@ +--- +zenml: + package_name: zenml + package_provider: 'pip' + diff --git a/data/zenml/hiera.yaml b/data/zenml/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/zenml/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default From a2f3c3d64635aa1db2512400c4644fe27806f755 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 27 May 2022 22:10:03 +0200 Subject: [PATCH 233/284] crowdsec repo data moved to dedicated tp app --- data/crowdsec-bouncer/default.yaml | 12 ++++++++++ data/crowdsec-bouncer/hiera.yaml | 9 ++++++++ data/crowdsec/default.yaml | 22 +++++++++++++++++++ data/crowdsec/hiera.yaml | 10 +++++++++ data/crowdsec_repo/default.yaml | 3 +++ data/crowdsec_repo/hiera.yaml | 10 +++++++++ data/crowdsec_repo/upstream/default.yaml | 6 +++++ .../upstream/operatingsystem/Ubuntu.yaml | 3 +++ .../upstream/osfamily/Debian.yaml | 3 +++ .../upstream/osfamily/RedHat.yaml | 4 ++++ .../upstream/osfamily/RedHat6.yaml | 3 +++ .../upstream/osfamily/RedHat7.yaml | 3 +++ .../upstream/osfamily/RedHat8.yaml | 3 +++ .../upstream/osfamily/RedHat9.yaml | 3 +++ .../crowdsec_repo/upstream/osfamily/Suse.yaml | 3 +++ .../upstream/osfamily/Suse13.yaml | 2 ++ .../upstream/osfamily/Suse14.yaml | 3 +++ .../upstream/osfamily/Suse15.yaml | 3 +++ 18 files changed, 105 insertions(+) create mode 100644 data/crowdsec-bouncer/default.yaml create mode 100644 data/crowdsec-bouncer/hiera.yaml create mode 100644 data/crowdsec/default.yaml create mode 100644 data/crowdsec/hiera.yaml create mode 100644 data/crowdsec_repo/default.yaml create mode 100644 data/crowdsec_repo/hiera.yaml create mode 100644 data/crowdsec_repo/upstream/default.yaml create mode 100644 data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/Debian.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/RedHat.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/RedHat6.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/RedHat7.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/RedHat8.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/RedHat9.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/Suse.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/Suse13.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/Suse14.yaml create mode 100644 data/crowdsec_repo/upstream/osfamily/Suse15.yaml diff --git a/data/crowdsec-bouncer/default.yaml b/data/crowdsec-bouncer/default.yaml new file mode 100644 index 00000000..e2e2cadd --- /dev/null +++ b/data/crowdsec-bouncer/default.yaml @@ -0,0 +1,12 @@ +--- +crowdsec-bouncer::settings: + upstream_repo: true + package_name: 'crowdsec-firewall-bouncer-iptables' + service_name: 'crowdsec-firewall-bouncer' + config_file_path: '/etc/crowdsec/bouncers/crowdsec-firewall-bouncer.yaml' + config_dir_path: '/etc/crowdsec/bouncers' + process_name: 'crowdsec-firewall-bouncer' + process_user: 'root' + process_group: 'root' + tp_prerequisites: + - crowdsec_repo \ No newline at end of file diff --git a/data/crowdsec-bouncer/hiera.yaml b/data/crowdsec-bouncer/hiera.yaml new file mode 100644 index 00000000..1c820bbc --- /dev/null +++ b/data/crowdsec-bouncer/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/crowdsec/default.yaml b/data/crowdsec/default.yaml new file mode 100644 index 00000000..510fd541 --- /dev/null +++ b/data/crowdsec/default.yaml @@ -0,0 +1,22 @@ +--- +crowdsec::settings: + upstream_repo: true + package_name: 'crowdsec' + service_name: 'crowdsec' + config_file_path: '/etc/crowdsec/config.yaml' + config_dir_path: '/etc/crowdsec' + data_dir_path: '/var/lib/crowdsec/data' + log_file_path: + - '/var/log/crowdsec.log' + - '/var/log/crowdsec_api.log' + process_name: 'crowdsec' + process_user: 'root' + process_group: 'root' + config_file_format: yaml + info_commands: + decisions_list: 'cscli decisions list' + alerts_list: 'cscli alerts list' + metrics: 'cscli metrics' + config_show: 'cscli config show' + tp_prerequisites: + - crowdsec_repo \ No newline at end of file diff --git a/data/crowdsec/hiera.yaml b/data/crowdsec/hiera.yaml new file mode 100644 index 00000000..21c6b540 --- /dev/null +++ b/data/crowdsec/hiera.yaml @@ -0,0 +1,10 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/crowdsec_repo/default.yaml b/data/crowdsec_repo/default.yaml new file mode 100644 index 00000000..96b8b20e --- /dev/null +++ b/data/crowdsec_repo/default.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + upstream_repo: true diff --git a/data/crowdsec_repo/hiera.yaml b/data/crowdsec_repo/hiera.yaml new file mode 100644 index 00000000..21c6b540 --- /dev/null +++ b/data/crowdsec_repo/hiera.yaml @@ -0,0 +1,10 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/crowdsec_repo/upstream/default.yaml b/data/crowdsec_repo/upstream/default.yaml new file mode 100644 index 00000000..bae6fd9d --- /dev/null +++ b/data/crowdsec_repo/upstream/default.yaml @@ -0,0 +1,6 @@ +--- +crowdsec_repo::settings: + key_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/gpgkey' + key: '6A89 E3C2 303A 901A 8899 71D3 376E D532 6E93 CD0C' + apt_repos: 'main' + repo_name: crowdsec_crowdsec diff --git a/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml b/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml new file mode 100644 index 00000000..a1b4254a --- /dev/null +++ b/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/ubuntu' diff --git a/data/crowdsec_repo/upstream/osfamily/Debian.yaml b/data/crowdsec_repo/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..555db9a6 --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/debian' diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..4c73b251 --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +crowdsec_repo::settings: + key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' + package_prerequisites: pygpgme \ No newline at end of file diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml new file mode 100644 index 00000000..ca993e0d --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/el/6/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml new file mode 100644 index 00000000..e33c9f70 --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/el/7/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml new file mode 100644 index 00000000..4c9b0dbe --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/el/8/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml new file mode 100644 index 00000000..39b0e36d --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/el/9/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/Suse.yaml b/data/crowdsec_repo/upstream/osfamily/Suse.yaml new file mode 100644 index 00000000..8964672b --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/opensuse/14/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/Suse13.yaml b/data/crowdsec_repo/upstream/osfamily/Suse13.yaml new file mode 100644 index 00000000..102ba84d --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/Suse13.yaml @@ -0,0 +1,2 @@ +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/opensuse/13/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/Suse14.yaml b/data/crowdsec_repo/upstream/osfamily/Suse14.yaml new file mode 100644 index 00000000..8964672b --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/Suse14.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/opensuse/14/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/Suse15.yaml b/data/crowdsec_repo/upstream/osfamily/Suse15.yaml new file mode 100644 index 00000000..24fce2ea --- /dev/null +++ b/data/crowdsec_repo/upstream/osfamily/Suse15.yaml @@ -0,0 +1,3 @@ +--- +crowdsec_repo::settings: + repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/opensuse/15/$basearch' From e8cb10ce79d95076524506d680b51c0ebc1ae280 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 4 Jun 2022 09:50:51 +0200 Subject: [PATCH 234/284] Fixed crowdspec_repo --- data/crowdsec/default.yaml | 6 ++++++ data/crowdsec_repo/hiera.yaml | 1 + data/crowdsec_repo/upstream/default.yaml | 13 +++++++++++-- .../upstream/operatingsystem/Ubuntu.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/Debian.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/RedHat.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/RedHat6.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/RedHat7.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/RedHat8.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/RedHat9.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/Suse.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/Suse13.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/Suse14.yaml | 2 +- data/crowdsec_repo/upstream/osfamily/Suse15.yaml | 2 +- 14 files changed, 29 insertions(+), 13 deletions(-) diff --git a/data/crowdsec/default.yaml b/data/crowdsec/default.yaml index 510fd541..9fc934df 100644 --- a/data/crowdsec/default.yaml +++ b/data/crowdsec/default.yaml @@ -16,7 +16,13 @@ crowdsec::settings: info_commands: decisions_list: 'cscli decisions list' alerts_list: 'cscli alerts list' + bouncers_list: 'cscli bouncers list' + machines_list: 'cscli machines list' + collections_list: 'cscli collections list' metrics: 'cscli metrics' config_show: 'cscli config show' + task_commands: + hub_upgrade: + command: 'cscli hub update && cscli hub upgrade' tp_prerequisites: - crowdsec_repo \ No newline at end of file diff --git a/data/crowdsec_repo/hiera.yaml b/data/crowdsec_repo/hiera.yaml index 21c6b540..5ef67128 100644 --- a/data/crowdsec_repo/hiera.yaml +++ b/data/crowdsec_repo/hiera.yaml @@ -2,6 +2,7 @@ :hierarchy: - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/default" diff --git a/data/crowdsec_repo/upstream/default.yaml b/data/crowdsec_repo/upstream/default.yaml index bae6fd9d..e705c2aa 100644 --- a/data/crowdsec_repo/upstream/default.yaml +++ b/data/crowdsec_repo/upstream/default.yaml @@ -1,6 +1,15 @@ --- crowdsec_repo::settings: - key_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/gpgkey' + key_url: "https://packagecloud.io/crowdsec/crowdsec/gpgkey\n https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-B78D1222C9AD2D5D.pub.gpg\n https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-FED78314A2468CCF.pub.gpg" + key_url_array: + - 'https://packagecloud.io/crowdsec/crowdsec/gpgkey' + - 'https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-B78D1222C9AD2D5D.pub.gpg' + - 'https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-FED78314A2468CCF.pub.gpg' key: '6A89 E3C2 303A 901A 8899 71D3 376E D532 6E93 CD0C' apt_repos: 'main' - repo_name: crowdsec_crowdsec + repo_filename: crowdsec_crowdsec + repo_description: 'Cloudsec repository' + yumrepo_settings: + sslverify: 1 + sslcacert: /etc/pki/tls/certs/ca-bundle.crt + metadata_expire: 300 \ No newline at end of file diff --git a/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml b/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml index a1b4254a..af3e2a2f 100644 --- a/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml +++ b/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/ubuntu' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/ubuntu' diff --git a/data/crowdsec_repo/upstream/osfamily/Debian.yaml b/data/crowdsec_repo/upstream/osfamily/Debian.yaml index 555db9a6..5a312edc 100644 --- a/data/crowdsec_repo/upstream/osfamily/Debian.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/debian' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/debian' diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat.yaml index 4c73b251..33f712ce 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- crowdsec_repo::settings: key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' - package_prerequisites: pygpgme \ No newline at end of file +# package_prerequisites: pygpgme diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml index ca993e0d..3fa4064c 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/el/6/$basearch' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/el/6/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml index e33c9f70..6e0b0e4f 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/el/7/$basearch' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/el/7/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml index 4c9b0dbe..c24fa38e 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/el/8/$basearch' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/el/8/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml index 39b0e36d..0ebd4579 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/el/9/$basearch' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/el/9/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/Suse.yaml b/data/crowdsec_repo/upstream/osfamily/Suse.yaml index 8964672b..562fb989 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/opensuse/14/$basearch' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/14/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/Suse13.yaml b/data/crowdsec_repo/upstream/osfamily/Suse13.yaml index 102ba84d..09dab7b6 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse13.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse13.yaml @@ -1,2 +1,2 @@ crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/opensuse/13/$basearch' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/13/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/Suse14.yaml b/data/crowdsec_repo/upstream/osfamily/Suse14.yaml index 8964672b..562fb989 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse14.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse14.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/opensuse/14/$basearch' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/14/$basearch' diff --git a/data/crowdsec_repo/upstream/osfamily/Suse15.yaml b/data/crowdsec_repo/upstream/osfamily/Suse15.yaml index 24fce2ea..8e351c27 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse15.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse15.yaml @@ -1,3 +1,3 @@ --- crowdsec_repo::settings: - repo_url: 'https://packagecloud.io/crowdsec_repo/crowdsec_repo/opensuse/15/$basearch' + repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/15/$basearch' From 3953b5afcdc58186ba41d1b4cabaa225aef4c3af Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 6 Jun 2022 21:30:35 +0200 Subject: [PATCH 235/284] Renamed crowdsec-bouncer all to crowdsec-firewall-bouncer-iptables --- .../default.yaml | 5 +++-- .../hiera.yaml | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename data/{crowdsec-bouncer => crowdsec-firewall-bouncer-iptables}/default.yaml (83%) rename data/{crowdsec-bouncer => crowdsec-firewall-bouncer-iptables}/hiera.yaml (100%) diff --git a/data/crowdsec-bouncer/default.yaml b/data/crowdsec-firewall-bouncer-iptables/default.yaml similarity index 83% rename from data/crowdsec-bouncer/default.yaml rename to data/crowdsec-firewall-bouncer-iptables/default.yaml index e2e2cadd..23384db5 100644 --- a/data/crowdsec-bouncer/default.yaml +++ b/data/crowdsec-firewall-bouncer-iptables/default.yaml @@ -1,5 +1,5 @@ --- -crowdsec-bouncer::settings: +crowdsec-firewall-bouncer-iptables::settings: upstream_repo: true package_name: 'crowdsec-firewall-bouncer-iptables' service_name: 'crowdsec-firewall-bouncer' @@ -9,4 +9,5 @@ crowdsec-bouncer::settings: process_user: 'root' process_group: 'root' tp_prerequisites: - - crowdsec_repo \ No newline at end of file + - crowdsec_repo + \ No newline at end of file diff --git a/data/crowdsec-bouncer/hiera.yaml b/data/crowdsec-firewall-bouncer-iptables/hiera.yaml similarity index 100% rename from data/crowdsec-bouncer/hiera.yaml rename to data/crowdsec-firewall-bouncer-iptables/hiera.yaml From 9d635b704a61685ed55ed1c690e632669df8be3c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 6 Jun 2022 23:04:39 +0200 Subject: [PATCH 236/284] Fixed setting name in crowdsec_repo --- data/crowdsec_repo/upstream/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/crowdsec_repo/upstream/default.yaml b/data/crowdsec_repo/upstream/default.yaml index e705c2aa..43ae5c1e 100644 --- a/data/crowdsec_repo/upstream/default.yaml +++ b/data/crowdsec_repo/upstream/default.yaml @@ -9,7 +9,7 @@ crowdsec_repo::settings: apt_repos: 'main' repo_filename: crowdsec_crowdsec repo_description: 'Cloudsec repository' - yumrepo_settings: + yumrepo_params: sslverify: 1 sslcacert: /etc/pki/tls/certs/ca-bundle.crt metadata_expire: 300 \ No newline at end of file From 68c94632523cbd503283ee9552195359054e8168 Mon Sep 17 00:00:00 2001 From: Florus Both Date: Thu, 30 Jun 2022 16:37:52 +0200 Subject: [PATCH 237/284] add elastic 8.x repo --- data/elastic_repo/8.x/default.yaml | 4 ++++ data/elastic_repo/8.x/osfamily/Debian.yaml | 5 +++++ data/elastic_repo/8.x/osfamily/RedHat.yaml | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 data/elastic_repo/8.x/default.yaml create mode 100644 data/elastic_repo/8.x/osfamily/Debian.yaml create mode 100644 data/elastic_repo/8.x/osfamily/RedHat.yaml diff --git a/data/elastic_repo/8.x/default.yaml b/data/elastic_repo/8.x/default.yaml new file mode 100644 index 00000000..6697685f --- /dev/null +++ b/data/elastic_repo/8.x/default.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_filename: elastic-8.x + repo_description: 'Elastic repository for 8.x packages' diff --git a/data/elastic_repo/8.x/osfamily/Debian.yaml b/data/elastic_repo/8.x/osfamily/Debian.yaml new file mode 100644 index 00000000..39f3d01e --- /dev/null +++ b/data/elastic_repo/8.x/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- +elastic_repo::settings: + repo_url: 'https://artifacts.elastic.co/packages/8.x/apt' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/elastic_repo/8.x/osfamily/RedHat.yaml b/data/elastic_repo/8.x/osfamily/RedHat.yaml new file mode 100644 index 00000000..2ede54e6 --- /dev/null +++ b/data/elastic_repo/8.x/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_url: 'https://artifacts.elastic.co/packages/8.x/yum' + From be87d5fd3406dd4d0b85ef3a15b40c1ccd1f55c7 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 12 Aug 2022 09:57:53 +0200 Subject: [PATCH 238/284] Some updates + krateo --- data/krateo/default.yaml | 3 +++ data/krateo/hiera.yaml | 7 +++++++ data/krateo/osfamily/Darwin.yaml | 3 +++ data/serf/default.yaml | 31 +++++++++++++++++++++++++++++++ data/serf/hiera.yaml | 8 ++++++++ data/serf/upstream/default.yaml | 4 ++++ data/terraform/default.yaml | 1 - data/vagrant/default.yaml | 5 ++++- data/vault/default.yaml | 5 ++++- 9 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 data/krateo/default.yaml create mode 100644 data/krateo/hiera.yaml create mode 100644 data/krateo/osfamily/Darwin.yaml create mode 100644 data/serf/default.yaml create mode 100644 data/serf/hiera.yaml create mode 100644 data/serf/upstream/default.yaml diff --git a/data/krateo/default.yaml b/data/krateo/default.yaml new file mode 100644 index 00000000..37e2e917 --- /dev/null +++ b/data/krateo/default.yaml @@ -0,0 +1,3 @@ +--- +krateo::settings: + package_name: krateo diff --git a/data/krateo/hiera.yaml b/data/krateo/hiera.yaml new file mode 100644 index 00000000..a6dec64c --- /dev/null +++ b/data/krateo/hiera.yaml @@ -0,0 +1,7 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/krateo/osfamily/Darwin.yaml b/data/krateo/osfamily/Darwin.yaml new file mode 100644 index 00000000..4cc523a4 --- /dev/null +++ b/data/krateo/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +krateo::settings: + brew_tap: 'krateoplatformops/krateo' diff --git a/data/serf/default.yaml b/data/serf/default.yaml new file mode 100644 index 00000000..4c0eb7fa --- /dev/null +++ b/data/serf/default.yaml @@ -0,0 +1,31 @@ +--- +serf::settings: + upstream_repo: true + package_name: 'serf' + process_name: 'serf' + version_command: 'serf version' + info_commands: + info: 'serf info' + members: 'serf members' + log_commands: + monitor: 'serf monitor' + help_commands: + agent: 'serf agent --help' + + + sub_commands: + 'agent': 'Runs a Serf agent' + 'event': 'Send a custom event through the Serf cluster' + 'force-leave': 'Forces a member of the cluster to enter the "left" state' + 'info': 'Provides debugging information for operators' + 'join': 'Tell Serf agent to join cluster' + 'keygen': 'Generates a new encryption key' + 'keys': 'Manipulate the internal encryption keyring used by Serf' + 'leave': 'Gracefully leaves the Serf cluster and shuts down' + 'members': 'Lists the members of a Serf cluster' + 'monitor': 'Stream logs from a Serf agent' + 'query': 'Send a query to the Serf cluster' + 'reachability': 'Test network reachability' + 'rtt': 'Estimates network round trip time between nodes' + 'tags': 'Modify tags of a running Serf agent' + 'version': 'Prints the Serf version' \ No newline at end of file diff --git a/data/serf/hiera.yaml b/data/serf/hiera.yaml new file mode 100644 index 00000000..990b9755 --- /dev/null +++ b/data/serf/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/serf/upstream/default.yaml b/data/serf/upstream/default.yaml new file mode 100644 index 00000000..b7d4f418 --- /dev/null +++ b/data/serf/upstream/default.yaml @@ -0,0 +1,4 @@ +--- +serf::settings: + tp_prerequisites: + hashicorp_repo: {} \ No newline at end of file diff --git a/data/terraform/default.yaml b/data/terraform/default.yaml index f3e16217..4fb31c87 100644 --- a/data/terraform/default.yaml +++ b/data/terraform/default.yaml @@ -2,5 +2,4 @@ terraform::settings: upstream_repo: true package_name: 'terraform' - process_name: 'terraform' diff --git a/data/vagrant/default.yaml b/data/vagrant/default.yaml index 2ce837cf..b92ee406 100644 --- a/data/vagrant/default.yaml +++ b/data/vagrant/default.yaml @@ -4,4 +4,7 @@ vagrant::settings: package_name: 'vagrant' process_name: 'vagrant' home_dir_path: '/opt/vagrant' - + info_commands: + global-status: 'vagrant global-status' + git_source: https://github.com/hashicorp/vagrant.git + git_use: true \ No newline at end of file diff --git a/data/vault/default.yaml b/data/vault/default.yaml index 3496b25b..1a303e50 100644 --- a/data/vault/default.yaml +++ b/data/vault/default.yaml @@ -9,4 +9,7 @@ vault::settings: data_dir_path: '/opt/vault' config_file_format: 'hcl' tcp_port: 8200 - + git_source: https://github.com/hashicorp/vault.git + info_commands: + vault_status: 'vault status' + From a6f38da8b21fa0d564c0bb691a2bd2676878cd0f Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 12 Nov 2022 18:47:17 +0100 Subject: [PATCH 239/284] Added test ci workflow (#52) --- .github/workflows/pr.yml | 86 ++++++++++++------ .github/workflows/release.yml | 2 +- .gitlab-ci.yml | 5 +- .rubocop.yml | 30 +++--- data/azure-cli/default.yaml | 5 + data/azure-cli/hiera.yaml | 11 +++ data/azure-cli/upstream/default.yaml | 7 ++ data/azure-cli/upstream/osfamily/Debian.yaml | 3 + data/azure-cli/upstream/osfamily/RedHat.yaml | 3 + data/azure-cli/upstream/osfamily/RedHat7.yaml | 5 + data/azure-cli/upstream/osfamily/RedHat8.yaml | 4 + data/azure-cli/upstream/osfamily/RedHat9.yaml | 3 + data/azure-cli/upstream/osfamily/Suse.yaml | 3 + data/azure-cli/upstream/osfamily/windows.yaml | 3 + data/crowdsec/default.yaml | 2 +- data/crowdsec_repo/upstream/default.yaml | 6 +- data/filebeat/default.yaml | 1 - data/gitlab-ce/default.yaml | 28 ++++-- data/gitlab-ce/osfamily/RedHat.yaml | 10 +- data/gitlab-ee/default.yaml | 28 ++++-- data/gitlab-ee/osfamily/RedHat.yaml | 10 +- data/hashicorp_repo/hiera.yaml | 1 + .../upstream/osfamily/Debian.yaml | 1 - data/nginx/default.yaml | 1 + data/openssh/default.yaml | 1 + data/postfix/default.yaml | 1 + data/rsyslog/default.yaml | 1 + .../zeek/upstream/operatingsystem/Ubuntu.yaml | 2 +- .../upstream/operatingsystem/Ubuntu22.04.yaml | 4 + scripts/functions | 91 +++++++++++++++++++ scripts/github_tp_setup.sh | 15 +++ scripts/github_tp_test.sh | 36 ++++++++ {bin => scripts}/moduledata_clone.sh | 0 33 files changed, 331 insertions(+), 78 deletions(-) create mode 100644 data/azure-cli/default.yaml create mode 100644 data/azure-cli/hiera.yaml create mode 100644 data/azure-cli/upstream/default.yaml create mode 100644 data/azure-cli/upstream/osfamily/Debian.yaml create mode 100644 data/azure-cli/upstream/osfamily/RedHat.yaml create mode 100644 data/azure-cli/upstream/osfamily/RedHat7.yaml create mode 100644 data/azure-cli/upstream/osfamily/RedHat8.yaml create mode 100644 data/azure-cli/upstream/osfamily/RedHat9.yaml create mode 100644 data/azure-cli/upstream/osfamily/Suse.yaml create mode 100644 data/azure-cli/upstream/osfamily/windows.yaml create mode 100644 data/zeek/upstream/operatingsystem/Ubuntu22.04.yaml create mode 100644 scripts/functions create mode 100755 scripts/github_tp_setup.sh create mode 100755 scripts/github_tp_test.sh rename {bin => scripts}/moduledata_clone.sh (100%) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9d4257d8..b1cab29e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,39 +1,69 @@ --- name: PR tests - on: pull_request jobs: - static: - name: 'Syntax validation' + validate-yaml: runs-on: ubuntu-latest - timeout-minutes: 10 - container: puppet/puppet-dev-tools:4.x steps: - - uses: actions/checkout@v2 - - name: Run static validations - run: /usr/local/bin/pdk bundle exec rake validate lint check - env: - BUNDLE_WITHOUT: development:system_tests:release + - uses: actions/checkout@v3 + - name: Validate YAML files + run: yamllint . - unit: - name: 'Unit tests' + acceptance: + strategy: + matrix: + include: + - container: ubuntu:18.04 + pkg_install: apt-get update && apt-get install -y + - container: ubuntu:20.04 + pkg_install: apt-get update && apt-get install -y + - container: ubuntu:22.04 + pkg_install: apt-get update && apt-get install -y + - container: debian:11 + pkg_install: apt-get update && apt-get install -y + - container: debian:10 + pkg_install: apt-get update && apt-get install -y + - container: debian:9 + pkg_install: apt-get update && apt-get install -y + - container: debian:8 + pkg_install: apt-get update && apt-get install -y + - container: redhat/ubi9-minimal + pkg_install: yum install -y + - container: redhat/ubi8-minimal + pkg_install: yum install -y + - container: redhat/ubi7-minimal + pkg_install: yum install -y runs-on: ubuntu-latest + container: + image: ${{ matrix.container }} + options: --user root + name: "Acceptance test on ${{ matrix.container }}" timeout-minutes: 60 - container: puppet/puppet-dev-tools:4.x steps: - - uses: actions/checkout@v2 - - name: Run unit tests on current puppet -# run: /usr/local/bin/pdk bundle exec rake spec - run: /usr/local/bin/pdk test unit - env: - BUNDLE_WITHOUT: development:system_tests:release - - name: Run unit tests on Puppet 6 - run: /usr/local/bin/pdk test unit --puppet-version=6 - env: - BUNDLE_WITHOUT: development:system_tests:release - - name: Run unit tests on Puppet 5 - run: /usr/local/bin/pdk test unit --puppet-version=5 - env: - BUNDLE_WITHOUT: development:system_tests:release - continue-on-error: true + - name: Install Puppet, Tiny Puppet and git + run: | + ${{ matrix.pkg_install }} wget + wget -O - https://bit.ly/installpuppet | bash + mkdir -p /etc/puppetlabs/code/modules/tinydata/ + ln -s /home/runner/work/tinydata/tinydata/data /etc/puppetlabs/code/modules/tinydata/data + puppet module install example42-tp --ignore-dependencies + puppet module install puppetlabs-stdlib --ignore-dependencies + puppet tp setup + tp install git + shell: 'script -q -e -c "bash {0}"' + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v34 + - name: Run tp tests + run: scripts/github_tp_test.sh "${{ steps.changed-files.outputs.all_changed_files }}" + shell: 'script -q -e -c "bash {0}"' + - name: 'Upload results artifact' + uses: actions/upload-artifact@v3 + with: + name: my-artifact + path: my_file.txt + retention-days: 5 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 805ece35..c14929bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: container: puppet/puppet-dev-tools:4.x steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Publish to the Forge run: /usr/local/bin/pdk bundle exec rake module:push env: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81e6d762..88d0bd9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,11 @@ before_script: - bundle -v - bundle install --without system_tests --path vendor/bundle --jobs $(nproc) -syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.3-Puppet ~> 6: +syntax: stage: syntax image: ruby:2.5.3 script: - - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop + - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore variables: PUPPET_GEM_VERSION: '~> 6' @@ -38,4 +38,3 @@ parallel_spec-Ruby 2.4.5-Puppet ~> 5: - bundle exec rake parallel_spec variables: PUPPET_GEM_VERSION: '~> 5' - diff --git a/.rubocop.yml b/.rubocop.yml index f5a6c2a4..0ecd9653 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,30 +4,30 @@ AllCops: DisplayCopNames: true TargetRubyVersion: '2.1' Include: - - "./**/*.rb" + - "./**/*.rb" Exclude: - - bin/* - - ".vendor/**/*" - - "**/Gemfile" - - "**/Rakefile" - - pkg/**/* - - spec/fixtures/**/* - - vendor/**/* - - "**/Puppetfile" - - "**/Vagrantfile" - - "**/Guardfile" + - bin/* + - ".vendor/**/*" + - "**/Gemfile" + - "**/Rakefile" + - pkg/**/* + - spec/fixtures/**/* + - vendor/**/* + - "**/Puppetfile" + - "**/Vagrantfile" + - "**/Guardfile" Metrics/LineLength: Description: People have wide screens, use them. Max: 200 GetText/DecorateString: Description: We don't want to decorate test output. Exclude: - - spec/* + - spec/* RSpec/BeforeAfterAll: Description: Beware of using after(:all) as it may cause state to leak between tests. A necessary evil in acceptance testing. Exclude: - - spec/acceptance/**/*.rb + - spec/acceptance/**/*.rb RSpec/HookArgument: Description: Prefer explicit :each argument, matching existing module's style EnforcedStyle: each @@ -74,8 +74,8 @@ RSpec/MessageSpies: EnforcedStyle: receive Style/Documentation: Exclude: - - lib/puppet/parser/functions/**/* - - spec/**/* + - lib/puppet/parser/functions/**/* + - spec/**/* Style/WordArray: EnforcedStyle: brackets Style/CollectionMethods: diff --git a/data/azure-cli/default.yaml b/data/azure-cli/default.yaml new file mode 100644 index 00000000..1c2a2280 --- /dev/null +++ b/data/azure-cli/default.yaml @@ -0,0 +1,5 @@ +--- +azure-cli::settings: + upstream_repo: true + package_name: azure-cli + version_command: 'az -v' diff --git a/data/azure-cli/hiera.yaml b/data/azure-cli/hiera.yaml new file mode 100644 index 00000000..5ef67128 --- /dev/null +++ b/data/azure-cli/hiera.yaml @@ -0,0 +1,11 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/azure-cli/upstream/default.yaml b/data/azure-cli/upstream/default.yaml new file mode 100644 index 00000000..37052ae5 --- /dev/null +++ b/data/azure-cli/upstream/default.yaml @@ -0,0 +1,7 @@ +--- +azure-cli::settings: + key_url: https://packages.microsoft.com/keys/microsoft.asc + key: '8439 38DF 228D 22F7 B374 2BC0 D94A A3F0 EFE2 1092' + apt_repos: 'main' + repo_filename: azure-cli + repo_description: 'Azure CLI' diff --git a/data/azure-cli/upstream/osfamily/Debian.yaml b/data/azure-cli/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..754b7157 --- /dev/null +++ b/data/azure-cli/upstream/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +azure-cli::settings: + repo_url: 'https://packages.microsoft.com/repos/azure-cli/' diff --git a/data/azure-cli/upstream/osfamily/RedHat.yaml b/data/azure-cli/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..c16d7de2 --- /dev/null +++ b/data/azure-cli/upstream/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +azure-cli::settings: + key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' diff --git a/data/azure-cli/upstream/osfamily/RedHat7.yaml b/data/azure-cli/upstream/osfamily/RedHat7.yaml new file mode 100644 index 00000000..3d3b0ed0 --- /dev/null +++ b/data/azure-cli/upstream/osfamily/RedHat7.yaml @@ -0,0 +1,5 @@ +--- +azure-cli::settings: + repo_url: 'https://packages.microsoft.com/yumrepos/azure-cli' + repo_filename: azure-cli + repo_description: 'Azure CLI' \ No newline at end of file diff --git a/data/azure-cli/upstream/osfamily/RedHat8.yaml b/data/azure-cli/upstream/osfamily/RedHat8.yaml new file mode 100644 index 00000000..d018865f --- /dev/null +++ b/data/azure-cli/upstream/osfamily/RedHat8.yaml @@ -0,0 +1,4 @@ +--- +azure-cli::settings: + repo_package_url: 'https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm' + diff --git a/data/azure-cli/upstream/osfamily/RedHat9.yaml b/data/azure-cli/upstream/osfamily/RedHat9.yaml new file mode 100644 index 00000000..63d5ea65 --- /dev/null +++ b/data/azure-cli/upstream/osfamily/RedHat9.yaml @@ -0,0 +1,3 @@ +--- +azure-cli::settings: + repo_package_url: 'https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm' diff --git a/data/azure-cli/upstream/osfamily/Suse.yaml b/data/azure-cli/upstream/osfamily/Suse.yaml new file mode 100644 index 00000000..59f565ee --- /dev/null +++ b/data/azure-cli/upstream/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- +azure-cli::settings: + repo_url: 'https://packages.microsoft.com/yumrepos/azure-cli' diff --git a/data/azure-cli/upstream/osfamily/windows.yaml b/data/azure-cli/upstream/osfamily/windows.yaml new file mode 100644 index 00000000..fbc5da93 --- /dev/null +++ b/data/azure-cli/upstream/osfamily/windows.yaml @@ -0,0 +1,3 @@ +--- +azure-cli::settings: + winget_package_name: 'Microsoft.AzureCLI' diff --git a/data/crowdsec/default.yaml b/data/crowdsec/default.yaml index 9fc934df..bded496a 100644 --- a/data/crowdsec/default.yaml +++ b/data/crowdsec/default.yaml @@ -21,7 +21,7 @@ crowdsec::settings: collections_list: 'cscli collections list' metrics: 'cscli metrics' config_show: 'cscli config show' - task_commands: + run_commands: hub_upgrade: command: 'cscli hub update && cscli hub upgrade' tp_prerequisites: diff --git a/data/crowdsec_repo/upstream/default.yaml b/data/crowdsec_repo/upstream/default.yaml index 43ae5c1e..774c6221 100644 --- a/data/crowdsec_repo/upstream/default.yaml +++ b/data/crowdsec_repo/upstream/default.yaml @@ -1,10 +1,6 @@ --- crowdsec_repo::settings: - key_url: "https://packagecloud.io/crowdsec/crowdsec/gpgkey\n https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-B78D1222C9AD2D5D.pub.gpg\n https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-FED78314A2468CCF.pub.gpg" - key_url_array: - - 'https://packagecloud.io/crowdsec/crowdsec/gpgkey' - - 'https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-B78D1222C9AD2D5D.pub.gpg' - - 'https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-FED78314A2468CCF.pub.gpg' + key_url: https://packagecloud.io/crowdsec/crowdsec/gpgkey key: '6A89 E3C2 303A 901A 8899 71D3 376E D532 6E93 CD0C' apt_repos: 'main' repo_filename: crowdsec_crowdsec diff --git a/data/filebeat/default.yaml b/data/filebeat/default.yaml index c6a9cad7..e847b66f 100644 --- a/data/filebeat/default.yaml +++ b/data/filebeat/default.yaml @@ -12,4 +12,3 @@ filebeat::settings: home_dir_path: '/usr/share/filebeat' data_dir_path: '/var/lib/filebeat' process_name: 'filebeat' - diff --git a/data/gitlab-ce/default.yaml b/data/gitlab-ce/default.yaml index 8d09ab09..76de6bf2 100644 --- a/data/gitlab-ce/default.yaml +++ b/data/gitlab-ce/default.yaml @@ -1,7 +1,23 @@ --- - gitlab-ce::settings: - package_name: 'gitlab-ce' - service_name: 'gitlab-runsvdir' - config_file_path: '/etc/gitlab/gitlab.rb' - config_dir_path: '/etc/gitlab' - ssl_dir_path: '/etc/gitlab/ssl' +gitlab-ce::settings: + package_name: 'gitlab-ce' + service_name: 'gitlab-runsvdir' + config_file_path: '/etc/gitlab/gitlab.rb' + config_dir_path: '/etc/gitlab' + ssl_dir_path: '/etc/gitlab/ssl' + version_command: 'gitlab-rake gitlab:env:info' + info_commands: + status: 'gitlab-ctl status' + service-list: 'gitlab-ctl service-list' + get-redis-master: 'gitlab-ctl get-redis-master' + run_commands: + reconfigure: + command: 'gitlab-ctl reconfigure' + backup-etc: + command: 'gitlab-ctl backup-etc' + renew-le-certs: + command: 'gitlab-ctl renew-le-certs' + registry-garbage-collect: + command: 'gitlab-ctl registry-garbage-collect' + test_commands: + status: 'gitlab-ctl status' \ No newline at end of file diff --git a/data/gitlab-ce/osfamily/RedHat.yaml b/data/gitlab-ce/osfamily/RedHat.yaml index afdeb628..e93045a5 100644 --- a/data/gitlab-ce/osfamily/RedHat.yaml +++ b/data/gitlab-ce/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - gitlab-ce::settings: - exec_prerequisites: - gitlab-install: - command: 'curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.rpm.sh | bash' - creates: '/etc/yum.repos.d/gitlab_gitlab-ce.repo' +gitlab-ce::settings: + exec_prerequisites: + gitlab-install: + command: 'curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.rpm.sh | bash' + creates: '/etc/yum.repos.d/gitlab_gitlab-ce.repo' diff --git a/data/gitlab-ee/default.yaml b/data/gitlab-ee/default.yaml index 54d6fd7a..5d62ee32 100644 --- a/data/gitlab-ee/default.yaml +++ b/data/gitlab-ee/default.yaml @@ -1,7 +1,23 @@ --- - gitlab-ee::settings: - package_name: 'gitlab-ee' - service_name: 'gitlab-runsvdir' - config_file_path: '/etc/gitlab/gitlab.rb' - config_dir_path: '/etc/gitlab' - ssl_dir_path: '/etc/gitlab/ssl' +gitlab-ee::settings: + package_name: 'gitlab-ee' + service_name: 'gitlab-runsvdir' + config_file_path: '/etc/gitlab/gitlab.rb' + config_dir_path: '/etc/gitlab' + ssl_dir_path: '/etc/gitlab/ssl' + version_command: 'gitlab-rake gitlab:env:info' + info_commands: + status: 'gitlab-ctl status' + service-list: 'gitlab-ctl service-list' + get-redis-master: 'gitlab-ctl get-redis-master' + run_commands: + reconfigure: + command: 'gitlab-ctl reconfigure' + backup-etc: + command: 'gitlab-ctl backup-etc' + renew-le-certs: + command: 'gitlab-ctl renew-le-certs' + registry-garbage-collect: + command: 'gitlab-ctl registry-garbage-collect' + test_commands: + status: 'gitlab-ctl status' \ No newline at end of file diff --git a/data/gitlab-ee/osfamily/RedHat.yaml b/data/gitlab-ee/osfamily/RedHat.yaml index 4e886fea..2784993a 100644 --- a/data/gitlab-ee/osfamily/RedHat.yaml +++ b/data/gitlab-ee/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - gitlab-ee::settings: - exec_prerequisites: - gitlab-install: - command: 'curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.rpm.sh | bash' - creates: '/etc/yum.repos.d/gitlab_gitlab-ee.repo' +gitlab-ee::settings: + exec_prerequisites: + gitlab-install: + command: 'curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.rpm.sh | bash' + creates: '/etc/yum.repos.d/gitlab_gitlab-ee.repo' diff --git a/data/hashicorp_repo/hiera.yaml b/data/hashicorp_repo/hiera.yaml index eb223b18..28dbb017 100644 --- a/data/hashicorp_repo/hiera.yaml +++ b/data/hashicorp_repo/hiera.yaml @@ -7,5 +7,6 @@ - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/hashicorp_repo/upstream/osfamily/Debian.yaml b/data/hashicorp_repo/upstream/osfamily/Debian.yaml index aa37f948..66e6eb44 100644 --- a/data/hashicorp_repo/upstream/osfamily/Debian.yaml +++ b/data/hashicorp_repo/upstream/osfamily/Debian.yaml @@ -2,6 +2,5 @@ hashicorp_repo::settings: repo_url: 'https://apt.releases.hashicorp.com' apt_repos: 'main' - apt_release: 'stable' key_url: 'https://apt.releases.hashicorp.com/gpg' key: 'E8A0 32E0 94D8 EB4E A189 D270 DA41 8C88 A321 9F7B' diff --git a/data/nginx/default.yaml b/data/nginx/default.yaml index 0ba7df0e..f42831d0 100644 --- a/data/nginx/default.yaml +++ b/data/nginx/default.yaml @@ -19,3 +19,4 @@ nodaemon_args: -g 'daemon off;' validate_cmd: config: 'nginx -t -c %' + version_command: 'nginx -v' diff --git a/data/openssh/default.yaml b/data/openssh/default.yaml index 707a827a..bb069e12 100644 --- a/data/openssh/default.yaml +++ b/data/openssh/default.yaml @@ -13,3 +13,4 @@ process_group: 'root' nodaemon_args: '-D' validate_cmd: 'sshd -t -f %' + version_command: 'ssh -V' diff --git a/data/postfix/default.yaml b/data/postfix/default.yaml index 0db7dfd3..0fc92d0f 100644 --- a/data/postfix/default.yaml +++ b/data/postfix/default.yaml @@ -17,3 +17,4 @@ sendmail_path: '/usr/sbin/sendmail' newaliases_path: '/usr/bin/newaliases' mailq_path: '/usr/bin/mailq' + version_command: 'postconf mail_version' diff --git a/data/rsyslog/default.yaml b/data/rsyslog/default.yaml index 95d864c1..e4186421 100644 --- a/data/rsyslog/default.yaml +++ b/data/rsyslog/default.yaml @@ -13,3 +13,4 @@ process_name: 'rsyslogd' process_user: 'root' process_group: 'root' + version_command: 'rsyslogd -v' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu.yaml b/data/zeek/upstream/operatingsystem/Ubuntu.yaml index 480cf3ce..2435c2f3 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu.yaml @@ -4,5 +4,5 @@ zeek::settings: repo_url: 'https://download.zeek.com/linux/ubuntu' key: '9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88' key_url: 'https://download.zeek.com/linux/ubuntu/gpg' - apt_repos: 'stable' + apt_repos: '/' apt_key_server: 'http://p80.pool.sks-keyservers.net' diff --git a/data/zeek/upstream/operatingsystem/Ubuntu22.04.yaml b/data/zeek/upstream/operatingsystem/Ubuntu22.04.yaml new file mode 100644 index 00000000..162f336e --- /dev/null +++ b/data/zeek/upstream/operatingsystem/Ubuntu22.04.yaml @@ -0,0 +1,4 @@ +--- +zeek::settings: + repo_url: 'http://download.opensuse.org/repositories/security:/zeek/xUbuntu_22.04/' + key_url: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_22.04/Release.key' \ No newline at end of file diff --git a/scripts/functions b/scripts/functions new file mode 100644 index 00000000..08409e88 --- /dev/null +++ b/scripts/functions @@ -0,0 +1,91 @@ +#!/bin/bash +# General functions for shell scripts in this directory + +if tty -s +then + SETCOLOR_SUCCESS=$(tput setaf 2) + SETCOLOR_FAILURE=$(tput setaf 1) + SETCOLOR_WARNING=$(tput setaf 3) + SETCOLOR_ASK=$(tput setaf 13) + SETCOLOR_NORMAL=$(tput sgr0) + SETCOLOR_TITLE=$(tput setaf 6) + SETCOLOR_SUBTITLE=$(tput setaf 14) + SETCOLOR_BOLD=$(tput setaf 15) +else + SETCOLOR_SUCCESS="-" + SETCOLOR_FAILURE="-" + SETCOLOR_WARNING="-" + SETCOLOR_ASK="-" + SETCOLOR_NORMAL="-" + SETCOLOR_TITLE="-" + SETCOLOR_SUBTITLE="-" + SETCOLOR_BOLD="-" +fi +echo_success() { + echo "${SETCOLOR_SUCCESS}${1}${SETCOLOR_NORMAL}" +} + +echo_failure() { + echo "${SETCOLOR_FAILURE}${1}${SETCOLOR_NORMAL}" + return 1 +} + +echo_warning() { + echo "${SETCOLOR_WARNING}${1}${SETCOLOR_NORMAL}" + return 1 +} + +echo_title () { + echo + echo "${SETCOLOR_BOLD}###${SETCOLOR_NORMAL} ${SETCOLOR_TITLE}${1}${SETCOLOR_NORMAL} ${SETCOLOR_BOLD}###${SETCOLOR_NORMAL}" +} +echo_subtitle () { + echo "${SETCOLOR_BOLD}# ${SETCOLOR_NORMAL}${SETCOLOR_SUBTITLE}${1}${SETCOLOR_NORMAL}" +} + +ask_interactive () { + echo "${SETCOLOR_ASK}${1}${SETCOLOR_NORMAL}" + echo "Press 'x' to skip or just return to go on" + read press + case $press in + x) return 2 ;; + *) return + esac +} + +ask_warning () { + echo "${SETCOLOR_WARNING}${1}${SETCOLOR_NORMAL}" + echo "Press 'y' to continue or anything else to skip." + read press + case $press in + y) return ;; + *) return 2 + esac +} + +# Shows or executes a command +show_command () { + echo + $SETCOLOR_BOLD ; echo "$HOSTNAME: $*" ; $SETCOLOR_NORMAL + + bash -c "$*" +} + +# Filtering out only: $ ; ` | < > +shell_filter () { + echo $1 | sed 's/\$//g' | sed 's/;//g' | sed 's/`//g' | sed 's/|//g' | sed 's///g' +} + +shell_filter_strict () { +# Filtering out: $ ; ` | < > = ! { } [ ] / \ # & + echo $1 | sed 's/\$//g' | sed 's/;//g' | sed 's/`//g' | sed 's/|//g' | sed 's///g' | sed 's/=//g' | sed 's/!//g' | sed 's/{//g' | sed 's/}//g' | sed 's/\[//g' | sed 's/\]//g' | sed 's/\///g' | sed 's/\\//g' | sed 's/#//g' | sed 's/&//g' + +# Filtering out: all but accepted chars +# echo $1 | sed "s/[^a-Z0-9_\-]//Ig" +} + +if [ $USER == 'root' ]; then + sudo_command='' +else + sudo_command='sudo ' +fi diff --git a/scripts/github_tp_setup.sh b/scripts/github_tp_setup.sh new file mode 100755 index 00000000..a3cf00bf --- /dev/null +++ b/scripts/github_tp_setup.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +PATH=/opt/puppetlabs/puppet/bin:/usr/local/sbin:$PATH +wget -O - https://bit.ly/installpuppet | sudo bash + +# Let's use tinydaya from the PR +sudo mkdir -p /etc/puppetlabs/code/modules/tinydata/ +sudo ln -s /home/runner/work/tinydata/tinydata/data /etc/puppetlabs/code/modules/tinydata/data + +echo "### Installing Tiny Puppet" +sudo puppet module install example42-tp --ignore-dependencies +sudo puppet module install puppetlabs-stdlib --ignore-dependencies +sudo puppet tp setup +sudo tp install git + +exit 0 \ No newline at end of file diff --git a/scripts/github_tp_test.sh b/scripts/github_tp_test.sh new file mode 100755 index 00000000..df80bc7b --- /dev/null +++ b/scripts/github_tp_test.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +changedfiles="${1}" +repo_dir="$(dirname "${0}")/.." +. "${repo_dir}/scripts/functions" + +# Detecting apps for which we have changes in the PR +#default_branch='master' +#diff_commits_number=$(git log $default_branch.."${1}" --pretty=oneline | wc -l) +#echo "Checking for files in the last $diff_commits_number commits" +#changedfiles=$(git diff HEAD~"${diff_commits_number}" --name-only | grep 'data/'); +#changedfiles=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD origin/$default_branch)) + +apps=$(for a in $changedfiles ; do echo "$a" ; done | grep '^data' | cut -d '/' -f 2 | sort | uniq) + +for app in $apps; do + + echo_title "### Checking ${app}" + sudo tp install "${app}" || true + if sudo tp test "${app}"; then + result='success' + else + result='failure' + fi + echo_$result "### ${app} test: ${result}!" + echo + echo_title "### ${app} info" + sudo tp info "${app}" + echo + echo_title "### ${app} version" + sudo tp version "${app}" + echo + echo_title "### ${app} uninstall" + sudo tp uninstall "${app}" || true + echo + +done diff --git a/bin/moduledata_clone.sh b/scripts/moduledata_clone.sh similarity index 100% rename from bin/moduledata_clone.sh rename to scripts/moduledata_clone.sh From eb2c3a2e567f480a3c68169105dfad1bf7920678 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 26 Nov 2022 12:46:50 +0100 Subject: [PATCH 240/284] Ci (#53) * Use example42 tp images for testing * Fixed tabs in activemq and ansible * Do not use sudo in tp tests * Added git config safe dir in CI * Temporarily disable old OS * Temporarily disable old OS * Basic bird data. Indents fixing * Version 0.4.7 * Temporarily skip tests on ubuntu1804 --- .github/workflows/pr.yml | 48 ++++++++++----------------- data/activemq/default.yaml | 24 +++++++------- data/activemq/osfamily/Debian.yaml | 4 +-- data/activemq/osfamily/RedHat.yaml | 4 +-- data/ansible/default.yaml | 12 +++---- data/apache/default.yaml | 32 +++++++++--------- data/apache/osfamily/Debian.yaml | 44 ++++++++++++------------ data/apache/osfamily/FreeBSD.yaml | 6 ++-- data/apache/osfamily/Linux.yaml | 30 ++++++++--------- data/apache/osfamily/RedHat.yaml | 32 +++++++++--------- data/apache/osfamily/Suse.yaml | 26 +++++++-------- data/bird/default.yaml | 19 +++++++++++ data/bird/hiera.yaml | 9 +++++ data/openssh/default.yaml | 30 ++++++++--------- data/openssh/osfamily/Debian.yaml | 13 ++++---- data/openssh/osfamily/OpenBSD.yaml | 12 +++---- data/openssh/osfamily/RedHat.yaml | 24 +++++++------- data/openssh/osfamily/Solaris.yaml | 11 +++--- data/openssh/osfamily/Solaris/10.yaml | 14 ++++---- data/openssh/osfamily/Solaris/11.yaml | 4 +-- data/openssh/osfamily/Suse.yaml | 11 +++--- data/rsyslog/default.yaml | 30 ++++++++--------- data/rsyslog/osfamily/Debian.yaml | 8 ++--- metadata.json | 2 +- scripts/github_tp_test.sh | 12 ++++--- 25 files changed, 237 insertions(+), 224 deletions(-) create mode 100644 data/bird/default.yaml create mode 100644 data/bird/hiera.yaml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b1cab29e..bdf0725f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,26 +14,21 @@ jobs: strategy: matrix: include: - - container: ubuntu:18.04 - pkg_install: apt-get update && apt-get install -y - - container: ubuntu:20.04 - pkg_install: apt-get update && apt-get install -y - - container: ubuntu:22.04 - pkg_install: apt-get update && apt-get install -y - - container: debian:11 - pkg_install: apt-get update && apt-get install -y - - container: debian:10 - pkg_install: apt-get update && apt-get install -y - - container: debian:9 - pkg_install: apt-get update && apt-get install -y - - container: debian:8 - pkg_install: apt-get update && apt-get install -y - - container: redhat/ubi9-minimal - pkg_install: yum install -y - - container: redhat/ubi8-minimal - pkg_install: yum install -y - - container: redhat/ubi7-minimal - pkg_install: yum install -y +# - container: example42/tiny-puppet-ubuntu1804 + - container: example42/tiny-puppet-ubuntu2004 + - container: example42/tiny-puppet-ubuntu2204 + - container: example42/tiny-puppet-debian11 + - container: example42/tiny-puppet-debian10 +# - container: example42/tiny-puppet-debian9 +# - container: example42/tiny-puppet-debian8 + - container: example42/tiny-puppet-rockylinux9 + - container: example42/tiny-puppet-rockylinux8 + - container: example42/tiny-puppet-almalinux9 + - container: example42/tiny-puppet-almalinux8 + - container: example42/tiny-puppet-redhat9 + - container: example42/tiny-puppet-redhat8 +# - container: example42/tiny-puppet-centos7 +# - container: example42/tiny-puppet-centos6 runs-on: ubuntu-latest container: image: ${{ matrix.container }} @@ -41,20 +36,11 @@ jobs: name: "Acceptance test on ${{ matrix.container }}" timeout-minutes: 60 steps: - - name: Install Puppet, Tiny Puppet and git - run: | - ${{ matrix.pkg_install }} wget - wget -O - https://bit.ly/installpuppet | bash - mkdir -p /etc/puppetlabs/code/modules/tinydata/ - ln -s /home/runner/work/tinydata/tinydata/data /etc/puppetlabs/code/modules/tinydata/data - puppet module install example42-tp --ignore-dependencies - puppet module install puppetlabs-stdlib --ignore-dependencies - puppet tp setup - tp install git - shell: 'script -q -e -c "bash {0}"' - uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Git config safe directory + run: git config --global --add safe.directory /__w/tinydata/tinydata - name: Get changed files id: changed-files uses: tj-actions/changed-files@v34 diff --git a/data/activemq/default.yaml b/data/activemq/default.yaml index b45b59ed..685de2a4 100644 --- a/data/activemq/default.yaml +++ b/data/activemq/default.yaml @@ -1,13 +1,13 @@ --- - activemq::settings: - package_name: 'activemq' - service_name: 'activemq' - config_file_path: '/etc/activemq/activemq.xml' - config_dir_path: '/etc/activemq' - tpp_port: '8161' - pid_file_path: '/var/run/activemq/activemq.pid' - log_file_path: '/var/log/activemq' - process_name: 'java' - process_extra_name: 'activemq' - process_user: 'activemq' - process_group: 'activemq' +activemq::settings: + package_name: 'activemq' + service_name: 'activemq' + config_file_path: '/etc/activemq/activemq.xml' + config_dir_path: '/etc/activemq' + tpp_port: '8161' + pid_file_path: '/var/run/activemq/activemq.pid' + log_file_path: '/var/log/activemq' + process_name: 'java' + process_extra_name: 'activemq' + process_user: 'activemq' + process_group: 'activemq' diff --git a/data/activemq/osfamily/Debian.yaml b/data/activemq/osfamily/Debian.yaml index 6fd4a695..1a0f8352 100644 --- a/data/activemq/osfamily/Debian.yaml +++ b/data/activemq/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - activemq::settings: - init_file_path: '/etc/default/activemq' +activemq::settings: + init_file_path: '/etc/default/activemq' diff --git a/data/activemq/osfamily/RedHat.yaml b/data/activemq/osfamily/RedHat.yaml index 4dd92d95..353b4910 100644 --- a/data/activemq/osfamily/RedHat.yaml +++ b/data/activemq/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - activemq::settings: - init_file_path: '/etc/sysconfig/activemq' +activemq::settings: + init_file_path: '/etc/sysconfig/activemq' diff --git a/data/ansible/default.yaml b/data/ansible/default.yaml index daab30d7..02644845 100644 --- a/data/ansible/default.yaml +++ b/data/ansible/default.yaml @@ -1,7 +1,7 @@ --- - ansible::settings: - package_name: 'ansible' - config_file_path: '/etc/ansible/ansible.cfg' - config_dir_path: '/etc/ansible' - roles_dir_path: '/etc/ansible/roles' - inventory_file_path: '/etc/ansible/hosts' +ansible::settings: + package_name: 'ansible' + config_file_path: '/etc/ansible/ansible.cfg' + config_dir_path: '/etc/ansible' + roles_dir_path: '/etc/ansible/roles' + inventory_file_path: '/etc/ansible/hosts' diff --git a/data/apache/default.yaml b/data/apache/default.yaml index f198fc8e..cf34e478 100644 --- a/data/apache/default.yaml +++ b/data/apache/default.yaml @@ -1,17 +1,17 @@ --- - apache::settings: - package_name: 'httpd' - service_name: 'httpd' - config_file_path: '/etc/httpd/conf/httpd.conf' - config_dir_path: '/etc/httpd' - tcp_port: '80' - pid_file_path: '/var/run/httpd.pid' - log_file_path: [ '/var/log/httpd/access.log' , '/var/log/httpd/error.log' ] - log_dir_path: '/var/log/httpd' - data_dir_path: '/var/www/html' - process_name: 'httpd' - process_user: 'apache' - process_group: 'apache' - nodaemon_args: '-DFOREGROUND' - validate_cmd: - config: 'httpd -t -f %' +apache::settings: + package_name: 'httpd' + service_name: 'httpd' + config_file_path: '/etc/httpd/conf/httpd.conf' + config_dir_path: '/etc/httpd' + tcp_port: '80' + pid_file_path: '/var/run/httpd.pid' + log_file_path: [ '/var/log/httpd/access.log' , '/var/log/httpd/error.log' ] + log_dir_path: '/var/log/httpd' + data_dir_path: '/var/www/html' + process_name: 'httpd' + process_user: 'apache' + process_group: 'apache' + nodaemon_args: '-DFOREGROUND' + validate_cmd: + config: 'httpd -t -f %' diff --git a/data/apache/osfamily/Debian.yaml b/data/apache/osfamily/Debian.yaml index cf4981c3..75e9815a 100644 --- a/data/apache/osfamily/Debian.yaml +++ b/data/apache/osfamily/Debian.yaml @@ -1,23 +1,23 @@ --- - apache::settings: - package_name: 'apache2' - service_name: 'apache2' - config_file_path: '/etc/apache2/apache2.conf' - init_file_path: '/etc/default/apache2' - config_dir_path: '/etc/apache2' - mods-available_dir_path: '/etc/apache2/mods-available' - mods-enabled_dir_path: '/etc/apache2/mods-enabled' - sites-available_dir_path: '/etc/apache2/sites-available' - sites-enabled_dir_path: '/etc/apache2/sites-enabled' - conf-available_dir_path: '/etc/apache2/conf-available' - conf-enabled_dir_path: '/etc/apache2/conf-enabled' - conf_dir_path: '/etc/apache2/conf.d' - pid_file_path: '/var/run/apache2.pid' - log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] - log_dir_path: '/var/log/apache2' - data_dir_path: '/var/www' - process_name: 'apache2' - process_user: 'www-data' - process_group: 'www-data' - validate_cmd: - config: 'apache2 -t -f %' +apache::settings: + package_name: 'apache2' + service_name: 'apache2' + config_file_path: '/etc/apache2/apache2.conf' + init_file_path: '/etc/default/apache2' + config_dir_path: '/etc/apache2' + mods-available_dir_path: '/etc/apache2/mods-available' + mods-enabled_dir_path: '/etc/apache2/mods-enabled' + sites-available_dir_path: '/etc/apache2/sites-available' + sites-enabled_dir_path: '/etc/apache2/sites-enabled' + conf-available_dir_path: '/etc/apache2/conf-available' + conf-enabled_dir_path: '/etc/apache2/conf-enabled' + conf_dir_path: '/etc/apache2/conf.d' + pid_file_path: '/var/run/apache2.pid' + log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] + log_dir_path: '/var/log/apache2' + data_dir_path: '/var/www' + process_name: 'apache2' + process_user: 'www-data' + process_group: 'www-data' + validate_cmd: + config: 'apache2 -t -f %' diff --git a/data/apache/osfamily/FreeBSD.yaml b/data/apache/osfamily/FreeBSD.yaml index 639778ec..6995315d 100644 --- a/data/apache/osfamily/FreeBSD.yaml +++ b/data/apache/osfamily/FreeBSD.yaml @@ -1,4 +1,4 @@ --- - apache::settings: - config_file_path: '/usr/local/etc/apache20/httpd.conf' - config_dir_path: '/usr/local/etc/apache20' +apache::settings: + config_file_path: '/usr/local/etc/apache20/httpd.conf' + config_dir_path: '/usr/local/etc/apache20' diff --git a/data/apache/osfamily/Linux.yaml b/data/apache/osfamily/Linux.yaml index 9d2a7c6d..0facf358 100644 --- a/data/apache/osfamily/Linux.yaml +++ b/data/apache/osfamily/Linux.yaml @@ -1,17 +1,17 @@ --- - apache::settings: - package_name: 'apache2' - service_name: 'apache2' - config_file_path: '/etc/apache2/httpd.conf' - init_file_path: '/etc/conf.d/apache2' - config_dir_path: '/etc/apache2' - conf_dir_path: '/etc/apache2/conf.d' - pid_file_path: '/var/run/apache2/httpd.pid' - log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] - log_dir_path: '/var/log/apache2' - data_dir_path: '/var/www' - process_name: 'httpd' - process_user: 'apache' - process_group: 'apache' - modules_dir_path: '/usr/lib/apache2' +apache::settings: + package_name: 'apache2' + service_name: 'apache2' + config_file_path: '/etc/apache2/httpd.conf' + init_file_path: '/etc/conf.d/apache2' + config_dir_path: '/etc/apache2' + conf_dir_path: '/etc/apache2/conf.d' + pid_file_path: '/var/run/apache2/httpd.pid' + log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] + log_dir_path: '/var/log/apache2' + data_dir_path: '/var/www' + process_name: 'httpd' + process_user: 'apache' + process_group: 'apache' + modules_dir_path: '/usr/lib/apache2' diff --git a/data/apache/osfamily/RedHat.yaml b/data/apache/osfamily/RedHat.yaml index 64dd7286..ef2a07d6 100644 --- a/data/apache/osfamily/RedHat.yaml +++ b/data/apache/osfamily/RedHat.yaml @@ -1,17 +1,17 @@ --- - apache::settings: - package_name: 'httpd' - service_name: 'httpd' - config_file_path: '/etc/httpd/conf/httpd.conf' - config_file_mode: '0644' - config_dir_path: '/etc/httpd' - conf_dir_path: '/etc/httpd/conf.d' - init_file_path: '/etc/sysconfig/httpd' - tcp_port: '80' - pid_file_path: '/var/run/httpd.pid' - log_file_path: [ '/var/log/httpd/access_log' , '/var/log/httpd/error_log' ] - log_dir_path: '/var/log/httpd' - data_dir_path: '/var/www/html' - process_name: 'httpd' - process_user: 'apache' - process_group: 'apache' +apache::settings: + package_name: 'httpd' + service_name: 'httpd' + config_file_path: '/etc/httpd/conf/httpd.conf' + config_file_mode: '0644' + config_dir_path: '/etc/httpd' + conf_dir_path: '/etc/httpd/conf.d' + init_file_path: '/etc/sysconfig/httpd' + tcp_port: '80' + pid_file_path: '/var/run/httpd.pid' + log_file_path: [ '/var/log/httpd/access_log' , '/var/log/httpd/error_log' ] + log_dir_path: '/var/log/httpd' + data_dir_path: '/var/www/html' + process_name: 'httpd' + process_user: 'apache' + process_group: 'apache' diff --git a/data/apache/osfamily/Suse.yaml b/data/apache/osfamily/Suse.yaml index 536d6d50..4e778bf3 100644 --- a/data/apache/osfamily/Suse.yaml +++ b/data/apache/osfamily/Suse.yaml @@ -1,16 +1,16 @@ --- - apache::settings: - package_name: 'apache2' - service_name: 'apache2' +apache::settings: + package_name: 'apache2' + service_name: 'apache2' - config_file_path: '/etc/apache2/httpd.conf' - init_file_path: '/etc/default/apache2' - config_dir_path: '/etc/apache2' - pid_file_path: '/var/run/httpd2.pid' - log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] - log_dir_path: '/var/log/apache2' - data_dir_path: '/var/www/htdocs' - process_name: 'httpd2-prefork' - process_user: 'wwwrun' - process_group: 'wwwrun' + config_file_path: '/etc/apache2/httpd.conf' + init_file_path: '/etc/default/apache2' + config_dir_path: '/etc/apache2' + pid_file_path: '/var/run/httpd2.pid' + log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] + log_dir_path: '/var/log/apache2' + data_dir_path: '/var/www/htdocs' + process_name: 'httpd2-prefork' + process_user: 'wwwrun' + process_group: 'wwwrun' diff --git a/data/bird/default.yaml b/data/bird/default.yaml new file mode 100644 index 00000000..a7c707a8 --- /dev/null +++ b/data/bird/default.yaml @@ -0,0 +1,19 @@ +--- +bird::settings: + upstream_repo: false + package_name: 'bird' + service_name: 'bird' + config_file_path: '/etc/bird/bird.conf' + config_dir_path: '/etc/bird' + home_dir_path: '/run/bird' + process_name: 'bird' + process_user: 'bird' + process_group: 'bird' + info_commands: + show-protocols: 'birdc show protocols' + show-protocols6: 'birdc6 show protocols' + count-bgp-sessions: 'birdc show protocols | grep -i established | wc -l' + count-bgp-sessions6: 'birdc6 show protocols | grep -i established | wc -l' + log_file_path: + - /var/log/bird.log + - /var/log/bird6.log diff --git a/data/bird/hiera.yaml b/data/bird/hiera.yaml new file mode 100644 index 00000000..1c820bbc --- /dev/null +++ b/data/bird/hiera.yaml @@ -0,0 +1,9 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/openssh/default.yaml b/data/openssh/default.yaml index bb069e12..d52de270 100644 --- a/data/openssh/default.yaml +++ b/data/openssh/default.yaml @@ -1,16 +1,16 @@ --- - openssh::settings: - package_name: 'openssh-server' - service_name: 'ssh' - config_file_path: '/etc/ssh/sshd_config' - config_file_mode: '0600' - config_dir_path: '/etc/ssh' - tcp_port: '22' - pid_file_path: '/var/run/sshd.pid' - log_file_path: '/var/log/messages' - process_name: 'sshd' - process_user: 'root' - process_group: 'root' - nodaemon_args: '-D' - validate_cmd: 'sshd -t -f %' - version_command: 'ssh -V' +openssh::settings: + package_name: 'openssh-server' + service_name: 'ssh' + config_file_path: '/etc/ssh/sshd_config' + config_file_mode: '0600' + config_dir_path: '/etc/ssh' + tcp_port: '22' + pid_file_path: '/var/run/sshd.pid' + log_file_path: '/var/log/messages' + process_name: 'sshd' + process_user: 'root' + process_group: 'root' + nodaemon_args: '-D' + validate_cmd: 'sshd -t -f %' + version_command: 'ssh -V' diff --git a/data/openssh/osfamily/Debian.yaml b/data/openssh/osfamily/Debian.yaml index bfb02165..0dd89779 100644 --- a/data/openssh/osfamily/Debian.yaml +++ b/data/openssh/osfamily/Debian.yaml @@ -1,8 +1,7 @@ --- - openssh::settings: - package_name: 'openssh-server' - service_name: 'ssh' - - config_file_mode: '0644' - init_file_path: '/var/default/ssh' - log_file_path: '/var/log/syslog' +openssh::settings: + package_name: 'openssh-server' + service_name: 'ssh' + config_file_mode: '0644' + init_file_path: '/var/default/ssh' + log_file_path: '/var/log/syslog' diff --git a/data/openssh/osfamily/OpenBSD.yaml b/data/openssh/osfamily/OpenBSD.yaml index fd68cd54..d2cb735b 100644 --- a/data/openssh/osfamily/OpenBSD.yaml +++ b/data/openssh/osfamily/OpenBSD.yaml @@ -1,7 +1,7 @@ --- - openssh::settings: - package_name: '' - service_name: 'sshd' - config_file_mode: '0644' - init_file_path: '' - log_file_path: '/var/log/authlog' +openssh::settings: + package_name: '' + service_name: 'sshd' + config_file_mode: '0644' + init_file_path: '' + log_file_path: '/var/log/authlog' diff --git a/data/openssh/osfamily/RedHat.yaml b/data/openssh/osfamily/RedHat.yaml index ec96a533..83f73782 100644 --- a/data/openssh/osfamily/RedHat.yaml +++ b/data/openssh/osfamily/RedHat.yaml @@ -1,13 +1,13 @@ --- - openssh::settings: - package_name: 'openssh-server' - service_name: 'sshd' - config_file_path: '/etc/ssh/sshd_config' - config_file_mode: '0600' - config_dir_path: '/etc/ssh' - tcp_port: '22' - pid_file_path: '/var/run/sshd.pid' - log_file_path: '/var/log/messages' - process_name: 'sshd' - process_user: 'root' - process_group: 'root' +openssh::settings: + package_name: 'openssh-server' + service_name: 'sshd' + config_file_path: '/etc/ssh/sshd_config' + config_file_mode: '0600' + config_dir_path: '/etc/ssh' + tcp_port: '22' + pid_file_path: '/var/run/sshd.pid' + log_file_path: '/var/log/messages' + process_name: 'sshd' + process_user: 'root' + process_group: 'root' diff --git a/data/openssh/osfamily/Solaris.yaml b/data/openssh/osfamily/Solaris.yaml index c083d12a..68d2fea4 100644 --- a/data/openssh/osfamily/Solaris.yaml +++ b/data/openssh/osfamily/Solaris.yaml @@ -1,7 +1,6 @@ --- - openssh::settings: - package_name: '' - service_name: 'ssh' - - config_file_mode: '0600' - log_file_path: '/var/adm/authlog' +openssh::settings: + package_name: '' + service_name: 'ssh' + config_file_mode: '0600' + log_file_path: '/var/adm/authlog' diff --git a/data/openssh/osfamily/Solaris/10.yaml b/data/openssh/osfamily/Solaris/10.yaml index a12dc74d..5bf01afd 100644 --- a/data/openssh/osfamily/Solaris/10.yaml +++ b/data/openssh/osfamily/Solaris/10.yaml @@ -1,9 +1,9 @@ --- - openssh::settings: - package_name: - - 'SUNWsshcu' - - 'SUNWsshdr' - - 'SUNWsshdu' - - 'SUNWsshr' - - 'SUNWsshu' +openssh::settings: + package_name: + - 'SUNWsshcu' + - 'SUNWsshdr' + - 'SUNWsshdu' + - 'SUNWsshr' + - 'SUNWsshu' diff --git a/data/openssh/osfamily/Solaris/11.yaml b/data/openssh/osfamily/Solaris/11.yaml index b8e5f7f7..1a872a55 100644 --- a/data/openssh/osfamily/Solaris/11.yaml +++ b/data/openssh/osfamily/Solaris/11.yaml @@ -1,4 +1,4 @@ --- - openssh::settings: - package_name: 'network/openssh' +openssh::settings: + package_name: 'network/openssh' diff --git a/data/openssh/osfamily/Suse.yaml b/data/openssh/osfamily/Suse.yaml index d9969025..a0b32cad 100644 --- a/data/openssh/osfamily/Suse.yaml +++ b/data/openssh/osfamily/Suse.yaml @@ -1,7 +1,6 @@ --- - openssh::settings: - package_name: 'openssh' - service_name: 'sshd' - - config_file_mode: '0640' - init_file_path: '/etc/sysconfig/sshd' +openssh::settings: + package_name: 'openssh' + service_name: 'sshd' + config_file_mode: '0640' + init_file_path: '/etc/sysconfig/sshd' diff --git a/data/rsyslog/default.yaml b/data/rsyslog/default.yaml index e4186421..b6034bf5 100644 --- a/data/rsyslog/default.yaml +++ b/data/rsyslog/default.yaml @@ -1,16 +1,16 @@ --- - rsyslog::settings: - package_name: 'rsyslog' - service_name: 'rsyslog' - config_file_path: '/etc/rsyslog.conf' - config_dir_path: '/etc/rsyslog.d' - conf_dir_path: '/etc/rsyslog.d' - data_dir_path: '/var/log' - init_file_path: '/etc/sysconfig/rsyslog' - udp_port: '69' - pid_file_path: '/var/run/rsyslog.pid' - log_file_path: '/var/log/messages' - process_name: 'rsyslogd' - process_user: 'root' - process_group: 'root' - version_command: 'rsyslogd -v' +rsyslog::settings: + package_name: 'rsyslog' + service_name: 'rsyslog' + config_file_path: '/etc/rsyslog.conf' + config_dir_path: '/etc/rsyslog.d' + conf_dir_path: '/etc/rsyslog.d' + data_dir_path: '/var/log' + init_file_path: '/etc/sysconfig/rsyslog' + udp_port: '69' + pid_file_path: '/var/run/rsyslog.pid' + log_file_path: '/var/log/messages' + process_name: 'rsyslogd' + process_user: 'root' + process_group: 'root' + version_command: 'rsyslogd -v' diff --git a/data/rsyslog/osfamily/Debian.yaml b/data/rsyslog/osfamily/Debian.yaml index 2b9cbe5f..5f7d0596 100644 --- a/data/rsyslog/osfamily/Debian.yaml +++ b/data/rsyslog/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - rsyslog::settings: - init_file_path: '/etc/default/rsyslog' - pid_file_path: '/var/run/rsyslogd.pid' - log_file_path: '/var/log/syslog' +rsyslog::settings: + init_file_path: '/etc/default/rsyslog' + pid_file_path: '/var/run/rsyslogd.pid' + log_file_path: '/var/log/syslog' diff --git a/metadata.json b/metadata.json index 1f934502..5f813cf4 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.6", + "version": "0.4.7", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", diff --git a/scripts/github_tp_test.sh b/scripts/github_tp_test.sh index df80bc7b..bdeb7818 100755 --- a/scripts/github_tp_test.sh +++ b/scripts/github_tp_test.sh @@ -3,6 +3,8 @@ changedfiles="${1}" repo_dir="$(dirname "${0}")/.." . "${repo_dir}/scripts/functions" +PATH:"$PATH":/usr/local/bin + # Detecting apps for which we have changes in the PR #default_branch='master' #diff_commits_number=$(git log $default_branch.."${1}" --pretty=oneline | wc -l) @@ -15,8 +17,8 @@ apps=$(for a in $changedfiles ; do echo "$a" ; done | grep '^data' | cut -d '/' for app in $apps; do echo_title "### Checking ${app}" - sudo tp install "${app}" || true - if sudo tp test "${app}"; then + tp install "${app}" || true + if tp test "${app}"; then result='success' else result='failure' @@ -24,13 +26,13 @@ for app in $apps; do echo_$result "### ${app} test: ${result}!" echo echo_title "### ${app} info" - sudo tp info "${app}" + tp info "${app}" echo echo_title "### ${app} version" - sudo tp version "${app}" + tp version "${app}" echo echo_title "### ${app} uninstall" - sudo tp uninstall "${app}" || true + tp uninstall "${app}" || true echo done From a09d55c014a54cc93b20d51099d9570d5427d07b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 4 Dec 2022 21:14:33 +0100 Subject: [PATCH 241/284] Added homebrew and oh-my-zsh data (#54) * Added homebrew and oh-my-zsh data * Yamls cleanups * Do not stop on faield tests * Temporary exit0 on github_test --- .github/workflows/pr.yml | 13 +- .gitignore | 1 + .gitlab-ci.yml | 40 ------ .rubocop.yml | 122 ------------------ .travis.yml | 54 -------- appveyor.yml | 55 -------- .../upstream/osfamily/Suse13.yaml | 1 + data/foreman/default.yaml | 1 - data/homebrew/default.yaml | 17 +++ data/homebrew/hiera.yaml | 6 + data/homebrew/osfamily/Darwin.yaml | 15 +++ .../upstream/operatingsystem/Darwin.yaml | 2 +- data/oh-my-zsh/default.yaml | 11 ++ data/oh-my-zsh/hiera.yaml | 6 + data/oh-my-zsh/osfamily/Darwin.yaml | 5 + data/openswan/osfamily/RedHat.yaml | 1 + data/passenger/default.yaml | 4 +- data/passenger/osfamily/Debian.yaml | 11 +- data/passenger/osfamily/RedHat.yaml | 5 +- data/scl/operatingsystem/CentOS.yaml | 4 +- data/scl/operatingsystem/RedHat6.yaml | 11 +- data/scl/operatingsystem/RedHat7.yaml | 11 +- scripts/github_tp_test.sh | 6 +- 23 files changed, 97 insertions(+), 305 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 .rubocop.yml delete mode 100644 .travis.yml delete mode 100644 appveyor.yml create mode 100644 data/homebrew/default.yaml create mode 100644 data/homebrew/hiera.yaml create mode 100644 data/homebrew/osfamily/Darwin.yaml create mode 100644 data/oh-my-zsh/default.yaml create mode 100644 data/oh-my-zsh/hiera.yaml create mode 100644 data/oh-my-zsh/osfamily/Darwin.yaml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index bdf0725f..8d048ddb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,21 +14,21 @@ jobs: strategy: matrix: include: -# - container: example42/tiny-puppet-ubuntu1804 +# - container: example42/tiny-puppet-ubuntu1804 - container: example42/tiny-puppet-ubuntu2004 - container: example42/tiny-puppet-ubuntu2204 - container: example42/tiny-puppet-debian11 - container: example42/tiny-puppet-debian10 -# - container: example42/tiny-puppet-debian9 -# - container: example42/tiny-puppet-debian8 +# - container: example42/tiny-puppet-debian9 +# - container: example42/tiny-puppet-debian8 - container: example42/tiny-puppet-rockylinux9 - container: example42/tiny-puppet-rockylinux8 - container: example42/tiny-puppet-almalinux9 - container: example42/tiny-puppet-almalinux8 - container: example42/tiny-puppet-redhat9 - container: example42/tiny-puppet-redhat8 -# - container: example42/tiny-puppet-centos7 -# - container: example42/tiny-puppet-centos6 +# - container: example42/tiny-puppet-centos7 +# - container: example42/tiny-puppet-centos6 runs-on: ubuntu-latest container: image: ${{ matrix.container }} @@ -47,9 +47,10 @@ jobs: - name: Run tp tests run: scripts/github_tp_test.sh "${{ steps.changed-files.outputs.all_changed_files }}" shell: 'script -q -e -c "bash {0}"' + if: success() || failure() - name: 'Upload results artifact' uses: actions/upload-artifact@v3 with: name: my-artifact - path: my_file.txt + path: results.txt retention-days: 5 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2767022c..d59c5401 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ .project .envrc /inventory.yaml +/results.txt \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 88d0bd9c..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -stages: - - syntax - - unit - -cache: - paths: - - vendor/bundle - -before_script: - - bundle -v - - rm Gemfile.lock || true - - gem update --system $RUBYGEMS_VERSION - - gem --version - - bundle -v - - bundle install --without system_tests --path vendor/bundle --jobs $(nproc) - -syntax: - stage: syntax - image: ruby:2.5.3 - script: - - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore - variables: - PUPPET_GEM_VERSION: '~> 6' - -parallel_spec-Ruby 2.5.3-Puppet ~> 6: - stage: unit - image: ruby:2.5.3 - script: - - bundle exec rake parallel_spec - variables: - PUPPET_GEM_VERSION: '~> 6' - -parallel_spec-Ruby 2.4.5-Puppet ~> 5: - stage: unit - image: ruby:2.4.5 - script: - - bundle exec rake parallel_spec - variables: - PUPPET_GEM_VERSION: '~> 5' diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index 0ecd9653..00000000 --- a/.rubocop.yml +++ /dev/null @@ -1,122 +0,0 @@ ---- -require: rubocop-rspec -AllCops: - DisplayCopNames: true - TargetRubyVersion: '2.1' - Include: - - "./**/*.rb" - Exclude: - - bin/* - - ".vendor/**/*" - - "**/Gemfile" - - "**/Rakefile" - - pkg/**/* - - spec/fixtures/**/* - - vendor/**/* - - "**/Puppetfile" - - "**/Vagrantfile" - - "**/Guardfile" -Metrics/LineLength: - Description: People have wide screens, use them. - Max: 200 -GetText/DecorateString: - Description: We don't want to decorate test output. - Exclude: - - spec/* -RSpec/BeforeAfterAll: - Description: Beware of using after(:all) as it may cause state to leak between tests. - A necessary evil in acceptance testing. - Exclude: - - spec/acceptance/**/*.rb -RSpec/HookArgument: - Description: Prefer explicit :each argument, matching existing module's style - EnforcedStyle: each -Style/BlockDelimiters: - Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to - be consistent then. - EnforcedStyle: braces_for_chaining -Style/ClassAndModuleChildren: - Description: Compact style reduces the required amount of indentation. - EnforcedStyle: compact -Style/EmptyElse: - Description: Enforce against empty else clauses, but allow `nil` for clarity. - EnforcedStyle: empty -Style/FormatString: - Description: Following the main puppet project's style, prefer the % format format. - EnforcedStyle: percent -Style/FormatStringToken: - Description: Following the main puppet project's style, prefer the simpler template - tokens over annotated ones. - EnforcedStyle: template -Style/Lambda: - Description: Prefer the keyword for easier discoverability. - EnforcedStyle: literal -Style/RegexpLiteral: - Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168 - EnforcedStyle: percent_r -Style/TernaryParentheses: - Description: Checks for use of parentheses around ternary conditions. Enforce parentheses - on complex expressions for better readability, but seriously consider breaking - it up. - EnforcedStyle: require_parentheses_when_complex -Style/TrailingCommaInArguments: - Description: Prefer always trailing comma on multiline argument lists. This makes - diffs, and re-ordering nicer. - EnforcedStyleForMultiline: comma -Style/TrailingCommaInLiteral: - Description: Prefer always trailing comma on multiline literals. This makes diffs, - and re-ordering nicer. - EnforcedStyleForMultiline: comma -Style/SymbolArray: - Description: Using percent style obscures symbolic intent of array's contents. - EnforcedStyle: brackets -RSpec/MessageSpies: - EnforcedStyle: receive -Style/Documentation: - Exclude: - - lib/puppet/parser/functions/**/* - - spec/**/* -Style/WordArray: - EnforcedStyle: brackets -Style/CollectionMethods: - Enabled: true -Style/MethodCalledOnDoEndBlock: - Enabled: true -Style/StringMethods: - Enabled: true -Layout/EndOfLine: - Enabled: false -Layout/IndentHeredoc: - Enabled: false -Metrics/AbcSize: - Enabled: false -Metrics/BlockLength: - Enabled: false -Metrics/ClassLength: - Enabled: false -Metrics/CyclomaticComplexity: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/ParameterLists: - Enabled: false -Metrics/PerceivedComplexity: - Enabled: false -RSpec/DescribeClass: - Enabled: false -RSpec/ExampleLength: - Enabled: false -RSpec/MessageExpectation: - Enabled: false -RSpec/MultipleExpectations: - Enabled: false -RSpec/NestedGroups: - Enabled: false -Style/AsciiComments: - Enabled: false -Style/IfUnlessModifier: - Enabled: false -Style/SymbolProc: - Enabled: false diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 074a10fe..00000000 --- a/.travis.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- -dist: trusty -language: ruby -cache: bundler -before_install: - - bundle -v - - rm -f Gemfile.lock - - gem update --system $RUBYGEMS_VERSION - - gem --version - - bundle -v -script: - - 'bundle exec rake $CHECK' -bundler_args: --without system_tests -rvm: - - 2.5.3 -stages: - - static - - spec - - acceptance - - - if: tag =~ ^v\d - name: deploy -matrix: - fast_finish: true - include: - - - env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" - stage: static - - - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec - rvm: 2.4.5 - stage: spec - - - env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec - rvm: 2.5.3 - stage: spec - - - env: DEPLOY_TO_FORGE=yes - stage: deploy -branches: - only: - - master - - /^v\d/ -notifications: - email: false -deploy: - provider: puppetforge - user: puppet - password: - secure: "" - on: - tags: true - all_branches: true - condition: "$DEPLOY_TO_FORGE = yes" diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index e10ba3bf..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,55 +0,0 @@ ---- -version: 1.1.x.{build} -branches: - only: - - master -skip_commits: - message: /^\(?doc\)?.*/ -clone_depth: 10 -init: - - SET - - 'mkdir C:\ProgramData\PuppetLabs\code && exit 0' - - 'mkdir C:\ProgramData\PuppetLabs\facter && exit 0' - - 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0' - - 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0' -environment: - matrix: - - - RUBY_VERSION: 24-x64 - CHECK: syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop - - - PUPPET_GEM_VERSION: ~> 5.0 - RUBY_VERSION: 24 - CHECK: parallel_spec - - - PUPPET_GEM_VERSION: ~> 5.0 - RUBY_VERSION: 24-x64 - CHECK: parallel_spec - - - PUPPET_GEM_VERSION: ~> 6.0 - RUBY_VERSION: 25 - CHECK: parallel_spec - - - PUPPET_GEM_VERSION: ~> 6.0 - RUBY_VERSION: 25-x64 - CHECK: parallel_spec -matrix: - fast_finish: true -install: - - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - - bundle install --jobs 4 --retry 2 --without system_tests - - type Gemfile.lock -build: off -test_script: - - bundle exec puppet -V - - ruby -v - - gem -v - - bundle -v - - bundle exec rake %CHECK% -notifications: - - provider: Email - to: - - nobody@nowhere.com - on_build_success: false - on_build_failure: false - on_build_status_changed: false diff --git a/data/crowdsec_repo/upstream/osfamily/Suse13.yaml b/data/crowdsec_repo/upstream/osfamily/Suse13.yaml index 09dab7b6..123354a4 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse13.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse13.yaml @@ -1,2 +1,3 @@ +--- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/13/$basearch' diff --git a/data/foreman/default.yaml b/data/foreman/default.yaml index 5dd182a1..ddca2e58 100644 --- a/data/foreman/default.yaml +++ b/data/foreman/default.yaml @@ -9,7 +9,6 @@ - '/var/log/foreman/production.log' - '/var/log/foreman/error.log' log_dir_path: '/var/log/foreman' -# process_name: 'foreman' process_user: 'foreman' process_group: 'foreman' tp_prerequisites: diff --git a/data/homebrew/default.yaml b/data/homebrew/default.yaml new file mode 100644 index 00000000..676c30b5 --- /dev/null +++ b/data/homebrew/default.yaml @@ -0,0 +1,17 @@ +--- +homebrew::settings: + exec_prerequisites: + homebrew-install: + command: 'NONINTERACTIVE=1 ; curl https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | bash' + creates: '/home/linuxbrew/.linuxbrew/bin/brew' + exec_postinstall: + homebrew-add-user-env: + command: 'echo "eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" >> ~/.profile' + provider: 'shell' + unless: "grep '/home/linuxbrew/.linuxbrew/bin/brew shellenv' ~/.profile" + package_prerequisites: + - curl + debug_commands: + doctor: '/home/linuxbrew/.linuxbrew/bin/brew doctor' + info_commands: + config: '/home/linuxbrew/.linuxbrew/bin/brew config' diff --git a/data/homebrew/hiera.yaml b/data/homebrew/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/homebrew/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/homebrew/osfamily/Darwin.yaml b/data/homebrew/osfamily/Darwin.yaml new file mode 100644 index 00000000..979afe57 --- /dev/null +++ b/data/homebrew/osfamily/Darwin.yaml @@ -0,0 +1,15 @@ +--- +homebrew::settings: + exec_prerequisites: + homebrew-install: + command: 'NONINTERACTIVE=1 ; curl https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | bash' + creates: '/opt/homebrew/bin/brew' + exec_postinstall: + homebrew-add-user-env: + command: 'echo "eval $(/opt/homebrew/bin/brew shellenv)" >> ~/.zprofile' + provider: 'shell' + unless: "grep '/opt/homebrew/bin/brew shellenv' ~/.zprofile" + debug_commands: + doctor: '/opt/homebrew/bin/brew doctor' + info_commands: + config: '/opt/homebrew/bin/brew config' diff --git a/data/mongodb/upstream/operatingsystem/Darwin.yaml b/data/mongodb/upstream/operatingsystem/Darwin.yaml index 88ee9336..9a3367dc 100644 --- a/data/mongodb/upstream/operatingsystem/Darwin.yaml +++ b/data/mongodb/upstream/operatingsystem/Darwin.yaml @@ -2,5 +2,5 @@ mongodb::settings: package_name: 'mongodb-community@4.4' service_name: 'mongodb-community@4.4' - brew_tab: 'mongodb/brew' + brew_tap: 'mongodb/brew' config_file_path: '/usr/local/etc/mongod.conf' diff --git a/data/oh-my-zsh/default.yaml b/data/oh-my-zsh/default.yaml new file mode 100644 index 00000000..e278670d --- /dev/null +++ b/data/oh-my-zsh/default.yaml @@ -0,0 +1,11 @@ +--- +oh-my-zsh::settings: + exec_prerequisites: + oh-my-zsh-install: + command: 'sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"' + creates: '~/.oh-my-zsh' + provider: 'shell' + package_prerequisites: + - curl + - git + - zsh diff --git a/data/oh-my-zsh/hiera.yaml b/data/oh-my-zsh/hiera.yaml new file mode 100644 index 00000000..19fa9ae9 --- /dev/null +++ b/data/oh-my-zsh/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/oh-my-zsh/osfamily/Darwin.yaml b/data/oh-my-zsh/osfamily/Darwin.yaml new file mode 100644 index 00000000..35e73a43 --- /dev/null +++ b/data/oh-my-zsh/osfamily/Darwin.yaml @@ -0,0 +1,5 @@ +--- +oh-my-zsh::settings: + package_prerequisites: [] + tp_prerequisites: + - git diff --git a/data/openswan/osfamily/RedHat.yaml b/data/openswan/osfamily/RedHat.yaml index 64143d0f..549e78a9 100644 --- a/data/openswan/osfamily/RedHat.yaml +++ b/data/openswan/osfamily/RedHat.yaml @@ -1,2 +1,3 @@ +--- openswan::settings: package_name: 'libreswan' \ No newline at end of file diff --git a/data/passenger/default.yaml b/data/passenger/default.yaml index 5a2b3700..d109c98b 100644 --- a/data/passenger/default.yaml +++ b/data/passenger/default.yaml @@ -1,3 +1,3 @@ --- - passenger::settings: - package_name: 'passenger' +passenger::settings: + package_name: 'passenger' diff --git a/data/passenger/osfamily/Debian.yaml b/data/passenger/osfamily/Debian.yaml index 2144a0c8..965c5ee7 100644 --- a/data/passenger/osfamily/Debian.yaml +++ b/data/passenger/osfamily/Debian.yaml @@ -1,7 +1,6 @@ --- - passenger::settings: - repo_url: 'https://oss-binaries.phusionpassenger.com/apt/passenger' - key: '561F9B9CAC40B2F7' - apt_repos: 'main' -# apt_release: 'stable' - apt_key_server: 'http://keyserver.ubuntu.com' +passenger::settings: + repo_url: 'https://oss-binaries.phusionpassenger.com/apt/passenger' + key: '561F9B9CAC40B2F7' + apt_repos: 'main' + apt_key_server: 'http://keyserver.ubuntu.com' diff --git a/data/passenger/osfamily/RedHat.yaml b/data/passenger/osfamily/RedHat.yaml index 0f3df5fd..82a8eb46 100644 --- a/data/passenger/osfamily/RedHat.yaml +++ b/data/passenger/osfamily/RedHat.yaml @@ -1,5 +1,4 @@ --- - passenger::settings: - repo_url: 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' -# key_url: 'https://packagecloud.io/gpg.key' +passenger::settings: + repo_url: 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' diff --git a/data/scl/operatingsystem/CentOS.yaml b/data/scl/operatingsystem/CentOS.yaml index a4c4cca9..5ed7dcdf 100644 --- a/data/scl/operatingsystem/CentOS.yaml +++ b/data/scl/operatingsystem/CentOS.yaml @@ -1,3 +1,3 @@ --- - scl::settings: - package_name: 'centos-release-scl' +scl::settings: + package_name: 'centos-release-scl' diff --git a/data/scl/operatingsystem/RedHat6.yaml b/data/scl/operatingsystem/RedHat6.yaml index 9830ecfc..c3c69128 100644 --- a/data/scl/operatingsystem/RedHat6.yaml +++ b/data/scl/operatingsystem/RedHat6.yaml @@ -1,7 +1,6 @@ --- -# untested - scl::settings: - exec_prerequisites: - subscription_scl: - command: 'subscription-manager repos --enable rhel-server-rhscl-6-rpms' - unless: 'subscription-manager repos --list | grep scl' +scl::settings: + exec_prerequisites: + subscription_scl: + command: 'subscription-manager repos --enable rhel-server-rhscl-6-rpms' + unless: 'subscription-manager repos --list | grep scl' diff --git a/data/scl/operatingsystem/RedHat7.yaml b/data/scl/operatingsystem/RedHat7.yaml index 43c2e3ac..ab692532 100644 --- a/data/scl/operatingsystem/RedHat7.yaml +++ b/data/scl/operatingsystem/RedHat7.yaml @@ -1,7 +1,6 @@ --- -# untested - scl::settings: - exec_prerequisites: - subscription_scl: - command: 'subscription-manager repos --enable rhel-server-rhscl-7-rpms' - unless: 'subscription-manager repos --list | grep scl' +scl::settings: + exec_prerequisites: + subscription_scl: + command: 'subscription-manager repos --enable rhel-server-rhscl-7-rpms' + unless: 'subscription-manager repos --list | grep scl' diff --git a/scripts/github_tp_test.sh b/scripts/github_tp_test.sh index bdeb7818..ee6a8213 100755 --- a/scripts/github_tp_test.sh +++ b/scripts/github_tp_test.sh @@ -2,6 +2,7 @@ changedfiles="${1}" repo_dir="$(dirname "${0}")/.." . "${repo_dir}/scripts/functions" +outputfile="${repo_dir}/results.txt" PATH:"$PATH":/usr/local/bin @@ -13,15 +14,17 @@ PATH:"$PATH":/usr/local/bin #changedfiles=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD origin/$default_branch)) apps=$(for a in $changedfiles ; do echo "$a" ; done | grep '^data' | cut -d '/' -f 2 | sort | uniq) +exitcode='0' for app in $apps; do echo_title "### Checking ${app}" - tp install "${app}" || true + tp install "${app}" | tee -a "$outputfile" || true if tp test "${app}"; then result='success' else result='failure' + exitcode='1' fi echo_$result "### ${app} test: ${result}!" echo @@ -36,3 +39,4 @@ for app in $apps; do echo done +exit 0 From 425c9f8800a1795aaee653232c3ba44b25b1f4a9 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 4 Dec 2022 21:15:10 +0100 Subject: [PATCH 242/284] 0.4.8 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 5f813cf4..71fcf015 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.7", + "version": "0.4.8", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 337266e22844255baf7bd1002a48fb88a377680e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 12 Dec 2022 11:37:04 +0100 Subject: [PATCH 243/284] =?UTF-8?q?Updated=20data=20for=20activemq=20postf?= =?UTF-8?q?ix=20apt=20awscli=20python-pip=20apparmor=20elas=E2=80=A6=20(#5?= =?UTF-8?q?5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated data for activemq postfix apt awscli python-pip apparmor elastic_repo azure-cli auditbeat * version commands * Updated data for boundary bind bash bacula-client azure-cli awscli. Added docker_image data * General updates on hiera.yaml * Versio 0.5.0 * Test app without package and service --- data/activemq/default.yaml | 8 ++++ data/activemq/hiera.yaml | 1 + data/activemq/osfamily/RedHat.yaml | 3 +- data/ansible/default.yaml | 4 ++ data/ansible/hiera.yaml | 1 + data/apache/default.yaml | 10 +++++ data/apache/hiera.yaml | 1 + data/apache/osfamily/Debian.yaml | 7 +++ data/apache/osfamily/Suse.yaml | 11 ++++- data/apm-server/default.yaml | 3 +- data/apm-server/hiera.yaml | 2 + data/apm-server/osfamily/RedHat9.yaml | 11 +++++ data/apparmor/default.yaml | 15 ++++++- data/apparmor/hiera.yaml | 1 + data/apparmor/osfamily/Debian.yaml | 3 ++ data/apparmor/osfamily/RedHat.yaml | 3 -- data/apt/default.yaml | 15 ++++--- data/apt/hiera.yaml | 1 + data/apt/osfamily/Darwin.yaml | 3 ++ data/apt/osfamily/RedHat.yaml | 3 ++ data/apt/osfamily/Suse.yaml | 3 ++ data/apt/osfamily/windows.yaml | 3 ++ data/auditbeat/default.yaml | 8 +++- data/auditbeat/hiera.yaml | 2 + data/auditbeat/osfamily/RedHat9.yaml | 11 +++++ data/autofs/default.yaml | 17 +++---- data/autofs/hiera.yaml | 1 + data/autofs/osfamily/Debian.yaml | 4 +- data/autofs/osfamily/RedHat.yaml | 4 +- data/awscli/default.yaml | 17 +++---- data/awscli/hiera.yaml | 2 + data/awscli/osfamily/RedHat.yaml | 4 +- data/awscli/osfamily/RedHat8.yaml | 3 ++ data/azure-cli/default.yaml | 1 + data/azure-cli/upstream/default.yaml | 2 + data/azure-cli/upstream/osfamily/RedHat.yaml | 2 + data/azure-cli/upstream/osfamily/RedHat8.yaml | 2 +- data/azure-cli/upstream/osfamily/windows.yaml | 1 + data/bacula-client/default.yaml | 38 ++++++++++------ data/bacula-client/hiera.yaml | 3 ++ .../operatingsystem/Ubuntu22.04.yaml | 4 ++ data/bacula-client/osfamily/Debian.yaml | 6 +-- data/bacula-client/osfamily/RedHat.yaml | 6 +-- data/bash/default.yaml | 10 ++++- data/bash/hiera.yaml | 1 + data/bind-utils/default.yaml | 1 + data/bind-utils/hiera.yaml | 1 + data/bind-utils/osfamily/Ubuntu.yaml | 4 -- data/bind/default.yaml | 39 ++++++++++------ data/bind/hiera.yaml | 1 + data/bind/operatingsystem/Ubuntu.yaml | 17 +++---- data/bind/osfamily/Debian.yaml | 15 ++++--- data/bind/osfamily/RedHat.yaml | 21 +++++---- data/bird/default.yaml | 2 + data/bird/hiera.yaml | 1 + data/bluepill/default.yaml | 11 ----- data/bluepill/hiera.yaml | 6 --- data/bluepill/osfamily/Debian.yaml | 3 -- data/bluepill/osfamily/RedHat.yaml | 3 -- data/bolt/default.yaml | 20 ++++++++- data/bolt/hiera.yaml | 3 +- data/bolt/osfamily/windows.yaml | 4 ++ data/boundary/default.yaml | 27 +++++++++++- data/boundary/hiera.yaml | 1 + data/bzip2/default.yaml | 6 ++- data/bzip2/hiera.yaml | 1 + data/ceilometer/default.yaml | 27 +++++++----- data/ceilometer/hiera.yaml | 1 + data/ceilometer/osfamily/Debian.yaml | 6 +-- data/ceilometer/osfamily/RedHat.yaml | 6 +-- data/ceph/default.yaml | 27 +++++++----- data/ceph/hiera.yaml | 1 + data/ceph/osfamily/Debian.yaml | 4 +- data/ceph/osfamily/RedHat.yaml | 4 +- data/cinder/default.yaml | 18 ++++---- data/cinder/hiera.yaml | 1 + data/cinder/osfamily/Debian.yaml | 10 ++--- data/cinder/osfamily/RedHat.yaml | 10 ++--- data/clvm/default.yaml | 16 +++---- data/clvm/hiera.yaml | 1 + data/clvm/osfamily/Debian.yaml | 8 ++-- data/clvm/osfamily/RedHat.yaml | 4 +- data/collectd/default.yaml | 20 ++++----- data/collectd/hiera.yaml | 1 + data/collectd/osfamily/Debian.yaml | 4 +- data/collectd/osfamily/RedHat.yaml | 10 ++--- data/consul-enterprise/hiera.yaml | 1 + data/consul/hiera.yaml | 1 + data/corosync/default.yaml | 20 ++++----- data/corosync/hiera.yaml | 1 + data/corosync/osfamily/Debian.yaml | 4 +- data/corosync/osfamily/RedHat.yaml | 4 +- data/cron/hiera.yaml | 1 + .../hiera.yaml | 1 + data/docker/hiera.yaml | 1 + data/docker/upstream/osfamily/RedHat.yaml | 3 ++ data/elastic_repo/ds/default.yaml | 4 ++ data/elastic_repo/ds/osfamily/Debian.yaml | 5 +++ data/elastic_repo/ds/osfamily/RedHat.yaml | 4 ++ data/elastic_repo/hiera.yaml | 1 + data/elastic_repo/upstream/default.yaml | 4 +- .../upstream/osfamily/Debian.yaml | 2 +- .../upstream/osfamily/RedHat.yaml | 2 +- data/epel/osfamily/RedHat6.yaml | 2 +- data/epel/osfamily/RedHat9.yaml | 3 ++ data/openssh/default.yaml | 1 + data/postfix/default.yaml | 44 +++++++++++-------- data/postfix/hiera.yaml | 1 + data/postfix/osfamily/Debian.yaml | 8 ++-- data/postfix/osfamily/RedHat.yaml | 10 ++--- data/postfix/osfamily/Suse.yaml | 6 +-- data/python-pip/default.yaml | 16 ++++++- data/python-pip/osfamily/Debian.yaml | 4 +- data/python-pip/osfamily/Debian20.04.yaml | 3 ++ data/python-pip/osfamily/Debian22.04.yaml | 3 ++ data/python-pip/osfamily/RedHat7.yaml | 4 +- data/python-pip/osfamily/RedHat8.yaml | 3 ++ data/python-pip/osfamily/RedHat9.yaml | 3 ++ data/test/default.yaml | 26 +++++------ data/test/osfamily/Debian.yaml | 4 +- data/test/osfamily/RedHat.yaml | 4 +- metadata.json | 2 +- 122 files changed, 545 insertions(+), 288 deletions(-) create mode 100644 data/apm-server/osfamily/RedHat9.yaml create mode 100644 data/apparmor/osfamily/Debian.yaml delete mode 100644 data/apparmor/osfamily/RedHat.yaml create mode 100644 data/apt/osfamily/Darwin.yaml create mode 100644 data/apt/osfamily/RedHat.yaml create mode 100644 data/apt/osfamily/Suse.yaml create mode 100644 data/apt/osfamily/windows.yaml create mode 100644 data/auditbeat/osfamily/RedHat9.yaml create mode 100644 data/awscli/osfamily/RedHat8.yaml create mode 100644 data/bacula-client/operatingsystem/Ubuntu22.04.yaml delete mode 100644 data/bind-utils/osfamily/Ubuntu.yaml delete mode 100644 data/bluepill/default.yaml delete mode 100644 data/bluepill/hiera.yaml delete mode 100644 data/bluepill/osfamily/Debian.yaml delete mode 100644 data/bluepill/osfamily/RedHat.yaml create mode 100644 data/bolt/osfamily/windows.yaml create mode 100644 data/docker/upstream/osfamily/RedHat.yaml create mode 100644 data/elastic_repo/ds/default.yaml create mode 100644 data/elastic_repo/ds/osfamily/Debian.yaml create mode 100644 data/elastic_repo/ds/osfamily/RedHat.yaml create mode 100644 data/epel/osfamily/RedHat9.yaml create mode 100644 data/python-pip/osfamily/Debian20.04.yaml create mode 100644 data/python-pip/osfamily/Debian22.04.yaml create mode 100644 data/python-pip/osfamily/RedHat8.yaml create mode 100644 data/python-pip/osfamily/RedHat9.yaml diff --git a/data/activemq/default.yaml b/data/activemq/default.yaml index 685de2a4..5a8f7ffb 100644 --- a/data/activemq/default.yaml +++ b/data/activemq/default.yaml @@ -11,3 +11,11 @@ activemq::settings: process_extra_name: 'activemq' process_user: 'activemq' process_group: 'activemq' + website_url: 'https://activemq.apache.org/' + git_source: 'https://github.com/apache/activemq' + info_commands: + dstat: 'activemq dstat' + list: 'activemq list' + test_commands: + status: 'activemq status' + docker_image: 'apache/activemq' \ No newline at end of file diff --git a/data/activemq/hiera.yaml b/data/activemq/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/activemq/hiera.yaml +++ b/data/activemq/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/activemq/osfamily/RedHat.yaml b/data/activemq/osfamily/RedHat.yaml index 353b4910..033e3dc3 100644 --- a/data/activemq/osfamily/RedHat.yaml +++ b/data/activemq/osfamily/RedHat.yaml @@ -1,3 +1,4 @@ --- activemq::settings: - init_file_path: '/etc/sysconfig/activemq' + package_name: '' + service_name: '' diff --git a/data/ansible/default.yaml b/data/ansible/default.yaml index 02644845..b95ef619 100644 --- a/data/ansible/default.yaml +++ b/data/ansible/default.yaml @@ -5,3 +5,7 @@ ansible::settings: config_dir_path: '/etc/ansible' roles_dir_path: '/etc/ansible/roles' inventory_file_path: '/etc/ansible/hosts' + config_file_format: 'inifile_with_stanzas' + website_url: 'https://www.ansible.com/' + git_source: 'https://github.com/ansible/ansible' + docker_image: 'quay.io/ansible/ansible-runner' diff --git a/data/ansible/hiera.yaml b/data/ansible/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/ansible/hiera.yaml +++ b/data/ansible/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/apache/default.yaml b/data/apache/default.yaml index cf34e478..ccc4b0a1 100644 --- a/data/apache/default.yaml +++ b/data/apache/default.yaml @@ -15,3 +15,13 @@ apache::settings: nodaemon_args: '-DFOREGROUND' validate_cmd: config: 'httpd -t -f %' + version_command: 'httpd -v' + info_commands: + show_compile_settings: 'httpd -V' + show_compiled_modules: 'httpd -l' + show_loaded_modules: 'httpd -t -D DUMP_MODULES' + test_commands: + validate_config: 'httpd -t' + website_url: 'https://httpd.apache.org/' + git_source: 'https://github.com/apache/httpd' + docker_image: 'httpd' diff --git a/data/apache/hiera.yaml b/data/apache/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/apache/hiera.yaml +++ b/data/apache/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/apache/osfamily/Debian.yaml b/data/apache/osfamily/Debian.yaml index 75e9815a..b1a728be 100644 --- a/data/apache/osfamily/Debian.yaml +++ b/data/apache/osfamily/Debian.yaml @@ -21,3 +21,10 @@ apache::settings: process_group: 'www-data' validate_cmd: config: 'apache2 -t -f %' + version_command: 'apache2 -v' + info_commands: + show_compile_settings: 'apache2 -V' + show_compiled_modules: 'apache2 -l' + show_loaded_modules: 'apache2 -t -D DUMP_MODULES' + test_commands: + validate_config: 'source /etc/apache2/envvars ; apache2 -t' diff --git a/data/apache/osfamily/Suse.yaml b/data/apache/osfamily/Suse.yaml index 4e778bf3..ce31683b 100644 --- a/data/apache/osfamily/Suse.yaml +++ b/data/apache/osfamily/Suse.yaml @@ -2,7 +2,6 @@ apache::settings: package_name: 'apache2' service_name: 'apache2' - config_file_path: '/etc/apache2/httpd.conf' init_file_path: '/etc/default/apache2' config_dir_path: '/etc/apache2' @@ -13,4 +12,12 @@ apache::settings: process_name: 'httpd2-prefork' process_user: 'wwwrun' process_group: 'wwwrun' - + validate_cmd: + config: 'httpd2-prefork -t -f %' + info_commands: + show_compile_settings: 'httpd2-prefork -V' + show_compiled_modules: 'httpd2-prefork -l' + show_loaded_modules: 'httpd2-prefork -t -D DUMP_MODULES' + test_commands: + validate_config: 'httpd2-prefork -t' + version_command: 'httpd2-prefork -v' diff --git a/data/apm-server/default.yaml b/data/apm-server/default.yaml index 6a0fa32b..25c95893 100644 --- a/data/apm-server/default.yaml +++ b/data/apm-server/default.yaml @@ -12,4 +12,5 @@ apm-server::settings: home_dir_path: '/usr/share/apm-server' data_dir_path: '/var/lib/apm-server' process_name: 'apm-server' - + version_command: 'apm-server version' + docker_image: 'elastic/apm-server' diff --git a/data/apm-server/hiera.yaml b/data/apm-server/hiera.yaml index 990b9755..26b032ee 100644 --- a/data/apm-server/hiera.yaml +++ b/data/apm-server/hiera.yaml @@ -2,7 +2,9 @@ :hierarchy: - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/apm-server/osfamily/RedHat9.yaml b/data/apm-server/osfamily/RedHat9.yaml new file mode 100644 index 00000000..e73b9caa --- /dev/null +++ b/data/apm-server/osfamily/RedHat9.yaml @@ -0,0 +1,11 @@ +--- +# Workaround for GPG-KEY in SHA1 https://github.com/elastic/elasticsearch/issues/85876 +apm-server::settings: + exec_prerequisites: + allow_sha1: + command: '/usr/bin/update-crypto-policies --set DEFAULT:SHA1' + unless: 'rpm -qi apm-server' + exec_postinstall: + disallow_sha1: + command: '/usr/bin/update-crypto-policies --set DEFAULT' + unless: 'rpm -qi apm-server' diff --git a/data/apparmor/default.yaml b/data/apparmor/default.yaml index f85fe835..ce9feaaf 100644 --- a/data/apparmor/default.yaml +++ b/data/apparmor/default.yaml @@ -1,3 +1,14 @@ --- - apparmor::settings: - package_name: 'apparmor' +apparmor::settings: + package_name: '' + config_file_path: '/etc/apparmor/parser.conf' + config_dir_path: '/etc/apparmor/' + conf_dir_path: '/etc/apparmor.d/' + data_dir_path: '/var/cache/apparmor/' + website_url: 'https://apparmor.net/' + git_source: 'https://gitlab.com/apparmor/apparmor' + info_commands: + status: 'aa-status' + debug_commands: + show_denied: 'grep -i denied /var/log/kern.log /var/log/syslog' + version_command: 'dpkg -l apparmor | grep apparmor' diff --git a/data/apparmor/hiera.yaml b/data/apparmor/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/apparmor/hiera.yaml +++ b/data/apparmor/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/apparmor/osfamily/Debian.yaml b/data/apparmor/osfamily/Debian.yaml new file mode 100644 index 00000000..23d9c325 --- /dev/null +++ b/data/apparmor/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +apparmor::settings: + package_name: 'apparmor' diff --git a/data/apparmor/osfamily/RedHat.yaml b/data/apparmor/osfamily/RedHat.yaml deleted file mode 100644 index 390fb7ef..00000000 --- a/data/apparmor/osfamily/RedHat.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - apparmor::settings: - package_name: '' diff --git a/data/apt/default.yaml b/data/apt/default.yaml index 70c145ec..c21f9b68 100644 --- a/data/apt/default.yaml +++ b/data/apt/default.yaml @@ -1,7 +1,10 @@ --- - apt::settings: - package_name: 'apt' - config_file_path: '/etc/apt/apt.conf' - config_dir_path: '/etc/apt' - log_file_path: '/var/log/apt' - process_name: 'apt' +apt::settings: + package_name: 'apt' + config_file_path: '/etc/apt/apt.conf' + conf_dir_path: '/etc/apt/apt.conf.d' + sources_file_path: '/etc/apt/sourced.list' + sources_dir_path: '/etc/apt/sourced.list.d' + config_dir_path: '/etc/apt' + log_file_path: '/var/log/apt' + data_dir_path: '/var/cache/apt' \ No newline at end of file diff --git a/data/apt/hiera.yaml b/data/apt/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/apt/hiera.yaml +++ b/data/apt/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/apt/osfamily/Darwin.yaml b/data/apt/osfamily/Darwin.yaml new file mode 100644 index 00000000..a37690c2 --- /dev/null +++ b/data/apt/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +apt::settings: + package_name: '' + service_name: '' \ No newline at end of file diff --git a/data/apt/osfamily/RedHat.yaml b/data/apt/osfamily/RedHat.yaml new file mode 100644 index 00000000..a37690c2 --- /dev/null +++ b/data/apt/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +apt::settings: + package_name: '' + service_name: '' \ No newline at end of file diff --git a/data/apt/osfamily/Suse.yaml b/data/apt/osfamily/Suse.yaml new file mode 100644 index 00000000..a37690c2 --- /dev/null +++ b/data/apt/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +apt::settings: + package_name: '' + service_name: '' \ No newline at end of file diff --git a/data/apt/osfamily/windows.yaml b/data/apt/osfamily/windows.yaml new file mode 100644 index 00000000..a37690c2 --- /dev/null +++ b/data/apt/osfamily/windows.yaml @@ -0,0 +1,3 @@ +apt::settings: + package_name: '' + service_name: '' \ No newline at end of file diff --git a/data/auditbeat/default.yaml b/data/auditbeat/default.yaml index 9f643d99..baad675e 100644 --- a/data/auditbeat/default.yaml +++ b/data/auditbeat/default.yaml @@ -12,4 +12,10 @@ auditbeat::settings: home_dir_path: '/usr/share/auditbeat' data_dir_path: '/var/lib/auditbeat' process_name: 'auditbeat' - + website_url: 'https://www.elastic.co/beats/auditbeat' + git_source: 'https://github.com/elastic/beats/tree/master/auditbeat' + version_command: 'auditbeat version' + info_commands: + show_status: 'auditbeat show auditd_status' + show_rules: 'auditbeat show auditd_rules' + docker_image: 'elastic/autditbeat' diff --git a/data/auditbeat/hiera.yaml b/data/auditbeat/hiera.yaml index 990b9755..26b032ee 100644 --- a/data/auditbeat/hiera.yaml +++ b/data/auditbeat/hiera.yaml @@ -2,7 +2,9 @@ :hierarchy: - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/auditbeat/osfamily/RedHat9.yaml b/data/auditbeat/osfamily/RedHat9.yaml new file mode 100644 index 00000000..1560e4f7 --- /dev/null +++ b/data/auditbeat/osfamily/RedHat9.yaml @@ -0,0 +1,11 @@ +--- +# Workaround for GPG-KEY in SHA1 https://github.com/elastic/elasticsearch/issues/85876 +auditbeat::settings: + exec_prerequisites: + allow_sha1: + command: '/usr/bin/update-crypto-policies --set DEFAULT:SHA1' + unless: 'rpm -qi auditbeat' + exec_postinstall: + disallow_sha1: + command: '/usr/bin/update-crypto-policies --set DEFAULT' + unless: 'rpm -qi auditbeat' diff --git a/data/autofs/default.yaml b/data/autofs/default.yaml index 4fc2c702..ffdefc68 100644 --- a/data/autofs/default.yaml +++ b/data/autofs/default.yaml @@ -1,9 +1,10 @@ --- - autofs::settings: - package_name: 'autofs' - service_name: 'autofs' - config_file_path: '/etc/auto.master' - init_file_path: '/etc/sysconfig/autofs' - pid_file_path: '/var/run/autofs.pid' - process_user: 'root' - process_group: 'root' +autofs::settings: + package_name: 'autofs' + service_name: 'autofs' + config_file_path: '/etc/auto.master' + init_file_path: '/etc/sysconfig/autofs' + pid_file_path: '/var/run/autofs.pid' + process_user: 'root' + process_group: 'root' + git_source: 'https://kernel.googlesource.com/pub/scm/linux/storage/autofs/autofs/' \ No newline at end of file diff --git a/data/autofs/hiera.yaml b/data/autofs/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/autofs/hiera.yaml +++ b/data/autofs/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/autofs/osfamily/Debian.yaml b/data/autofs/osfamily/Debian.yaml index 7f9953b9..ea94e53a 100644 --- a/data/autofs/osfamily/Debian.yaml +++ b/data/autofs/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - autofs::settings: - init_file_path: '/etc/default/autofs' +autofs::settings: + init_file_path: '/etc/default/autofs' diff --git a/data/autofs/osfamily/RedHat.yaml b/data/autofs/osfamily/RedHat.yaml index 8cd553dc..5f885ba6 100644 --- a/data/autofs/osfamily/RedHat.yaml +++ b/data/autofs/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - autofs::settings: - init_file_path: '/etc/sysconfig/autofs' +autofs::settings: + init_file_path: '/etc/sysconfig/autofs' diff --git a/data/awscli/default.yaml b/data/awscli/default.yaml index 6e9efa3e..cd02c351 100644 --- a/data/awscli/default.yaml +++ b/data/awscli/default.yaml @@ -1,9 +1,10 @@ --- - awscli::settings: - package_name: 'awscli' - package_provider: 'pip' - config_file_path: '/root/.aws/config' - config_dir_path: '/etc/aws' - tp_prerequisites: - - python-pip - +awscli::settings: + package_name: 'awscli' + package_provider: 'pip' + config_file_path: '/root/.aws/config' + config_dir_path: '/etc/aws' + tp_prerequisites: + - python-pip + version_command: 'aws --version' + docker_image: 'amazon/aws-cli' diff --git a/data/awscli/hiera.yaml b/data/awscli/hiera.yaml index 19fa9ae9..d34d2477 100644 --- a/data/awscli/hiera.yaml +++ b/data/awscli/hiera.yaml @@ -1,6 +1,8 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/awscli/osfamily/RedHat.yaml b/data/awscli/osfamily/RedHat.yaml index 8ecf160d..534f6d95 100644 --- a/data/awscli/osfamily/RedHat.yaml +++ b/data/awscli/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - awscli::settings: - config_file_path: '/etc/awsclirc' +awscli::settings: + config_file_path: '/etc/awsclirc' diff --git a/data/awscli/osfamily/RedHat8.yaml b/data/awscli/osfamily/RedHat8.yaml new file mode 100644 index 00000000..b3e6c0a2 --- /dev/null +++ b/data/awscli/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +awscli::settings: + package_provider: 'pip3' diff --git a/data/azure-cli/default.yaml b/data/azure-cli/default.yaml index 1c2a2280..90a77a5d 100644 --- a/data/azure-cli/default.yaml +++ b/data/azure-cli/default.yaml @@ -3,3 +3,4 @@ azure-cli::settings: upstream_repo: true package_name: azure-cli version_command: 'az -v' + docker_image: 'bitnami/azure-cli' diff --git a/data/azure-cli/upstream/default.yaml b/data/azure-cli/upstream/default.yaml index 37052ae5..7edb4b28 100644 --- a/data/azure-cli/upstream/default.yaml +++ b/data/azure-cli/upstream/default.yaml @@ -5,3 +5,5 @@ azure-cli::settings: apt_repos: 'main' repo_filename: azure-cli repo_description: 'Azure CLI' + git_source: https://github.com/Azure/azure-cli + website_url: https://learn.microsoft.com/en-us/cli/azure/ diff --git a/data/azure-cli/upstream/osfamily/RedHat.yaml b/data/azure-cli/upstream/osfamily/RedHat.yaml index c16d7de2..112c6d2a 100644 --- a/data/azure-cli/upstream/osfamily/RedHat.yaml +++ b/data/azure-cli/upstream/osfamily/RedHat.yaml @@ -1,3 +1,5 @@ --- azure-cli::settings: key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' + repo_package_name: packages-microsoft-prod + repo_filename: microsoft-prod diff --git a/data/azure-cli/upstream/osfamily/RedHat8.yaml b/data/azure-cli/upstream/osfamily/RedHat8.yaml index d018865f..cdab77fd 100644 --- a/data/azure-cli/upstream/osfamily/RedHat8.yaml +++ b/data/azure-cli/upstream/osfamily/RedHat8.yaml @@ -1,4 +1,4 @@ --- azure-cli::settings: - repo_package_url: 'https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm' + repo_package_url: 'https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm' diff --git a/data/azure-cli/upstream/osfamily/windows.yaml b/data/azure-cli/upstream/osfamily/windows.yaml index fbc5da93..86e320f4 100644 --- a/data/azure-cli/upstream/osfamily/windows.yaml +++ b/data/azure-cli/upstream/osfamily/windows.yaml @@ -1,3 +1,4 @@ --- azure-cli::settings: winget_package_name: 'Microsoft.AzureCLI' + choco_package_name: 'azure-cli' diff --git a/data/bacula-client/default.yaml b/data/bacula-client/default.yaml index 36500028..3705c3c6 100644 --- a/data/bacula-client/default.yaml +++ b/data/bacula-client/default.yaml @@ -1,15 +1,25 @@ --- - bacula-client::settings: - package_name: 'bacula-client' - service_name: 'bacula-fd' - config_file_path: '/etc/bacula/bacula-fd.conf' - config_dir_path: '/etc/bacula' - work_dir_path: '/var/lib/bacula' - init_file_path: '/etc/sysconfig/bacula-fd' - tcp_port: '9102' - pid_file_path: '/var/run/bacula/bacula-fd.9102.pid' - log_file_path: '/var/log/messages' - log_dir_path: '/var/log/bacula' - process_name: 'bacula-fd' - process_user: 'root' - process_group: 'root' +bacula-client::settings: + package_name: 'bacula-client' + service_name: 'bacula-fd' + config_file_path: '/etc/bacula/bacula-fd.conf' + config_dir_path: '/etc/bacula' + work_dir_path: '/var/lib/bacula' + init_file_path: '/etc/sysconfig/bacula-fd' + tcp_port: '9102' + pid_file_path: '/var/run/bacula/bacula-fd.9102.pid' + log_file_path: '/var/log/messages' + log_dir_path: '/var/log/bacula' + process_name: 'bacula-fd' + process_user: 'root' + process_group: 'root' + website_url: 'https://www.bacula.org/' + git_source: 'https://gitlab.bacula.org/bacula-community-edition/bacula-community' + nodaemon_args: '-f' + test_commands: + test_configuration: 'bacula-console -t' + info_commands: + print_kaboom: 'bacula-fd -m' + list_directors: 'bacula-console -l' + list_consoles: 'bacula-console -L' + version_command: 'bacula-fd -? 2>&1 | grep -i version' \ No newline at end of file diff --git a/data/bacula-client/hiera.yaml b/data/bacula-client/hiera.yaml index 19fa9ae9..9602dfdd 100644 --- a/data/bacula-client/hiera.yaml +++ b/data/bacula-client/hiera.yaml @@ -1,6 +1,9 @@ --- :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/bacula-client/operatingsystem/Ubuntu22.04.yaml b/data/bacula-client/operatingsystem/Ubuntu22.04.yaml new file mode 100644 index 00000000..6a13b336 --- /dev/null +++ b/data/bacula-client/operatingsystem/Ubuntu22.04.yaml @@ -0,0 +1,4 @@ +--- +bacula-client::settings: + package_name: '' + service_name: '' \ No newline at end of file diff --git a/data/bacula-client/osfamily/Debian.yaml b/data/bacula-client/osfamily/Debian.yaml index b129f1c5..cd47c3de 100644 --- a/data/bacula-client/osfamily/Debian.yaml +++ b/data/bacula-client/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - bacula-client::settings: - work_dir_path: '/var/lib/bacula' - init_file_path: '/etc/default/bacula-fd' +bacula-client::settings: + work_dir_path: '/var/lib/bacula' + init_file_path: '/etc/default/bacula-fd' diff --git a/data/bacula-client/osfamily/RedHat.yaml b/data/bacula-client/osfamily/RedHat.yaml index 9e08cb21..68049dab 100644 --- a/data/bacula-client/osfamily/RedHat.yaml +++ b/data/bacula-client/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - bacula-client::settings: - work_dir_path: '/var/spool/bacula' - init_file_path: '/etc/default/bacula-fd' +bacula-client::settings: + work_dir_path: '/var/spool/bacula' + init_file_path: '/etc/default/bacula-fd' diff --git a/data/bash/default.yaml b/data/bash/default.yaml index f4428eb2..3e0b05ae 100644 --- a/data/bash/default.yaml +++ b/data/bash/default.yaml @@ -1,3 +1,9 @@ --- - bash::settings: - package_name: 'bash' +bash::settings: + package_name: 'bash' + website_url: 'https://www.gnu.org/software/bash/' + git_source: 'https://git.savannah.gnu.org/git/bash.git' + config_file_path: '/etc/profile' + config_dir_path: '/etc/profile.d' + user_config_file_path: '$HOME/.bash_profile' + docker_image: 'bash' diff --git a/data/bash/hiera.yaml b/data/bash/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/bash/hiera.yaml +++ b/data/bash/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/bind-utils/default.yaml b/data/bind-utils/default.yaml index ef6dbf71..ff20a8a8 100644 --- a/data/bind-utils/default.yaml +++ b/data/bind-utils/default.yaml @@ -1,3 +1,4 @@ --- bind-utils::settings: package_name: 'bind-utils' + git_source: 'https://github.com/tigeli/bind-utils' diff --git a/data/bind-utils/hiera.yaml b/data/bind-utils/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/bind-utils/hiera.yaml +++ b/data/bind-utils/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/bind-utils/osfamily/Ubuntu.yaml b/data/bind-utils/osfamily/Ubuntu.yaml deleted file mode 100644 index fc53f5bb..00000000 --- a/data/bind-utils/osfamily/Ubuntu.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - bind-utils::settings: - package_name: 'dnsutils' - diff --git a/data/bind/default.yaml b/data/bind/default.yaml index 042b12d2..c6fae0a5 100644 --- a/data/bind/default.yaml +++ b/data/bind/default.yaml @@ -1,14 +1,27 @@ --- - bind::settings: - package_name: 'bind' - service_name: 'bind' - config_file_path: '/etc/bind.conf' - config_dir_path: '/etc/bind.d' - conf_dir_path: '/etc/bind.d' - log_dir_path: '/var/log/bind' - udp_port: '53' - pid_file_path: '/var/run/bind.pid' - log_file_path: '/var/log/syslog' - process_name: 'named' - process_user: 'bind' - process_group: 'bind' +bind::settings: + package_name: 'bind' + service_name: 'bind' + config_file_path: '/etc/bind.conf' + config_dir_path: '/etc/bind.d' + conf_dir_path: '/etc/bind.d' + data_dir_path: '/var/named' + udp_port: '53' + pid_file_path: '/var/run/bind.pid' + log_file_path: '/var/log/messages' + process_name: 'named' + process_user: 'bind' + process_group: 'bind' + website: 'http://www.isc.org/software/bind' + git_source: 'https://gitlab.isc.org/isc-projects/bind9' + version_command: 'named -v' + debug_commands: + trace: 'named -m trace' + nodaemon_args: '-f' + docker_image: 'internetsystemsconsortium/bind9' + info_commands: + status: 'rndc status' + tsig-list: 'rndc tsig-list' + tcp-timeouts: 'rndc tcp-timeouts' + stats: 'rndc stats ; cat /var/cache/bind/named.stats' + dumpdb: 'rndc dumpdb ; cat /var/cache/bind/named_dump.db' diff --git a/data/bind/hiera.yaml b/data/bind/hiera.yaml index 7ba6fd10..1b8d6940 100644 --- a/data/bind/hiera.yaml +++ b/data/bind/hiera.yaml @@ -3,5 +3,6 @@ - "%{title}/operatingsystem/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/bind/operatingsystem/Ubuntu.yaml b/data/bind/operatingsystem/Ubuntu.yaml index 7d60c288..afef3608 100644 --- a/data/bind/operatingsystem/Ubuntu.yaml +++ b/data/bind/operatingsystem/Ubuntu.yaml @@ -1,11 +1,8 @@ --- - bind::settings: - config_file_path: '/etc/bind/named.conf' - config_dir_path: '/etc/bind' - conf_dir_path: '/etc/bind' - pid_file_path: '/var/run/named/named.pid' - log_file_path: '/var/log/syslog' - service_name: 'bind9' - process_name: 'named' - process_user: 'bind' - process_group: 'bind' +bind::settings: + pid_file_path: '/var/run/named/named.pid' + log_file_path: '/var/log/syslog' + service_name: 'bind9' + process_name: 'named' + process_user: 'bind' + process_group: 'bind' diff --git a/data/bind/osfamily/Debian.yaml b/data/bind/osfamily/Debian.yaml index b995fc06..d8f221cb 100644 --- a/data/bind/osfamily/Debian.yaml +++ b/data/bind/osfamily/Debian.yaml @@ -1,6 +1,11 @@ --- - bind::settings: - package_name: 'bind9' - service_name: 'bind9' - init_file_path: '/etc/default/bind9' - pid_file_path: '/var/run/named/named.pid' +bind::settings: + package_name: 'bind9' + service_name: 'bind9' + init_file_path: '/etc/default/bind9' + pid_file_path: '/var/run/named/named.pid' + log_file_path: '/var/log/syslog' + config_file_path: '/etc/bind/named.conf' + config_dir_path: '/etc/bind' + conf_dir_path: '/etc/bind' + data_dir_path: '/var/cache/named' diff --git a/data/bind/osfamily/RedHat.yaml b/data/bind/osfamily/RedHat.yaml index 6e46ac32..e44ce73c 100644 --- a/data/bind/osfamily/RedHat.yaml +++ b/data/bind/osfamily/RedHat.yaml @@ -1,9 +1,14 @@ --- - bind::settings: - config_file_path: '/etc/named.conf' - config_dir_path: '/etc/named' - init_file_path: '/etc/sysconfig/named' - pid_file_path: '/var/run/named/named.pid' - service_name: 'named' - process_user: 'named' - process_group: 'named' +bind::settings: + config_file_path: '/etc/named.conf' + config_dir_path: '/etc/named' + init_file_path: '/etc/sysconfig/named' + pid_file_path: '/var/run/named/named.pid' + service_name: 'named' + process_user: 'named' + process_group: 'named' + info_commands: + status: 'rndc status' + tsig-list: 'rndc tsig-list' + tcp-timeouts: 'rndc tcp-timeouts' + stats: 'rndc stats ; cat /var/named/data/named_stats.txt' diff --git a/data/bird/default.yaml b/data/bird/default.yaml index a7c707a8..8f9d0c7a 100644 --- a/data/bird/default.yaml +++ b/data/bird/default.yaml @@ -17,3 +17,5 @@ bird::settings: log_file_path: - /var/log/bird.log - /var/log/bird6.log + website_url: 'https://bird.network.cz/' + git_source: 'https://gitlab.labs.nic.cz/labs/bird' diff --git a/data/bird/hiera.yaml b/data/bird/hiera.yaml index 1c820bbc..21c6b540 100644 --- a/data/bird/hiera.yaml +++ b/data/bird/hiera.yaml @@ -5,5 +5,6 @@ - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/bluepill/default.yaml b/data/bluepill/default.yaml deleted file mode 100644 index 1768f782..00000000 --- a/data/bluepill/default.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- - bluepill::settings: - package_name: 'bluepill' - service_name: 'bluepill' - config_file_path: '/etc/bluepill/bluepill.rb' - pid_file_path: '/var/run/bluepill.pid' - config_dir_path: '/etc/bluepill' - conf_dir_path: '/etc/bluepill/conf.d' - process_name: 'bluepill' - process_user: 'root' - process_group: 'bluepill' diff --git a/data/bluepill/hiera.yaml b/data/bluepill/hiera.yaml deleted file mode 100644 index 19fa9ae9..00000000 --- a/data/bluepill/hiera.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -:hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - "default/%{operatingsystem}" - - default diff --git a/data/bluepill/osfamily/Debian.yaml b/data/bluepill/osfamily/Debian.yaml deleted file mode 100644 index 7fb3ebc1..00000000 --- a/data/bluepill/osfamily/Debian.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - bluepill::settings: - init_file_path: '/etc/default/bluepill' diff --git a/data/bluepill/osfamily/RedHat.yaml b/data/bluepill/osfamily/RedHat.yaml deleted file mode 100644 index 68a26927..00000000 --- a/data/bluepill/osfamily/RedHat.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - bluepill::settings: - init_file_path: '/etc/sysconfig/blupill' diff --git a/data/bolt/default.yaml b/data/bolt/default.yaml index ad979f6b..6d6e86d8 100644 --- a/data/bolt/default.yaml +++ b/data/bolt/default.yaml @@ -1,5 +1,21 @@ --- -pdk::settings: +bolt::settings: package_name: 'puppet-bolt' tp_prerequisites: - puppet_repo: {} \ No newline at end of file + puppet_repo: {} + website_url: 'https://puppet.com/docs/bolt/' + git_source: 'https://github.com/puppetlabs/bolt' + config_file_path: '/etc/puppetlabs/bolt/bolt-defaults.yaml' + config_dir_path: '/etc/puppetlabs/bolt' + config_file_format: 'yaml' + user_config_file_path: '$HOME/.puppetlabs/etc/bolt/bolt-defaults.yaml' + user_config_dir_path: '$HOME/.puppetlabs/etc/bolt' + info_commands: + inventory_show: 'bolt inventory show' + group_show: 'bolt group show' + module_show: 'bolt module show' + plan_show: 'bolt plan show' + task_show: 'bolt task show' + plugin_show: 'bolt plugin show' + policy_show: 'bolt policy show' + docker_image: 'puppet/puppet-bolt' \ No newline at end of file diff --git a/data/bolt/hiera.yaml b/data/bolt/hiera.yaml index dfd3d93f..f326560f 100644 --- a/data/bolt/hiera.yaml +++ b/data/bolt/hiera.yaml @@ -1,5 +1,6 @@ --- :hierarchy: - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" - default diff --git a/data/bolt/osfamily/windows.yaml b/data/bolt/osfamily/windows.yaml new file mode 100644 index 00000000..ad247047 --- /dev/null +++ b/data/bolt/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +bolt::settings: + config_file_path: 'C:\ProgramData\PuppetLabs\bolt\etc\bolt-defaults.yaml' + config_dir_path: 'C:\ProgramData\PuppetLabs\bolt\etc\' diff --git a/data/boundary/default.yaml b/data/boundary/default.yaml index 20b250e9..16c883b4 100644 --- a/data/boundary/default.yaml +++ b/data/boundary/default.yaml @@ -3,4 +3,29 @@ boundary::settings: upstream_repo: true package_name: 'boundary' process_name: 'boundary' - + website_url: 'https://boundaryproject.io/' + git_source: 'https://github.com/hashicorp/boundary' + config_file_path: '/etc/boundary.d/boundary.hcl' + config_dir_path: '/etc/boundary.d' + conf_dir_path: '/etc/boundary.d' + config_file_format: 'hcl' + version_command: 'boundary version' + tcp_port: 9200 + info_commands: + accounts: 'boundary accounts list' + auth-methods: 'boundary auth-methods list' + auth-tokens: 'boundary auth-tokens list' + credential-libraries: 'boundary credential-libraries list' + credentials: 'boundary credentials list' + credentials-store: 'boundary credential-stores list' + groups: 'boundary groups list' + hosts: 'boundary hosts list' + host-catalogs: 'boundary host-catalogs list' + host-sets: 'boundary host-sets list' + managed-groups: 'boundary managed-groups list' + scopes: 'boundary scopes list' + sessions: 'boundary sessions list' + targets: 'boundary targets list' + users: 'boundary users list' + workers: 'boundary workers list' + docker_image: 'hashicorp/boundary' diff --git a/data/boundary/hiera.yaml b/data/boundary/hiera.yaml index 990b9755..5b72dd95 100644 --- a/data/boundary/hiera.yaml +++ b/data/boundary/hiera.yaml @@ -4,5 +4,6 @@ - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/bzip2/default.yaml b/data/bzip2/default.yaml index a01899a1..89d44ec5 100644 --- a/data/bzip2/default.yaml +++ b/data/bzip2/default.yaml @@ -1,3 +1,5 @@ --- - bzip2::settings: - package_name: 'bzip2' +bzip2::settings: + package_name: 'bzip2' + website_url: 'https://sourceware.org/bzip2/' + git_source: 'https://gitlab.com/bzip2/bzip2/' \ No newline at end of file diff --git a/data/bzip2/hiera.yaml b/data/bzip2/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/bzip2/hiera.yaml +++ b/data/bzip2/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/ceilometer/default.yaml b/data/ceilometer/default.yaml index 889026bd..6241f800 100644 --- a/data/ceilometer/default.yaml +++ b/data/ceilometer/default.yaml @@ -1,13 +1,16 @@ --- - ceilometer::settings: - package_name: 'ceilometer' - config_file_path: '/etc/ceilometer/ceilometer.conf' - config_dir_path: '/etc/ceilometer' - config_dir_owner: 'ceilometer' - config_dir_group: 'ceilometer' - pid_file_path: '/var/run/ceilometer.pid' - log_file_path: '/var/log/ceilometer/ceilometer.log' - log_dir_path: '/var/log/ceilometer' - process_name: 'ceilometer' - process_user: 'ceilometer' - process_group: 'ceilometer' +ceilometer::settings: + package_name: 'ceilometer' + config_file_path: '/etc/ceilometer/ceilometer.conf' + config_dir_path: '/etc/ceilometer' + config_dir_owner: 'ceilometer' + config_dir_group: 'ceilometer' + pid_file_path: '/var/run/ceilometer.pid' + log_file_path: '/var/log/ceilometer/ceilometer.log' + log_dir_path: '/var/log/ceilometer' + process_name: 'ceilometer' + process_user: 'ceilometer' + process_group: 'ceilometer' + website_url: 'http://docs.openstack.org/ceilometer/' + git_source: 'https://opendev.org/openstack/ceilometer' + config_file_format: 'inifile_with_stanzas' \ No newline at end of file diff --git a/data/ceilometer/hiera.yaml b/data/ceilometer/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/ceilometer/hiera.yaml +++ b/data/ceilometer/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/ceilometer/osfamily/Debian.yaml b/data/ceilometer/osfamily/Debian.yaml index f509af98..2fd904e6 100644 --- a/data/ceilometer/osfamily/Debian.yaml +++ b/data/ceilometer/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - ceilometer::settings: - package_name: ceilometer-common - init_file_path: '/etc/default/ceilometer' +ceilometer::settings: + package_name: ceilometer-common + init_file_path: '/etc/default/ceilometer' diff --git a/data/ceilometer/osfamily/RedHat.yaml b/data/ceilometer/osfamily/RedHat.yaml index 4d763e22..f3f8dbfc 100644 --- a/data/ceilometer/osfamily/RedHat.yaml +++ b/data/ceilometer/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - ceilometer::settings: - package_name: 'openstack-ceilometer-common' - init_file_path: '/etc/sysconfig/ceilometer' +ceilometer::settings: + package_name: 'openstack-ceilometer-common' + init_file_path: '/etc/sysconfig/ceilometer' diff --git a/data/ceph/default.yaml b/data/ceph/default.yaml index 15328bab..7f417513 100644 --- a/data/ceph/default.yaml +++ b/data/ceph/default.yaml @@ -1,13 +1,16 @@ --- - ceph::settings: - package_name: 'ceph' - service_name: 'ceph' - config_file_path: '/etc/ceph/ceph.conf' - config_dir_path: '/etc/ceph' - conf_dir_path: '/etc/ceph/conf.d' - pid_file_path: '/var/run/ceph.pid' - log_file_path: '/var/log/ceph/ceph.log' - log_dir_path: '/var/log/ceph' - process_name: 'ceph' - process_user: 'ceph' - process_group: 'ceph' +ceph::settings: + package_name: 'ceph' + service_name: 'ceph' + config_file_path: '/etc/ceph/ceph.conf' + config_dir_path: '/etc/ceph' + conf_dir_path: '/etc/ceph/conf.d' + pid_file_path: '/var/run/ceph.pid' + log_file_path: '/var/log/ceph/ceph.log' + log_dir_path: '/var/log/ceph' + process_name: 'ceph' + process_user: 'ceph' + process_group: 'ceph' + website_url: 'http://ceph.com' + git_source: 'https://github.com/ceph/ceph' + docker_image: 'ceph/cepth' \ No newline at end of file diff --git a/data/ceph/hiera.yaml b/data/ceph/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/ceph/hiera.yaml +++ b/data/ceph/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/ceph/osfamily/Debian.yaml b/data/ceph/osfamily/Debian.yaml index 7f61f02d..818861da 100644 --- a/data/ceph/osfamily/Debian.yaml +++ b/data/ceph/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - ceph::settings: - init_file_path: '/etc/default/ceph' +ceph::settings: + init_file_path: '/etc/default/ceph' diff --git a/data/ceph/osfamily/RedHat.yaml b/data/ceph/osfamily/RedHat.yaml index 5d1e206b..757ded80 100644 --- a/data/ceph/osfamily/RedHat.yaml +++ b/data/ceph/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - ceph::settings: - init_file_path: '/etc/sysconfig/ceph' +ceph::settings: + init_file_path: '/etc/sysconfig/ceph' diff --git a/data/cinder/default.yaml b/data/cinder/default.yaml index 3a77162b..db91ba6d 100644 --- a/data/cinder/default.yaml +++ b/data/cinder/default.yaml @@ -1,10 +1,10 @@ --- - cinder::settings: - config_file_path: '/etc/cinder/cinder.conf' - config_dir_path: '/etc/cinder' - pid_file_path: '/var/run/cinder.pid' - log_file_path: '/var/log/cinder/cinder.log' - log_dir_path: '/var/log/cinder' - process_name: 'cinder' - process_user: 'cinder' - process_group: 'cinder' +cinder::settings: + config_file_path: '/etc/cinder/cinder.conf' + config_dir_path: '/etc/cinder' + pid_file_path: '/var/run/cinder.pid' + log_file_path: '/var/log/cinder/cinder.log' + log_dir_path: '/var/log/cinder' + process_name: 'cinder' + process_user: 'cinder' + process_group: 'cinder' diff --git a/data/cinder/hiera.yaml b/data/cinder/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/cinder/hiera.yaml +++ b/data/cinder/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/cinder/osfamily/Debian.yaml b/data/cinder/osfamily/Debian.yaml index 0629e81c..a81aa669 100644 --- a/data/cinder/osfamily/Debian.yaml +++ b/data/cinder/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - cinder::settings: - package_name: - - 'python-cinder' - - 'cinder-common' - init_file_path: '/etc/default/cinder' +cinder::settings: + package_name: + - 'python-cinder' + - 'cinder-common' + init_file_path: '/etc/default/cinder' diff --git a/data/cinder/osfamily/RedHat.yaml b/data/cinder/osfamily/RedHat.yaml index 88ab8859..724db0e9 100644 --- a/data/cinder/osfamily/RedHat.yaml +++ b/data/cinder/osfamily/RedHat.yaml @@ -1,7 +1,7 @@ --- - cinder::settings: - package_name: - - 'python-cinder' - - 'openstack-cinder' - init_file_path: '/etc/sysconfig/cinder' +cinder::settings: + package_name: + - 'python-cinder' + - 'openstack-cinder' + init_file_path: '/etc/sysconfig/cinder' diff --git a/data/clvm/default.yaml b/data/clvm/default.yaml index 50a92458..ca0a357e 100644 --- a/data/clvm/default.yaml +++ b/data/clvm/default.yaml @@ -1,9 +1,9 @@ --- - clvm::settings: - package_name: 'lvm2-cluster' - service_name: 'clvmd' - config_file_path: '/etc/lvm/lvm.conf' - config_dir_path: '/etc/lvm' - pid_file_path: '/var/run/clvmd.pid' - process_user: 'root' - process_group: 'root' +clvm::settings: + package_name: 'lvm2-cluster' + service_name: 'clvmd' + config_file_path: '/etc/lvm/lvm.conf' + config_dir_path: '/etc/lvm' + pid_file_path: '/var/run/clvmd.pid' + process_user: 'root' + process_group: 'root' diff --git a/data/clvm/hiera.yaml b/data/clvm/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/clvm/hiera.yaml +++ b/data/clvm/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/clvm/osfamily/Debian.yaml b/data/clvm/osfamily/Debian.yaml index 288160c2..874bb456 100644 --- a/data/clvm/osfamily/Debian.yaml +++ b/data/clvm/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - clvm::settings: - package_name: 'clvm' - service_name: 'clvm' - init_file_path: '/etc/default/clvmd' +clvm::settings: + package_name: 'clvm' + service_name: 'clvm' + init_file_path: '/etc/default/clvmd' diff --git a/data/clvm/osfamily/RedHat.yaml b/data/clvm/osfamily/RedHat.yaml index 91f6bf20..b0435542 100644 --- a/data/clvm/osfamily/RedHat.yaml +++ b/data/clvm/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - clvm::settings: - init_file_path: '/etc/sysconfig/clvmd' +clvm::settings: + init_file_path: '/etc/sysconfig/clvmd' diff --git a/data/collectd/default.yaml b/data/collectd/default.yaml index c26fe5c9..087b7bde 100644 --- a/data/collectd/default.yaml +++ b/data/collectd/default.yaml @@ -1,11 +1,11 @@ --- - collectd::settings: - package_name: 'collectd' - service_name: 'collectd' - config_file_path: '/etc/collectd/collectd.conf' - config_dir_path: '/etc/collectd' - conf_dir_path: '/etc/collectd/collectd.d' - pid_file_path: '/var/run/collectd.pid' - log_file_path: '/var/log/collectd.log' - process_user: 'collectd' - process_group: 'collectd' +collectd::settings: + package_name: 'collectd' + service_name: 'collectd' + config_file_path: '/etc/collectd/collectd.conf' + config_dir_path: '/etc/collectd' + conf_dir_path: '/etc/collectd/collectd.d' + pid_file_path: '/var/run/collectd.pid' + log_file_path: '/var/log/collectd.log' + process_user: 'collectd' + process_group: 'collectd' diff --git a/data/collectd/hiera.yaml b/data/collectd/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/collectd/hiera.yaml +++ b/data/collectd/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/collectd/osfamily/Debian.yaml b/data/collectd/osfamily/Debian.yaml index 0728163c..965fa36d 100644 --- a/data/collectd/osfamily/Debian.yaml +++ b/data/collectd/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - collectd::settings: - init_file_path: '/etc/default/collectd' +collectd::settings: + init_file_path: '/etc/default/collectd' diff --git a/data/collectd/osfamily/RedHat.yaml b/data/collectd/osfamily/RedHat.yaml index 76003753..fde5211c 100644 --- a/data/collectd/osfamily/RedHat.yaml +++ b/data/collectd/osfamily/RedHat.yaml @@ -1,7 +1,7 @@ --- - collectd::settings: - init_file_path: '/etc/sysconfig/collectd' - config_file_path: '/etc/collectd.conf' - config_dir_path: '/etc/collectd.d' - conf_dir_path: '/etc/collectd.d' +collectd::settings: + init_file_path: '/etc/sysconfig/collectd' + config_file_path: '/etc/collectd.conf' + config_dir_path: '/etc/collectd.d' + conf_dir_path: '/etc/collectd.d' diff --git a/data/consul-enterprise/hiera.yaml b/data/consul-enterprise/hiera.yaml index 990b9755..5b72dd95 100644 --- a/data/consul-enterprise/hiera.yaml +++ b/data/consul-enterprise/hiera.yaml @@ -4,5 +4,6 @@ - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/consul/hiera.yaml b/data/consul/hiera.yaml index 990b9755..5b72dd95 100644 --- a/data/consul/hiera.yaml +++ b/data/consul/hiera.yaml @@ -4,5 +4,6 @@ - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/corosync/default.yaml b/data/corosync/default.yaml index 8d686e64..0e932270 100644 --- a/data/corosync/default.yaml +++ b/data/corosync/default.yaml @@ -1,11 +1,11 @@ --- - corosync::settings: - package_name: 'corosync' - service_name: 'corosync' - config_file_path: '/etc/corosync/corosync.conf' - config_dir_path: '/etc/corosync' - log_file_path: '/var/log/corosync/corosync.log' - log_dir_path: '/var/log/corosync' - process_name: 'corosync' - process_user: 'corosync' - process_group: 'corosync' +corosync::settings: + package_name: 'corosync' + service_name: 'corosync' + config_file_path: '/etc/corosync/corosync.conf' + config_dir_path: '/etc/corosync' + log_file_path: '/var/log/corosync/corosync.log' + log_dir_path: '/var/log/corosync' + process_name: 'corosync' + process_user: 'corosync' + process_group: 'corosync' diff --git a/data/corosync/hiera.yaml b/data/corosync/hiera.yaml index 19fa9ae9..a6dec64c 100644 --- a/data/corosync/hiera.yaml +++ b/data/corosync/hiera.yaml @@ -2,5 +2,6 @@ :hierarchy: - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/corosync/osfamily/Debian.yaml b/data/corosync/osfamily/Debian.yaml index 90e02073..534aa621 100644 --- a/data/corosync/osfamily/Debian.yaml +++ b/data/corosync/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - corosync::settings: - init_file_path: '/etc/default/corosync' +corosync::settings: + init_file_path: '/etc/default/corosync' diff --git a/data/corosync/osfamily/RedHat.yaml b/data/corosync/osfamily/RedHat.yaml index 3fbc02ef..ca8945bd 100644 --- a/data/corosync/osfamily/RedHat.yaml +++ b/data/corosync/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - corosync::settings: - init_file_path: '/etc/sysconfig/corosync' +corosync::settings: + init_file_path: '/etc/sysconfig/corosync' diff --git a/data/cron/hiera.yaml b/data/cron/hiera.yaml index 13f2e8fd..c867385e 100644 --- a/data/cron/hiera.yaml +++ b/data/cron/hiera.yaml @@ -3,5 +3,6 @@ - "%{title}/osfamily/%{operatingsystem}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/crowdsec-firewall-bouncer-iptables/hiera.yaml b/data/crowdsec-firewall-bouncer-iptables/hiera.yaml index 1c820bbc..21c6b540 100644 --- a/data/crowdsec-firewall-bouncer-iptables/hiera.yaml +++ b/data/crowdsec-firewall-bouncer-iptables/hiera.yaml @@ -5,5 +5,6 @@ - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/docker/hiera.yaml b/data/docker/hiera.yaml index 401d06e4..21c6b540 100644 --- a/data/docker/hiera.yaml +++ b/data/docker/hiera.yaml @@ -2,6 +2,7 @@ :hierarchy: - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/default" - "default/%{operatingsystem}%{operatingsystemmajrelease}" diff --git a/data/docker/upstream/osfamily/RedHat.yaml b/data/docker/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..b06c17a7 --- /dev/null +++ b/data/docker/upstream/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +docker::settings: + repo_file_url: 'https://download.docker.com/linux/rhel/docker-ce.repo' diff --git a/data/elastic_repo/ds/default.yaml b/data/elastic_repo/ds/default.yaml new file mode 100644 index 00000000..9cc7c368 --- /dev/null +++ b/data/elastic_repo/ds/default.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_filename: elastic-7.x + repo_description: 'Elastic repository for 7.x packages' diff --git a/data/elastic_repo/ds/osfamily/Debian.yaml b/data/elastic_repo/ds/osfamily/Debian.yaml new file mode 100644 index 00000000..9cdca979 --- /dev/null +++ b/data/elastic_repo/ds/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- +elastic_repo::settings: + repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/elastic_repo/ds/osfamily/RedHat.yaml b/data/elastic_repo/ds/osfamily/RedHat.yaml new file mode 100644 index 00000000..9ad7a7e3 --- /dev/null +++ b/data/elastic_repo/ds/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +elastic_repo::settings: + repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + diff --git a/data/elastic_repo/hiera.yaml b/data/elastic_repo/hiera.yaml index 6c3adfb5..19f0364f 100644 --- a/data/elastic_repo/hiera.yaml +++ b/data/elastic_repo/hiera.yaml @@ -2,6 +2,7 @@ :hierarchy: - "%{title}/%{repo}/osfamily/%{osfamily}" - "%{title}/%{repo}/default" + - "%{title}/upstream/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" diff --git a/data/elastic_repo/upstream/default.yaml b/data/elastic_repo/upstream/default.yaml index 9cc7c368..6697685f 100644 --- a/data/elastic_repo/upstream/default.yaml +++ b/data/elastic_repo/upstream/default.yaml @@ -1,4 +1,4 @@ --- elastic_repo::settings: - repo_filename: elastic-7.x - repo_description: 'Elastic repository for 7.x packages' + repo_filename: elastic-8.x + repo_description: 'Elastic repository for 8.x packages' diff --git a/data/elastic_repo/upstream/osfamily/Debian.yaml b/data/elastic_repo/upstream/osfamily/Debian.yaml index 9cdca979..39f3d01e 100644 --- a/data/elastic_repo/upstream/osfamily/Debian.yaml +++ b/data/elastic_repo/upstream/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- elastic_repo::settings: - repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' + repo_url: 'https://artifacts.elastic.co/packages/8.x/apt' apt_repos: 'main' apt_release: 'stable' diff --git a/data/elastic_repo/upstream/osfamily/RedHat.yaml b/data/elastic_repo/upstream/osfamily/RedHat.yaml index 9ad7a7e3..2ede54e6 100644 --- a/data/elastic_repo/upstream/osfamily/RedHat.yaml +++ b/data/elastic_repo/upstream/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- elastic_repo::settings: - repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + repo_url: 'https://artifacts.elastic.co/packages/8.x/yum' diff --git a/data/epel/osfamily/RedHat6.yaml b/data/epel/osfamily/RedHat6.yaml index 323c6215..cc578572 100644 --- a/data/epel/osfamily/RedHat6.yaml +++ b/data/epel/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- epel::settings: - repo_package_url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm' + repo_package_url: 'https://dl.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm' diff --git a/data/epel/osfamily/RedHat9.yaml b/data/epel/osfamily/RedHat9.yaml new file mode 100644 index 00000000..c6d91979 --- /dev/null +++ b/data/epel/osfamily/RedHat9.yaml @@ -0,0 +1,3 @@ +--- +epel::settings: + repo_package_url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm' diff --git a/data/openssh/default.yaml b/data/openssh/default.yaml index d52de270..783c3eff 100644 --- a/data/openssh/default.yaml +++ b/data/openssh/default.yaml @@ -14,3 +14,4 @@ openssh::settings: nodaemon_args: '-D' validate_cmd: 'sshd -t -f %' version_command: 'ssh -V' + config_file_format: 'inifile' \ No newline at end of file diff --git a/data/postfix/default.yaml b/data/postfix/default.yaml index 0fc92d0f..6bb30afa 100644 --- a/data/postfix/default.yaml +++ b/data/postfix/default.yaml @@ -1,20 +1,26 @@ --- - postfix::settings: - package_name: 'postfix' - service_name: 'postfix' - config_file_path: '/etc/postfix/main.cf' - config_dir_path: '/etc/postfix' - pid_file_path: '/var/spool/postfix/pid/master.pid' - log_file_path: '/var/log/maillog' - data_dir_path: '/var/spool/postfix' - process_name: 'master' - process_user: 'postfix' - process_group: 'postfix' - setgid_group: 'postdrop' - tcp_port: '25' - queue_dir_path: '/var/spool/postfix' - daemon_dir_path: '/usr/libexec/postfix' - sendmail_path: '/usr/sbin/sendmail' - newaliases_path: '/usr/bin/newaliases' - mailq_path: '/usr/bin/mailq' - version_command: 'postconf mail_version' +postfix::settings: + package_name: 'postfix' + service_name: 'postfix' + config_file_path: '/etc/postfix/main.cf' + config_dir_path: '/etc/postfix' + pid_file_path: '/var/spool/postfix/pid/master.pid' + log_file_path: '/var/log/maillog' + data_dir_path: '/var/spool/postfix' + process_name: 'master' + process_user: 'postfix' + process_group: 'postfix' + setgid_group: 'postdrop' + tcp_port: '25' + queue_dir_path: '/var/spool/postfix' + daemon_dir_path: '/usr/libexec/postfix' + sendmail_path: '/usr/sbin/sendmail' + newaliases_path: '/usr/bin/newaliases' + mailq_path: '/usr/bin/mailq' + version_command: 'postconf mail_version' + website_url: 'https://www.postfix.org/' + git_source: 'https://github.com/vdukhovni/postfix' + info_commands: + mailqueue: 'mailq' + validate_cmd: 'postconf -n' + config_file_format: 'inifile' diff --git a/data/postfix/hiera.yaml b/data/postfix/hiera.yaml index 7d5ead52..2bfd5772 100644 --- a/data/postfix/hiera.yaml +++ b/data/postfix/hiera.yaml @@ -2,6 +2,7 @@ :hierarchy: - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemrelease}" - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/postfix/osfamily/Debian.yaml b/data/postfix/osfamily/Debian.yaml index 6597b0f5..fa8b942f 100644 --- a/data/postfix/osfamily/Debian.yaml +++ b/data/postfix/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - postfix::settings: - log_file_path: '/var/log/mail.log' - init_file_path: '/etc/default/postfix' - daemon_dir_path: '/usr/lib/postfix/sbin' +postfix::settings: + log_file_path: '/var/log/mail.log' + init_file_path: '/etc/default/postfix' + daemon_dir_path: '/usr/lib/postfix/sbin' diff --git a/data/postfix/osfamily/RedHat.yaml b/data/postfix/osfamily/RedHat.yaml index bc8b577c..a57fea5d 100644 --- a/data/postfix/osfamily/RedHat.yaml +++ b/data/postfix/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - postfix::settings: - init_file_path: '/etc/sysconfig/postfix' - sendmail_path: '/usr/sbin/sendmail.postfix' - newaliases_path: '/usr/bin/newaliases.postfix' - mailq_path: '/usr/bin/mailq.postfix' +postfix::settings: + init_file_path: '/etc/sysconfig/postfix' + sendmail_path: '/usr/sbin/sendmail.postfix' + newaliases_path: '/usr/bin/newaliases.postfix' + mailq_path: '/usr/bin/mailq.postfix' diff --git a/data/postfix/osfamily/Suse.yaml b/data/postfix/osfamily/Suse.yaml index 9f7f6315..1a2266c5 100644 --- a/data/postfix/osfamily/Suse.yaml +++ b/data/postfix/osfamily/Suse.yaml @@ -1,4 +1,4 @@ --- - postfix::settings: - setgid_group: 'maildrop' - daemon_dir_path: '/usr/lib/postfix/bin' +postfix::settings: + setgid_group: 'maildrop' + daemon_dir_path: '/usr/lib/postfix/bin' diff --git a/data/python-pip/default.yaml b/data/python-pip/default.yaml index 3aa0bb5e..417751a2 100644 --- a/data/python-pip/default.yaml +++ b/data/python-pip/default.yaml @@ -1,3 +1,15 @@ --- - python-pip::settings: - package_name: 'python-pip' +python-pip::settings: + package_name: 'python-pip' + version_command: 'pip -V' + website_url: 'https://pypi.org/project/pip/' + git_source: 'https://github.com/pypa/pip' + config_file_path: '/etc/pip.conf' + user_config_file_path: '$HOME/.config/pip/pip.conf' + config_file_format: 'inifile_with_stanzas' + debug_commands: + debug: 'pip debug' + info_commands: + cache_info: 'pip cache info' + check: 'pip check' + config_debug: 'pip config debug' diff --git a/data/python-pip/osfamily/Debian.yaml b/data/python-pip/osfamily/Debian.yaml index 3aa0bb5e..be597202 100644 --- a/data/python-pip/osfamily/Debian.yaml +++ b/data/python-pip/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - python-pip::settings: - package_name: 'python-pip' +python-pip::settings: + package_name: 'python3-pip' diff --git a/data/python-pip/osfamily/Debian20.04.yaml b/data/python-pip/osfamily/Debian20.04.yaml new file mode 100644 index 00000000..be597202 --- /dev/null +++ b/data/python-pip/osfamily/Debian20.04.yaml @@ -0,0 +1,3 @@ +--- +python-pip::settings: + package_name: 'python3-pip' diff --git a/data/python-pip/osfamily/Debian22.04.yaml b/data/python-pip/osfamily/Debian22.04.yaml new file mode 100644 index 00000000..be597202 --- /dev/null +++ b/data/python-pip/osfamily/Debian22.04.yaml @@ -0,0 +1,3 @@ +--- +python-pip::settings: + package_name: 'python3-pip' diff --git a/data/python-pip/osfamily/RedHat7.yaml b/data/python-pip/osfamily/RedHat7.yaml index 251aa1c4..1cf425ad 100644 --- a/data/python-pip/osfamily/RedHat7.yaml +++ b/data/python-pip/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- - python-pip::settings: - site_packages_dir_path: '/usr/lib/python2.7/site-packages' +python-pip::settings: + package_name: 'python3-pip' \ No newline at end of file diff --git a/data/python-pip/osfamily/RedHat8.yaml b/data/python-pip/osfamily/RedHat8.yaml new file mode 100644 index 00000000..be597202 --- /dev/null +++ b/data/python-pip/osfamily/RedHat8.yaml @@ -0,0 +1,3 @@ +--- +python-pip::settings: + package_name: 'python3-pip' diff --git a/data/python-pip/osfamily/RedHat9.yaml b/data/python-pip/osfamily/RedHat9.yaml new file mode 100644 index 00000000..17d6ca57 --- /dev/null +++ b/data/python-pip/osfamily/RedHat9.yaml @@ -0,0 +1,3 @@ +--- +python-pip::settings: + package_name: 'python3-pip' \ No newline at end of file diff --git a/data/test/default.yaml b/data/test/default.yaml index 1c28f4f0..8f019b5a 100644 --- a/data/test/default.yaml +++ b/data/test/default.yaml @@ -1,14 +1,14 @@ --- - test::settings: - package_name: 'test' - service_name: 'test' - config_file_path: '/etc/test/test.conf' - config_dir_path: '/etc/test' - conf_dir_path: '/etc/test/conf.d' - pid_file_path: '/var/run/test.pid' - log_file_path: '/var/log/test/test.log' - log_dir_path: '/var/log/test' - process_name: 'test' - process_user: 'test' - process_group: 'test' - tcp_port: '6379' +test::settings: + package_name: '' + service_name: '' + config_file_path: '/etc/test/test.conf' + config_dir_path: '/etc/test' + conf_dir_path: '/etc/test/conf.d' + pid_file_path: '/var/run/test.pid' + log_file_path: '/var/log/test/test.log' + log_dir_path: '/var/log/test' + process_name: 'test' + process_user: 'test' + process_group: 'test' + tcp_port: '6379' diff --git a/data/test/osfamily/Debian.yaml b/data/test/osfamily/Debian.yaml index a2fb0efe..7ccf2845 100644 --- a/data/test/osfamily/Debian.yaml +++ b/data/test/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - test::settings: - init_file_path: '/etc/default/test' +test::settings: + init_file_path: '/etc/default/test' diff --git a/data/test/osfamily/RedHat.yaml b/data/test/osfamily/RedHat.yaml index f9f48f9b..f74d1e96 100644 --- a/data/test/osfamily/RedHat.yaml +++ b/data/test/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - test::settings: - init_file_path: '/etc/sysconfig/test' +test::settings: + init_file_path: '/etc/sysconfig/test' diff --git a/metadata.json b/metadata.json index 71fcf015..f6bab5c7 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.4.8", + "version": "0.5.0", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 99c6fc61a4e6b66403b65a8896e385ff20923965 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 12 Dec 2022 11:40:51 +0100 Subject: [PATCH 244/284] Updated dependencies --- metadata.json | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/metadata.json b/metadata.json index f6bab5c7..d6fe5101 100644 --- a/metadata.json +++ b/metadata.json @@ -16,7 +16,15 @@ "operatingsystemrelease": [ "6", "7", - "8" + "8", + "9" + ] + }, + { + "operatingsystem": "Rovky", + "operatingsystemrelease": [ + "8", + "9" ] }, { @@ -32,7 +40,8 @@ "operatingsystemrelease": [ "6", "7", - "8" + "8", + "9" ] }, { @@ -56,7 +65,9 @@ "6", "7", "8", - "9" + "9", + "10", + "11" ] }, { @@ -66,14 +77,16 @@ "12.04", "14.04", "16.04", - "18.04" + "18.04", + "20.04", + "22.04" ] } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 3.0.0 < 8.0.0" + "version_requirement": ">= 3.0.0 < 9.0.0" } ], "checksums": { From b67ad5033a784f222f2437466cf88a584983dade Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 14 Dec 2022 02:32:25 +0100 Subject: [PATCH 245/284] Desktop apps (#56) * Added microsoft_repo, sysinternals, procdump, vscode, powershell, git data * Added data for autoruns, edge, omi, powertorys, scx, telegram-desktop * Added data for discord libreoffice obs-studio twitch-studio twitch webexe-meetings webex zoom * Versiob 0.5.1 --- .github/ISSUE_TEMPLATE.md | 15 ++++++++++----- data/autoruns/default.yaml | 4 ++++ data/autoruns/hiera.yaml | 8 ++++++++ data/autoruns/osfamily/windows.yaml | 5 +++++ data/azure-cli/default.yaml | 3 ++- data/discord/default.yaml | 5 +++++ data/discord/hiera.yaml | 8 ++++++++ data/discord/osfamily/Darwin.yaml | 3 +++ data/discord/osfamily/windows.yaml | 4 ++++ data/edge/default.yaml | 7 +++++++ data/edge/hiera.yaml | 8 ++++++++ data/edge/osfamily/Darwin.yaml | 4 ++++ data/edge/osfamily/windows.yaml | 5 +++++ data/git/default.yaml | 9 +++++++-- data/git/hiera.yaml | 2 ++ data/git/osfamily/Darwin.yaml | 3 +++ data/git/osfamily/windows.yaml | 6 ++++++ data/libreoffice/default.yaml | 6 ++++++ data/libreoffice/hiera.yaml | 8 ++++++++ data/libreoffice/osfamily/Darwin.yaml | 3 +++ data/libreoffice/osfamily/windows.yaml | 4 ++++ data/microsoft_repo/default.yaml | 4 ++++ data/microsoft_repo/hiera.yaml | 12 ++++++++++++ data/microsoft_repo/upstream/default.yaml | 3 +++ .../upstream/operatingsystem/CentOS6.yaml | 3 +++ .../upstream/operatingsystem/CentOS7.yaml | 3 +++ .../upstream/operatingsystem/CentOS8.yaml | 3 +++ .../upstream/operatingsystem/Debian10.yaml | 3 +++ .../upstream/operatingsystem/Debian11.yaml | 3 +++ .../upstream/operatingsystem/Debian8.yaml | 3 +++ .../upstream/operatingsystem/Debian9.yaml | 3 +++ .../upstream/operatingsystem/Fedora26.yaml | 4 ++++ .../upstream/operatingsystem/Fedora27.yaml | 4 ++++ .../upstream/operatingsystem/Fedora28.yaml | 4 ++++ .../upstream/operatingsystem/Fedora29.yaml | 4 ++++ .../upstream/operatingsystem/Fedora30.yaml | 4 ++++ .../upstream/operatingsystem/Fedora31.yaml | 4 ++++ .../upstream/operatingsystem/Fedora32.yaml | 4 ++++ .../upstream/operatingsystem/Fedora33.yaml | 4 ++++ .../upstream/operatingsystem/Fedora34.yaml | 4 ++++ .../upstream/operatingsystem/Fedora35.yaml | 4 ++++ .../upstream/operatingsystem/Fedora36.yaml | 4 ++++ .../upstream/operatingsystem/OpenSuse12.yaml | 4 ++++ .../upstream/operatingsystem/OpenSuse15.yaml | 4 ++++ .../upstream/operatingsystem/OpenSuse42.2.yaml | 4 ++++ .../upstream/operatingsystem/OpenSuse42.3.yaml | 4 ++++ .../upstream/operatingsystem/SLES11.yaml | 4 ++++ .../upstream/operatingsystem/SLES12.yaml | 4 ++++ .../upstream/operatingsystem/SLES15.yaml | 4 ++++ .../upstream/operatingsystem/Ubuntu14.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu15.10.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu16.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu16.10.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu17.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu17.10.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu18.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu18.10.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu19.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu19.10.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu20.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu20.10.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu21.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu21.10.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu22.04.yaml | 3 +++ .../upstream/operatingsystem/Ubuntu22.10.yaml | 3 +++ .../microsoft_repo/upstream/osfamily/RedHat6.yaml | 3 +++ .../microsoft_repo/upstream/osfamily/RedHat7.yaml | 3 +++ .../microsoft_repo/upstream/osfamily/RedHat8.yaml | 4 ++++ .../microsoft_repo/upstream/osfamily/RedHat9.yaml | 3 +++ data/obs-studio/default.yaml | 6 ++++++ data/obs-studio/hiera.yaml | 8 ++++++++ data/obs-studio/osfamily/Darwin.yaml | 3 +++ data/obs-studio/osfamily/windows.yaml | 4 ++++ data/omi/default.yaml | 12 ++++++++++++ data/omi/hiera.yaml | 8 ++++++++ data/omi/osfamily/Darwin.yaml | 5 +++++ data/omi/osfamily/windows.yaml | 5 +++++ data/powershell/default.yaml | 9 +++++++++ data/powershell/hiera.yaml | 8 ++++++++ data/powershell/osfamily/Darwin.yaml | 3 +++ data/powershell/osfamily/windows.yaml | 4 ++++ data/powertoys/default.yaml | 4 ++++ data/powertoys/hiera.yaml | 8 ++++++++ data/powertoys/osfamily/windows.yaml | 5 +++++ data/procdump/default.yaml | 7 +++++++ data/procdump/hiera.yaml | 8 ++++++++ data/procdump/osfamily/Darwin.yaml | 3 +++ data/procdump/osfamily/windows.yaml | 3 +++ data/scx/default.yaml | 10 ++++++++++ data/scx/hiera.yaml | 8 ++++++++ data/scx/osfamily/windows.yaml | 5 +++++ data/sysinternals/default.yaml | 7 +++++++ data/sysinternals/hiera.yaml | 8 ++++++++ data/sysinternals/osfamily/windows.yaml | 5 +++++ data/sysmon/default.yaml | 7 +++++++ data/sysmon/hiera.yaml | 8 ++++++++ data/sysmon/osfamily/windows.yaml | 4 ++++ data/telegram-desktop/default.yaml | 6 ++++++ data/telegram-desktop/hiera.yaml | 8 ++++++++ data/telegram-desktop/osfamily/Darwin.yaml | 3 +++ data/telegram-desktop/osfamily/windows.yaml | 4 ++++ data/twitch-studio/default.yaml | 4 ++++ data/twitch-studio/hiera.yaml | 8 ++++++++ data/twitch-studio/osfamily/Darwin.yaml | 3 +++ data/twitch-studio/osfamily/windows.yaml | 5 +++++ data/twitch/default.yaml | 6 ++++++ data/twitch/hiera.yaml | 8 ++++++++ data/twitch/osfamily/Darwin.yaml | 4 ++++ data/twitch/osfamily/windows.yaml | 4 ++++ data/vagrant/default.yaml | 1 - data/vscode/default.yaml | 11 +++++++++++ data/vscode/hiera.yaml | 8 ++++++++ data/vscode/osfamily/Darwin.yaml | 5 +++++ data/vscode/osfamily/Debian.yaml | 3 +++ data/vscode/osfamily/RedHat.yaml | 3 +++ data/vscode/osfamily/windows.yaml | 7 +++++++ data/webex-meetings/default.yaml | 6 ++++++ data/webex-meetings/hiera.yaml | 8 ++++++++ data/webex-meetings/osfamily/Darwin.yaml | 4 ++++ data/webex-meetings/osfamily/windows.yaml | 5 +++++ data/webex/default.yaml | 5 +++++ data/webex/hiera.yaml | 8 ++++++++ data/webex/osfamily/Darwin.yaml | 4 ++++ data/webex/osfamily/windows.yaml | 5 +++++ data/zoom/default.yaml | 5 +++++ data/zoom/hiera.yaml | 8 ++++++++ data/zoom/osfamily/Darwin.yaml | 4 ++++ data/zoom/osfamily/windows.yaml | 5 +++++ metadata.json | 2 +- 129 files changed, 628 insertions(+), 10 deletions(-) create mode 100644 data/autoruns/default.yaml create mode 100644 data/autoruns/hiera.yaml create mode 100644 data/autoruns/osfamily/windows.yaml create mode 100644 data/discord/default.yaml create mode 100644 data/discord/hiera.yaml create mode 100644 data/discord/osfamily/Darwin.yaml create mode 100644 data/discord/osfamily/windows.yaml create mode 100644 data/edge/default.yaml create mode 100644 data/edge/hiera.yaml create mode 100644 data/edge/osfamily/Darwin.yaml create mode 100644 data/edge/osfamily/windows.yaml create mode 100644 data/git/osfamily/Darwin.yaml create mode 100644 data/git/osfamily/windows.yaml create mode 100644 data/libreoffice/default.yaml create mode 100644 data/libreoffice/hiera.yaml create mode 100644 data/libreoffice/osfamily/Darwin.yaml create mode 100644 data/libreoffice/osfamily/windows.yaml create mode 100644 data/microsoft_repo/default.yaml create mode 100644 data/microsoft_repo/hiera.yaml create mode 100644 data/microsoft_repo/upstream/default.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/CentOS6.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/CentOS7.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/CentOS8.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Debian10.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Debian11.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Debian8.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Debian9.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora26.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora27.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora28.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora29.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora30.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora31.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora32.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora33.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora34.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora35.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Fedora36.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/OpenSuse12.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/OpenSuse15.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/OpenSuse42.2.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/OpenSuse42.3.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/SLES11.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/SLES12.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/SLES15.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu14.04.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu15.10.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu16.10.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu17.04.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu17.10.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu18.04.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu18.10.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu19.04.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu19.10.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu20.04.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu20.10.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu21.04.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu21.10.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu22.04.yaml create mode 100644 data/microsoft_repo/upstream/operatingsystem/Ubuntu22.10.yaml create mode 100644 data/microsoft_repo/upstream/osfamily/RedHat6.yaml create mode 100644 data/microsoft_repo/upstream/osfamily/RedHat7.yaml create mode 100644 data/microsoft_repo/upstream/osfamily/RedHat8.yaml create mode 100644 data/microsoft_repo/upstream/osfamily/RedHat9.yaml create mode 100644 data/obs-studio/default.yaml create mode 100644 data/obs-studio/hiera.yaml create mode 100644 data/obs-studio/osfamily/Darwin.yaml create mode 100644 data/obs-studio/osfamily/windows.yaml create mode 100644 data/omi/default.yaml create mode 100644 data/omi/hiera.yaml create mode 100644 data/omi/osfamily/Darwin.yaml create mode 100644 data/omi/osfamily/windows.yaml create mode 100644 data/powershell/default.yaml create mode 100644 data/powershell/hiera.yaml create mode 100644 data/powershell/osfamily/Darwin.yaml create mode 100644 data/powershell/osfamily/windows.yaml create mode 100644 data/powertoys/default.yaml create mode 100644 data/powertoys/hiera.yaml create mode 100644 data/powertoys/osfamily/windows.yaml create mode 100644 data/procdump/default.yaml create mode 100644 data/procdump/hiera.yaml create mode 100644 data/procdump/osfamily/Darwin.yaml create mode 100644 data/procdump/osfamily/windows.yaml create mode 100644 data/scx/default.yaml create mode 100644 data/scx/hiera.yaml create mode 100644 data/scx/osfamily/windows.yaml create mode 100644 data/sysinternals/default.yaml create mode 100644 data/sysinternals/hiera.yaml create mode 100644 data/sysinternals/osfamily/windows.yaml create mode 100644 data/sysmon/default.yaml create mode 100644 data/sysmon/hiera.yaml create mode 100644 data/sysmon/osfamily/windows.yaml create mode 100644 data/telegram-desktop/default.yaml create mode 100644 data/telegram-desktop/hiera.yaml create mode 100644 data/telegram-desktop/osfamily/Darwin.yaml create mode 100644 data/telegram-desktop/osfamily/windows.yaml create mode 100644 data/twitch-studio/default.yaml create mode 100644 data/twitch-studio/hiera.yaml create mode 100644 data/twitch-studio/osfamily/Darwin.yaml create mode 100644 data/twitch-studio/osfamily/windows.yaml create mode 100644 data/twitch/default.yaml create mode 100644 data/twitch/hiera.yaml create mode 100644 data/twitch/osfamily/Darwin.yaml create mode 100644 data/twitch/osfamily/windows.yaml create mode 100644 data/vscode/default.yaml create mode 100644 data/vscode/hiera.yaml create mode 100644 data/vscode/osfamily/Darwin.yaml create mode 100644 data/vscode/osfamily/Debian.yaml create mode 100644 data/vscode/osfamily/RedHat.yaml create mode 100644 data/vscode/osfamily/windows.yaml create mode 100644 data/webex-meetings/default.yaml create mode 100644 data/webex-meetings/hiera.yaml create mode 100644 data/webex-meetings/osfamily/Darwin.yaml create mode 100644 data/webex-meetings/osfamily/windows.yaml create mode 100644 data/webex/default.yaml create mode 100644 data/webex/hiera.yaml create mode 100644 data/webex/osfamily/Darwin.yaml create mode 100644 data/webex/osfamily/windows.yaml create mode 100644 data/zoom/default.yaml create mode 100644 data/zoom/hiera.yaml create mode 100644 data/zoom/osfamily/Darwin.yaml create mode 100644 data/zoom/osfamily/windows.yaml diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 0a265656..4f169ec1 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,12 +1,17 @@ -## Expected Behavior +# Describe your issue -## Actual Behavior -## Steps to Reproduce the Problem +# Labels -## Specifications +Please use the following labels: -Please add this info: +* **tinydata request** for any request for new or updated tinydata for an application +* **questions** for any error you find, doubt or clarification request + + +# Context + +Please provide any info useful for troubleshooting, like: 1. Output of `facter -p` on the failing node (at least the OS related facts) 2. Version of Puppet and of the module diff --git a/data/autoruns/default.yaml b/data/autoruns/default.yaml new file mode 100644 index 00000000..d67816b5 --- /dev/null +++ b/data/autoruns/default.yaml @@ -0,0 +1,4 @@ +--- +autoruns::settings: + package_name: '' + website_url: 'https://learn.microsoft.com/en-us/sysinternals/downloads/autoruns' diff --git a/data/autoruns/hiera.yaml b/data/autoruns/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/autoruns/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/autoruns/osfamily/windows.yaml b/data/autoruns/osfamily/windows.yaml new file mode 100644 index 00000000..c3c74aa2 --- /dev/null +++ b/data/autoruns/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +autoruns::settings: + winget_package_name: 'Microsoft.Sysinternals.Autoruns' + choco_package_name: 'autoruns' + package_name: 'autoruns' diff --git a/data/azure-cli/default.yaml b/data/azure-cli/default.yaml index 90a77a5d..92233996 100644 --- a/data/azure-cli/default.yaml +++ b/data/azure-cli/default.yaml @@ -1,6 +1,7 @@ --- azure-cli::settings: - upstream_repo: true package_name: azure-cli version_command: 'az -v' docker_image: 'bitnami/azure-cli' + tp_prerequisites: + - microsoft_repo diff --git a/data/discord/default.yaml b/data/discord/default.yaml new file mode 100644 index 00000000..694e3208 --- /dev/null +++ b/data/discord/default.yaml @@ -0,0 +1,5 @@ +--- +discord::settings: + package_name: discord + snap_package_name: 'discord' + website_url: 'https://discord.com/' diff --git a/data/discord/hiera.yaml b/data/discord/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/discord/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/discord/osfamily/Darwin.yaml b/data/discord/osfamily/Darwin.yaml new file mode 100644 index 00000000..b257d069 --- /dev/null +++ b/data/discord/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +discord::settings: + brew_package_name: 'discord' diff --git a/data/discord/osfamily/windows.yaml b/data/discord/osfamily/windows.yaml new file mode 100644 index 00000000..16c25c97 --- /dev/null +++ b/data/discord/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +discord::settings: + winget_package_name: 'Discord.Discord' + choco_package_name: 'discord' diff --git a/data/edge/default.yaml b/data/edge/default.yaml new file mode 100644 index 00000000..5044df9e --- /dev/null +++ b/data/edge/default.yaml @@ -0,0 +1,7 @@ +--- +edge::settings: + package_name: microsoft-edge-stable + docker_image: 'microsoft/edge' + website_url: 'https://learn.microsoft.com/edge/' + tp_prerequisites: + - 'microsoft_repo' diff --git a/data/edge/hiera.yaml b/data/edge/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/edge/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/edge/osfamily/Darwin.yaml b/data/edge/osfamily/Darwin.yaml new file mode 100644 index 00000000..896ae8ba --- /dev/null +++ b/data/edge/osfamily/Darwin.yaml @@ -0,0 +1,4 @@ +--- +edge::settings: + brew_package_name: 'microsoft-edge' + package_name: 'microsoft-edge' diff --git a/data/edge/osfamily/windows.yaml b/data/edge/osfamily/windows.yaml new file mode 100644 index 00000000..a1c293ea --- /dev/null +++ b/data/edge/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +edge::settings: + winget_package_name: 'Microsoft.Edge' + choco_package_name: 'edge' + package_name: 'edge' \ No newline at end of file diff --git a/data/git/default.yaml b/data/git/default.yaml index ebd19f1f..92ed2a6c 100644 --- a/data/git/default.yaml +++ b/data/git/default.yaml @@ -1,3 +1,8 @@ --- - git::settings: - package_name: 'git' +git::settings: + package_name: 'git' + website_url: 'https://git-scm.com/' + git_source: 'https://github.com/git/git' + docker_image: 'bitnami/git' + user_config_dir: '$HOME/.git' + user_config_path: '$HOME/.gitconfig' \ No newline at end of file diff --git a/data/git/hiera.yaml b/data/git/hiera.yaml index 19fa9ae9..d34d2477 100644 --- a/data/git/hiera.yaml +++ b/data/git/hiera.yaml @@ -1,6 +1,8 @@ --- :hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/git/osfamily/Darwin.yaml b/data/git/osfamily/Darwin.yaml new file mode 100644 index 00000000..f434f7ac --- /dev/null +++ b/data/git/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +git::settings: + package_name: 'git' diff --git a/data/git/osfamily/windows.yaml b/data/git/osfamily/windows.yaml new file mode 100644 index 00000000..fd4b8e54 --- /dev/null +++ b/data/git/osfamily/windows.yaml @@ -0,0 +1,6 @@ +--- +git::settings: + winget_package_name: 'Git.Git' + choco_package_name: 'git' + user_config_dir: '%HOMEPATH%/.git' + user_config_path: '%HOMEPATH%/.gitconfig' \ No newline at end of file diff --git a/data/libreoffice/default.yaml b/data/libreoffice/default.yaml new file mode 100644 index 00000000..9f3a2a8f --- /dev/null +++ b/data/libreoffice/default.yaml @@ -0,0 +1,6 @@ +--- +libreoffice::settings: + package_name: libreoffice + snap_package_name: 'libreoffice' + website_url: 'https://www.libreoffice.org/' + git_source: 'https://github.com/LibreOffice/core' diff --git a/data/libreoffice/hiera.yaml b/data/libreoffice/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/libreoffice/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/libreoffice/osfamily/Darwin.yaml b/data/libreoffice/osfamily/Darwin.yaml new file mode 100644 index 00000000..f2b69c8e --- /dev/null +++ b/data/libreoffice/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +libreoffice::settings: + brew_package_name: 'libreoffice' diff --git a/data/libreoffice/osfamily/windows.yaml b/data/libreoffice/osfamily/windows.yaml new file mode 100644 index 00000000..67c92694 --- /dev/null +++ b/data/libreoffice/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +libreoffice::settings: + winget_package_name: 'TheDocumentFoundation.LibreOffice' + choco_package_name: 'libreoffice' diff --git a/data/microsoft_repo/default.yaml b/data/microsoft_repo/default.yaml new file mode 100644 index 00000000..b34c4ecd --- /dev/null +++ b/data/microsoft_repo/default.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + upstream_repo: true + \ No newline at end of file diff --git a/data/microsoft_repo/hiera.yaml b/data/microsoft_repo/hiera.yaml new file mode 100644 index 00000000..28dbb017 --- /dev/null +++ b/data/microsoft_repo/hiera.yaml @@ -0,0 +1,12 @@ +--- +:hierarchy: + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/microsoft_repo/upstream/default.yaml b/data/microsoft_repo/upstream/default.yaml new file mode 100644 index 00000000..05b9c182 --- /dev/null +++ b/data/microsoft_repo/upstream/default.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_filename: packages-microsoft-prod diff --git a/data/microsoft_repo/upstream/operatingsystem/CentOS6.yaml b/data/microsoft_repo/upstream/operatingsystem/CentOS6.yaml new file mode 100644 index 00000000..5311eb98 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/CentOS6.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/centos/6/packages-microsoft-prod.rpm' diff --git a/data/microsoft_repo/upstream/operatingsystem/CentOS7.yaml b/data/microsoft_repo/upstream/operatingsystem/CentOS7.yaml new file mode 100644 index 00000000..89b06b06 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/CentOS7.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm' diff --git a/data/microsoft_repo/upstream/operatingsystem/CentOS8.yaml b/data/microsoft_repo/upstream/operatingsystem/CentOS8.yaml new file mode 100644 index 00000000..67b2f2da --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/CentOS8.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/centos/8/packages-microsoft-prod.rpm' diff --git a/data/microsoft_repo/upstream/operatingsystem/Debian10.yaml b/data/microsoft_repo/upstream/operatingsystem/Debian10.yaml new file mode 100644 index 00000000..4becbc57 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Debian10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Debian11.yaml b/data/microsoft_repo/upstream/operatingsystem/Debian11.yaml new file mode 100644 index 00000000..080e070a --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Debian11.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb' \ No newline at end of file diff --git a/data/microsoft_repo/upstream/operatingsystem/Debian8.yaml b/data/microsoft_repo/upstream/operatingsystem/Debian8.yaml new file mode 100644 index 00000000..e126b962 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Debian8.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/debian/8/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Debian9.yaml b/data/microsoft_repo/upstream/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..56e2b58a --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Debian9.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/debian/9/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora26.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora26.yaml new file mode 100644 index 00000000..a3ef514b --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora26.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/26/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora27.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora27.yaml new file mode 100644 index 00000000..09007be2 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora27.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/27/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora28.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora28.yaml new file mode 100644 index 00000000..355e192a --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora28.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/28/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora29.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora29.yaml new file mode 100644 index 00000000..f3a44143 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora29.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/29/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora30.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora30.yaml new file mode 100644 index 00000000..a700b5fe --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora30.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/30/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora31.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora31.yaml new file mode 100644 index 00000000..ce409ba2 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora31.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/31/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora32.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora32.yaml new file mode 100644 index 00000000..00d3df81 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora32.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/32/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora33.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora33.yaml new file mode 100644 index 00000000..2d941d27 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora33.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/33/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora34.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora34.yaml new file mode 100644 index 00000000..8b7ac855 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora34.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/34/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora35.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora35.yaml new file mode 100644 index 00000000..cc56536b --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora35.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/35/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Fedora36.yaml b/data/microsoft_repo/upstream/operatingsystem/Fedora36.yaml new file mode 100644 index 00000000..490832e9 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora36.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/fedora/36/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/OpenSuse12.yaml b/data/microsoft_repo/upstream/operatingsystem/OpenSuse12.yaml new file mode 100644 index 00000000..ccab09ce --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/OpenSuse12.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_file_url: 'https://packages.microsoft.com/config/opensuse/12/prod.repo' + diff --git a/data/microsoft_repo/upstream/operatingsystem/OpenSuse15.yaml b/data/microsoft_repo/upstream/operatingsystem/OpenSuse15.yaml new file mode 100644 index 00000000..37996777 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/OpenSuse15.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/opensuse/15/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.2.yaml b/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.2.yaml new file mode 100644 index 00000000..ec733f5a --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.2.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/opensuse/42.2/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.3.yaml b/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.3.yaml new file mode 100644 index 00000000..a0920878 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.3.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/opensuse/42.3/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/SLES11.yaml b/data/microsoft_repo/upstream/operatingsystem/SLES11.yaml new file mode 100644 index 00000000..6cf3bb96 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/SLES11.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/sles/11/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/SLES12.yaml b/data/microsoft_repo/upstream/operatingsystem/SLES12.yaml new file mode 100644 index 00000000..de50d35a --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/SLES12.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/sles/12/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/SLES15.yaml b/data/microsoft_repo/upstream/operatingsystem/SLES15.yaml new file mode 100644 index 00000000..5eed67a8 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/SLES15.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/sles/15/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu14.04.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu14.04.yaml new file mode 100644 index 00000000..a4dfd1ae --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu14.04.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu15.10.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu15.10.yaml new file mode 100644 index 00000000..ed4ec169 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu15.10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/15.10/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.04.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..19b1b961 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.10.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.10.yaml new file mode 100644 index 00000000..6768b402 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/16.10/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.04.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.04.yaml new file mode 100644 index 00000000..c5a2ad40 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.04.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/17.04/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.10.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.10.yaml new file mode 100644 index 00000000..0d011293 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/17.10/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.04.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..475860b3 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.10.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.10.yaml new file mode 100644 index 00000000..86aa742e --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/18.10/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.04.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.04.yaml new file mode 100644 index 00000000..3897626a --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.04.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/19.04/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.10.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.10.yaml new file mode 100644 index 00000000..4244b79f --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/19.10/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.04.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.04.yaml new file mode 100644 index 00000000..3fb1cb71 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.04.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.10.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.10.yaml new file mode 100644 index 00000000..90fd1471 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/20.10/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.04.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.04.yaml new file mode 100644 index 00000000..1280759b --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.04.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/21.04/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.10.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.10.yaml new file mode 100644 index 00000000..0844a19d --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/21.10/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.04.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.04.yaml new file mode 100644 index 00000000..cb311442 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.04.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.10.yaml b/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.10.yaml new file mode 100644 index 00000000..d9749322 --- /dev/null +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.10.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/ubuntu/22.10/multiarch/packages-microsoft-prod.deb' diff --git a/data/microsoft_repo/upstream/osfamily/RedHat6.yaml b/data/microsoft_repo/upstream/osfamily/RedHat6.yaml new file mode 100644 index 00000000..5aa1470f --- /dev/null +++ b/data/microsoft_repo/upstream/osfamily/RedHat6.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/rhel/6/packages-microsoft-prod.rpm' diff --git a/data/microsoft_repo/upstream/osfamily/RedHat7.yaml b/data/microsoft_repo/upstream/osfamily/RedHat7.yaml new file mode 100644 index 00000000..a5837284 --- /dev/null +++ b/data/microsoft_repo/upstream/osfamily/RedHat7.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/rhel/7.4/packages-microsoft-prod.rpm' diff --git a/data/microsoft_repo/upstream/osfamily/RedHat8.yaml b/data/microsoft_repo/upstream/osfamily/RedHat8.yaml new file mode 100644 index 00000000..28ae2cd0 --- /dev/null +++ b/data/microsoft_repo/upstream/osfamily/RedHat8.yaml @@ -0,0 +1,4 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm' + diff --git a/data/microsoft_repo/upstream/osfamily/RedHat9.yaml b/data/microsoft_repo/upstream/osfamily/RedHat9.yaml new file mode 100644 index 00000000..05b77851 --- /dev/null +++ b/data/microsoft_repo/upstream/osfamily/RedHat9.yaml @@ -0,0 +1,3 @@ +--- +microsoft_repo::settings: + repo_package_url: 'https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm' diff --git a/data/obs-studio/default.yaml b/data/obs-studio/default.yaml new file mode 100644 index 00000000..3d560c80 --- /dev/null +++ b/data/obs-studio/default.yaml @@ -0,0 +1,6 @@ +--- +obs-studio::settings: + package_name: obs-studio + snap_package_name: 'obs-studio' + website_url: 'https://obsproject.com/' + git_source: 'https://github.com/obsproject/obs-studio.git' diff --git a/data/obs-studio/hiera.yaml b/data/obs-studio/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/obs-studio/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/obs-studio/osfamily/Darwin.yaml b/data/obs-studio/osfamily/Darwin.yaml new file mode 100644 index 00000000..f4cf9340 --- /dev/null +++ b/data/obs-studio/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +obs-studio::settings: + brew_package_name: 'streamlabs-obs' diff --git a/data/obs-studio/osfamily/windows.yaml b/data/obs-studio/osfamily/windows.yaml new file mode 100644 index 00000000..3b919bf9 --- /dev/null +++ b/data/obs-studio/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +obs-studio::settings: + winget_package_name: 'OBSProject.OBSStudio' + choco_package_name: 'obs-studio' diff --git a/data/omi/default.yaml b/data/omi/default.yaml new file mode 100644 index 00000000..03f5c643 --- /dev/null +++ b/data/omi/default.yaml @@ -0,0 +1,12 @@ +--- +omi::settings: + package_name: 'omi' + service_name: 'omid' + website_url: 'https://learn.microsoft.com/en-us/system-center/scom/plan-planning-agent-deployment' + git_source: 'https://github.com/microsoft/omi.git' + log_dir_path: '/var/opt/omi/log/' + config_dir_path: '/etc/opt/microsoft/omi/' + config_file_path: '/etc/opt/omi/conf/omiserver.conf' + home_dir_path: '/opt/microsoft/omi/' + tp_prerequisites: + - 'microsoft_repo' diff --git a/data/omi/hiera.yaml b/data/omi/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/omi/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/omi/osfamily/Darwin.yaml b/data/omi/osfamily/Darwin.yaml new file mode 100644 index 00000000..836f5d33 --- /dev/null +++ b/data/omi/osfamily/Darwin.yaml @@ -0,0 +1,5 @@ +--- +omi::settings: + package_name: '' + winget_package_name: '' + choco_package_name: '' diff --git a/data/omi/osfamily/windows.yaml b/data/omi/osfamily/windows.yaml new file mode 100644 index 00000000..836f5d33 --- /dev/null +++ b/data/omi/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +omi::settings: + package_name: '' + winget_package_name: '' + choco_package_name: '' diff --git a/data/powershell/default.yaml b/data/powershell/default.yaml new file mode 100644 index 00000000..8c3c87cd --- /dev/null +++ b/data/powershell/default.yaml @@ -0,0 +1,9 @@ +--- +powershell::settings: + package_name: powershell + snap_package_name: 'powershell' + docker_image: 'microsoft/powershell' + website_url: 'https://learn.microsoft.com/powershell/' + git_source: 'https://github.com/PowerShell/PowerShell.git' + tp_prerequisites: + - 'microsoft_repo' diff --git a/data/powershell/hiera.yaml b/data/powershell/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/powershell/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/powershell/osfamily/Darwin.yaml b/data/powershell/osfamily/Darwin.yaml new file mode 100644 index 00000000..b488fe7c --- /dev/null +++ b/data/powershell/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +powershell::settings: + brew_package_name: 'powershell' diff --git a/data/powershell/osfamily/windows.yaml b/data/powershell/osfamily/windows.yaml new file mode 100644 index 00000000..6159162a --- /dev/null +++ b/data/powershell/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +powershell::settings: + winget_package_name: 'Microsoft.PowerShell' + choco_package_name: 'powershell' diff --git a/data/powertoys/default.yaml b/data/powertoys/default.yaml new file mode 100644 index 00000000..33200622 --- /dev/null +++ b/data/powertoys/default.yaml @@ -0,0 +1,4 @@ +--- +powertoys::settings: + website_url: 'https://learn.microsoft.com/windows/powertoys/' + git_source: 'https://github.com/microsoft/PowerToys.git' diff --git a/data/powertoys/hiera.yaml b/data/powertoys/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/powertoys/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/powertoys/osfamily/windows.yaml b/data/powertoys/osfamily/windows.yaml new file mode 100644 index 00000000..dde4273f --- /dev/null +++ b/data/powertoys/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +powertoys::settings: + winget_package_name: 'Microsoft.PowerToys' + choco_package_name: 'powertoys' + package_name: 'powertoys' diff --git a/data/procdump/default.yaml b/data/procdump/default.yaml new file mode 100644 index 00000000..172f85e6 --- /dev/null +++ b/data/procdump/default.yaml @@ -0,0 +1,7 @@ +--- +procdump::settings: + package_name: procdump + website_url: 'https://learn.microsoft.com/sysinternals/downloads/procdump/' + git_source: 'https://github.com/Sysinternals/ProcDump-for-Linux' + tp_prerequisites: + - 'microsoft_repo' diff --git a/data/procdump/hiera.yaml b/data/procdump/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/procdump/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/procdump/osfamily/Darwin.yaml b/data/procdump/osfamily/Darwin.yaml new file mode 100644 index 00000000..55e5c0e4 --- /dev/null +++ b/data/procdump/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +procdump::settings: + brew_package_name: 'procdump' diff --git a/data/procdump/osfamily/windows.yaml b/data/procdump/osfamily/windows.yaml new file mode 100644 index 00000000..6b3fe4eb --- /dev/null +++ b/data/procdump/osfamily/windows.yaml @@ -0,0 +1,3 @@ +--- +procdump::settings: + choco_package_name: 'procdump' diff --git a/data/scx/default.yaml b/data/scx/default.yaml new file mode 100644 index 00000000..68771323 --- /dev/null +++ b/data/scx/default.yaml @@ -0,0 +1,10 @@ +--- +scx::settings: + package_name: scx + website_url: 'https://learn.microsoft.com/en-us/system-center/scom/manage-security-administer-crossplat-agent' + git_source: 'https://github.com/microsoft/SCXcore.git' + log_dir_path: '/var/opt/microsoft/scx/log/' + config_dir_path: '/etc/opt/microsoft/scx/' + home_dir_path: '/opt/microsoft/scx/' + tp_prerequisites: + - 'microsoft_repo' diff --git a/data/scx/hiera.yaml b/data/scx/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/scx/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/scx/osfamily/windows.yaml b/data/scx/osfamily/windows.yaml new file mode 100644 index 00000000..eca7d670 --- /dev/null +++ b/data/scx/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +scx::settings: + package_name: '' + winget_package_name: '' + choco_package_name: '' diff --git a/data/sysinternals/default.yaml b/data/sysinternals/default.yaml new file mode 100644 index 00000000..6128b383 --- /dev/null +++ b/data/sysinternals/default.yaml @@ -0,0 +1,7 @@ +--- +sysinternals::settings: + package_name: sysinternalsebpf # It's not the full sysinternals suite (on Linux) + website_url: 'https://learn.microsoft.com/sysinternals/' + git_source: 'https://github.com/Sysinternals/SysinternalsEBPF.git' + tp_prerequisites: + - 'microsoft_repo' diff --git a/data/sysinternals/hiera.yaml b/data/sysinternals/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/sysinternals/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/sysinternals/osfamily/windows.yaml b/data/sysinternals/osfamily/windows.yaml new file mode 100644 index 00000000..dd73911b --- /dev/null +++ b/data/sysinternals/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +sysinternals::settings: + winget_package_name: 'Microsoft.PowerShell' + choco_package_name: 'sysinternals' + package_name: 'sysinternals' diff --git a/data/sysmon/default.yaml b/data/sysmon/default.yaml new file mode 100644 index 00000000..ec75f415 --- /dev/null +++ b/data/sysmon/default.yaml @@ -0,0 +1,7 @@ +--- +sysmon::settings: + package_name: sysmonforlinux + website_url: 'https://learn.microsoft.com/en-us/sysinternals/downloads/sysmon/' + git_source: 'https://github.com/Sysinternals/SysmonForLinux' + tp_prerequisites: + - 'microsoft_repo' diff --git a/data/sysmon/hiera.yaml b/data/sysmon/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/sysmon/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/sysmon/osfamily/windows.yaml b/data/sysmon/osfamily/windows.yaml new file mode 100644 index 00000000..72170f5b --- /dev/null +++ b/data/sysmon/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +sysmon::settings: + choco_package_name: 'sysmon' + package_name: 'sysmon' \ No newline at end of file diff --git a/data/telegram-desktop/default.yaml b/data/telegram-desktop/default.yaml new file mode 100644 index 00000000..6199a8da --- /dev/null +++ b/data/telegram-desktop/default.yaml @@ -0,0 +1,6 @@ +--- +telegram-desktop::settings: + package_name: telegram-desktop + snap_package_name: 'telegram-desktop' + website_url: 'https://desktop.telegram.org/' + git_source: 'https://github.com/telegramdesktop/tdesktop.git' diff --git a/data/telegram-desktop/hiera.yaml b/data/telegram-desktop/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/telegram-desktop/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/telegram-desktop/osfamily/Darwin.yaml b/data/telegram-desktop/osfamily/Darwin.yaml new file mode 100644 index 00000000..bcb86946 --- /dev/null +++ b/data/telegram-desktop/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +telegram-desktop::settings: + brew_package_name: 'telegram-desktop' diff --git a/data/telegram-desktop/osfamily/windows.yaml b/data/telegram-desktop/osfamily/windows.yaml new file mode 100644 index 00000000..b8a64397 --- /dev/null +++ b/data/telegram-desktop/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +telegram-desktop::settings: + winget_package_name: 'Telegram.TelegramDesktop' + choco_package_name: 'telegram-desktop' diff --git a/data/twitch-studio/default.yaml b/data/twitch-studio/default.yaml new file mode 100644 index 00000000..9e64c120 --- /dev/null +++ b/data/twitch-studio/default.yaml @@ -0,0 +1,4 @@ +--- +twitch-studio::settings: + package_name: '' + website_url: 'https://www.twitch.tv/' diff --git a/data/twitch-studio/hiera.yaml b/data/twitch-studio/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/twitch-studio/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/twitch-studio/osfamily/Darwin.yaml b/data/twitch-studio/osfamily/Darwin.yaml new file mode 100644 index 00000000..c5515d82 --- /dev/null +++ b/data/twitch-studio/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +twitch-studio::settings: + brew_package_name: 'twitch-studio' diff --git a/data/twitch-studio/osfamily/windows.yaml b/data/twitch-studio/osfamily/windows.yaml new file mode 100644 index 00000000..08d31d39 --- /dev/null +++ b/data/twitch-studio/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +twitch-studio::settings: + winget_package_name: 'Twitch.TwitchStudio' + choco_package_name: 'twitch-studio' + package_name: 'twitch-studio' diff --git a/data/twitch/default.yaml b/data/twitch/default.yaml new file mode 100644 index 00000000..1661c5fa --- /dev/null +++ b/data/twitch/default.yaml @@ -0,0 +1,6 @@ +--- +twitch::settings: + package_name: twitch + snap_package_name: 'twitch' + website_url: 'https://desktop.telegram.org/' + git_source: 'https://github.com/telegramdesktop/tdesktop.git' diff --git a/data/twitch/hiera.yaml b/data/twitch/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/twitch/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/twitch/osfamily/Darwin.yaml b/data/twitch/osfamily/Darwin.yaml new file mode 100644 index 00000000..219b1a42 --- /dev/null +++ b/data/twitch/osfamily/Darwin.yaml @@ -0,0 +1,4 @@ +--- +twitch::settings: + brew_package_name: 'streamlink-twitch-gui' + package_name: 'streamlink-twitch-gui' \ No newline at end of file diff --git a/data/twitch/osfamily/windows.yaml b/data/twitch/osfamily/windows.yaml new file mode 100644 index 00000000..e6cd7a1e --- /dev/null +++ b/data/twitch/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +twitch::settings: + winget_package_name: 'Streamlink.Streamlink.TwitchGui' + choco_package_name: 'twitch' diff --git a/data/vagrant/default.yaml b/data/vagrant/default.yaml index b92ee406..73fc5e89 100644 --- a/data/vagrant/default.yaml +++ b/data/vagrant/default.yaml @@ -7,4 +7,3 @@ vagrant::settings: info_commands: global-status: 'vagrant global-status' git_source: https://github.com/hashicorp/vagrant.git - git_use: true \ No newline at end of file diff --git a/data/vscode/default.yaml b/data/vscode/default.yaml new file mode 100644 index 00000000..c9093c45 --- /dev/null +++ b/data/vscode/default.yaml @@ -0,0 +1,11 @@ +--- +vscode::settings: + package_name: vscode + docker_image: 'bitnami/vscode' + website_url: 'https://code.visualstudio.com/' + git_source: 'https://github.com/microsoft/vscode' + config_file_format: 'json' + user_config_file_path: '$HOME/.config/Code/User/settings.json' + user_config_dir_path: '$HOME/.config/Code/User/' + tp_prerequisites: + - 'microsoft_repo' diff --git a/data/vscode/hiera.yaml b/data/vscode/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/vscode/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/vscode/osfamily/Darwin.yaml b/data/vscode/osfamily/Darwin.yaml new file mode 100644 index 00000000..e4b952d3 --- /dev/null +++ b/data/vscode/osfamily/Darwin.yaml @@ -0,0 +1,5 @@ +--- +vscode::settings: + package_name: 'visual-studio-code' + user_config_file_path: '$HOME/Library/Application\ Support/Code/User/settings.json' + user_config_dir_path: '$HOME/Library/Application\ Support/Code/User/' \ No newline at end of file diff --git a/data/vscode/osfamily/Debian.yaml b/data/vscode/osfamily/Debian.yaml new file mode 100644 index 00000000..cb82b85c --- /dev/null +++ b/data/vscode/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +vscode::settings: + snap_package_name: 'code' diff --git a/data/vscode/osfamily/RedHat.yaml b/data/vscode/osfamily/RedHat.yaml new file mode 100644 index 00000000..cb82b85c --- /dev/null +++ b/data/vscode/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +vscode::settings: + snap_package_name: 'code' diff --git a/data/vscode/osfamily/windows.yaml b/data/vscode/osfamily/windows.yaml new file mode 100644 index 00000000..09e3e103 --- /dev/null +++ b/data/vscode/osfamily/windows.yaml @@ -0,0 +1,7 @@ +--- +vscode::settings: + winget_package_name: 'Microsoft.VisualStudioCode' + choco_package_name: 'vscode' + user_config_file_path: '%APPDATA%\Code\User\settings.json' + user_config_dir_path: '%APPDATA%\Code\User' + diff --git a/data/webex-meetings/default.yaml b/data/webex-meetings/default.yaml new file mode 100644 index 00000000..4967e188 --- /dev/null +++ b/data/webex-meetings/default.yaml @@ -0,0 +1,6 @@ +--- +webex-meetings::settings: + package_name: '' + snap_package_name: 'webex-meetings' + website_url: 'https://desktop.telegram.org/' + git_source: 'https://github.com/telegramdesktop/tdesktop.git' diff --git a/data/webex-meetings/hiera.yaml b/data/webex-meetings/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/webex-meetings/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/webex-meetings/osfamily/Darwin.yaml b/data/webex-meetings/osfamily/Darwin.yaml new file mode 100644 index 00000000..2995e81d --- /dev/null +++ b/data/webex-meetings/osfamily/Darwin.yaml @@ -0,0 +1,4 @@ +--- +webex-meetings::settings: + brew_package_name: 'webex-meetings' + package_name: 'webex-meetings' diff --git a/data/webex-meetings/osfamily/windows.yaml b/data/webex-meetings/osfamily/windows.yaml new file mode 100644 index 00000000..da9b5b4b --- /dev/null +++ b/data/webex-meetings/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +webex-meetings::settings: + winget_package_name: 'Cisco.CiscoWebexMeetings' + choco_package_name: 'webex-meetings' + package_name: 'webex-meetings' diff --git a/data/webex/default.yaml b/data/webex/default.yaml new file mode 100644 index 00000000..382c2469 --- /dev/null +++ b/data/webex/default.yaml @@ -0,0 +1,5 @@ +--- +webex::settings: + package_name: '' + snap_package_name: 'webex' + website_url: 'https://www.webex.com' diff --git a/data/webex/hiera.yaml b/data/webex/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/webex/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/webex/osfamily/Darwin.yaml b/data/webex/osfamily/Darwin.yaml new file mode 100644 index 00000000..ba187a61 --- /dev/null +++ b/data/webex/osfamily/Darwin.yaml @@ -0,0 +1,4 @@ +--- +webex::settings: + brew_package_name: 'webex' + package_name: 'webex' diff --git a/data/webex/osfamily/windows.yaml b/data/webex/osfamily/windows.yaml new file mode 100644 index 00000000..cdf1686e --- /dev/null +++ b/data/webex/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +webex::settings: + winget_package_name: 'Cisco.WebexTeams' + choco_package_name: 'webex' + package_name: 'webex' diff --git a/data/zoom/default.yaml b/data/zoom/default.yaml new file mode 100644 index 00000000..7748531c --- /dev/null +++ b/data/zoom/default.yaml @@ -0,0 +1,5 @@ +--- +zoom::settings: + package_name: '' + snap_package_name: 'zoom' + website_url: 'https://zoom.us/' diff --git a/data/zoom/hiera.yaml b/data/zoom/hiera.yaml new file mode 100644 index 00000000..d34d2477 --- /dev/null +++ b/data/zoom/hiera.yaml @@ -0,0 +1,8 @@ +--- +:hierarchy: + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/zoom/osfamily/Darwin.yaml b/data/zoom/osfamily/Darwin.yaml new file mode 100644 index 00000000..ce8d49af --- /dev/null +++ b/data/zoom/osfamily/Darwin.yaml @@ -0,0 +1,4 @@ +--- +zoom::settings: + brew_package_name: 'zoom' + package_name: 'zoom' diff --git a/data/zoom/osfamily/windows.yaml b/data/zoom/osfamily/windows.yaml new file mode 100644 index 00000000..328f5aa1 --- /dev/null +++ b/data/zoom/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +zoom::settings: + winget_package_name: 'Zoom.Zoom' + choco_package_name: 'zoom' + package_name: 'zoom' diff --git a/metadata.json b/metadata.json index d6fe5101..22274b08 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.5.0", + "version": "0.5.1", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 58c2f002ce72b2e193288c8ff57b1f2f2c5ff607 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 14 Dec 2022 18:31:25 +0100 Subject: [PATCH 246/284] Lint --- .github/ISSUE_TEMPLATE.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 4f169ec1..db16f01c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,15 +1,13 @@ # Describe your issue - -# Labels +## Labels Please use the following labels: * **tinydata request** for any request for new or updated tinydata for an application * **questions** for any error you find, doubt or clarification request - -# Context +## Context Please provide any info useful for troubleshooting, like: From 7c6fbe8c556286ec3ce13961f30c38f7e9bc3ef3 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 4 Jan 2023 23:22:36 +0100 Subject: [PATCH 247/284] Data 4.0 (#57) * Updated puppet and others data * Devuan basic support * Added sample template for tp4 data * Sample templates with data 4.0 * Getting closer to final v4 layout * .. * Removed Sample string --- data/bolt/osfamily/windows.yaml | 1 + data/bolt/osfamily/windows11.yaml | 3 + data/default.yaml | 26 +-- data/default/Devuan4.yaml | 5 + data/git/osfamily/Suse.yaml | 3 + .../upstream/operatingsystem/Debian11.yaml | 4 + data/microsoft_repo/upstream/default.yaml | 1 + data/pdk/default.yaml | 5 - data/pdk/hiera.yaml | 7 - data/prometheus/default.yaml | 155 ++++++++++++++++++ data/prometheus/hiera.yaml | 13 ++ data/prometheus/operatingsystem/Devuan4.yaml | 3 + data/prometheus/osfamily/Darwin.yaml | 13 ++ data/prometheus/osfamily/Debian.yaml | 9 + data/prometheus/osfamily/RedHat.yaml | 4 + data/prometheus/osfamily/windows.yaml | 20 +++ data/prometheus/osfamily/windows11.yaml | 3 + data/puppet-agent/default.yaml | 19 ++- data/puppet-agent/hiera.yaml | 2 + data/puppet-agent/osfamily/Debian.yaml | 2 +- data/puppet-agent/upstream/default.yaml | 127 +++++++++++--- .../puppet-agent/upstream/osfamily/Linux.yaml | 1 - data/puppet/upstream/osfamily/windows.yaml | 2 + data/puppet/upstream/osfamily/windows11.yaml | 3 + .../upstream/operatingsystem/Devuan4.yaml | 3 + .../puppet_repo/upstream/osfamily/Suse11.yaml | 2 +- data/python-pip/osfamily/Suse.yaml | 3 + data/python-pip/osfamily/windows.yaml | 3 + data/reference/default.yaml | 124 ++++++++++++++ data/reference/hiera.yaml | 15 ++ data/reference/osfamily/Darwin.yaml | 13 ++ data/reference/osfamily/Debian.yaml | 8 + data/reference/osfamily/RedHat.yaml | 3 + data/reference/osfamily/windows.yaml | 19 +++ data/reference/osfamily/windows11.yaml | 3 + data/reference/upstream/default.yaml | 6 + data/sample/default.yaml | 129 +++++++++++++++ data/sample/hiera.yaml | 15 ++ data/sample/osfamily/Darwin.yaml | 13 ++ data/sample/osfamily/Debian.yaml | 8 + data/sample/osfamily/RedHat.yaml | 3 + data/sample/osfamily/windows.yaml | 19 +++ data/sample/osfamily/windows11.yaml | 3 + data/sample/upstream/default.yaml | 6 + data/spiderfoot/default.yaml | 65 ++++++++ data/spiderfoot/hiera.yaml | 13 ++ data/spiderfoot/operatingsystem/Debian10.yaml | 5 + data/spiderfoot/operatingsystem/Debian9.yaml | 5 + .../operatingsystem/Ubuntu16.04.yaml | 5 + .../operatingsystem/Ubuntu18.04.yaml | 5 + data/spiderfoot/osfamily/Darwin.yaml | 3 + data/spiderfoot/osfamily/Debian.yaml | 10 ++ data/spiderfoot/osfamily/RedHat.yaml | 3 + data/spiderfoot/osfamily/windows.yaml | 13 ++ data/spiderfoot/osfamily/windows11.yaml | 3 + data/unzip/hiera.yaml | 12 +- data/unzip/osfamily/windows.yaml | 3 + scripts/moduledata_clone.sh | 30 ++-- 58 files changed, 927 insertions(+), 77 deletions(-) create mode 100644 data/bolt/osfamily/windows11.yaml create mode 100644 data/default/Devuan4.yaml create mode 100644 data/git/osfamily/Suse.yaml create mode 100644 data/hashicorp_repo/upstream/operatingsystem/Debian11.yaml delete mode 100644 data/pdk/default.yaml delete mode 100644 data/pdk/hiera.yaml create mode 100644 data/prometheus/default.yaml create mode 100644 data/prometheus/hiera.yaml create mode 100644 data/prometheus/operatingsystem/Devuan4.yaml create mode 100644 data/prometheus/osfamily/Darwin.yaml create mode 100644 data/prometheus/osfamily/Debian.yaml create mode 100644 data/prometheus/osfamily/RedHat.yaml create mode 100644 data/prometheus/osfamily/windows.yaml create mode 100644 data/prometheus/osfamily/windows11.yaml create mode 100644 data/puppet/upstream/osfamily/windows11.yaml create mode 100644 data/puppet_repo/upstream/operatingsystem/Devuan4.yaml create mode 100644 data/python-pip/osfamily/Suse.yaml create mode 100644 data/python-pip/osfamily/windows.yaml create mode 100644 data/reference/default.yaml create mode 100644 data/reference/hiera.yaml create mode 100644 data/reference/osfamily/Darwin.yaml create mode 100644 data/reference/osfamily/Debian.yaml create mode 100644 data/reference/osfamily/RedHat.yaml create mode 100644 data/reference/osfamily/windows.yaml create mode 100644 data/reference/osfamily/windows11.yaml create mode 100644 data/reference/upstream/default.yaml create mode 100644 data/sample/default.yaml create mode 100644 data/sample/hiera.yaml create mode 100644 data/sample/osfamily/Darwin.yaml create mode 100644 data/sample/osfamily/Debian.yaml create mode 100644 data/sample/osfamily/RedHat.yaml create mode 100644 data/sample/osfamily/windows.yaml create mode 100644 data/sample/osfamily/windows11.yaml create mode 100644 data/sample/upstream/default.yaml create mode 100644 data/spiderfoot/default.yaml create mode 100644 data/spiderfoot/hiera.yaml create mode 100644 data/spiderfoot/operatingsystem/Debian10.yaml create mode 100644 data/spiderfoot/operatingsystem/Debian9.yaml create mode 100644 data/spiderfoot/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/spiderfoot/operatingsystem/Ubuntu18.04.yaml create mode 100644 data/spiderfoot/osfamily/Darwin.yaml create mode 100644 data/spiderfoot/osfamily/Debian.yaml create mode 100644 data/spiderfoot/osfamily/RedHat.yaml create mode 100644 data/spiderfoot/osfamily/windows.yaml create mode 100644 data/spiderfoot/osfamily/windows11.yaml create mode 100644 data/unzip/osfamily/windows.yaml diff --git a/data/bolt/osfamily/windows.yaml b/data/bolt/osfamily/windows.yaml index ad247047..9e20abe0 100644 --- a/data/bolt/osfamily/windows.yaml +++ b/data/bolt/osfamily/windows.yaml @@ -2,3 +2,4 @@ bolt::settings: config_file_path: 'C:\ProgramData\PuppetLabs\bolt\etc\bolt-defaults.yaml' config_dir_path: 'C:\ProgramData\PuppetLabs\bolt\etc\' + winget_package_name: 'Puppet.puppet-bolt' diff --git a/data/bolt/osfamily/windows11.yaml b/data/bolt/osfamily/windows11.yaml new file mode 100644 index 00000000..dfaf13dc --- /dev/null +++ b/data/bolt/osfamily/windows11.yaml @@ -0,0 +1,3 @@ +--- +bolt::settings: + package_name: 'Puppet.puppet-bolt' diff --git a/data/default.yaml b/data/default.yaml index a0bf052a..b3ac710f 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -1,14 +1,14 @@ --- - default::settings: - upstream_repo: false - package_ensure: 'present' - service_ensure: 'running' - service_enable: true - config_file_owner: 'root' - config_file_group: 'root' - config_file_mode: '0644' - config_dir_owner: 'root' - config_dir_group: 'root' - config_dir_mode: '0755' - config_dir_purge: false - config_dir_recurse: true +default::settings: + upstream_repo: false + package_ensure: 'present' + service_ensure: 'running' + service_enable: true + config_file_owner: 'root' + config_file_group: 'root' + config_file_mode: '0644' + config_dir_owner: 'root' + config_dir_group: 'root' + config_dir_mode: '0755' + config_dir_purge: false + config_dir_recurse: true diff --git a/data/default/Devuan4.yaml b/data/default/Devuan4.yaml new file mode 100644 index 00000000..712e2776 --- /dev/null +++ b/data/default/Devuan4.yaml @@ -0,0 +1,5 @@ +--- +default::settings: + apt_release: 'chimaera' + init_system: 'sysvinit' + service_provider: 'sysvinit' \ No newline at end of file diff --git a/data/git/osfamily/Suse.yaml b/data/git/osfamily/Suse.yaml new file mode 100644 index 00000000..167a875d --- /dev/null +++ b/data/git/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- +git::settings: + package_name: 'git-core' \ No newline at end of file diff --git a/data/hashicorp_repo/upstream/operatingsystem/Debian11.yaml b/data/hashicorp_repo/upstream/operatingsystem/Debian11.yaml new file mode 100644 index 00000000..42327f31 --- /dev/null +++ b/data/hashicorp_repo/upstream/operatingsystem/Debian11.yaml @@ -0,0 +1,4 @@ +--- +hashicorp_repo::settings: + repo_url: 'https://apt.releases.hashicorp.com' + apt_release: 'buster main' diff --git a/data/microsoft_repo/upstream/default.yaml b/data/microsoft_repo/upstream/default.yaml index 05b9c182..cab3a474 100644 --- a/data/microsoft_repo/upstream/default.yaml +++ b/data/microsoft_repo/upstream/default.yaml @@ -1,3 +1,4 @@ --- microsoft_repo::settings: repo_filename: packages-microsoft-prod + repo_package_name: packages-microsoft-prod \ No newline at end of file diff --git a/data/pdk/default.yaml b/data/pdk/default.yaml deleted file mode 100644 index 5fff6f2c..00000000 --- a/data/pdk/default.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -pdk::settings: - package_name: 'pdk' - tp_prerequisites: - puppet_repo: {} \ No newline at end of file diff --git a/data/pdk/hiera.yaml b/data/pdk/hiera.yaml deleted file mode 100644 index 28673c23..00000000 --- a/data/pdk/hiera.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -:hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - "default/%{operatingsystem}%{operatingsystemmajrelease}" - - "default/%{operatingsystem}" - - default \ No newline at end of file diff --git a/data/prometheus/default.yaml b/data/prometheus/default.yaml new file mode 100644 index 00000000..3a4bbbee --- /dev/null +++ b/data/prometheus/default.yaml @@ -0,0 +1,155 @@ +--- +prometheus::settings: + tp_prerequisites: {} + + upstream_repo: false + package_name: 'prometheus' + service_name: 'prometheus' + + process_name: 'prometheus' + process_user: 'prometheus' + process_group: 'prometheus' + + config_file_path: '/etc/prometheus/prometheus.yml' + config_file_group: prometheus + config_file_mode: '0660' + config_file_format: yaml +# validate_cmd: 'prometheus validate' + pid_file_path: '' + init_file_path: '/etc/sysconfig/prometheus.conf' + log_file_path: + - '/var/log/prometheus/prometheus.log' + - '/var/log/prometheus/prometheus-node-exporter.log' + config_dir_path: '/etc/prometheus' + log_dir_path: '/var/log/prometheus' + + +# tp 4 settings + install_method: 'file' + description: 'The Prometheus monitoring system and time series database' + docker_image: 'prom/prometheus' + website: 'https://prometheus.io/' + issues: 'https://github.com/prometheus/prometheus/issues' + git_source: 'https://github.com/prometheus/prometheus' + + configs: + main: + path: '/etc/prometheus/prometheus.yml' + format: yaml + init: + path: '/etc/sysconfig/prometheus.conf' + format: inifile + systemd: + path: '/etc/systemd/system/prometheus.service' + format: inifile_with_stanzas + + dirs: + main: + path: '/etc/prometheus' + rules: + path: '/etc/prometheus/rules' + rules.d: + path: '/etc/prometheus/rules.d' + files_sd: + path: /etc/prometheus/files_sd + home: + path: /var/lib/prometheus + data: + path: /var/lib/prometheus + + user_configs: + main: + path: '$HOME/.prometheus/prometheus.conf' + + user_dirs: + main: + path: '$HOME/.prometheus' + + ports: + main: + port: 9090 + protocol: tcp + listen: 127.0.0.1 + + commands: + info: + list: 'prometheus list' + debug: + debug: 'prometheus debug' + test: + status: 'prometheus status' + version: 'prometheus --version' + run: + start: + command: 'prometheus start' + arguments: + - 'instance': + default: '' + description: 'Instance to start' + options: + config_file: + default: 'prometheus.conf' + value: String + description: 'Config file to use' + restart: + command: 'prometheus restart' + + releases: + base_url: 'https://github.com/prometheus/prometheus/releases/download/' + file_format: 'tar.gz' + # extracted_dir: 'prometheus-$VERSION.$OS-$ARCH' # Override standard tar content + latest_version: '2.41.0' + prerequisites: {} + latest: {} + version: + file_name: 'prometheus-$VERSION.$OS-$ARCH.tar.gz' + extracted_dir: 'prometheus-$VERSION.$OS-$ARCH' + checksum_url: 'https://github.com/prometheus/prometheus/releases/download/$VERSION/sha256sums.txt' + base_path: 'v$VERSION/' + # file_name: 'prometheus-$VERSION.$OS-$ARCH.tar.gz' + + install: + enable: true + files: + prometheus: + path: '/usr/local/bin/prometheus' + mode: '0755' + promtool: + path: '/usr/local/bin/promtool' + mode: '0755' + prometheus.yml: + path: '/etc/prometheus/prometheus.yml' + mode: '0644' + resources: + file: + /etc/prometheus: + ensure: directory + /var/log/prometheus: + ensure: directory + owner: prometheus + exec: + prometheus_init_config: + command: 'touch /etc/sysconfig/prometheus.conf' + creates: '/etc/sysconfig/prometheus.conf' + systemd_settings: {} + manage_service: true + manage_user: true +# systemd_symlink: '/etc/systemd/system/multi-user.target.wants/prometheus.service' #default +# systemd_template: 'tinydata/prometheus/systemd.epp' + + build: + enable: false + prerequisites: + tp::install: + - nodejs + - golang + - npm + execs: + build: + command: 'go build cmd/prometheus/main.go' + environment: + - 'GO111MODULE=on' + setup: + command: 'go install cmd/prometheus/main.go' + environment: + - 'GO111MODULE=on' diff --git a/data/prometheus/hiera.yaml b/data/prometheus/hiera.yaml new file mode 100644 index 00000000..3e87c188 --- /dev/null +++ b/data/prometheus/hiera.yaml @@ -0,0 +1,13 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/prometheus/operatingsystem/Devuan4.yaml b/data/prometheus/operatingsystem/Devuan4.yaml new file mode 100644 index 00000000..8c8357d9 --- /dev/null +++ b/data/prometheus/operatingsystem/Devuan4.yaml @@ -0,0 +1,3 @@ +--- +prometheus::settings: + pid_file_path: '/run/prometheus/prometheus.pid' \ No newline at end of file diff --git a/data/prometheus/osfamily/Darwin.yaml b/data/prometheus/osfamily/Darwin.yaml new file mode 100644 index 00000000..77b75ce4 --- /dev/null +++ b/data/prometheus/osfamily/Darwin.yaml @@ -0,0 +1,13 @@ +--- +prometheus::settings: + brew_package_name: 'prometheus' + user_config_file_path: '$HOME/Library/Application\ Support/Prometheus/prometheus.yml' + user_config_dir_path: '$HOME/Library/Application\ Support/Prometheus/' + + user_configs: + main: + path: '$HOME/Library/Application\ Support/Prometheus/prometheus.yml' + + user_dirs: + main: + path: '$HOME/Library/Application\ Support/Prometheus/prometheus.yml' \ No newline at end of file diff --git a/data/prometheus/osfamily/Debian.yaml b/data/prometheus/osfamily/Debian.yaml new file mode 100644 index 00000000..73445611 --- /dev/null +++ b/data/prometheus/osfamily/Debian.yaml @@ -0,0 +1,9 @@ +--- +prometheus::settings: + init_file_path: '/etc/default/prometheus' + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' + install_method: 'package' + + configs: + init: + path: '/etc/default/prometheus' diff --git a/data/prometheus/osfamily/RedHat.yaml b/data/prometheus/osfamily/RedHat.yaml new file mode 100644 index 00000000..728c3e07 --- /dev/null +++ b/data/prometheus/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +prometheus::settings: + dockerfile_prerequisites: 'RUN yum install -y wget which' + install_method: 'file' diff --git a/data/prometheus/osfamily/windows.yaml b/data/prometheus/osfamily/windows.yaml new file mode 100644 index 00000000..81555f3c --- /dev/null +++ b/data/prometheus/osfamily/windows.yaml @@ -0,0 +1,20 @@ +--- +prometheus::settings: + install_method: 'package' + choco_package_name: 'prometheus' + package_name: 'prometheus' + config_file_path: 'C:\ProgramData\prometheus\prometheus\etc\prometheus.yml' + config_dir_path: 'C:\ProgramData\prometheus\prometheus\etc' + process_user: 'LocalSystem' + process_group: 'LocalSystem' + user_config_file_path: '%APPDATA%\prometheus\prometheus.yml' + user_config_dir_path: '%APPDATA%\prometheus' + + user_configs: + main: + path: '%APPDATA%\prometheus\prometheus.yml' + + user_dirs: + main: + path: '%APPDATA%\prometheus' + diff --git a/data/prometheus/osfamily/windows11.yaml b/data/prometheus/osfamily/windows11.yaml new file mode 100644 index 00000000..ecf08bd2 --- /dev/null +++ b/data/prometheus/osfamily/windows11.yaml @@ -0,0 +1,3 @@ +--- +prometheus::settings: + package_name: 'prometheus' diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml index 05d82c4c..64e0c37a 100644 --- a/data/puppet-agent/default.yaml +++ b/data/puppet-agent/default.yaml @@ -2,11 +2,18 @@ puppet-agent::settings: upstream_repo: true package_name: 'puppet-agent' - service_name: 'puppet-agent' - config_file_path: '/etc/puppet-agent/puppet-agent.conf' - config_dir_path: '/etc/puppet-agent' - pid_file_path: '/var/run/puppet-agent/puppet-agent.pid' - log_dir_path: '/var/log/puppet-agent' - process_name: 'puppet-agent' + service_name: [ 'puppet', 'pxp-agent' ] + config_file_path: '/etc/puppetlabs/puppet/puppet.conf' + config_dir_path: '/etc/puppetlabs/puppet' + pid_file_path: '/var/run/puppetlabs/agent.pid' + process_name: 'puppet' process_user: 'root' process_group: 'root' + log_file_path: + - '/var/log/puppet/pxp-agent/pxp-agent.log' + log_dir_path: + - '/var/log/puppetlabs/puppet' + - '/var/log/puppetlabs/pxp-agent' + process_name: 'puppet' + process_user: 'root' + process_group: 'root' \ No newline at end of file diff --git a/data/puppet-agent/hiera.yaml b/data/puppet-agent/hiera.yaml index a53d4aff..b0798f73 100644 --- a/data/puppet-agent/hiera.yaml +++ b/data/puppet-agent/hiera.yaml @@ -4,5 +4,7 @@ - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/%{repo}/osfamily/%{osfamily}" - "%{title}/%{repo}/default" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index 49afa346..9d2add5c 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- puppet-agent::settings: - init_file_path: '/etc/default/puppet-agent' + init_file_path: '/etc/default/puppet' dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet-agent/upstream/default.yaml b/data/puppet-agent/upstream/default.yaml index 8bad3325..bbc3fe10 100644 --- a/data/puppet-agent/upstream/default.yaml +++ b/data/puppet-agent/upstream/default.yaml @@ -1,24 +1,109 @@ --- puppet-agent::settings: - package_name: 'puppet-agent-agent' - service_name: 'puppet-agent' - config_file_path: '/etc/puppet-agentlabs/puppet-agent/puppet-agent.conf' - fileserver_file_path: '/etc/puppet-agentlabs/puppet-agent/fileserver.conf' - routes_file_path: '/etc/puppet-agentlabs/puppet-agent/routes.yaml' - autosign_file_path: '/etc/puppet-agentlabs/puppet-agent/autosign.conf' - auth_file_path: '/etc/puppet-agentlabs/puppet-agent/auth.conf' - puppet-agentdb_file_path: '/etc/puppet-agentlabs/puppet-agent/puppet-agentdb.conf' - config_dir_path: '/etc/puppet-agentlabs/puppet-agent/' - code_dir_path: '/etc/puppet-agentlabs/code' - environment_dir_path: '/etc/puppet-agentlabs/code/environments' - pid_file_path: '/var/run/puppet-agentlabs/agent.pid' - log_file_path: - - '/var/log/puppet-agentlabs/puppet-agent/puppet-agent.log' - - '/var/log/puppet-agentlabs/pxp-agent/pxp-agent.log' - - '/var/log/puppet-agentlabs/mcollective-log' - log_dir_path: '/var/log/puppet-agentlabs/puppet-agent' - process_name: 'puppet-agent' - process_user: 'root' - process_group: 'root' tp_prerequisites: - puppet-agent_repo: {} \ No newline at end of file + puppet-agent_repo: {} + + + # tp 4 settings + + configs: + main: + path: '/etc/puppetlabs/puppet/puppet.conf' + fileserverconfig: + path: '/etc/puppetlabs/puppet/fileserver.conf' + routes: + path: '/etc/puppetlabs/puppet/routes.yaml' + autosign: + path: '/etc/puppetlabs/puppet/autosign.conf' + auth: + path: '/etc/puppetlabs/puppet/auth.conf' + puppetdb: + path: '/etc/puppetlabs/puppet/puppetdb.conf' + agent_catalog_run_lockfile: + path: '/opt/puppetlabs/puppet/cache/state/agent_catalog_run.lock' + agent_disabled_lockfile: + path: '/opt/puppetlabs/puppet/cache/state/agent_disabled.lock' + classfile: + path: '/opt/puppetlabs/puppet/cache/state/classes.txt' + lastrunfile: + path: '/opt/puppetlabs/puppet/public/last_run_summary.yaml' + passfile: + path: '/etc/puppetlabs/puppet/ssl/private/password' + pidfile: + path: '/var/run/puppetlabs/main.pid' + resourcefile: + path: /opt/puppetlabs/puppet/cache/state/resources.txt + routefile: + path: '/etc/puppetlabs/puppet/routes.yaml' + ssl_lockfile: + path: '/etc/puppetlabs/puppet/ssl/ssl.lock' + statefile: + path: '/opt/puppetlabs/puppet/cache/state/state.yaml' + transactionstorefile: + path: '/opt/puppetlabs/puppet/cache/state/transactionstore.yaml' + trusted_oid_mapping_file: + path: '/etc/puppetlabs/puppet/custom_trusted_oid_mapping.yaml' + + dirs: + main: + path: '/etc/puppetlabs/puppet' + log: + path: '/var/log/puppetlabs' + code: + path: '/etc/puppetlabs/code' + environment: + path: '/etc/puppetlabs/code/environments' + client_datadir: + path: /opt/puppetlabs/puppet/cache/client_data + clientbucketdir: + path: /opt/puppetlabs/puppet/cache/clientbucket + clientyamldir: + path: /opt/puppetlabs/puppet/cache/client_yaml + codedir: + path: /etc/puppetlabs/code + confdir: + path: /etc/puppetlabs/puppet + csrdir: + path: /etc/puppetlabs/puppetserver/ca/requests + deviceconfdir: + path: /etc/puppetlabs/puppet/devices + devicedir: + path: /opt/puppetlabs/puppet/cache/devices + graphdir: + path: /opt/puppetlabs/puppet/cache/state/graphs + libdir: + path: /opt/puppetlabs/puppet/cache/lib + logdir: + path: /var/log/puppetlabs/puppet + module_working_dir: + path: /opt/puppetlabs/puppet/cache/puppet-module + preview_outputdir: + path: /opt/puppetlabs/puppet/cache/preview + privatedir: + path: /etc/puppetlabs/puppet/ssl/private + privatekeydir: + path: /etc/puppetlabs/puppet/ssl/private_keys + publicdir: + path: /opt/puppetlabs/puppet/public + publickeydir: + path: /etc/puppetlabs/puppet/ssl/public_keys + reportdir: + path: /opt/puppetlabs/puppet/cache/reports + requestdir: + path: /etc/puppetlabs/puppet/ssl/certificate_requests + rundir: + path: /var/run/puppetlabs + server_datadir: + path: /opt/puppetlabs/puppet/cache/server_data + signeddir: + path: /etc/puppetlabs/puppetserver/ca/signed + ssldir: + path: /etc/puppetlabs/puppet/ssl + statedir: + path: /opt/puppetlabs/puppet/cache/state + vardir: + path: /opt/puppetlabs/puppet/cache + vendormoduledir: + path: /opt/puppetlabs/puppet/vendor_modules + yaml: + path: /opt/puppetlabs/puppet/cache/yaml diff --git a/data/puppet-agent/upstream/osfamily/Linux.yaml b/data/puppet-agent/upstream/osfamily/Linux.yaml index 966a903b..d763de76 100644 --- a/data/puppet-agent/upstream/osfamily/Linux.yaml +++ b/data/puppet-agent/upstream/osfamily/Linux.yaml @@ -1,4 +1,3 @@ --- puppet-agent::settings: - package_name: '' dockerfile_prerequisites: "RUN echo -e 'http://dl-3.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && echo -e 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk update && apk add shadow ruby less bash && gem install puppet-agent --no-ri --no-rdoc " diff --git a/data/puppet/upstream/osfamily/windows.yaml b/data/puppet/upstream/osfamily/windows.yaml index c95f4747..64a7438b 100644 --- a/data/puppet/upstream/osfamily/windows.yaml +++ b/data/puppet/upstream/osfamily/windows.yaml @@ -13,3 +13,5 @@ puppet::settings: log_dir_path: 'C:\ProgramData\PuppetLabs\var\log' process_user: 'LocalSystem' process_group: 'LocalSystem' + winget_package_name: 'Puppet.puppet-agent' + \ No newline at end of file diff --git a/data/puppet/upstream/osfamily/windows11.yaml b/data/puppet/upstream/osfamily/windows11.yaml new file mode 100644 index 00000000..ecd89b6e --- /dev/null +++ b/data/puppet/upstream/osfamily/windows11.yaml @@ -0,0 +1,3 @@ +--- +puppet::settings: + package_name: 'Puppet.puppet-agent' diff --git a/data/puppet_repo/upstream/operatingsystem/Devuan4.yaml b/data/puppet_repo/upstream/operatingsystem/Devuan4.yaml new file mode 100644 index 00000000..006cf23c --- /dev/null +++ b/data/puppet_repo/upstream/operatingsystem/Devuan4.yaml @@ -0,0 +1,3 @@ +--- +puppet_repo::settings: + repo_package_url: 'https://apt.puppet.com/puppet-release-bullseye.deb' diff --git a/data/puppet_repo/upstream/osfamily/Suse11.yaml b/data/puppet_repo/upstream/osfamily/Suse11.yaml index 8976c7a2..09ea415d 100644 --- a/data/puppet_repo/upstream/osfamily/Suse11.yaml +++ b/data/puppet_repo/upstream/osfamily/Suse11.yaml @@ -1,3 +1,3 @@ --- puppet_repo::settings: - repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-sles-11.noarch.rpm' + repo_package_url: 'https://yum.puppet.com/puppet6/puppet6-release-sles-11.noarch.rpm' diff --git a/data/python-pip/osfamily/Suse.yaml b/data/python-pip/osfamily/Suse.yaml new file mode 100644 index 00000000..be597202 --- /dev/null +++ b/data/python-pip/osfamily/Suse.yaml @@ -0,0 +1,3 @@ +--- +python-pip::settings: + package_name: 'python3-pip' diff --git a/data/python-pip/osfamily/windows.yaml b/data/python-pip/osfamily/windows.yaml new file mode 100644 index 00000000..73205a94 --- /dev/null +++ b/data/python-pip/osfamily/windows.yaml @@ -0,0 +1,3 @@ +--- +python-pip::settings: + package_name: 'python' \ No newline at end of file diff --git a/data/reference/default.yaml b/data/reference/default.yaml new file mode 100644 index 00000000..ceeeaa26 --- /dev/null +++ b/data/reference/default.yaml @@ -0,0 +1,124 @@ +--- +# This reference module shows all the possible tinydata settings. +# +# The settings key is looked up by the tp_lookuop function +# It's an hash whose values are looked up in deep merge mode across the hierarchies +# defined in hiera.yaml. +reference::settings: + +# If the app needs other apps, installed via tp. +# Key used in tp::install (and tp::install::*) +# Valids values: String, Array, Hash of tp::install resources with (in case of Hash) +# their parameters. v3 and v4 compatible. +# These resources, as every other prerequisites, are installed if tp::auto_prereq is set to true. +# If auto_prereq is set to false, the user is responsible for installing the prerequisites. + tp_prerequisites: {} + +# If to use the upstream repo or not (if defined in tinydata) + upstream_repo: false + +# The name of the package to install. ust be available via the system or the configured repos +# v3 and v4 compatible. + package_name: 'reference' + +# The name of the service to manage + service_name: 'reference' + process_name: 'reference' + process_user: 'root' + process_group: 'root' + config_file_path: '/etc/reference/reference.conf' + config_file_format: yaml +# validate_cmd: 'reference validate' + pid_file_path: '/run/reference.pid' + init_file_path: '/etc/sysconfig/reference.conf' + log_file_path: + - '/var/log/reference/reference.log' + config_dir_path: '/etc/reference' + log_dir_path: + - '/var/log/reference' + + info_commandsTOCONFIG: + list: 'reference list' + debug_commandsTOCONFIG: + list: 'reference debug' + test_commandsTOCONFIG: + status: 'reference status' + version_command: 'reference version' + run_commandsTOCONFIG: + start: + command: 'reference start' + arguments: + - 'instance': + default: '' + description: 'Instance to start' + options: + config_file: + default: 'reference.conf' + value: String + description: 'Config file to use' + restart: + command: 'reference restart' + +# tp 4 settings + install_method: 'package' + description: 'reference_packages description' + docker_image: 'reference/reference' + website: 'https://reference.com' + issues: 'https://github.com/reference/reference/issues' + git_source: 'https://github.com/reference/reference' + + configs: + main: + path: '/etc/reference/reference.conf' + init: + path: '/etc/sysconfig/reference.conf' + format: 'inifile' + systemd: + path: '/etc/systemd/system/reference.service' + format: 'inifile_with_stanzas' + + dirs: + main: + path: '/etc/reference' + conf: + path: '/etc/reference/conf.d' + log: + path: /var/log/reference + home: + path: /var/lib/reference + + user_configs: + main: + path: '$HOME/.reference/reference.conf' + + user_dirs: + main: + path: '$HOME/.reference' + + ports: + main: + port: 42 + protocol: tcp + ssl: + port: 4432 + protocol: tcp + + build: + prerequisites: + tp::install: + - build-essential + execs: + configure: + command: './configure' + build: + command: 'make' + setup: + command: 'make install' + + releases: + baseurl: 'https://github.com/reference/reference/releases/download/' + file_format: tar.gz + latest: + release_url: 'https://github.com/reference/reference/releases/download/reference-latest/reference-latest.tar.gz' + version: + release_url: 'https://github.com/reference/reference/releases/download/reference-$VERSION/reference-$VERSION.tar.gz' diff --git a/data/reference/hiera.yaml b/data/reference/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/reference/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/reference/osfamily/Darwin.yaml b/data/reference/osfamily/Darwin.yaml new file mode 100644 index 00000000..b1557d25 --- /dev/null +++ b/data/reference/osfamily/Darwin.yaml @@ -0,0 +1,13 @@ +--- +reference::settings: + brew_package_name: 'reference' + user_config_file_path: '$HOME/Library/Application\ Support/reference/reference.conf' + user_config_dir_path: '$HOME/Library/Application\ Support/reference/' + + user_configs: + main: + path: '$HOME/Library/Application\ Support/reference/reference.conf' + + user_dirs: + main: + path: '$HOME/Library/Application\ Support/reference/reference.conf' \ No newline at end of file diff --git a/data/reference/osfamily/Debian.yaml b/data/reference/osfamily/Debian.yaml new file mode 100644 index 00000000..8e709b6d --- /dev/null +++ b/data/reference/osfamily/Debian.yaml @@ -0,0 +1,8 @@ +--- +reference::settings: + init_file_path: '/etc/default/reference' + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' + + configs: + init: + path: '/etc/default/reference' \ No newline at end of file diff --git a/data/reference/osfamily/RedHat.yaml b/data/reference/osfamily/RedHat.yaml new file mode 100644 index 00000000..c757b372 --- /dev/null +++ b/data/reference/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +reference::settings: + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/reference/osfamily/windows.yaml b/data/reference/osfamily/windows.yaml new file mode 100644 index 00000000..6d804a75 --- /dev/null +++ b/data/reference/osfamily/windows.yaml @@ -0,0 +1,19 @@ +--- +reference::settings: + winget_package_name: 'reference.reference' + choco_package_name: 'reference' + package_name: 'reference' + config_file_path: 'C:\ProgramData\reference\reference\etc\reference.conf' + config_dir_path: 'C:\ProgramData\reference\reference\etc' + process_user: 'LocalSystem' + process_group: 'LocalSystem' + user_config_file_path: '%APPDATA%\reference\reference.conf' + user_config_dir_path: '%APPDATA%\reference' + + user_configs: + main: + path: '%APPDATA%\reference\reference.conf' + + user_dirs: + main: + path: '%APPDATA%\reference' \ No newline at end of file diff --git a/data/reference/osfamily/windows11.yaml b/data/reference/osfamily/windows11.yaml new file mode 100644 index 00000000..9f69b3cb --- /dev/null +++ b/data/reference/osfamily/windows11.yaml @@ -0,0 +1,3 @@ +--- +reference::settings: + package_name: 'reference.reference' diff --git a/data/reference/upstream/default.yaml b/data/reference/upstream/default.yaml new file mode 100644 index 00000000..6c4a9ca1 --- /dev/null +++ b/data/reference/upstream/default.yaml @@ -0,0 +1,6 @@ +--- +reference::settings: {} + +# tp_prerequisites: +# reference_repo: {} + diff --git a/data/sample/default.yaml b/data/sample/default.yaml new file mode 100644 index 00000000..8aeb8b4a --- /dev/null +++ b/data/sample/default.yaml @@ -0,0 +1,129 @@ +--- +sample::settings: + tp_prerequisites: {} + + upstream_repo: false + package_name: 'sample' + service_name: 'sample' + process_name: 'sample' + process_user: 'root' + process_group: 'root' + config_file_path: '/etc/sample/sample.conf' + config_file_format: yaml +# validate_cmd: 'sample validate' + pid_file_path: '/run/sample.pid' + init_file_path: '/etc/sysconfig/sample.conf' + log_file_path: + - '/var/log/sample/sample.log' + config_dir_path: '/etc/sample' + log_dir_path: + - '/var/log/sample' + +# tp 4 settings + install_method: 'package' + description: 'sample description' + docker_image: 'sample/sample' + docker_args: '' + website: 'https://sample.com' + issues: 'https://github.com/sample/sample/issues' + git_source: 'https://github.com/sample/sample' + + configs: + main: + path: '/etc/sample/sample.conf' + init: + path: '/etc/sysconfig/sample.conf' + format: 'inifile' + systemd: + path: '/etc/systemd/system/sample.service' + format: 'inifile_with_stanzas' + + dirs: + main: + path: '/etc/sample' + conf: + path: '/etc/sample/conf.d' + log: + path: /var/log/sample + home: + path: /var/lib/sample + + user_configs: + main: + path: '$HOME/.sample/sample.conf' + + user_dirs: + main: + path: '$HOME/.sample' + + ports: + main: + port: 42 + protocol: tcp + ssl: + port: 4432 + protocol: tcp + + commandsTOCONF: + info: + list: 'sample list' + debug: + debug: 'sample debug' + test: + status: 'sample status' + version: 'sample --version' + run: + start: + command: 'sample start' + arguments: + - 'instance': + default: '' + description: 'Instance to start' + options: + config_file: + default: 'sample.conf' + value: String + description: 'Config file to use' + restart: + command: 'sample restart' + + + build: + prerequisites: + tp::install: + - build-essential + execs: + configure: + command: './configure' + build: + command: 'make' + setup: + command: 'make install' + + releases: + base_url: 'https://github.com/sample/sample/releases/download/' + file_format: tar.gz + latest_version: '4.0' + prerequisites: {} + latest: + release_url: 'https://github.com/sample/sample/releases/download/sample-latest/sample-latest.tar.gz' + version: + release_url: 'https://github.com/sample/sample/releases/download/sample-$VERSION/sample-$VERSION.tar.gz' + file_name: 'sample-$VERSIONN.zip' + extracted_dir: 'sample-$VERSION' + base_path: 'sample-$VERSION' + + install: + enable: true + files: + sample: + path: '/usr/local/bin/sample' + mode: '0755' + systemd_settings: + Service: + ExecStart: '/var/lib/tp/source/sample/sample -l 127.0.0.1' + EnvironmentFile: ~ + resources: {} + manage_service: true + manage_user: false + diff --git a/data/sample/hiera.yaml b/data/sample/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/sample/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/sample/osfamily/Darwin.yaml b/data/sample/osfamily/Darwin.yaml new file mode 100644 index 00000000..9bf01d10 --- /dev/null +++ b/data/sample/osfamily/Darwin.yaml @@ -0,0 +1,13 @@ +--- +sample::settings: + brew_package_name: 'sample' + user_config_file_path: '$HOME/Library/Application\ Support/sample/sample.conf' + user_config_dir_path: '$HOME/Library/Application\ Support/sample/' + + user_configs: + main: + path: '$HOME/Library/Application\ Support/sample/sample.conf' + + user_dirs: + main: + path: '$HOME/Library/Application\ Support/sample/sample.conf' \ No newline at end of file diff --git a/data/sample/osfamily/Debian.yaml b/data/sample/osfamily/Debian.yaml new file mode 100644 index 00000000..4805e3ca --- /dev/null +++ b/data/sample/osfamily/Debian.yaml @@ -0,0 +1,8 @@ +--- +sample::settings: + init_file_path: '/etc/default/sample' + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' + + configs: + init: + path: '/etc/default/sample' \ No newline at end of file diff --git a/data/sample/osfamily/RedHat.yaml b/data/sample/osfamily/RedHat.yaml new file mode 100644 index 00000000..dfab05c4 --- /dev/null +++ b/data/sample/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +sample::settings: + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/sample/osfamily/windows.yaml b/data/sample/osfamily/windows.yaml new file mode 100644 index 00000000..ed1909e2 --- /dev/null +++ b/data/sample/osfamily/windows.yaml @@ -0,0 +1,19 @@ +--- +sample::settings: + winget_package_name: 'sample.sample' + choco_package_name: 'sample' + package_name: 'sample' + config_file_path: 'C:\ProgramData\sample\sample\etc\sample.conf' + config_dir_path: 'C:\ProgramData\sample\sample\etc' + process_user: 'LocalSystem' + process_group: 'LocalSystem' + user_config_file_path: '%APPDATA%\sample\sample.conf' + user_config_dir_path: '%APPDATA%\sample' + + user_configs: + main: + path: '%APPDATA%\sample\sample.conf' + + user_dirs: + main: + path: '%APPDATA%\sample' \ No newline at end of file diff --git a/data/sample/osfamily/windows11.yaml b/data/sample/osfamily/windows11.yaml new file mode 100644 index 00000000..0a50fef1 --- /dev/null +++ b/data/sample/osfamily/windows11.yaml @@ -0,0 +1,3 @@ +--- +sample::settings: + package_name: 'sample.sample' diff --git a/data/sample/upstream/default.yaml b/data/sample/upstream/default.yaml new file mode 100644 index 00000000..998a7c92 --- /dev/null +++ b/data/sample/upstream/default.yaml @@ -0,0 +1,6 @@ +--- +sample::settings: {} + +# tp_prerequisites: +# sample_repo: {} + diff --git a/data/spiderfoot/default.yaml b/data/spiderfoot/default.yaml new file mode 100644 index 00000000..24e0da39 --- /dev/null +++ b/data/spiderfoot/default.yaml @@ -0,0 +1,65 @@ +--- +spiderfoot::settings: + tp_prerequisites: + - python-pip + + upstream_repo: false + package_name: 'spiderfoot' + service_name: 'spiderfoot' + package_provider: 'pip' + + process_name: 'spiderfoot' + process_user: 'spiderfoot' + process_group: 'root' + + git_source: 'https://github.com/smicallef/spiderfoot' + + +# tp 4 settings + description: 'SpiderFoot automates OSINT so you can find what matters, faster.' + + website: 'https://www.spiderfoot.net/' + issues: 'https://github.com/smicallef/spiderfoot/issues' + + ports: + main: + port: 5001 + protocol: tcp + + build: + enable: true + prerequisites: + tp::install: + - python-pip + execs: + build: + command: 'pip install -r requirements.txt' + + install_method: 'source' + + releases: + base_url: 'https://github.com/smicallef/spiderfoot/archive/refs/tags' + file_format: 'zip' + # extracted_dir: 'spiderfoot-$VERSION.$OS-$ARCH' # Override standard tar content + latest_version: '4.0' + prerequisites: {} + latest: {} + version: + file_name: 'v$VERSION.zip' + extracted_dir: 'spiderfoot-$VERSION' + # base_path: 'v$VERSION/' + release_url: '$VERSION.tar.gz' + + install: + enable: true + files: + sf.py: + path: '/usr/local/bin/sf.py' + mode: '0755' + systemd_settings: + Service: + ExecStart: '/var/lib/tp/source/spiderfoot/sf.py -l 127.0.0.1:5001' + EnvironmentFile: ~ + manage_service: true + manage_user: true + diff --git a/data/spiderfoot/hiera.yaml b/data/spiderfoot/hiera.yaml new file mode 100644 index 00000000..3e87c188 --- /dev/null +++ b/data/spiderfoot/hiera.yaml @@ -0,0 +1,13 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/spiderfoot/operatingsystem/Debian10.yaml b/data/spiderfoot/operatingsystem/Debian10.yaml new file mode 100644 index 00000000..7c95b7ca --- /dev/null +++ b/data/spiderfoot/operatingsystem/Debian10.yaml @@ -0,0 +1,5 @@ +spiderfoot::settings: + build: + execs: + build: + command: 'pip3 install -r requirements.txt' diff --git a/data/spiderfoot/operatingsystem/Debian9.yaml b/data/spiderfoot/operatingsystem/Debian9.yaml new file mode 100644 index 00000000..7c95b7ca --- /dev/null +++ b/data/spiderfoot/operatingsystem/Debian9.yaml @@ -0,0 +1,5 @@ +spiderfoot::settings: + build: + execs: + build: + command: 'pip3 install -r requirements.txt' diff --git a/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml b/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml new file mode 100644 index 00000000..7c95b7ca --- /dev/null +++ b/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml @@ -0,0 +1,5 @@ +spiderfoot::settings: + build: + execs: + build: + command: 'pip3 install -r requirements.txt' diff --git a/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml b/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml new file mode 100644 index 00000000..7c95b7ca --- /dev/null +++ b/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml @@ -0,0 +1,5 @@ +spiderfoot::settings: + build: + execs: + build: + command: 'pip3 install -r requirements.txt' diff --git a/data/spiderfoot/osfamily/Darwin.yaml b/data/spiderfoot/osfamily/Darwin.yaml new file mode 100644 index 00000000..296744b9 --- /dev/null +++ b/data/spiderfoot/osfamily/Darwin.yaml @@ -0,0 +1,3 @@ +--- +spiderfoot::settings: + brew_package_name: 'spiderfoot' diff --git a/data/spiderfoot/osfamily/Debian.yaml b/data/spiderfoot/osfamily/Debian.yaml new file mode 100644 index 00000000..42dad9f3 --- /dev/null +++ b/data/spiderfoot/osfamily/Debian.yaml @@ -0,0 +1,10 @@ +--- +spiderfoot::settings: + init_file_path: '/etc/default/spiderfoot' + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' + + configs: + init: + path: '/etc/default/spiderfoot' + + upstream_repo: true \ No newline at end of file diff --git a/data/spiderfoot/osfamily/RedHat.yaml b/data/spiderfoot/osfamily/RedHat.yaml new file mode 100644 index 00000000..2c18798b --- /dev/null +++ b/data/spiderfoot/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +spiderfoot::settings: + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/spiderfoot/osfamily/windows.yaml b/data/spiderfoot/osfamily/windows.yaml new file mode 100644 index 00000000..bfda77b0 --- /dev/null +++ b/data/spiderfoot/osfamily/windows.yaml @@ -0,0 +1,13 @@ +--- +spiderfoot::settings: + choco_package_name: 'spiderfoot' + package_name: 'spiderfoot' + + install: + enable: true + files: + sf.py: + path: ~ + mode: '0755' + manage_service: false + manage_user: false \ No newline at end of file diff --git a/data/spiderfoot/osfamily/windows11.yaml b/data/spiderfoot/osfamily/windows11.yaml new file mode 100644 index 00000000..351405bf --- /dev/null +++ b/data/spiderfoot/osfamily/windows11.yaml @@ -0,0 +1,3 @@ +--- +spiderfoot::settings: + package_name: 'spiderfoot' diff --git a/data/unzip/hiera.yaml b/data/unzip/hiera.yaml index 2010c5af..1b8d6940 100644 --- a/data/unzip/hiera.yaml +++ b/data/unzip/hiera.yaml @@ -1,6 +1,8 @@ --- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/unzip/osfamily/windows.yaml b/data/unzip/osfamily/windows.yaml new file mode 100644 index 00000000..d8497c2a --- /dev/null +++ b/data/unzip/osfamily/windows.yaml @@ -0,0 +1,3 @@ +--- + unzip::settings: + package_name: 'zip' diff --git a/scripts/moduledata_clone.sh b/scripts/moduledata_clone.sh index e8a8cbc8..3aebc70d 100755 --- a/scripts/moduledata_clone.sh +++ b/scripts/moduledata_clone.sh @@ -1,31 +1,27 @@ #!/bin/bash +name=$2 +module=$1 showhelp () { cat << EOF +Use this script to generate tinydata for a new app. -This script clones and renames the directory of a module data +Use existing or sample data as a template to create a new tinydata dir: +$0 sample +Clone default sample data (data/sample) in a new app whose name is requested -Usage: -$0 -m test -Create a module data dir based on test module data +$0 sample_command vim +Clone sample_command data (data/sample_command) into a data dir called vim (data/vim) -$0 -m wget -n vim -Create a module data dir for vim based on wget module data +$0 sample_app discord +Clone sample_app data (for GUI apps) into a data dir called discord (data/discord) + +$0 sample_repo hashicorp_repo +Clone sample_repo data (data/sample_repo) into a data dir called vim (data/hashicorp_repo) EOF } -while [ $# -gt 0 ]; do - case "$1" in - -m) - module=$2 - shift 2 ;; - -n) - name=$2 - shift 2 ;; - esac -done - showhelp clone_from_module() { From 7c7ae9570adb2e84ce7221a5e30059fbb90ba1ae Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 12 Jan 2023 17:30:56 +0100 Subject: [PATCH 248/284] Devel (#58) * Removed docker-engine. Tuning docker settings * Updated to sample and reference * Nats-server data * Nuclei tinydata * Docker on new OSes * Updated reference and other v4 tinydata --- README.md | 47 +- data/default.yaml | 1 + data/default/Debian.yaml | 3 +- data/docker-engine/default.yaml | 10 - data/docker-engine/hiera.yaml | 6 - .../docker-engine/operatingsystem/CentOS.yaml | 6 - .../operatingsystem/CentOS6.yaml | 3 - .../operatingsystem/CentOS7.yaml | 3 - .../docker-engine/operatingsystem/Darwin.yaml | 4 - .../docker-engine/operatingsystem/Debian.yaml | 9 - .../operatingsystem/Debian7.yaml | 3 - .../operatingsystem/Debian8.yaml | 3 - .../operatingsystem/Debian9.yaml | 3 - .../docker-engine/operatingsystem/RedHat.yaml | 6 - .../docker-engine/operatingsystem/Ubuntu.yaml | 9 - .../operatingsystem/Ubuntu12.04.yaml | 3 - .../operatingsystem/Ubuntu15.04.yaml | 3 - .../operatingsystem/Ubuntu15.10.yaml | 3 - .../operatingsystem/Ubuntu16.04.yaml | 3 - data/docker/default.yaml | 1 + .../upstream/operatingsystem/Amazon2.yaml | 4 + .../upstream/operatingsystem/Devuan4.yaml | 4 + .../upstream/operatingsystem/SLES12.yaml | 3 + .../upstream/operatingsystem/SLES15.yaml | 3 + data/docker/upstream/osfamily/RedHat.yaml | 2 +- data/docker/upstream/osfamily/windows.yaml | 2 + data/nats-server/default.yaml | 83 ++++ data/nats-server/hiera.yaml | 15 + data/nats-server/osfamily/Darwin.yaml | 4 + data/nats-server/osfamily/windows.yaml | 5 + data/nuclei/default.yaml | 99 +++++ data/nuclei/hiera.yaml | 15 + data/nuclei/osfamily/Darwin.yaml | 4 + data/nuclei/osfamily/windows.yaml | 3 + data/prometheus/default.yaml | 40 +- data/prometheus/osfamily/Darwin.yaml | 6 +- data/prometheus/osfamily/Debian.yaml | 3 +- data/prometheus/osfamily/windows.yaml | 6 +- data/puppet-agent/osfamily/Debian.yaml | 1 - data/puppet-agent/upstream/default.yaml | 10 +- data/puppet/osfamily/Debian.yaml | 1 - data/reference/default.yaml | 408 +++++++++++++++--- data/reference/hiera.yaml | 40 ++ data/reference/osfamily/Darwin.yaml | 17 +- data/reference/osfamily/Debian.yaml | 8 +- data/reference/osfamily/windows.yaml | 25 +- data/reference/osfamily/windows11.yaml | 3 - data/reference/upstream/default.yaml | 6 - data/sample/default.yaml | 32 +- data/sample/osfamily/Darwin.yaml | 6 +- data/sample/osfamily/Debian.yaml | 3 +- data/sample/osfamily/windows.yaml | 10 +- data/spiderfoot/default.yaml | 16 +- data/spiderfoot/osfamily/Debian.yaml | 3 +- 54 files changed, 774 insertions(+), 245 deletions(-) delete mode 100644 data/docker-engine/default.yaml delete mode 100644 data/docker-engine/hiera.yaml delete mode 100644 data/docker-engine/operatingsystem/CentOS.yaml delete mode 100644 data/docker-engine/operatingsystem/CentOS6.yaml delete mode 100644 data/docker-engine/operatingsystem/CentOS7.yaml delete mode 100644 data/docker-engine/operatingsystem/Darwin.yaml delete mode 100644 data/docker-engine/operatingsystem/Debian.yaml delete mode 100644 data/docker-engine/operatingsystem/Debian7.yaml delete mode 100644 data/docker-engine/operatingsystem/Debian8.yaml delete mode 100644 data/docker-engine/operatingsystem/Debian9.yaml delete mode 100644 data/docker-engine/operatingsystem/RedHat.yaml delete mode 100644 data/docker-engine/operatingsystem/Ubuntu.yaml delete mode 100644 data/docker-engine/operatingsystem/Ubuntu12.04.yaml delete mode 100644 data/docker-engine/operatingsystem/Ubuntu15.04.yaml delete mode 100644 data/docker-engine/operatingsystem/Ubuntu15.10.yaml delete mode 100644 data/docker-engine/operatingsystem/Ubuntu16.04.yaml create mode 100644 data/docker/upstream/operatingsystem/Amazon2.yaml create mode 100644 data/docker/upstream/operatingsystem/Devuan4.yaml create mode 100644 data/docker/upstream/operatingsystem/SLES12.yaml create mode 100644 data/docker/upstream/operatingsystem/SLES15.yaml create mode 100644 data/docker/upstream/osfamily/windows.yaml create mode 100644 data/nats-server/default.yaml create mode 100644 data/nats-server/hiera.yaml create mode 100644 data/nats-server/osfamily/Darwin.yaml create mode 100644 data/nats-server/osfamily/windows.yaml create mode 100644 data/nuclei/default.yaml create mode 100644 data/nuclei/hiera.yaml create mode 100644 data/nuclei/osfamily/Darwin.yaml create mode 100644 data/nuclei/osfamily/windows.yaml delete mode 100644 data/reference/osfamily/windows11.yaml delete mode 100644 data/reference/upstream/default.yaml diff --git a/README.md b/README.md index 07035e2b..d721ce02 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,9 @@ This repository contains data used to manage applications on different Operating Systems. -It's currently used by the ([Tiny Puppet](https://github.com/example42/puppet-tp) module as default backend where is stored the application informations. +It's currently used by the ([Tiny Puppet (tp)](https://github.com/example42/puppet-tp) module as default backend where is stored the application informations. -## Update policy - -Software evolves and things change. -Our committment is to keep Tiny Data as updated as possible, so whenever new references to new vesions (for example in repos url) are available, they will be updated. -If data for some Operating Systems is incorred (and it is) we will update it without caring about possible backwards incompatibilities on existing setups: the driving principle is to have the correct data for each version of each supported operating system and application. - -We recommend to make a local fork of this module and update it from this upstream version only with extreme attention. Of course any bug reporting or pull request is welcomed. - -## Data structure +## Data files Each supported application has a sub directory in ```data/``` which contains: @@ -20,7 +12,7 @@ Each supported application has a sub directory in ```data/``` which contains: - the yaml files where data is stored according to the defined hierarchy. -A sample ```hiera.yaml``` is like this: +A basic ```hiera.yaml``` is like this: ``` --- @@ -36,7 +28,38 @@ so the lookup is done, if ```$title == 'mariadb'``` and ```$facts['os']['family tinydata/data/mariadb/default.yaml tinydata/data/default.yaml -The last file contains general defaults for every application. +The last file contains general defaults for every application, if a setting is specified in an higher level file, it will override the default. +For example what's set in tinydata/data/mariadb/osfamily/RedHat.yaml will override the default in tinydata/data/default.yaml (on RedHat derivatives). + +## Data format + +For each application a settings hash is stored in the yaml files. + +Check the [reference app](data/reference/default.yaml) tinyata for the official reference on the settings and how they are used. +Settings marked as v3 are used by tp module up to version 4, where they are still supported but start to be deprecated. +Settings marked as v4 are used by tp module 4 and above (a tech preview is available from tp 3.8.0). + +## Create data for a new application +To create tinydata for a new application is enough to create a new directory in ```data/``` with the name of the application and then: +- add the ```hiera.yaml``` where you configure the hierarchy to follow. +- add at least a ```default.yaml``` (or whatever matches your default file in hiera.yaml) with the settings for the application. + +The recommended approach is to use the [moduledata_clone.sh](scripts/moduledata_clone.sh) script to generate a new app data directory based on an existing one. + +Usage is as follows: + + scripts/moduledata_clone.sh + +You can and should use one of the sample apps templates with predefined and updated tinydata to have a good starting point: + + scripts/moduledata_clone.sh sample + +## Update policy + +Software evolves and things change. +Our committment is to keep Tiny Data as updated as possible, so whenever new references to new versions (for example in repos url) are available, they will be updated. +If data for some Operating Systems is incorrect (and it is) we will update it without caring about possible backwards incompatibilities on existing setups: the driving principle is to have the correct data for each version of each supported operating system and application. +We recommend to refer to a specific version on this module in your Puppetfile and update it after proper checks on the eventual changes introduced in data related to the application you managing via Tiny Puppet. diff --git a/data/default.yaml b/data/default.yaml index b3ac710f..68636f2c 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -12,3 +12,4 @@ default::settings: config_dir_mode: '0755' config_dir_purge: false config_dir_recurse: true + install_method: 'package' \ No newline at end of file diff --git a/data/default/Debian.yaml b/data/default/Debian.yaml index 51b3a8ce..1c2cd31a 100755 --- a/data/default/Debian.yaml +++ b/data/default/Debian.yaml @@ -1,4 +1,5 @@ --- default::settings: repo_package_provider: dpkg - init_system: 'sysvinit' \ No newline at end of file + init_system: 'sysvinit' + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/docker-engine/default.yaml b/data/docker-engine/default.yaml deleted file mode 100644 index c615acf9..00000000 --- a/data/docker-engine/default.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -docker-engine::settings: - package_name: 'docker-engine' - service_name: 'docker' - pid_file_path: '/var/run/docker.pid' - process_name: 'docker' - process_user: 'docker' - process_group: 'docker' - tcp_port: '2375' - compose_version: '1.16.0' diff --git a/data/docker-engine/hiera.yaml b/data/docker-engine/hiera.yaml deleted file mode 100644 index df27bff8..00000000 --- a/data/docker-engine/hiera.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- - :hierarchy: - - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - - "%{title}/operatingsystem/%{operatingsystem}" - - "%{title}/default" - - default diff --git a/data/docker-engine/operatingsystem/CentOS.yaml b/data/docker-engine/operatingsystem/CentOS.yaml deleted file mode 100644 index 05945325..00000000 --- a/data/docker-engine/operatingsystem/CentOS.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -docker-engine::settings: - init_file_path: '/etc/sysconfig/docker' - config_file_path: '/etc/sysconfig/docker' - key: '2C52609D' - key_url: 'http://yum.dockerproject.org/gpg' diff --git a/data/docker-engine/operatingsystem/CentOS6.yaml b/data/docker-engine/operatingsystem/CentOS6.yaml deleted file mode 100644 index c827a0d1..00000000 --- a/data/docker-engine/operatingsystem/CentOS6.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - repo_url: 'https://yum.dockerproject.org/repo/main/centos/6' diff --git a/data/docker-engine/operatingsystem/CentOS7.yaml b/data/docker-engine/operatingsystem/CentOS7.yaml deleted file mode 100644 index b48ef7fd..00000000 --- a/data/docker-engine/operatingsystem/CentOS7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - repo_url: 'https://yum.dockerproject.org/repo/main/centos/7' diff --git a/data/docker-engine/operatingsystem/Darwin.yaml b/data/docker-engine/operatingsystem/Darwin.yaml deleted file mode 100644 index 5369c027..00000000 --- a/data/docker-engine/operatingsystem/Darwin.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - docker-engine::settings: - package_source: https://download.docker.com/mac/stable/Docker.dmg - diff --git a/data/docker-engine/operatingsystem/Debian.yaml b/data/docker-engine/operatingsystem/Debian.yaml deleted file mode 100644 index 7e289e1c..00000000 --- a/data/docker-engine/operatingsystem/Debian.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -docker-engine::settings: - init_file_path: '/etc/default/docker' - config_file_path: '/etc/default/docker' - repo_url: 'https://apt.dockerproject.org/repo' - key: '2C52609D' - key_url: 'http://apt.dockerproject.org/gpg' - apt_repos: 'main' - apt_key_server: 'http://p80.pool.sks-keyservers.net' diff --git a/data/docker-engine/operatingsystem/Debian7.yaml b/data/docker-engine/operatingsystem/Debian7.yaml deleted file mode 100644 index 93ce4f2b..00000000 --- a/data/docker-engine/operatingsystem/Debian7.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - apt_release: 'debian-wheezy' diff --git a/data/docker-engine/operatingsystem/Debian8.yaml b/data/docker-engine/operatingsystem/Debian8.yaml deleted file mode 100644 index 50972c48..00000000 --- a/data/docker-engine/operatingsystem/Debian8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - apt_release: 'debian-jessie' diff --git a/data/docker-engine/operatingsystem/Debian9.yaml b/data/docker-engine/operatingsystem/Debian9.yaml deleted file mode 100644 index 79a9f7c9..00000000 --- a/data/docker-engine/operatingsystem/Debian9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - apt_release: 'debian-stretch' diff --git a/data/docker-engine/operatingsystem/RedHat.yaml b/data/docker-engine/operatingsystem/RedHat.yaml deleted file mode 100644 index 05945325..00000000 --- a/data/docker-engine/operatingsystem/RedHat.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -docker-engine::settings: - init_file_path: '/etc/sysconfig/docker' - config_file_path: '/etc/sysconfig/docker' - key: '2C52609D' - key_url: 'http://yum.dockerproject.org/gpg' diff --git a/data/docker-engine/operatingsystem/Ubuntu.yaml b/data/docker-engine/operatingsystem/Ubuntu.yaml deleted file mode 100644 index 7e289e1c..00000000 --- a/data/docker-engine/operatingsystem/Ubuntu.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -docker-engine::settings: - init_file_path: '/etc/default/docker' - config_file_path: '/etc/default/docker' - repo_url: 'https://apt.dockerproject.org/repo' - key: '2C52609D' - key_url: 'http://apt.dockerproject.org/gpg' - apt_repos: 'main' - apt_key_server: 'http://p80.pool.sks-keyservers.net' diff --git a/data/docker-engine/operatingsystem/Ubuntu12.04.yaml b/data/docker-engine/operatingsystem/Ubuntu12.04.yaml deleted file mode 100644 index bbd3e213..00000000 --- a/data/docker-engine/operatingsystem/Ubuntu12.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - apt_release: 'ubuntu-precise' diff --git a/data/docker-engine/operatingsystem/Ubuntu15.04.yaml b/data/docker-engine/operatingsystem/Ubuntu15.04.yaml deleted file mode 100644 index bacf1d26..00000000 --- a/data/docker-engine/operatingsystem/Ubuntu15.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - apt_release: 'ubuntu-vivid' diff --git a/data/docker-engine/operatingsystem/Ubuntu15.10.yaml b/data/docker-engine/operatingsystem/Ubuntu15.10.yaml deleted file mode 100644 index b125db1f..00000000 --- a/data/docker-engine/operatingsystem/Ubuntu15.10.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - apt_release: 'ubuntu-wily' diff --git a/data/docker-engine/operatingsystem/Ubuntu16.04.yaml b/data/docker-engine/operatingsystem/Ubuntu16.04.yaml deleted file mode 100644 index 1a9dd487..00000000 --- a/data/docker-engine/operatingsystem/Ubuntu16.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -docker-engine::settings: - apt_release: 'ubuntu-xenial' diff --git a/data/docker/default.yaml b/data/docker/default.yaml index 6c0e2fbd..61b1d5bb 100644 --- a/data/docker/default.yaml +++ b/data/docker/default.yaml @@ -10,3 +10,4 @@ docker::settings: tcp_port: '2375' config_file_path: '/etc/docker/daemon.json' config_dir_path: '/etc/docker' + config_file_format: 'json' diff --git a/data/docker/upstream/operatingsystem/Amazon2.yaml b/data/docker/upstream/operatingsystem/Amazon2.yaml new file mode 100644 index 00000000..3450eefc --- /dev/null +++ b/data/docker/upstream/operatingsystem/Amazon2.yaml @@ -0,0 +1,4 @@ +--- +docker::settings: + repo_file_url: ~ + package_name: docker diff --git a/data/docker/upstream/operatingsystem/Devuan4.yaml b/data/docker/upstream/operatingsystem/Devuan4.yaml new file mode 100644 index 00000000..f1445213 --- /dev/null +++ b/data/docker/upstream/operatingsystem/Devuan4.yaml @@ -0,0 +1,4 @@ +--- +docker::settings: + repo_url: ~ + package_name: 'docker' diff --git a/data/docker/upstream/operatingsystem/SLES12.yaml b/data/docker/upstream/operatingsystem/SLES12.yaml new file mode 100644 index 00000000..7edcf5eb --- /dev/null +++ b/data/docker/upstream/operatingsystem/SLES12.yaml @@ -0,0 +1,3 @@ +--- +docker::settings: + repo_file_url: "https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP3/security:SELinux.repo" diff --git a/data/docker/upstream/operatingsystem/SLES15.yaml b/data/docker/upstream/operatingsystem/SLES15.yaml new file mode 100644 index 00000000..7edcf5eb --- /dev/null +++ b/data/docker/upstream/operatingsystem/SLES15.yaml @@ -0,0 +1,3 @@ +--- +docker::settings: + repo_file_url: "https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP3/security:SELinux.repo" diff --git a/data/docker/upstream/osfamily/RedHat.yaml b/data/docker/upstream/osfamily/RedHat.yaml index b06c17a7..f1f11c0e 100644 --- a/data/docker/upstream/osfamily/RedHat.yaml +++ b/data/docker/upstream/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- docker::settings: - repo_file_url: 'https://download.docker.com/linux/rhel/docker-ce.repo' + repo_file_url: 'https://download.docker.com/linux/centos/docker-ce.repo' diff --git a/data/docker/upstream/osfamily/windows.yaml b/data/docker/upstream/osfamily/windows.yaml new file mode 100644 index 00000000..f2eb5d9b --- /dev/null +++ b/data/docker/upstream/osfamily/windows.yaml @@ -0,0 +1,2 @@ +docker::settings: + package_name: 'docker-engine' \ No newline at end of file diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml new file mode 100644 index 00000000..6c5fea46 --- /dev/null +++ b/data/nats-server/default.yaml @@ -0,0 +1,83 @@ +--- +nats-server::settings: + tp_prerequisites: {} + + upstream_repo: false + package_name: 'nats-server' + service_name: 'nats-server' + process_name: 'nats-server' + process_user: 'root' + process_group: 'root' + config_file_path: '/etc/nats/nats-server.conf' + config_dir_path: '/etc/nats' + +# tp 4 settings + install_method: 'file' + description: 'NATS is an open-source, high-performance, cloud native messaging system.' + docker_image: 'nats' + docker_args: '' + website: 'https://nats.io' + issues: 'https://github.com/nats-io/nats-server/issues' + git_source: 'https://github.com/nats-io/nats-server' + + files: + config: + path: '/etc/nats/nats-server.conf' + systemd: + path: '/etc/systemd/system/nats-server.service' + format: 'inifile_with_stanzas' + + dirs: + config: + path: '/etc/nats' + + user_files: + config: + path: '$HOME/.nats/nats-server.conf' + + user_dirs: + config: + path: '$HOME/.nats' + + ports: + main: + port: 4222 + protocol: tcp + management: + port: 8222 + protocol: tcp + routing: + port: 6222 + protocol: tcp + + build: + prerequisites: + tp::install: + - golang + execs: + build: + command: 'GO111MODULE=on go get github.com/nats-io/nats-server/v2' + + releases: + latest_version: '2.9.11' + prerequisites: {} + release_url: 'https://github.com/nats-io/nats-server/releases/download/v$VERSION/nats-server-v$VERSION-$OS-$ARCH.zip' + base_url: 'https://github.com/nats-io/nats-server' + base_path: 'releases/download/v$VERSION' + file_name: 'nats-server-v$VERSION-$OS-$ARCH.zip' + extracted_dir: 'nats-server-v$VERSION-$OS-$ARCH' + file_format: zip + + install: + enable: true + files: + nats-server: + path: '/usr/local/bin/nats-server' + mode: '0755' + systemd_options: + Service: + ExecStart: '/usr/local/bin/nats-server' + EnvironmentFile: ~ + resources: {} + manage_service: true + manage_user: false diff --git a/data/nats-server/hiera.yaml b/data/nats-server/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/nats-server/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/nats-server/osfamily/Darwin.yaml b/data/nats-server/osfamily/Darwin.yaml new file mode 100644 index 00000000..5c97cfa2 --- /dev/null +++ b/data/nats-server/osfamily/Darwin.yaml @@ -0,0 +1,4 @@ +--- +nats-server::settings: + brew_package_name: 'nats-server' + install_method: package \ No newline at end of file diff --git a/data/nats-server/osfamily/windows.yaml b/data/nats-server/osfamily/windows.yaml new file mode 100644 index 00000000..85986e78 --- /dev/null +++ b/data/nats-server/osfamily/windows.yaml @@ -0,0 +1,5 @@ +--- +nats-server::settings: + choco_package_name: 'nats-server' + package_name: 'nats-server' + install_method: package \ No newline at end of file diff --git a/data/nuclei/default.yaml b/data/nuclei/default.yaml new file mode 100644 index 00000000..d6d85c82 --- /dev/null +++ b/data/nuclei/default.yaml @@ -0,0 +1,99 @@ +--- +nuclei::settings: + tp_prerequisites: {} + + upstream_repo: false + package_name: 'nuclei' + config_file_path: '$HOME/.config/nuclei/config.yaml' + config_file_format: yaml + validate_cmd: 'nuclei' + config_dir_path: '$HOME/.config/nuclei' + +# tp 4 settings + install_method: 'file' + description: 'Fast and customizable vulnerability scanner based on simple YAML based DSL.' + docker_image: 'projectdiscovery/nuclei' + docker_args: '' + website: 'https://nuclei.projectdiscovery.io/' + issues: 'https://github.com/projectdiscovery/nuclei/issues' + git_source: 'https://github.com/projectdiscovery/nuclei' + + files: + config: + path: '$HOME/.config/nuclei/config.yaml' + format: 'yaml' + templates: + path: '$HOME/.config/nuclei/.templates-config.json' + format: 'json' + ignore: + path: '$HOME/.config/nuclei/.nuclei-ignore' + format: 'yaml' + report: + path: '$HOME/.config/nuclei/report-config.yaml' + format: 'yaml' + + dirs: + config: + path: '$HOME/.config/nuclei/' + templates: + path: '$HOME/nuclei-templates/' + + user_files: + config: + path: '$HOME/.config/nuclei/config.yaml' + format: 'yaml' + templates: + path: '$HOME/.config/nuclei/.templates-config.json' + format: 'json' + ignore: + path: '$HOME/.config/nuclei/.nuclei-ignore' + format: 'yaml' + report: + path: '$HOME/.config/nuclei/report-config.yaml' + format: 'yaml' + + user_dirs: + config: + path: '$HOME/.config/nuclei/' + templates: + path: '$HOME/nuclei-templates/' + + commands: + info: + stats: 'nuclei -stats' + debug: + debug: 'nuclei -debug' + test: + validate: 'nuclei -validate' + version: 'nuclei -version' + + build: + enable: false + prerequisites: + tp::install: + - golang + execs: + build: + command: 'go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest' + + releases: + latest_version: '2.8.6' + prerequisites: {} + release_url: 'https://github.com/projectdiscovery/nuclei/releases/download/v$VERSION/nuclei_$VERSION_$OS_$ARCH.zip' + base_url: 'https://github.com/projectdiscovery/nuclei' + base_path: 'releases/download/v$VERSION' + file_name: 'nuclei_$VERSION_$OS_$ARCH.zip' + extracted_dir: '' + extracted_file: 'nuclei' + file_format: zip + + install: + enable: true + files: + nuclei: + path: '/usr/local/bin/nuclei' + mode: '0755' + resources: {} + manage_service: false + manage_user: false + diff --git a/data/nuclei/hiera.yaml b/data/nuclei/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/nuclei/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/nuclei/osfamily/Darwin.yaml b/data/nuclei/osfamily/Darwin.yaml new file mode 100644 index 00000000..fcbd220b --- /dev/null +++ b/data/nuclei/osfamily/Darwin.yaml @@ -0,0 +1,4 @@ +--- +nuclei::settings: + brew_package_name: 'nuclei' + install_method: 'package' \ No newline at end of file diff --git a/data/nuclei/osfamily/windows.yaml b/data/nuclei/osfamily/windows.yaml new file mode 100644 index 00000000..9e89609f --- /dev/null +++ b/data/nuclei/osfamily/windows.yaml @@ -0,0 +1,3 @@ +--- +nuclei::settings: + install_method: 'file' diff --git a/data/prometheus/default.yaml b/data/prometheus/default.yaml index 3a4bbbee..932ed8ab 100644 --- a/data/prometheus/default.yaml +++ b/data/prometheus/default.yaml @@ -27,13 +27,12 @@ prometheus::settings: # tp 4 settings install_method: 'file' description: 'The Prometheus monitoring system and time series database' - docker_image: 'prom/prometheus' website: 'https://prometheus.io/' issues: 'https://github.com/prometheus/prometheus/issues' git_source: 'https://github.com/prometheus/prometheus' - configs: - main: + files: + config: path: '/etc/prometheus/prometheus.yml' format: yaml init: @@ -44,7 +43,7 @@ prometheus::settings: format: inifile_with_stanzas dirs: - main: + config: path: '/etc/prometheus' rules: path: '/etc/prometheus/rules' @@ -57,12 +56,12 @@ prometheus::settings: data: path: /var/lib/prometheus - user_configs: - main: - path: '$HOME/.prometheus/prometheus.conf' + user_files: + config: + path: '$HOME/.prometheus/prometheus.yml' user_dirs: - main: + config: path: '$HOME/.prometheus' ports: @@ -95,18 +94,19 @@ prometheus::settings: command: 'prometheus restart' releases: - base_url: 'https://github.com/prometheus/prometheus/releases/download/' - file_format: 'tar.gz' - # extracted_dir: 'prometheus-$VERSION.$OS-$ARCH' # Override standard tar content latest_version: '2.41.0' prerequisites: {} - latest: {} - version: - file_name: 'prometheus-$VERSION.$OS-$ARCH.tar.gz' - extracted_dir: 'prometheus-$VERSION.$OS-$ARCH' - checksum_url: 'https://github.com/prometheus/prometheus/releases/download/$VERSION/sha256sums.txt' - base_path: 'v$VERSION/' - # file_name: 'prometheus-$VERSION.$OS-$ARCH.tar.gz' + release_url: 'https://github.com/prometheus/prometheus/releases/download/v$VERSION/prometheus-$VERSION.$OS-$ARCH.tar.gz' + base_url: 'https://github.com/prometheus/prometheus' + base_path: 'releases/download/v$VERSION' + file_name: 'prometheus-$VERSION.$OS-$ARCH.tar.gz' + extracted_dir: 'prometheus-$VERSION.$OS-$ARCH' + file_format: 'tar.gz' + checksum_url: 'https://github.com/prometheus/prometheus/releases/download/$VERSION/sha256sums.txt' + + image: + name: 'prom/prometheus' + systemd_options: {} install: enable: true @@ -131,7 +131,9 @@ prometheus::settings: prometheus_init_config: command: 'touch /etc/sysconfig/prometheus.conf' creates: '/etc/sysconfig/prometheus.conf' - systemd_settings: {} + systemd_options: + Service: + ExecStart: '/usr/local/bin/prometheus --config.file /etc/prometheus/prometheus.yml' manage_service: true manage_user: true # systemd_symlink: '/etc/systemd/system/multi-user.target.wants/prometheus.service' #default diff --git a/data/prometheus/osfamily/Darwin.yaml b/data/prometheus/osfamily/Darwin.yaml index 77b75ce4..6ae84bfd 100644 --- a/data/prometheus/osfamily/Darwin.yaml +++ b/data/prometheus/osfamily/Darwin.yaml @@ -4,10 +4,10 @@ prometheus::settings: user_config_file_path: '$HOME/Library/Application\ Support/Prometheus/prometheus.yml' user_config_dir_path: '$HOME/Library/Application\ Support/Prometheus/' - user_configs: - main: + user_files: + config: path: '$HOME/Library/Application\ Support/Prometheus/prometheus.yml' user_dirs: - main: + config: path: '$HOME/Library/Application\ Support/Prometheus/prometheus.yml' \ No newline at end of file diff --git a/data/prometheus/osfamily/Debian.yaml b/data/prometheus/osfamily/Debian.yaml index 73445611..55988237 100644 --- a/data/prometheus/osfamily/Debian.yaml +++ b/data/prometheus/osfamily/Debian.yaml @@ -1,9 +1,8 @@ --- prometheus::settings: init_file_path: '/etc/default/prometheus' - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' install_method: 'package' - configs: + files: init: path: '/etc/default/prometheus' diff --git a/data/prometheus/osfamily/windows.yaml b/data/prometheus/osfamily/windows.yaml index 81555f3c..3d8c9040 100644 --- a/data/prometheus/osfamily/windows.yaml +++ b/data/prometheus/osfamily/windows.yaml @@ -10,11 +10,11 @@ prometheus::settings: user_config_file_path: '%APPDATA%\prometheus\prometheus.yml' user_config_dir_path: '%APPDATA%\prometheus' - user_configs: - main: + user_files: + config: path: '%APPDATA%\prometheus\prometheus.yml' user_dirs: - main: + config: path: '%APPDATA%\prometheus' diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index 9d2add5c..3bd3219c 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -1,4 +1,3 @@ --- puppet-agent::settings: init_file_path: '/etc/default/puppet' - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/puppet-agent/upstream/default.yaml b/data/puppet-agent/upstream/default.yaml index bbc3fe10..98cea29b 100644 --- a/data/puppet-agent/upstream/default.yaml +++ b/data/puppet-agent/upstream/default.yaml @@ -6,10 +6,10 @@ puppet-agent::settings: # tp 4 settings - configs: - main: + files: + config: path: '/etc/puppetlabs/puppet/puppet.conf' - fileserverconfig: + fileserver: path: '/etc/puppetlabs/puppet/fileserver.conf' routes: path: '/etc/puppetlabs/puppet/routes.yaml' @@ -29,7 +29,7 @@ puppet-agent::settings: path: '/opt/puppetlabs/puppet/public/last_run_summary.yaml' passfile: path: '/etc/puppetlabs/puppet/ssl/private/password' - pidfile: + pid: path: '/var/run/puppetlabs/main.pid' resourcefile: path: /opt/puppetlabs/puppet/cache/state/resources.txt @@ -45,7 +45,7 @@ puppet-agent::settings: path: '/etc/puppetlabs/puppet/custom_trusted_oid_mapping.yaml' dirs: - main: + config: path: '/etc/puppetlabs/puppet' log: path: '/var/log/puppetlabs' diff --git a/data/puppet/osfamily/Debian.yaml b/data/puppet/osfamily/Debian.yaml index 4c345068..876f0ba9 100644 --- a/data/puppet/osfamily/Debian.yaml +++ b/data/puppet/osfamily/Debian.yaml @@ -1,4 +1,3 @@ --- puppet::settings: init_file_path: '/etc/default/puppet' - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' diff --git a/data/reference/default.yaml b/data/reference/default.yaml index ceeeaa26..7fb41766 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -1,9 +1,38 @@ --- -# This reference module shows all the possible tinydata settings. +# This reference data shows all the possible tinydata settings for a sample application (called 'reference') # -# The settings key is looked up by the tp_lookuop function +# The main APPNAME::settings key below is looked up by the tp_lookup function in tp module manifests. # It's an hash whose values are looked up in deep merge mode across the hierarchies -# defined in hiera.yaml. +# defined in the hiera.yaml configuration file specific for each managed app. +# +# You don't have to set all these settings, but be sure that what's set is correct, otherwise tp may try to do weird +# things or plainly fail with wrong data. + +# Settings marked with v3 are used by every (not ancient) version of tp module. They are going to be deprecated (but still supported) from tp 4 +# Settings marked with v4 are used by tp module starting from version 4. +# Some of them are used, as technology preview, in tp version 3.8.0 onwards. + +# Note that in every template used by the tp::conf define you can access to these settings +# (so that you can automatically configure in your own templates the right paths and names for +# different underlying OSes) via the $settings variable (an hash with the settings values merged across the hierarchy). +# For example to get the name of the user running a given app (as a service) you can use something like: +# User <%= @settings['process_user'] %> # In erb templates +# User <%= $settings['process_user'] %> # In epp templates +# This works also for nested keys like: +# Port: <%= $settings['ports']['main']['port'] %> +# Protocol: <%= $settings['ports']['main']['protocol'] %> +# Note: Be sure the referred settings (and subkeys) exist in your tinydata to avoid errors like: +# Evaluation Error: Operator '[]' is not applicable to an Undef Value. + +# You can override these settings directly from tp defines using the parameter settings_hash (legacy) or, +# starting from tp 4, also the parameter my_settings. Their content must be an hash, with the same structure +# of the data below and is merged with what comes from tinydata (you can override or set new settings). + +# Here 'reference' is a sample application name, whose tinydata is expected to be placed under the +# directory data/reference/. Change it according to the app the tinydata is made for, or, better, +# run the scripts/moduledata_clone.sh script to scaffold the tinydata for a new app, based on the +# tinydata of an existing app: scripts/moduledata_clone.sh existing_app new_app +# ProTip: Use as existing app one of the example ones like: "sample", "sample_desktop" ... reference::settings: # If the app needs other apps, installed via tp. @@ -11,64 +40,136 @@ reference::settings: # Valids values: String, Array, Hash of tp::install resources with (in case of Hash) # their parameters. v3 and v4 compatible. # These resources, as every other prerequisites, are installed if tp::auto_prereq is set to true. -# If auto_prereq is set to false, the user is responsible for installing the prerequisites. +# If auto_prereq is set to false, the user is responsible for managing the prerequisites, when needed. tp_prerequisites: {} -# If to use the upstream repo or not (if defined in tinydata) +# If to use the upstream repo from the app developer or not (if it exists and is defined in tinydata) upstream_repo: false -# The name of the package to install. ust be available via the system or the configured repos +# The name of the package to install. Must be available on the system or via the configured repo # v3 and v4 compatible. package_name: 'reference' -# The name of the service to manage +# The provider to use for the package resource. Tinydata defaults are: +# - chocolatey on windows (you need to install chocolatey by yourself) +# - homebrew on Darwin (you need to install homebrew by yourself) +# - Puppet's default package provider for the other OSes + package_provider: ~ + +# The source argument of the package resource. The value is passed to the tp::url_replace function +# which automatically replaces the following variables in the string: +# $OS with downcase($facts['kernel']) +# $ARCH with $facts['os']['architecture'] (with some mapping to match GitHub default names of archs) +# $VERSION with the version of the package (if set via $ensure, $version or in $settings.releases.latest_version) +# For example, this could be: +# package_source: 'https://github.com/reference/reference/releases/download/v$VERSION/reference_$VERSION_$OS_$ARCH.msi' +# This works only with Puppet providers that accept a source argument + package_source: ~ + +# The install_options argument of the package resource. + package_install_options: [] + +# An optional hash of parameters to pass to the package resource. They are merged and can override +# or extend the above default package parameters (ensure,provider,source,install_options) +# Note that is you set both package_source: foo and package_params: { source: 'bar' } the latter (bar) +# will be used. Same for the provider and install_options arguments. + package_params: {} + +# The name of the service to manage. When present, the relevant service resource is managed. service_name: 'reference' + +# An optional hash of parameters to pass to the service resource. They are merged and can override +# or extend the default service parameters (ensure/enable/require) + service_params: {} + +# The name of the process of the managed application. This is used by the tp test, tp info and +# tp debug commands automatically show relevant information process_name: 'reference' + +# The name of the user used by the app when it runs as a service. This is used by the tp::service +# define when configuring automatically the systemd unit files. process_user: 'root' + +# The name of the group used by the app when it runs a service. This is used by tp::service as well process_group: 'root' + +# The path of the "main" configuration file of the app. When it's not clear what's the main +# config file, choice is arbitrarily left to the tinydata developer. +# This is the file managed when you use the tp::conf define without further arguments like path. +# tp::conf { 'reference': content => "whatever" } will manage the file in the path below. +# v3 format. v4 format equivalent is files.config.path config_file_path: '/etc/reference/reference.conf' + +# The format of the main configuration file. Can be any of the following: +# yaml, json, hcl (TODO), inifile, inifile_with_stanzas, spaced, spaced_with_stanzas +# When this setting is present you can directly configure the content of a file, via tp::conf +# without specifying a template or a sttic source. For example, Hiera data as follows: +# tp::confs: +# reference: +# my_options: +# foo: bar +# my: baz +# Or the analog Puppet code: +# tp::conf { 'reference': +# my_options => { +# foo => 'bar', +# my => 'baz', +# } +# } +# Will create /etc/reference/reference.conf in yaml format as follows: +# --- +# foo: bar +# my: baz +# v3 format. v4 format equivalent is files.config.format config_file_format: yaml -# validate_cmd: 'reference validate' + +# The eventual value of Puppet's validate_cmd argument for the main configuration file resource, when managed via tp::conf. +# This allows you to automatically validate the syntax of your configurations before changing them via Puppet +# Note the % which is the default placeholder for the file to validate (keep it) +# v3 format. v4 format equivalent is files.config.validate_cmd + validate_cmd: 'reference validate %' + +# The path of the pid file, if any. This is used by the tp info and tp debug commands to show info based the pid of the process +# v3 format. v4 format equivalent is files.pid.path pid_file_path: '/run/reference.pid' + +# The path of the service configuration file (not the systemd unit file or init script, but the file that they uses to configure the service) +# v3 format. v4 format equivalent is files.init.path init_file_path: '/etc/sysconfig/reference.conf' + +# The path[s] of the log file[s] of the app. This is used by the tp log and tp info commands to tail logs or show info on the app +# v3 format. v4 format equivalent is files.log.path log_file_path: - '/var/log/reference/reference.log' + +# The path of the directory where the app stores its configurations. This is the default path used by the tp::dir define. +# v3 format. v4 format equivalent is dirs.config.path config_dir_path: '/etc/reference' + +# The path where the app stores its log (if different by general log dirs like /var/log) +# v3 format. v4 format equivalent is dirs.log.path log_dir_path: - '/var/log/reference' - info_commandsTOCONFIG: - list: 'reference list' - debug_commandsTOCONFIG: - list: 'reference debug' - test_commandsTOCONFIG: - status: 'reference status' - version_command: 'reference version' - run_commandsTOCONFIG: - start: - command: 'reference start' - arguments: - - 'instance': - default: '' - description: 'Instance to start' - options: - config_file: - default: 'reference.conf' - value: String - description: 'Config file to use' - restart: - command: 'reference restart' - -# tp 4 settings - install_method: 'package' - description: 'reference_packages description' - docker_image: 'reference/reference' - website: 'https://reference.com' - issues: 'https://github.com/reference/reference/issues' - git_source: 'https://github.com/reference/reference' - - configs: - main: +# An v4 hash of files related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. +# They are used by tp::conf to manage files without the need to specify their path, and also can be used by tp info and tp debug commands. +# The common keys are: +# config : the main configuration file. It's path is used when you use tp::conf { 'appname': } +# init : the init script or systemd unit file configuration file. It's path is used when you use tp::conf { 'appname::init': } +# systemd: the systemd unit file. It's path is used when you use tp::conf { 'appname::systemd': } +# pid : the pid file. +# Any other string can be used to refer to other app specific files. Syntax and usage is similar. For example on nuclei +# tinydata you can have +# templates: the .templates-config.json file, which can be configured with tp::conf { 'nuclei::templates': } +# For each file the following subkeys can be used: +# path : the path of the file (required) +# format : the format of the file (optional, possible values are yaml, json, , inifile, inifile_with_stanzas, spaced, spaced_with_stanzas config_file_format) +# validate_cmd: the validate_cmd argument for the file resource used to validate its syntax before it's changed by Puppet (optional) +# mode : the mode of the file (optional) +# owner : the owner of the file (optional) +# group : the group of the file (optional) + files: + config: path: '/etc/reference/reference.conf' init: path: '/etc/sysconfig/reference.conf' @@ -76,9 +177,26 @@ reference::settings: systemd: path: '/etc/systemd/system/reference.service' format: 'inifile_with_stanzas' + pid: + path: '/run/reference.pid' +# An v4 hash of directories related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. +# They are used by tp::dir to manage the directories without the need to specify their path, and also can be used by tp info and tp debug commands. +# The common keys are: +# config : the main configuration directory. It's path is used when you use tp::dir { 'appname': } +# conf : a configuration directory for additional configuration files which are automatically added to the app's configuration (the dot conf files). +# It's path is used when you use tp::dir { 'appname::conf': } +# log : the log directory. It's path is used when you use tp::dir { 'appname::log': } (usually you don't need to manage it) +# home : the app's home directory if applicable +# data : the directory where the app stores its data +# Also for dirs you can have additional keys which refer to dirs specific to the app. +# For each dir the following subkeys can be used: +# path : the path of the dir (required) +# mode : the mode of the dir (optional) +# owner : the owner of the dir (optional) +# group : the group of the dir (optional) dirs: - main: + config: path: '/etc/reference' conf: path: '/etc/reference/conf.d' @@ -87,26 +205,169 @@ reference::settings: home: path: /var/lib/reference - user_configs: - main: +# This is a v4 hash equivalent to the files hash. It's used when Puppet is running as a not provileged user. +# So, given the examples in this doc, when you apply a manifest with tp::conf { 'reference': } the default +# path used will be /etc/reference/reference.conf if Puppet is running as root (on Linux and Mac) while +# if Puppet is running as a normal user the same define will manage the file $HOME/.reference/reference.conf +# Remember that you can always specify the path of the file to manage with tp::conf { 'reference': path => '/path/to/file' } + user_files: + config: path: '$HOME/.reference/reference.conf' +# This is a v4 hash equivalent to the dirs hash. It's used when Puppet is running as a not provileged user. +# Same logic as for user_files. user_dirs: - main: + config: path: '$HOME/.reference' +# This is v4 setting which allows you specify how the app has to be installed. +# What is set here in tinydata can be overridden by the tp::install argument install_method. +# Note however that not all the install methods might be available (or have the required tinydata) +# for all the apps and OS. +# Possible values are: +# package: the app is installed from a system package and managed by Puppet's package resource. This is usually the default value. +# file : the app is installed from a file downloaded and eventually extracted from an archive. Details under the release setting. +# source : the app is installed and eventually compiled from the git source repository. Details under the build setting. +# image : the app is installed as a Docker image. Details under the image setting. + install_method: 'package' + +# The description of the app. It's used by tp command. v4. + description: 'reference_packages description' + +# The name or the url of the official container image of the app. v3 format. The v4 equivalent is image.name + docker_image: 'reference/reference' + +# The official website of the application. v4. Used by tp command. + website: 'https://reference.com' + +# The tickets/issues page of the application. v4. Currently still not used. + issues: 'https://github.com/reference/reference/issues' + +# The git repository of the application. Used by tp::source and tp::install (with install_method = source). v4. + git_source: 'https://github.com/reference/reference' + +# An hash of extra commands to execute when running the tp info command or tp::info task. v3 and v4 compatible. +# The keys are the names of the commands (ie: tp info APP list), the values are the actual commands to execute. + info_commands: + list: 'reference list' + +# An hash of extra commands to execute when running the tp debug command or tp::debug task. v3 and v4 compatible. +# The keys are the names of the commands (ie: tp debug APP list), the values are the actual commands to execute. + debug_commands: + list: 'reference debug' + +# An hash of extra commands used to test if the application is running or installed correctly. +# They are executed when running the tp test command or the tp::test task. v3 and v4 compatible. + test_commands: + status: 'reference status' + +# The command to run to show the application's version. By default it's used appname --version, if a different command +# or argument is needed. Specify it here. v3 and v4 compatible. + version_command: 'reference version' + +# An hash of commands to execute when running the tp::run command or the tp::run task. v3 and v4 compatible. +# Experimental feature yet to be implemented. Format of the subkeys might change. + run_commands: + start: + command: 'reference start' + arguments: + - 'instance': + default: '' + description: 'Instance to start' + options: + config_file: + default: 'reference.conf' + value: String + description: 'Config file to use' + restart: + command: 'reference restart' + +# The main tcp port used by the application, if applicable. v3 only. Replaced by v4 ports.main.port and ports.main.protocol: tcp + tcp_port: 42 + +# The main udp port used by the application, if applicable. v3 only. Replaced by v4 ports.main.port and ports.main.protocol: udp + udp_port: 42 + +# A v4 hash of all the ports used by the application. +# The keys are the names of the ports, common names are (other names can be application specific): +# main: the main port used by the application +# ssl : the main port used by the application for ssl connections +# For each port name the values are hashes with the following keys: +# port : the port number (required) +# protocol : the protocol used (optional, default tcp) +# listen : the address to listen on (optional, default is based on the app's default) +# These settings are used by tp test and tp info commands and by tp::install with install_method=image +# to automatically map the app's port from host to container (see details under image setting). ports: main: port: 42 protocol: tcp + listen: '0.0.0.0' ssl: port: 4432 protocol: tcp +# Configurations to manage app as a container image. v4 only. +# Used by tp::install with install_method=image + image: + # The name of the image to use. Passed to docker pull. + # Can be a full url like quay.io/argoproj/argocd or just the + # image name on Docker hub like argoproj/argocd + # This value has precendence over the docker_image value (v3) + name: 'reference/reference' + + # The ports to map when starting the container. Different data types are supported: + # When undefined, the ports are mapped based on the settings.ports.main value, if set + # When an empty string (''), no ports are mapped (this overrides the undef value) + # When a string, they are mapped as is (e.g. '8080:8081' becomes '-p 8080:8081') + # When an integer, it's mapped as is (e.g. 8080 becomes '-p 8080:8080') + # When an array, it's mapped for each element (e.g. ['8080:8080', '8081:8082'] becomes '-p 8080:8080 -p 8081:8082') + # When an hash, it's mapped for each key/value pair (e.g. {'8080' => '8080', '8081' => '8082'} becomes '-p 8080:8080 -p 8081:8082') + ports: + - 9090:9090 + + # The volumes or bind mounts to map when starting the container. + # If you mount volumes, you have to manage and create them. + # Bind mounts are based on the host dirs (which you can manage via the tp::conf and tp::dir defines) + # Different data types are supported: + # When undefined, the bind mounts are mapped based on the settings.dirs values, if set + # When an empty string (''), nothing is mounted (this overrides the undef value) + # When a string, they are mapped as is (e.g. 'myvol2:/app' becomes '-v myvol2:/app') + # When an array, it's mapped for each element (e.g. ['myvol2:/app', '/etc/app:/etc/app:ro'] becomes '-v myvol2:/app -v /etc/app:/etc/app:ro') + # When an hash, it's mapped for each key/value pair (e.g. {'myvol2' => '/app', '/etc/app' => '/etc/app:ro'} becomes '-v myvol2:/app -v /etc/app:/etc/app:ro') + mounts: + - /etc/reference:/etc/reference + + # An hash of options to use in systemd unit file that overrides or extends the default ones which are: + # 'Unit' => { + # 'Description' => pick(getvar('settings.description'),"${app} service"), + # 'Documentation' => pick(getvar('settings.website'),"Search: ${app}"), + # 'After' => 'docker.service', + # 'Requires' => 'docker.service', + # }, + # 'Service' => { + # 'ExecStart' => "/usr/bin/docker run --rm --name ${app} ${docker_args} ${port_mapping} ${mount_mapping} ${docker_image}", + # 'Restart' => 'always', + # 'RestartSec' => '10s', + # }, + # 'Install' => { + # 'WantedBy' => 'multi-user.target', + # }, + systemd_options: {} + + # A custom template to use for the contents of thesystemd unit file. The default is tp/inifile_with_stanzas.erb which automatically + # maps systemd_options into a valid Systemd unit file in ini file format with stanza. You probably don't need to set this. + systemd_template: 'tp/inifile_with_stanzas.erb' + +# A v4 setting used by the tp::build define. build: + # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) + # to apply before building the app. The values of each resource (here tp::install) can be a string, an array + # or an hash of resource titles with the relevant arguments prerequisites: tp::install: - build-essential + # The commands to run execute in order to build the app execs: configure: command: './configure' @@ -115,10 +376,59 @@ reference::settings: setup: command: 'make install' +# A v4 setting used by the tp::install define to install the app when install_method=file releases: - baseurl: 'https://github.com/reference/reference/releases/download/' + # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) + # to apply before installing the app with install_method=file . The values of each resource can be a string, + # an array or an hash of resource titles with the relevant arguments + prerequisites: {} + + # The application latest known version released. This can be set the $version parameter of tp::install + # In the future, this value is going to be automatically updated, but it's likely to not be updated. + # It's used when no specific version is set via tp::install. + latest_version: '1.0.0' + + # The full url of the application archive. This is downloaded, eventually extracted and some of its contents eventually + # copied to target paths. + # The value is passed to the tp::url_replace function which automatically replaces, if present, the following variables: + # $OS with downcase($facts['kernel']) (common values: linux, windows, darwin) + # $ARCH with $facts['os']['architecture'] (common values: linux, windows, darwin) + # $VERSION with the version of the package (if set via $ensure, $version or in $settings.releases.latest_version) + release_url: 'https://github.com/reference/reference/releases/download/reference-$VERSION/reference-$VERSION.tar.gz' + + # If release_url is not set then the url is built using the following values: $base_url/$base_path/$file_name + # Note that base_url and base_path are optional if release_url is set (they are useful if you get release files + # from a local repository). file_name is mandatory. + base_url: 'https://github.com/reference/reference/releases/download' + base_path: 'releases/download/reference-$VERSION' + file_name: 'reference-$VERSION.tar.gz' + + # The format of the archive. Needed to find the right way to decompress it file_format: tar.gz - latest: - release_url: 'https://github.com/reference/reference/releases/download/reference-latest/reference-latest.tar.gz' - version: - release_url: 'https://github.com/reference/reference/releases/download/reference-$VERSION/reference-$VERSION.tar.gz' + + # Url of the latest release of an app, in case it's a fixed url which never changes and always points to + # the latest version of the app. + latest_url: ~ + + # The name of the directory extracted from the archive. This gets variables replacement as well. + # If not set, the file name without the file_format extension will be used. + # If empty the archive is not extracted into a directory but contains direclty one more files. + # When this happens, the extracted_file setting is used to specify the name of an extracted file. + # If extracted_dir is not an empty string, then extracted_file is ignored. + extracted_dir: 'reference-$VERSION' + extracted_file: '' + + install: + enable: true + files: + reference: + path: '/usr/local/bin/reference' + mode: '0755' + systemd_options: + Service: + ExecStart: '/usr/local/bin/reference -l 127.0.0.1' + EnvironmentFile: ~ + resources: {} + manage_service: true + manage_user: false + diff --git a/data/reference/hiera.yaml b/data/reference/hiera.yaml index b2a2fa6a..4b10fbcc 100644 --- a/data/reference/hiera.yaml +++ b/data/reference/hiera.yaml @@ -1,3 +1,43 @@ +# This file defines the hierathy to follow when looking for tinydata settings +# Note that even if it's called like a normal Hiera 3 configuration files +# and has a similar logic it's NOT a Hiera configuration and is not used by Hiera +# This file is actually used by the tp_slookuo function and has the following +# limitation: +# Variables interpolation is done ONLY for the following variables: +# - Fact $::operatingsystemmajrelease +# - Fact $::operatingsystemrelease +# - Fact $::operatingsystem +# - Fact $::osfamily +# - Argument $repo of the tp::install define (defaults to 'upstream' is upstream_repo is true) +# - $title of the tp::install (or other tp::*) define + +# As in Hiera lookup is done from top to bottom, according to the merge method specified +# when calling the tp_lookup function +# Starting from tp version 3.8 the merge method has changed from 'merge' to 'deep_merge' +# This is not expected to have any impact on the existing TinyData but is required by +# the more complex tinydata v4 settings + +# The lower levels in the hierarchy generally use a default to configure general settings +# valid for all the apps (and in some cases different for OS and OS versions) + +# For each app you can have a different hiera.yaml with more or less levels +# A minimal recommended hierarchy is as follows: +# - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" +# - "%{title}/osfamily/%{osfamily}" +# - "%{title}/default" +# - "default/%{operatingsystem}%{operatingsystemmajrelease}" +# - "default/%{operatingsystem}" +# - default + +# That maps respectively to the following files in the tinydata module: +# Example with the app redis on RedHat9 +# - data/redis/osfamily/RedHat9.yaml +# - data/redis/osfamily/RedHat.yaml +# - data/redis/default.yaml +# - data/default/RedHat9.yaml +# - data/default/RedHat.yaml +# - data/default.yaml + --- :hierarchy: - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" diff --git a/data/reference/osfamily/Darwin.yaml b/data/reference/osfamily/Darwin.yaml index b1557d25..1c0e6be3 100644 --- a/data/reference/osfamily/Darwin.yaml +++ b/data/reference/osfamily/Darwin.yaml @@ -1,13 +1,12 @@ --- reference::settings: + # Name of brew package to install. This parameter is optional and currently + # redundant, as on MacOS brew is always used to manage packages and + # the package_name setting is enough to define what package to install + # via the homebrew provider. brew_package_name: 'reference' - user_config_file_path: '$HOME/Library/Application\ Support/reference/reference.conf' - user_config_dir_path: '$HOME/Library/Application\ Support/reference/' - user_configs: - main: - path: '$HOME/Library/Application\ Support/reference/reference.conf' - - user_dirs: - main: - path: '$HOME/Library/Application\ Support/reference/reference.conf' \ No newline at end of file + # Name of a brew tap to use to install a package via brew. + # If set, the string used is the title of a package resource installed via + # the tap provider. + brew_tap: 'reference/reference' diff --git a/data/reference/osfamily/Debian.yaml b/data/reference/osfamily/Debian.yaml index 8e709b6d..c46f43ef 100644 --- a/data/reference/osfamily/Debian.yaml +++ b/data/reference/osfamily/Debian.yaml @@ -1,8 +1,10 @@ --- +# On Debian the configuration file used by a service init script is +# under /etc/default. Here the same setting is expressed in v3 and v4 formatting + reference::settings: init_file_path: '/etc/default/reference' - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' - configs: + files: init: - path: '/etc/default/reference' \ No newline at end of file + path: '/etc/default/reference' diff --git a/data/reference/osfamily/windows.yaml b/data/reference/osfamily/windows.yaml index 6d804a75..ee6eecc0 100644 --- a/data/reference/osfamily/windows.yaml +++ b/data/reference/osfamily/windows.yaml @@ -1,19 +1,16 @@ --- reference::settings: + # The name of a package when installed via winget + # (NOTE: Currently this setting is not used as no winget provider + # is available) winget_package_name: 'reference.reference' - choco_package_name: 'reference' - package_name: 'reference' - config_file_path: 'C:\ProgramData\reference\reference\etc\reference.conf' - config_dir_path: 'C:\ProgramData\reference\reference\etc' - process_user: 'LocalSystem' - process_group: 'LocalSystem' - user_config_file_path: '%APPDATA%\reference\reference.conf' - user_config_dir_path: '%APPDATA%\reference' - user_configs: - main: - path: '%APPDATA%\reference\reference.conf' + # The name of a package when installed via scoop + # (NOTE: Currently this setting is not used as no scoop provider + # is available) + scoop_package_name: 'reference.reference' - user_dirs: - main: - path: '%APPDATA%\reference' \ No newline at end of file + # The name of a package when installed via chocolately + # (NOTE: Currently this setting is not used as chocolately provider + # is used by default and on windows we use the package_name setting) + choco_package_name: 'reference' diff --git a/data/reference/osfamily/windows11.yaml b/data/reference/osfamily/windows11.yaml deleted file mode 100644 index 9f69b3cb..00000000 --- a/data/reference/osfamily/windows11.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -reference::settings: - package_name: 'reference.reference' diff --git a/data/reference/upstream/default.yaml b/data/reference/upstream/default.yaml deleted file mode 100644 index 6c4a9ca1..00000000 --- a/data/reference/upstream/default.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -reference::settings: {} - -# tp_prerequisites: -# reference_repo: {} - diff --git a/data/sample/default.yaml b/data/sample/default.yaml index 8aeb8b4a..8779e1c6 100644 --- a/data/sample/default.yaml +++ b/data/sample/default.yaml @@ -28,8 +28,8 @@ sample::settings: issues: 'https://github.com/sample/sample/issues' git_source: 'https://github.com/sample/sample' - configs: - main: + files: + config: path: '/etc/sample/sample.conf' init: path: '/etc/sysconfig/sample.conf' @@ -39,7 +39,7 @@ sample::settings: format: 'inifile_with_stanzas' dirs: - main: + config: path: '/etc/sample' conf: path: '/etc/sample/conf.d' @@ -48,12 +48,12 @@ sample::settings: home: path: /var/lib/sample - user_configs: - main: + user_files: + config: path: '$HOME/.sample/sample.conf' user_dirs: - main: + config: path: '$HOME/.sample' ports: @@ -101,17 +101,15 @@ sample::settings: command: 'make install' releases: - base_url: 'https://github.com/sample/sample/releases/download/' - file_format: tar.gz - latest_version: '4.0' + latest_version: ~ prerequisites: {} - latest: - release_url: 'https://github.com/sample/sample/releases/download/sample-latest/sample-latest.tar.gz' - version: - release_url: 'https://github.com/sample/sample/releases/download/sample-$VERSION/sample-$VERSION.tar.gz' - file_name: 'sample-$VERSIONN.zip' - extracted_dir: 'sample-$VERSION' - base_path: 'sample-$VERSION' + latest_url: ~ + release_url: 'https://github.com/sample/sample/releases/download/sample-$VERSION/sample-$VERSION.$OS-$ARCH.tar.gz' + base_url: 'https://github.com/sample/sample' + base_path: 'releases/download/sample-$VERSION' + file_name: 'sample-$VERSION.$OS-$ARCH.tar.gz' + extracted_dir: 'sample-$VERSION.$OS-$ARCH' + file_format: tar.gz install: enable: true @@ -119,7 +117,7 @@ sample::settings: sample: path: '/usr/local/bin/sample' mode: '0755' - systemd_settings: + systemd_options: Service: ExecStart: '/var/lib/tp/source/sample/sample -l 127.0.0.1' EnvironmentFile: ~ diff --git a/data/sample/osfamily/Darwin.yaml b/data/sample/osfamily/Darwin.yaml index 9bf01d10..cd51e27e 100644 --- a/data/sample/osfamily/Darwin.yaml +++ b/data/sample/osfamily/Darwin.yaml @@ -4,10 +4,10 @@ sample::settings: user_config_file_path: '$HOME/Library/Application\ Support/sample/sample.conf' user_config_dir_path: '$HOME/Library/Application\ Support/sample/' - user_configs: - main: + user_files: + config: path: '$HOME/Library/Application\ Support/sample/sample.conf' user_dirs: - main: + config: path: '$HOME/Library/Application\ Support/sample/sample.conf' \ No newline at end of file diff --git a/data/sample/osfamily/Debian.yaml b/data/sample/osfamily/Debian.yaml index 4805e3ca..cda87d49 100644 --- a/data/sample/osfamily/Debian.yaml +++ b/data/sample/osfamily/Debian.yaml @@ -1,8 +1,7 @@ --- sample::settings: init_file_path: '/etc/default/sample' - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' - configs: + files: init: path: '/etc/default/sample' \ No newline at end of file diff --git a/data/sample/osfamily/windows.yaml b/data/sample/osfamily/windows.yaml index ed1909e2..1a965a9a 100644 --- a/data/sample/osfamily/windows.yaml +++ b/data/sample/osfamily/windows.yaml @@ -10,10 +10,14 @@ sample::settings: user_config_file_path: '%APPDATA%\sample\sample.conf' user_config_dir_path: '%APPDATA%\sample' - user_configs: - main: +# If exe or msi package is available for direct download: + package_provider: 'windows' + package_source: 'https://github.com/sample/sample/releases/download/v$VERSION/sample_$VERSION_$OS_$ARCH.msi' + + user_files: + config: path: '%APPDATA%\sample\sample.conf' user_dirs: - main: + config: path: '%APPDATA%\sample' \ No newline at end of file diff --git a/data/spiderfoot/default.yaml b/data/spiderfoot/default.yaml index 24e0da39..11a2dcf0 100644 --- a/data/spiderfoot/default.yaml +++ b/data/spiderfoot/default.yaml @@ -38,17 +38,15 @@ spiderfoot::settings: install_method: 'source' releases: - base_url: 'https://github.com/smicallef/spiderfoot/archive/refs/tags' - file_format: 'zip' - # extracted_dir: 'spiderfoot-$VERSION.$OS-$ARCH' # Override standard tar content latest_version: '4.0' prerequisites: {} latest: {} - version: - file_name: 'v$VERSION.zip' - extracted_dir: 'spiderfoot-$VERSION' - # base_path: 'v$VERSION/' - release_url: '$VERSION.tar.gz' + release_url: '$VERSION.tar.gz' + base_url: 'https://github.com/smicallef/spiderfoot' + base_path: 'archive/refs/tags/v$VERSION/' + file_name: 'v$VERSION.zip' + extracted_dir: 'spiderfoot-$VERSION' + file_format: 'zip' install: enable: true @@ -56,7 +54,7 @@ spiderfoot::settings: sf.py: path: '/usr/local/bin/sf.py' mode: '0755' - systemd_settings: + systemd_options: Service: ExecStart: '/var/lib/tp/source/spiderfoot/sf.py -l 127.0.0.1:5001' EnvironmentFile: ~ diff --git a/data/spiderfoot/osfamily/Debian.yaml b/data/spiderfoot/osfamily/Debian.yaml index 42dad9f3..10a94ad4 100644 --- a/data/spiderfoot/osfamily/Debian.yaml +++ b/data/spiderfoot/osfamily/Debian.yaml @@ -1,9 +1,8 @@ --- spiderfoot::settings: init_file_path: '/etc/default/spiderfoot' - dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' - configs: + files: init: path: '/etc/default/spiderfoot' From 8e2b29eb6cf11bf3fd228f07ac408bdc91d6e95e Mon Sep 17 00:00:00 2001 From: florusboth Date: Wed, 1 Feb 2023 19:38:52 +0100 Subject: [PATCH 249/284] #60 for newer redhat (8+) use vim-enhanced (#61) * for newer redhat (8+) use vim-enhanced * fix yaml error * another yaml lint fix * another yaml lint fix * one more :) * you guessed it * add .yamlint.yaml to disable some errors + yaml fixes * more yaml fixes * also yaml fixes in actions --------- Co-authored-by: florus Co-authored-by: florus Co-authored-by: Florus Both --- .github/workflows/pr.yml | 14 +- .github/workflows/release.yml | 4 +- .yamllint.yaml | 29 ++ data/apache/default.yaml | 2 +- data/apache/osfamily/Debian.yaml | 2 +- data/apache/osfamily/Linux.yaml | 3 +- data/apache/osfamily/RedHat.yaml | 2 +- data/apache/osfamily/Suse.yaml | 2 +- data/apt/osfamily/Darwin.yaml | 1 + data/apt/osfamily/RedHat.yaml | 1 + data/apt/osfamily/Suse.yaml | 1 + data/apt/osfamily/windows.yaml | 1 + data/bind-utils/osfamily/Debian.yaml | 7 +- data/bzip2/default.yaml | 2 +- data/collectd/osfamily/RedHat.yaml | 1 - data/consul-enterprise/default.yaml | 1 - .../default.yaml | 1 - data/ddclient/default.yaml | 24 +- data/ddclient/osfamily/Debian.yaml | 4 +- data/ddclient/osfamily/RedHat.yaml | 2 +- data/debootstrap/default.yaml | 4 +- data/dhcpd/default.yaml | 20 +- data/dhcpd/osfamily/Debian.yaml | 16 +- data/dhcpd/osfamily/OpenBSD.yaml | 16 +- data/dhcpd/osfamily/RedHat.yaml | 10 +- data/dhcpd/osfamily/Suse.yaml | 11 +- data/dkms/default.yaml | 10 +- data/dkms/osfamily/RedHat.yaml | 6 +- data/dnsmasq/default.yaml | 26 +- data/dnsmasq/osfamily/Debian.yaml | 4 +- data/dnsmasq/osfamily/RedHat.yaml | 6 +- data/docker/upstream/osfamily/windows.yaml | 1 + data/dovecot/default.yaml | 26 +- data/dovecot/osfamily/Debian.yaml | 10 +- data/dovecot/osfamily/FreeBSD.yaml | 16 +- data/dovecot/osfamily/RedHat.yaml | 6 +- data/duply/default.yaml | 8 +- data/elrepo/osfamily/RedHat.yaml | 1 - data/epel/osfamily/RedHat4.yaml | 4 +- data/exim/default.yaml | 24 +- data/exim/osfamily/Debian.yaml | 18 +- data/exim/osfamily/RedHat.yaml | 4 +- data/fabric/default.yaml | 10 +- data/fabric/osfamily/Debian.yaml | 6 +- data/fabric/osfamily/RedHat.yaml | 8 +- data/fail2ban/default.yaml | 32 +- data/fail2ban/osfamily/Debian.yaml | 8 +- data/foreman/default.yaml | 41 +-- data/foreman/operatingsystem/Debian8.yaml | 4 +- data/foreman/operatingsystem/Ubuntu16.04.yaml | 4 +- data/foreman/osfamily/Debian.yaml | 16 +- data/foreman/osfamily/RedHat.yaml | 6 +- data/foreman/osfamily/RedHat7.yaml | 4 +- data/freeradius/default.yaml | 28 +- data/freeradius/osfamily/Debian.yaml | 28 +- data/freeradius/osfamily/RedHat.yaml | 4 +- data/git/default.yaml | 2 +- data/git/osfamily/Suse.yaml | 2 +- data/git/osfamily/windows.yaml | 2 +- data/gitlab-cli/default.yaml | 12 +- data/gitlab-runner/default.yaml | 10 +- data/gitlab-runner/osfamily/Debian.yaml | 11 +- data/gitlab-runner/osfamily/RedHat.yaml | 10 +- data/glance/default.yaml | 18 +- data/glance/osfamily/Debian.yaml | 6 +- data/glance/osfamily/RedHat.yaml | 6 +- data/go-server/default.yaml | 32 +- data/go-server/osfamily/Debian.yaml | 10 +- data/go-server/osfamily/RedHat.yaml | 6 +- data/grafana/default.yaml | 37 +- data/grafana/osfamily/Debian.yaml | 18 +- data/grafana/osfamily/RedHat.yaml | 16 +- data/graylog2/default.yaml | 24 +- data/graylog2/osfamily/Debian.yaml | 4 +- data/graylog2/osfamily/RedHat.yaml | 4 +- data/haproxy/default.yaml | 30 +- data/haproxy/osfamily/Debian.yaml | 4 +- data/haproxy/osfamily/RedHat.yaml | 4 +- data/hashicorp_repo/default.yaml | 1 - data/haveged/default.yaml | 4 +- data/hdm/default.yaml | 2 +- data/heartbeat/default.yaml | 26 +- data/heartbeat/osfamily/Debian.yaml | 4 +- data/heartbeat/osfamily/RedHat.yaml | 4 +- data/hosts/default.yaml | 4 +- data/icinga/default.yaml | 26 +- data/icinga/hiera.yaml | 8 +- data/icinga/osfamily/Debian.yaml | 10 +- data/icinga/osfamily/RedHat.yaml | 10 +- data/icinga2/default.yaml | 30 +- data/icinga2/osfamily/Debian.yaml | 4 +- data/icinga2/osfamily/RedHat.yaml | 16 +- data/icinga2/osfamily/RedHat5.yaml | 4 +- data/icinga2/osfamily/RedHat6.yaml | 4 +- data/icinga2/osfamily/RedHat7.yaml | 4 +- data/icingaweb2/default.yaml | 18 +- data/icingaweb2/osfamily/Debian.yaml | 4 +- data/icingaweb2/osfamily/RedHat.yaml | 15 +- data/icingaweb2/osfamily/RedHat5.yaml | 4 +- data/icingaweb2/osfamily/RedHat6.yaml | 4 +- data/icingaweb2/osfamily/RedHat7.yaml | 4 +- data/influxdb/default.yaml | 32 +- data/influxdb/operatingsystem/Debian7.yaml | 4 +- data/influxdb/operatingsystem/Debian8.yaml | 4 +- data/influxdb/operatingsystem/Debian9.yaml | 4 +- data/influxdb/operatingsystem/Ubuntu.yaml | 4 +- .../influxdb/operatingsystem/Ubuntu12.04.yaml | 4 +- .../influxdb/operatingsystem/Ubuntu14.04.yaml | 4 +- .../influxdb/operatingsystem/Ubuntu14.10.yaml | 4 +- .../influxdb/operatingsystem/Ubuntu16.04.yaml | 4 +- data/influxdb/osfamily/Debian.yaml | 10 +- data/influxdb/osfamily/RedHat.yaml | 4 +- data/influxdb/osfamily/RedHat6.yaml | 4 +- data/influxdb/osfamily/RedHat7.yaml | 4 +- data/iotop/default.yaml | 4 +- data/iptraf/default.yaml | 4 +- data/iptraf/operatingsystem/Debian-11.yaml | 4 +- data/iptraf/osfamily/RedHat.yaml | 4 +- data/jboss/default.yaml | 26 +- data/jboss/osfamily/Debian.yaml | 4 +- data/jboss/osfamily/RedHat.yaml | 4 +- data/jenkins/default.yaml | 26 +- data/jenkins/osfamily/Debian.yaml | 14 +- data/jenkins/osfamily/RedHat.yaml | 10 +- data/kedro/default.yaml | 1 - data/keepalived/default.yaml | 20 +- data/keepalived/osfamily/Debian.yaml | 4 +- data/keystone/default.yaml | 20 +- data/keystone/osfamily/Debian.yaml | 10 +- data/keystone/osfamily/RedHat.yaml | 12 +- data/libvirt/default.yaml | 26 +- data/libvirt/osfamily/Debian.yaml | 8 +- data/libvirt/osfamily/RedHat.yaml | 4 +- data/lighttpd/default.yaml | 30 +- data/lighttpd/osfamily/Debian.yaml | 6 +- data/logrotate/default.yaml | 10 +- data/lsb-release/default.yaml | 4 +- data/lsb-release/osfamily/Debian.yaml | 4 +- data/lsb-release/osfamily/RedHat.yaml | 4 +- data/lsb/default.yaml | 4 +- data/lsb/osfamily/Debian.yaml | 4 +- data/lsb/osfamily/RedHat.yaml | 4 +- data/lsb/osfamily/Suse.yaml | 4 +- data/lsof/default.yaml | 4 +- data/mailx/default.yaml | 6 +- data/mailx/osfamily/Debian.yaml | 4 +- data/make/default.yaml | 4 +- data/mariadb/default.yaml | 28 +- data/mariadb/osfamily/Debian.yaml | 6 +- data/mariadb/osfamily/RedHat.yaml | 6 +- data/mcollective/default.yaml | 22 +- data/mcollective/hiera.yaml | 8 +- data/mcollective/osfamily/Debian.yaml | 8 +- data/mcollective/osfamily/RedHat.yaml | 10 +- data/mdadm/default.yaml | 18 +- data/memcached/default.yaml | 22 +- data/memcached/osfamily/Debian.yaml | 4 +- data/memcached/osfamily/RedHat.yaml | 6 +- data/microsoft_repo/default.yaml | 1 - data/mlocate/default.yaml | 4 +- .../mongodb-mms-automation-agent/default.yaml | 22 +- .../osfamily/Debian.yaml | 4 +- .../osfamily/RedHat.yaml | 4 +- data/mongodb-mms-backup-agent/default.yaml | 22 +- .../osfamily/Debian.yaml | 4 +- .../osfamily/RedHat.yaml | 4 +- .../mongodb-mms-monitoring-agent/default.yaml | 22 +- .../osfamily/Debian.yaml | 4 +- .../osfamily/RedHat.yaml | 4 +- data/mongodb-mms/default.yaml | 22 +- data/mongodb-mms/osfamily/Debian.yaml | 4 +- data/mongodb-mms/osfamily/RedHat.yaml | 4 +- data/mongodb/osfamily/Debian.yaml | 6 +- data/mongodb/osfamily/RedHat.yaml | 15 +- data/monit/default.yaml | 24 +- data/monit/osfamily/Debian.yaml | 8 +- data/monit/osfamily/RedHat.yaml | 4 +- data/motd/default.yaml | 4 +- data/motd/lsbdistcodename/wheezy.yaml | 4 +- data/motd/operatingsystem/Debian.yaml | 4 +- data/motd/operatingsystem/Solaris.yaml | 4 +- data/msmtp/default.yaml | 10 +- data/msmtp/osfamily/Debian.yaml | 4 +- data/multipath/default.yaml | 18 +- data/multipath/osfamily/Debian.yaml | 10 +- data/multipath/osfamily/RedHat.yaml | 10 +- data/multipath/osfamily/Suse.yaml | 6 +- data/multitail/default.yaml | 4 +- data/munin-node/default.yaml | 30 +- data/munin-node/osfamily/Debian.yaml | 4 +- data/munin-node/osfamily/OpenBSD.yaml | 4 +- data/munin-node/osfamily/RedHat.yaml | 6 +- data/munin/default.yaml | 14 +- data/munin/osfamily/Debian.yaml | 4 +- data/munin/osfamily/RedHat.yaml | 4 +- data/mysql/default.yaml | 26 +- data/mysql/osfamily/Debian.yaml | 4 +- data/mysql/osfamily/FreeBSD.yaml | 8 +- data/mysql/osfamily/RedHat.yaml | 8 +- data/nagios/default.yaml | 22 +- data/nagios/osfamily/Debian.yaml | 24 +- data/nagios/osfamily/RedHat.yaml | 10 +- data/nano/default.yaml | 4 +- data/nats-server/default.yaml | 2 +- data/newrelic/default.yaml | 22 +- data/newrelic/osfamily/Debian.yaml | 4 +- data/newrelic/osfamily/RedHat.yaml | 4 +- data/nfs-client/default.yaml | 4 +- data/nfs-client/osfamily/Debian.yaml | 6 +- data/nfs-client/osfamily/RedHat.yaml | 6 +- data/nfs-client/osfamily/Suse.yaml | 6 +- data/nfs-server/default.yaml | 6 +- data/nfs-server/osfamily/Debian.yaml | 6 +- data/nfs-server/osfamily/RedHat.yaml | 6 +- data/nfs-server/osfamily/RedHat6.yaml | 4 +- data/nfs-server/osfamily/Suse.yaml | 6 +- data/nfs/default.yaml | 16 +- data/nfs/osfamily/Debian.yaml | 8 +- data/nfs/osfamily/RedHat.yaml | 8 +- data/nginx/default.yaml | 42 +-- data/nginx/osfamily/Debian.yaml | 16 +- data/nodejs/upstream/osfamily/Debian.yaml | 2 +- data/nodejs/upstream/osfamily/RedHat.yaml | 2 - data/nomad-enterprise/default.yaml | 2 - data/nomad-enterprise/upstream/default.yaml | 2 +- data/nova/default.yaml | 16 +- data/nova/osfamily/Debian.yaml | 10 +- data/nova/osfamily/RedHat.yaml | 11 +- data/nrpe/default.yaml | 22 +- data/nrpe/osfamily/Debian.yaml | 16 +- data/nrpe/osfamily/OpenBSD.yaml | 8 +- data/nrpe/osfamily/RedHat.yaml | 6 +- data/nrpe/osfamily/Solaris.yaml | 16 +- data/ntp/default.yaml | 22 +- data/ntp/osfamily/Debian.yaml | 4 +- data/ntp/osfamily/RedHat.yaml | 6 +- data/ntp/osfamily/Suse.yaml | 6 +- data/ntpdate/default.yaml | 4 +- data/ntpdate/osfamily/RedHat8.yaml | 4 +- data/nuclei/default.yaml | 2 +- data/octocatalog-diff/default.yaml | 20 +- data/octocatalog-diff/osfamily/Debian.yaml | 8 +- data/openjdk-jdk/default.yaml | 2 +- data/openjdk-jdk/operatingsystem/Debian9.yaml | 4 +- data/openjdk-jdk/operatingsystem/Ubuntu.yaml | 4 +- .../operatingsystem/Ubuntu10.04.yaml | 4 +- .../operatingsystem/Ubuntu10.10.yaml | 4 +- .../operatingsystem/Ubuntu15.04.yaml | 4 +- data/openjdk-jdk/osfamily/Debian.yaml | 4 +- data/openjdk-jdk/osfamily/Debian15.10.yaml | 4 +- data/openjdk-jdk/osfamily/Debian5.yaml | 4 +- data/openjdk-jdk/osfamily/Debian6.yaml | 4 +- data/openjdk-jdk/osfamily/OpenBSD.yaml | 4 +- data/openjdk-jdk/osfamily/RedHat6.yaml | 4 +- data/openjdk-jdk/osfamily/RedHat7.yaml | 4 +- data/openjdk-jre/default.yaml | 2 +- data/openjdk-jre/operatingsystem/Debian9.yaml | 4 +- data/openjdk-jre/operatingsystem/Ubuntu.yaml | 4 +- .../operatingsystem/Ubuntu10.04.yaml | 4 +- .../operatingsystem/Ubuntu10.10.yaml | 4 +- .../operatingsystem/Ubuntu15.04.yaml | 4 +- .../operatingsystem/Ubuntu15.10.yaml | 4 +- data/openjdk-jre/osfamily/Debian.yaml | 4 +- data/openjdk-jre/osfamily/Debian5.yaml | 4 +- data/openjdk-jre/osfamily/Debian6.yaml | 4 +- data/openjdk-jre/osfamily/OpenBSD.yaml | 4 +- data/openjdk-jre/osfamily/RedHat6.yaml | 4 +- data/openjdk-jre/osfamily/RedHat7.yaml | 4 +- data/openjdk-jre/osfamily/Suse.yaml | 4 +- data/openntpd/default.yaml | 22 +- data/openntpd/osfamily/Debian.yaml | 4 +- data/openntpd/osfamily/OpenBSD.yaml | 16 +- data/openswan/default.yaml | 34 +- data/openvpn/default.yaml | 24 +- data/openvpn/osfamily/Debian.yaml | 6 +- data/openvpn/osfamily/RedHat.yaml | 4 +- data/openvswitch/default.yaml | 22 +- data/openvswitch/osfamily/Debian.yaml | 4 +- data/openvswitch/osfamily/RedHat.yaml | 4 +- data/orientdb/default.yaml | 30 +- data/orientdb/osfamily/Debian.yaml | 4 +- data/orientdb/osfamily/RedHat.yaml | 4 +- data/pacemaker/default.yaml | 18 +- data/pacemaker/osfamily/Debian.yaml | 4 +- data/pacemaker/osfamily/RedHat.yaml | 4 +- data/packer/default.yaml | 1 - data/packer/upstream/default.yaml | 2 +- data/pam/default.yaml | 10 +- data/passenger-apache/default.yaml | 4 +- data/passenger-apache/osfamily/Debian.yaml | 13 +- data/passenger-nginx/default.yaml | 4 +- data/passenger-nginx/osfamily/Debian.yaml | 1 - data/passenger-nginx/osfamily/RedHat.yaml | 1 - data/pgbouncer/upstream/default.yaml | 2 +- .../upstream/operatingsystem/Debian9.yaml | 1 - data/php-fpm/default.yaml | 20 +- data/php-fpm/osfamily/Debian.yaml | 4 +- data/php-fpm/osfamily/RedHat.yaml | 4 +- data/php/default.yaml | 10 +- data/php/osfamily/Debian.yaml | 10 +- data/php/osfamily/RedHat.yaml | 8 +- data/php/osfamily/Suse.yaml | 10 +- data/postfix/osfamily/Debian.yaml | 2 +- data/postgresql/default.yaml | 26 +- data/postgresql/osfamily/Debian.yaml | 14 +- data/postgresql/osfamily/RedHat.yaml | 4 +- data/profile/default.yaml | 8 +- data/proftpd/default.yaml | 26 +- data/proftpd/osfamily/Debian.yaml | 4 +- data/proftpd/osfamily/RedHat.yaml | 4 +- data/prometheus/default.yaml | 10 +- data/psmisc/default.yaml | 4 +- data/puppet-agent/default.yaml | 5 +- data/puppet-agent/upstream/default.yaml | 4 +- data/puppet/upstream/osfamily/windows.yaml | 1 - data/pwgen/default.yaml | 4 +- data/pwgen/operatingsystem/OracleLinux.yaml | 4 +- data/python-pip/osfamily/RedHat7.yaml | 2 +- data/quagga/default.yaml | 24 +- data/quagga/osfamily/Debian.yaml | 4 +- data/quagga/osfamily/RedHat.yaml | 4 +- data/quantum/default.yaml | 18 +- data/quantum/osfamily/Debian.yaml | 8 +- data/quantum/osfamily/RedHat.yaml | 9 +- data/r10k/default.yaml | 12 +- data/rabbitmq/default.yaml | 24 +- data/rabbitmq/osfamily/Debian.yaml | 8 +- data/rabbitmq/osfamily/RedHat.yaml | 8 +- data/rails/default.yaml | 4 +- data/rails/osfamily/Debian.yaml | 8 +- data/rails/osfamily/RedHat.yaml | 8 +- data/redis/default.yaml | 24 +- data/redis/operatingsystem/testos-0.0.1.yaml | 20 +- data/redis/operatingsystem/testos.yaml | 20 +- data/redis/osfamily/Debian.yaml | 8 +- data/redis/osfamily/RedHat.yaml | 6 +- data/redis/osfamily/test.yaml | 32 +- data/reference/default.yaml | 341 +++++++++--------- data/reference/hiera.yaml | 8 +- data/reference/osfamily/Darwin.yaml | 2 +- data/rinse/default.yaml | 8 +- data/rinse/osfamily/Debian.yaml | 4 +- data/rpmfusion-free/osfamily/CentOS8.yaml | 2 +- data/rpmfusion-free/osfamily/RedHat8.yaml | 6 +- data/rsync/default.yaml | 18 +- data/rsync/osfamily/Debian.yaml | 4 +- data/rsync/osfamily/FreeBSD.yaml | 12 +- data/rsync/osfamily/RedHat.yaml | 4 +- data/rsyslog-relp/default.yaml | 4 +- data/ruby-dev/default.yaml | 4 +- data/ruby-dev/osfamily/Debian.yaml | 4 +- data/ruby-dev/osfamily/RedHat.yaml | 4 +- data/ruby-dev/osfamily/Suse.yaml | 4 +- data/ruby/default.yaml | 4 +- data/ruby/osfamily/RedHat6.yaml | 4 +- data/rundeck/default.yaml | 38 +- data/rundeck/osfamily/Debian.yaml | 2 +- data/rundeck/osfamily/RedHat.yaml | 6 +- data/samba/default.yaml | 26 +- data/samba/operatingsystem/Debian9.yaml | 4 +- data/samba/osfamily/Debian.yaml | 8 +- data/samba/osfamily/Suse.yaml | 8 +- data/sample/default.yaml | 4 +- data/sample/osfamily/windows.yaml | 2 +- data/scikit-learn/default.yaml | 1 - data/screen/default.yaml | 6 +- data/sendmail/default.yaml | 22 +- data/sendmail/osfamily/Debian.yaml | 8 +- data/sendmail/osfamily/RedHat.yaml | 6 +- data/sensu/default.yaml | 2 +- data/serf/default.yaml | 30 +- data/snmp/default.yaml | 4 +- data/snmp/osfamily/Debian.yaml | 9 +- data/snmp/osfamily/RedHat.yaml | 4 +- data/snmp/osfamily/Solaris.yaml | 4 +- data/snmp/osfamily/Suse.yaml | 5 +- data/snmp/osfamily/Ubuntu.yaml | 9 +- data/snmpd/default.yaml | 24 +- data/snmpd/osfamily/Debian.yaml | 12 +- data/snmpd/osfamily/OpenBSD.yaml | 10 +- data/snmpd/osfamily/RedHat.yaml | 8 +- data/snmpd/osfamily/Solaris.yaml | 14 +- data/snmpd/osfamily/Suse.yaml | 5 +- data/spiderfoot/default.yaml | 2 +- data/spiderfoot/operatingsystem/Debian10.yaml | 1 + data/spiderfoot/operatingsystem/Debian9.yaml | 1 + .../operatingsystem/Ubuntu16.04.yaml | 1 + .../operatingsystem/Ubuntu18.04.yaml | 1 + data/squid/default.yaml | 20 +- data/squid/osfamily/Debian9.yaml | 12 +- data/ssmtp/default.yaml | 12 +- data/strace/default.yaml | 4 +- data/subversion/default.yaml | 8 +- data/sudo/default.yaml | 8 +- data/supervisor/default.yaml | 22 +- data/supervisor/osfamily/Debian.yaml | 8 +- data/supervisor/osfamily/Linux.yaml | 10 +- data/supervisor/osfamily/RedHat.yaml | 12 +- data/supervisor/osfamily/RedHat6.yaml | 8 +- data/sysfs/default.yaml | 12 +- data/sysinternals/default.yaml | 2 +- data/sysklogd/default.yaml | 20 +- data/sysklogd/osfamily/Debian.yaml | 6 +- data/syslog-ng/default.yaml | 18 +- data/syslog-ng/osfamily/Debian.yaml | 4 +- data/syslog-ng/osfamily/RedHat.yaml | 4 +- data/sysstat/default.yaml | 14 +- data/sysstat/osfamily/Debian.yaml | 4 +- data/sysstat/osfamily/RedHat.yaml | 4 +- data/tcpdump/default.yaml | 4 +- data/telnet/default.yaml | 4 +- data/tftpd/default.yaml | 26 +- data/tftpd/osfamily/Debian.yaml | 14 +- data/tinc/default.yaml | 26 +- data/tinc/osfamily/Debian.yaml | 4 +- data/tinc/osfamily/RedHat.yaml | 4 +- data/tree/default.yaml | 4 +- data/trickle/default.yaml | 4 +- data/trickle/operatingsystem/OracleLinux.yaml | 4 +- data/unzip/default.yaml | 4 +- data/unzip/osfamily/windows.yaml | 4 +- data/varnish/default.yaml | 28 +- data/varnish/osfamily/Debian.yaml | 4 +- data/varnish/osfamily/RedHat.yaml | 4 +- data/varnish/osfamily/Suse12.yaml | 12 +- data/vault-enterprise/default.yaml | 1 - data/vault/default.yaml | 1 - data/vault/upstream/default.yaml | 2 +- data/vim/default.yaml | 8 +- data/vim/hiera.yaml | 2 + data/vim/operatingsystem/Fedora36.yaml | 4 + data/vim/osfamily/RedHat.yaml | 4 +- data/vim/osfamily/RedHat8.yaml | 4 + data/vim/osfamily/RedHat9.yaml | 4 + data/virtualbox/default.yaml | 8 +- data/virtualbox/operatingsystem/Debian7.yaml | 6 +- .../operatingsystem/Ubuntu14.04.yaml | 6 +- .../operatingsystem/Ubuntu14.10.yaml | 6 +- .../operatingsystem/Ubuntu15.04.yaml | 6 +- .../operatingsystem/Ubuntu15.10.yaml | 6 +- .../operatingsystem/Ubuntu18.04.yaml | 9 +- data/virtualbox/osfamily/Debian.yaml | 17 +- data/virtualbox/osfamily/RedHat.yaml | 16 +- data/vsftpd/default.yaml | 24 +- data/vsftpd/osfamily/Debian.yaml | 14 +- data/vsftpd/osfamily/RedHat.yaml | 8 +- data/wpscan/default.yaml | 26 +- data/xinetd/default.yaml | 20 +- data/xinetd/osfamily/Debian.yaml | 4 +- data/yarn/default.yaml | 4 +- data/yarn/osfamily/Debian.yaml | 12 +- data/yarn/osfamily/RedHat.yaml | 10 +- data/yum-cron/default.yaml | 10 +- data/zabbix-agent/default.yaml | 24 +- data/zabbix-agent/osfamily/Debian.yaml | 4 +- data/zabbix-agent/osfamily/RedHat.yaml | 4 +- data/zabbix-agent/osfamily/Suse.yaml | 8 +- .../zeek/upstream/operatingsystem/Darwin.yaml | 4 +- data/zeek/upstream/osfamily/Debian.yaml | 2 +- 459 files changed, 2256 insertions(+), 2244 deletions(-) create mode 100644 .yamllint.yaml create mode 100644 data/vim/operatingsystem/Fedora36.yaml create mode 100644 data/vim/osfamily/RedHat8.yaml create mode 100644 data/vim/osfamily/RedHat9.yaml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8d048ddb..7eb90f81 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,6 +1,6 @@ --- name: PR tests -on: pull_request +on: pull_request # yamllint disable-line rule:truthy jobs: validate-yaml: @@ -14,21 +14,21 @@ jobs: strategy: matrix: include: -# - container: example42/tiny-puppet-ubuntu1804 + # - container: example42/tiny-puppet-ubuntu1804 - container: example42/tiny-puppet-ubuntu2004 - container: example42/tiny-puppet-ubuntu2204 - container: example42/tiny-puppet-debian11 - container: example42/tiny-puppet-debian10 -# - container: example42/tiny-puppet-debian9 -# - container: example42/tiny-puppet-debian8 + # - container: example42/tiny-puppet-debian9 + # - container: example42/tiny-puppet-debian8 - container: example42/tiny-puppet-rockylinux9 - container: example42/tiny-puppet-rockylinux8 - container: example42/tiny-puppet-almalinux9 - container: example42/tiny-puppet-almalinux8 - container: example42/tiny-puppet-redhat9 - container: example42/tiny-puppet-redhat8 -# - container: example42/tiny-puppet-centos7 -# - container: example42/tiny-puppet-centos6 + # - container: example42/tiny-puppet-centos7 + # - container: example42/tiny-puppet-centos6 runs-on: ubuntu-latest container: image: ${{ matrix.container }} @@ -38,7 +38,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - fetch-depth: 0 + fetch-depth: 0 - name: Git config safe directory run: git config --global --add safe.directory /__w/tinydata/tinydata - name: Get changed files diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c14929bb..a79b8068 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ --- name: Release -on: +on: # yamllint disable-line rule:truthy push: tags: - '*' @@ -19,7 +19,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Publish to the Forge - run: /usr/local/bin/pdk bundle exec rake module:push + run: /usr/local/bin/pdk bundle exec rake module:push env: BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}' BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}' diff --git a/.yamllint.yaml b/.yamllint.yaml new file mode 100644 index 00000000..11ae79a5 --- /dev/null +++ b/.yamllint.yaml @@ -0,0 +1,29 @@ +--- +# to update some defaults during the actions run +rules: + braces: enable + brackets: enable + colons: enable + commas: enable + comments: + level: warning + comments-indentation: + level: warning + document-end: disable + document-start: + level: warning + empty-lines: disable + empty-values: disable + float-values: disable + hyphens: enable + indentation: enable + key-duplicates: enable + key-ordering: disable + line-length: disable + new-line-at-end-of-file: disable + new-lines: disable + octal-values: disable + quoted-strings: disable + trailing-spaces: enable + truthy: + level: warning \ No newline at end of file diff --git a/data/apache/default.yaml b/data/apache/default.yaml index ccc4b0a1..b8157291 100644 --- a/data/apache/default.yaml +++ b/data/apache/default.yaml @@ -6,7 +6,7 @@ apache::settings: config_dir_path: '/etc/httpd' tcp_port: '80' pid_file_path: '/var/run/httpd.pid' - log_file_path: [ '/var/log/httpd/access.log' , '/var/log/httpd/error.log' ] + log_file_path: ['/var/log/httpd/access.log', '/var/log/httpd/error.log'] log_dir_path: '/var/log/httpd' data_dir_path: '/var/www/html' process_name: 'httpd' diff --git a/data/apache/osfamily/Debian.yaml b/data/apache/osfamily/Debian.yaml index b1a728be..12c670a2 100644 --- a/data/apache/osfamily/Debian.yaml +++ b/data/apache/osfamily/Debian.yaml @@ -13,7 +13,7 @@ apache::settings: conf-enabled_dir_path: '/etc/apache2/conf-enabled' conf_dir_path: '/etc/apache2/conf.d' pid_file_path: '/var/run/apache2.pid' - log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] + log_file_path: ['/var/log/apache2/access.log', '/var/log/apache2/error.log'] log_dir_path: '/var/log/apache2' data_dir_path: '/var/www' process_name: 'apache2' diff --git a/data/apache/osfamily/Linux.yaml b/data/apache/osfamily/Linux.yaml index 0facf358..6c4aea24 100644 --- a/data/apache/osfamily/Linux.yaml +++ b/data/apache/osfamily/Linux.yaml @@ -7,11 +7,10 @@ apache::settings: config_dir_path: '/etc/apache2' conf_dir_path: '/etc/apache2/conf.d' pid_file_path: '/var/run/apache2/httpd.pid' - log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] + log_file_path: ['/var/log/apache2/access.log', '/var/log/apache2/error.log'] log_dir_path: '/var/log/apache2' data_dir_path: '/var/www' process_name: 'httpd' process_user: 'apache' process_group: 'apache' modules_dir_path: '/usr/lib/apache2' - diff --git a/data/apache/osfamily/RedHat.yaml b/data/apache/osfamily/RedHat.yaml index ef2a07d6..575fb84f 100644 --- a/data/apache/osfamily/RedHat.yaml +++ b/data/apache/osfamily/RedHat.yaml @@ -9,7 +9,7 @@ apache::settings: init_file_path: '/etc/sysconfig/httpd' tcp_port: '80' pid_file_path: '/var/run/httpd.pid' - log_file_path: [ '/var/log/httpd/access_log' , '/var/log/httpd/error_log' ] + log_file_path: ['/var/log/httpd/access_log', '/var/log/httpd/error_log'] log_dir_path: '/var/log/httpd' data_dir_path: '/var/www/html' process_name: 'httpd' diff --git a/data/apache/osfamily/Suse.yaml b/data/apache/osfamily/Suse.yaml index ce31683b..d04a6c67 100644 --- a/data/apache/osfamily/Suse.yaml +++ b/data/apache/osfamily/Suse.yaml @@ -6,7 +6,7 @@ apache::settings: init_file_path: '/etc/default/apache2' config_dir_path: '/etc/apache2' pid_file_path: '/var/run/httpd2.pid' - log_file_path: [ '/var/log/apache2/access.log' , '/var/log/apache2/error.log' ] + log_file_path: ['/var/log/apache2/access.log', '/var/log/apache2/error.log'] log_dir_path: '/var/log/apache2' data_dir_path: '/var/www/htdocs' process_name: 'httpd2-prefork' diff --git a/data/apt/osfamily/Darwin.yaml b/data/apt/osfamily/Darwin.yaml index a37690c2..b9b7c07a 100644 --- a/data/apt/osfamily/Darwin.yaml +++ b/data/apt/osfamily/Darwin.yaml @@ -1,3 +1,4 @@ +--- apt::settings: package_name: '' service_name: '' \ No newline at end of file diff --git a/data/apt/osfamily/RedHat.yaml b/data/apt/osfamily/RedHat.yaml index a37690c2..b9b7c07a 100644 --- a/data/apt/osfamily/RedHat.yaml +++ b/data/apt/osfamily/RedHat.yaml @@ -1,3 +1,4 @@ +--- apt::settings: package_name: '' service_name: '' \ No newline at end of file diff --git a/data/apt/osfamily/Suse.yaml b/data/apt/osfamily/Suse.yaml index a37690c2..b9b7c07a 100644 --- a/data/apt/osfamily/Suse.yaml +++ b/data/apt/osfamily/Suse.yaml @@ -1,3 +1,4 @@ +--- apt::settings: package_name: '' service_name: '' \ No newline at end of file diff --git a/data/apt/osfamily/windows.yaml b/data/apt/osfamily/windows.yaml index a37690c2..b9b7c07a 100644 --- a/data/apt/osfamily/windows.yaml +++ b/data/apt/osfamily/windows.yaml @@ -1,3 +1,4 @@ +--- apt::settings: package_name: '' service_name: '' \ No newline at end of file diff --git a/data/bind-utils/osfamily/Debian.yaml b/data/bind-utils/osfamily/Debian.yaml index fc53f5bb..deef48d1 100644 --- a/data/bind-utils/osfamily/Debian.yaml +++ b/data/bind-utils/osfamily/Debian.yaml @@ -1,4 +1,3 @@ ---- - bind-utils::settings: - package_name: 'dnsutils' - +--- +bind-utils::settings: + package_name: 'dnsutils' diff --git a/data/bzip2/default.yaml b/data/bzip2/default.yaml index 89d44ec5..9b51d71c 100644 --- a/data/bzip2/default.yaml +++ b/data/bzip2/default.yaml @@ -2,4 +2,4 @@ bzip2::settings: package_name: 'bzip2' website_url: 'https://sourceware.org/bzip2/' - git_source: 'https://gitlab.com/bzip2/bzip2/' \ No newline at end of file + git_source: 'https://gitlab.com/bzip2/bzip2/' diff --git a/data/collectd/osfamily/RedHat.yaml b/data/collectd/osfamily/RedHat.yaml index fde5211c..d52382a3 100644 --- a/data/collectd/osfamily/RedHat.yaml +++ b/data/collectd/osfamily/RedHat.yaml @@ -4,4 +4,3 @@ collectd::settings: config_file_path: '/etc/collectd.conf' config_dir_path: '/etc/collectd.d' conf_dir_path: '/etc/collectd.d' - diff --git a/data/consul-enterprise/default.yaml b/data/consul-enterprise/default.yaml index eebef0d5..58b6022f 100644 --- a/data/consul-enterprise/default.yaml +++ b/data/consul-enterprise/default.yaml @@ -12,4 +12,3 @@ consul-enterprise::settings: - 8301 - 8500 - 8600 - diff --git a/data/crowdsec-firewall-bouncer-iptables/default.yaml b/data/crowdsec-firewall-bouncer-iptables/default.yaml index 23384db5..3ae55c23 100644 --- a/data/crowdsec-firewall-bouncer-iptables/default.yaml +++ b/data/crowdsec-firewall-bouncer-iptables/default.yaml @@ -10,4 +10,3 @@ crowdsec-firewall-bouncer-iptables::settings: process_group: 'root' tp_prerequisites: - crowdsec_repo - \ No newline at end of file diff --git a/data/ddclient/default.yaml b/data/ddclient/default.yaml index c1ca2605..e07e3adc 100644 --- a/data/ddclient/default.yaml +++ b/data/ddclient/default.yaml @@ -1,13 +1,13 @@ --- - ddclient::settings: - package_name: 'ddclient' - service_name: 'ddclient' - config_file_path: '/etc/ddclient/ddclient.conf' - config_dir_path: '/etc/ddclient' - conf_dir_path: '/etc/ddclient/conf.d' - pid_file_path: '/var/run/ddclient.pid' - log_file_path: '/var/log/ddclient/ddclient.log' - log_dir_path: '/var/log/ddclient' - process_name: 'ddclient' - process_user: 'ddclient' - process_group: 'ddclient' +ddclient::settings: + package_name: 'ddclient' + service_name: 'ddclient' + config_file_path: '/etc/ddclient/ddclient.conf' + config_dir_path: '/etc/ddclient' + conf_dir_path: '/etc/ddclient/conf.d' + pid_file_path: '/var/run/ddclient.pid' + log_file_path: '/var/log/ddclient/ddclient.log' + log_dir_path: '/var/log/ddclient' + process_name: 'ddclient' + process_user: 'ddclient' + process_group: 'ddclient' diff --git a/data/ddclient/osfamily/Debian.yaml b/data/ddclient/osfamily/Debian.yaml index 3e911287..54cd63bc 100644 --- a/data/ddclient/osfamily/Debian.yaml +++ b/data/ddclient/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - ddclient::settings: - init_file_path: '/etc/default/ddclient' +ddclient::settings: + init_file_path: '/etc/default/ddclient' diff --git a/data/ddclient/osfamily/RedHat.yaml b/data/ddclient/osfamily/RedHat.yaml index d5e88638..4d8fab6f 100644 --- a/data/ddclient/osfamily/RedHat.yaml +++ b/data/ddclient/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - init_file_path: '/etc/sysconfig/ddclient' +init_file_path: '/etc/sysconfig/ddclient' diff --git a/data/debootstrap/default.yaml b/data/debootstrap/default.yaml index d8653c8d..d4c0765a 100644 --- a/data/debootstrap/default.yaml +++ b/data/debootstrap/default.yaml @@ -1,3 +1,3 @@ --- - debootstrap::settings: - package_name: 'debootstrap' +debootstrap::settings: + package_name: 'debootstrap' diff --git a/data/dhcpd/default.yaml b/data/dhcpd/default.yaml index 10e99249..94bf5416 100644 --- a/data/dhcpd/default.yaml +++ b/data/dhcpd/default.yaml @@ -1,11 +1,11 @@ --- - dhcpd::settings: - package_name: 'dhcpd' - service_name: 'dhcpd' - config_file_path: '/etc/dhcpd/dhcpd.conf' - config_dir_path: '/etc/dhcpd' - pid_file_path: '/var/run/dhcpd.pid' - process_name: 'dhcpd' - process_user: 'dhcpd' - process_group: 'dhcpd' - udp_port: '67' +dhcpd::settings: + package_name: 'dhcpd' + service_name: 'dhcpd' + config_file_path: '/etc/dhcpd/dhcpd.conf' + config_dir_path: '/etc/dhcpd' + pid_file_path: '/var/run/dhcpd.pid' + process_name: 'dhcpd' + process_user: 'dhcpd' + process_group: 'dhcpd' + udp_port: '67' diff --git a/data/dhcpd/osfamily/Debian.yaml b/data/dhcpd/osfamily/Debian.yaml index ee65302c..9a8dd0b9 100644 --- a/data/dhcpd/osfamily/Debian.yaml +++ b/data/dhcpd/osfamily/Debian.yaml @@ -1,10 +1,10 @@ --- - dhcpd::settings: - package_name: 'isc-dhcp-server' - service_name: 'isc-dhcp-server' - config_file_path: '/etc/dhcp/dhcpd.conf' - config_dir_path: '/etc/dhcp' - pid_file_path: '/var/run/dhcp-server/dhcpd.pid' - data_dir_path: '/var/lib/dhcp' - init_file_path: '/etc/default/isc-dhcp-server' +dhcpd::settings: + package_name: 'isc-dhcp-server' + service_name: 'isc-dhcp-server' + config_file_path: '/etc/dhcp/dhcpd.conf' + config_dir_path: '/etc/dhcp' + pid_file_path: '/var/run/dhcp-server/dhcpd.pid' + data_dir_path: '/var/lib/dhcp' + init_file_path: '/etc/default/isc-dhcp-server' diff --git a/data/dhcpd/osfamily/OpenBSD.yaml b/data/dhcpd/osfamily/OpenBSD.yaml index de2ed017..f3abcd18 100644 --- a/data/dhcpd/osfamily/OpenBSD.yaml +++ b/data/dhcpd/osfamily/OpenBSD.yaml @@ -1,9 +1,9 @@ --- - dhcpd::settings: - package_name: '' - config_file_path: '/etc/dhcpd.conf' - config_dir_path: '' - pid_file_path: '' - data_dir_path: '' - process_user: '_dhcp' - process_group: '_dhcp' +dhcpd::settings: + package_name: '' + config_file_path: '/etc/dhcpd.conf' + config_dir_path: '' + pid_file_path: '' + data_dir_path: '' + process_user: '_dhcp' + process_group: '_dhcp' diff --git a/data/dhcpd/osfamily/RedHat.yaml b/data/dhcpd/osfamily/RedHat.yaml index 9a6afe9e..46b03bba 100644 --- a/data/dhcpd/osfamily/RedHat.yaml +++ b/data/dhcpd/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - dhcpd::settings: - package_name: 'dhcp' - config_file_path: '/etc/dhcp/dhcpd.conf' - config_dir_path: '/etc/dhcp' - init_file_path: '/etc/sysconfig/dhcpd' +dhcpd::settings: + package_name: 'dhcp' + config_file_path: '/etc/dhcp/dhcpd.conf' + config_dir_path: '/etc/dhcp' + init_file_path: '/etc/sysconfig/dhcpd' diff --git a/data/dhcpd/osfamily/Suse.yaml b/data/dhcpd/osfamily/Suse.yaml index a55b83e5..03cedd4e 100644 --- a/data/dhcpd/osfamily/Suse.yaml +++ b/data/dhcpd/osfamily/Suse.yaml @@ -1,7 +1,6 @@ --- - dhcpd::settings: - package_name: 'dhcp-server' - config_dir_path: '/etc/dhcpd.d' - conf_dir_path: '/etc/dhcpd.d' - data_dir_path: '/var/lib/dhcp' - +dhcpd::settings: + package_name: 'dhcp-server' + config_dir_path: '/etc/dhcpd.d' + conf_dir_path: '/etc/dhcpd.d' + data_dir_path: '/var/lib/dhcp' diff --git a/data/dkms/default.yaml b/data/dkms/default.yaml index 21258313..415b8fb4 100644 --- a/data/dkms/default.yaml +++ b/data/dkms/default.yaml @@ -1,6 +1,6 @@ --- - dkms::settings: - package_name: 'dkms' - service_name: 'dkms' - config_file_path: '/etc/dkms/framework.conf' - config_dir_path: '/etc/dkms' +dkms::settings: + package_name: 'dkms' + service_name: 'dkms' + config_file_path: '/etc/dkms/framework.conf' + config_dir_path: '/etc/dkms' diff --git a/data/dkms/osfamily/RedHat.yaml b/data/dkms/osfamily/RedHat.yaml index 7c351d4a..67d62ef8 100644 --- a/data/dkms/osfamily/RedHat.yaml +++ b/data/dkms/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - dkms::settings: - tp_prerequisites: - - epel +dkms::settings: + tp_prerequisites: + - epel diff --git a/data/dnsmasq/default.yaml b/data/dnsmasq/default.yaml index fb2c5bfd..09270dff 100644 --- a/data/dnsmasq/default.yaml +++ b/data/dnsmasq/default.yaml @@ -1,14 +1,14 @@ --- - dnsmasq::settings: - package_name: 'dnsmasq' - service_name: 'dnsmasq' - config_file_path: '/etc/dnsmasq.conf' - config_dir_path: '/etc/dnsmasq.d' - conf_dir_path: '/etc/dnsmasq.d' - pid_file_path: '/var/run/dnsmasq.pid' - log_file_path: '/var/log/dnsmasq/dnsmasq.log' - log_dir_path: '/var/log/dnsmasq' - process_name: 'dnsmasq' - process_user: 'dnsmasq' - process_group: 'dnsmasq' - tcp_port: '53' +dnsmasq::settings: + package_name: 'dnsmasq' + service_name: 'dnsmasq' + config_file_path: '/etc/dnsmasq.conf' + config_dir_path: '/etc/dnsmasq.d' + conf_dir_path: '/etc/dnsmasq.d' + pid_file_path: '/var/run/dnsmasq.pid' + log_file_path: '/var/log/dnsmasq/dnsmasq.log' + log_dir_path: '/var/log/dnsmasq' + process_name: 'dnsmasq' + process_user: 'dnsmasq' + process_group: 'dnsmasq' + tcp_port: '53' diff --git a/data/dnsmasq/osfamily/Debian.yaml b/data/dnsmasq/osfamily/Debian.yaml index 9f7f4497..7dbd0433 100644 --- a/data/dnsmasq/osfamily/Debian.yaml +++ b/data/dnsmasq/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - dnsmasq::settings: - init_file_path: '/etc/default/dnsmasq' +dnsmasq::settings: + init_file_path: '/etc/default/dnsmasq' diff --git a/data/dnsmasq/osfamily/RedHat.yaml b/data/dnsmasq/osfamily/RedHat.yaml index 93db30d4..2c9c5a08 100644 --- a/data/dnsmasq/osfamily/RedHat.yaml +++ b/data/dnsmasq/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - dnsmasq::settings: - process_user: 'nobody' - init_file_path: '/etc/sysconfig/dnsmasq' +dnsmasq::settings: + process_user: 'nobody' + init_file_path: '/etc/sysconfig/dnsmasq' diff --git a/data/docker/upstream/osfamily/windows.yaml b/data/docker/upstream/osfamily/windows.yaml index f2eb5d9b..4ea34537 100644 --- a/data/docker/upstream/osfamily/windows.yaml +++ b/data/docker/upstream/osfamily/windows.yaml @@ -1,2 +1,3 @@ +--- docker::settings: package_name: 'docker-engine' \ No newline at end of file diff --git a/data/dovecot/default.yaml b/data/dovecot/default.yaml index 62bfa617..ba27cd26 100644 --- a/data/dovecot/default.yaml +++ b/data/dovecot/default.yaml @@ -1,14 +1,14 @@ --- - dovecot::settings: - package_name: 'dovecot' - service_name: 'dovecot' - config_file_path: '/etc/dovecot/dovecot.conf' - config_dir_path: '/etc/dovecot' - conf_dir_path: '/etc/dovecot/conf.d' - pid_file_path: '/var/run/dovecot.pid' - log_file_path: '/var/log/dovecot/dovecot.log' - log_dir_path: '/var/log/dovecot' - process_name: 'dovecot' - process_user: 'dovecot' - process_group: 'dovecot' - tcp_port: '143' +dovecot::settings: + package_name: 'dovecot' + service_name: 'dovecot' + config_file_path: '/etc/dovecot/dovecot.conf' + config_dir_path: '/etc/dovecot' + conf_dir_path: '/etc/dovecot/conf.d' + pid_file_path: '/var/run/dovecot.pid' + log_file_path: '/var/log/dovecot/dovecot.log' + log_dir_path: '/var/log/dovecot' + process_name: 'dovecot' + process_user: 'dovecot' + process_group: 'dovecot' + tcp_port: '143' diff --git a/data/dovecot/osfamily/Debian.yaml b/data/dovecot/osfamily/Debian.yaml index 715b288c..a2e2ed62 100644 --- a/data/dovecot/osfamily/Debian.yaml +++ b/data/dovecot/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - dovecot::settings: - package_name: - - 'dovecot-imapd' - init_file_path: '/etc/default/dovecot' - run_file_path: '/var/run/dovecot/master.pid' +dovecot::settings: + package_name: + - 'dovecot-imapd' + init_file_path: '/etc/default/dovecot' + run_file_path: '/var/run/dovecot/master.pid' diff --git a/data/dovecot/osfamily/FreeBSD.yaml b/data/dovecot/osfamily/FreeBSD.yaml index 7972bd95..8ccb0969 100644 --- a/data/dovecot/osfamily/FreeBSD.yaml +++ b/data/dovecot/osfamily/FreeBSD.yaml @@ -1,9 +1,9 @@ --- - dovecot::settings: - package_name: - - 'dovecot2' - - 'dovecot-pigeonhole' - config_file_path: '/usr/local/etc/dovecot/dovecot.conf' - config_dir_path: '/usr/local/etc/dovecot' - conf_dir_path: '' - pid_file_path: '/var/run/dovecot.pid' +dovecot::settings: + package_name: + - 'dovecot2' + - 'dovecot-pigeonhole' + config_file_path: '/usr/local/etc/dovecot/dovecot.conf' + config_dir_path: '/usr/local/etc/dovecot' + conf_dir_path: '' + pid_file_path: '/var/run/dovecot.pid' diff --git a/data/dovecot/osfamily/RedHat.yaml b/data/dovecot/osfamily/RedHat.yaml index 9a3b5b35..d10a1703 100644 --- a/data/dovecot/osfamily/RedHat.yaml +++ b/data/dovecot/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - dovecot::settings: - config_file_path: '/etc/dovecot.conf' - init_file_path: '/etc/sysconfig/dovecot' +dovecot::settings: + config_file_path: '/etc/dovecot.conf' + init_file_path: '/etc/sysconfig/dovecot' diff --git a/data/duply/default.yaml b/data/duply/default.yaml index b14a66af..f5fb3363 100644 --- a/data/duply/default.yaml +++ b/data/duply/default.yaml @@ -1,5 +1,5 @@ --- - duply::settings: - package_name: 'duply' - config_dir_path: '/etc/duply' - config_dir_mode: '0600' +duply::settings: + package_name: 'duply' + config_dir_path: '/etc/duply' + config_dir_mode: '0600' diff --git a/data/elrepo/osfamily/RedHat.yaml b/data/elrepo/osfamily/RedHat.yaml index 46b33c85..100fdf37 100644 --- a/data/elrepo/osfamily/RedHat.yaml +++ b/data/elrepo/osfamily/RedHat.yaml @@ -1,4 +1,3 @@ --- elrepo::settings: repo_package_name: 'elrepo-release' - diff --git a/data/epel/osfamily/RedHat4.yaml b/data/epel/osfamily/RedHat4.yaml index 4cd451cd..a9d69a32 100644 --- a/data/epel/osfamily/RedHat4.yaml +++ b/data/epel/osfamily/RedHat4.yaml @@ -1,3 +1,3 @@ --- - epel::settings: - repo_package_url: 'http://dl.fedoraproject.org/pub/archive/epel/4/i386/epel-release-4-10.noarch.rpm' +epel::settings: + repo_package_url: 'http://dl.fedoraproject.org/pub/archive/epel/4/i386/epel-release-4-10.noarch.rpm' diff --git a/data/exim/default.yaml b/data/exim/default.yaml index 442e9775..14b25149 100644 --- a/data/exim/default.yaml +++ b/data/exim/default.yaml @@ -1,13 +1,13 @@ --- - exim::settings: - package_name: 'exim' - service_name: 'exim' - config_file_path: '/etc/exim/exim.conf' - config_dir_path: '/etc/exim' - pid_file_path: '/var/run/exim.pid' - log_file_path: '/var/log/exim/exim.log' - log_dir_path: '/var/log/exim' - process_name: 'exim' - process_user: 'exim' - process_group: 'exim' - tcp_port: '25' +exim::settings: + package_name: 'exim' + service_name: 'exim' + config_file_path: '/etc/exim/exim.conf' + config_dir_path: '/etc/exim' + pid_file_path: '/var/run/exim.pid' + log_file_path: '/var/log/exim/exim.log' + log_dir_path: '/var/log/exim' + process_name: 'exim' + process_user: 'exim' + process_group: 'exim' + tcp_port: '25' diff --git a/data/exim/osfamily/Debian.yaml b/data/exim/osfamily/Debian.yaml index 7ad89d17..44c4d62e 100644 --- a/data/exim/osfamily/Debian.yaml +++ b/data/exim/osfamily/Debian.yaml @@ -1,10 +1,10 @@ --- - exim::settings: - package_name: 'exim4' - service_name: 'exim4' - config_file_path: '/etc/exim4/update-exim4.conf.conf' - config_dir_path: '/etc/exim4' - pid_file_path: '/var/run/exim4/exim.pid' - process_name: 'exim4' - process_user: 'Debian-exim' - init_file_path: '/etc/default/exim' +exim::settings: + package_name: 'exim4' + service_name: 'exim4' + config_file_path: '/etc/exim4/update-exim4.conf.conf' + config_dir_path: '/etc/exim4' + pid_file_path: '/var/run/exim4/exim.pid' + process_name: 'exim4' + process_user: 'Debian-exim' + init_file_path: '/etc/default/exim' diff --git a/data/exim/osfamily/RedHat.yaml b/data/exim/osfamily/RedHat.yaml index d6ab08e9..b4782f9c 100644 --- a/data/exim/osfamily/RedHat.yaml +++ b/data/exim/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - exim::settings: - init_file_path: '/etc/sysconfig/exim' +exim::settings: + init_file_path: '/etc/sysconfig/exim' diff --git a/data/fabric/default.yaml b/data/fabric/default.yaml index e30c8a40..9a8f2ed8 100644 --- a/data/fabric/default.yaml +++ b/data/fabric/default.yaml @@ -1,6 +1,6 @@ --- - fabric::settings: - package_name: 'fabric' - package_provider: 'pip' - tp_prerequisites: - - python-pip +fabric::settings: + package_name: 'fabric' + package_provider: 'pip' + tp_prerequisites: + - python-pip diff --git a/data/fabric/osfamily/Debian.yaml b/data/fabric/osfamily/Debian.yaml index be27c309..2105ea76 100644 --- a/data/fabric/osfamily/Debian.yaml +++ b/data/fabric/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - fabric::settings: - package_prerequisites: - - python-dev +fabric::settings: + package_prerequisites: + - python-dev diff --git a/data/fabric/osfamily/RedHat.yaml b/data/fabric/osfamily/RedHat.yaml index 1202c544..a50a1723 100644 --- a/data/fabric/osfamily/RedHat.yaml +++ b/data/fabric/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - fabric::settings: - package_prerequisites: - - python-devel - - openssl-devel +fabric::settings: + package_prerequisites: + - python-devel + - openssl-devel diff --git a/data/fail2ban/default.yaml b/data/fail2ban/default.yaml index a5ae4ad0..d73a447c 100644 --- a/data/fail2ban/default.yaml +++ b/data/fail2ban/default.yaml @@ -1,17 +1,17 @@ --- - fail2ban::settings: - package_name: 'fail2ban' - service_name: 'fail2ban' - config_file_path: '/etc/fail2ban/fail2ban.local' - jail_file_path: '/etc/fail2ban/jail.local' - init_file_path: '/etc/sysconfig/fail2ban' - pid_file_path: '/var/run/fail2ban.pid' - log_file_path: '/var/log/fail2ban/fail2ban.log' - config_dir_path: '/etc/fail2ban' - filter_dir_path: '/etc/fail2ban/filter.d' - action_dir_path: '/etc/fail2ban/action.d' - jail_dir_path: '/etc/fail2ban/jail.d' - log_dir_path: '/var/log/fail2ban' - process_name: 'fail2ban-server' - process_user: 'fail2ban' - process_group: 'fail2ban' +fail2ban::settings: + package_name: 'fail2ban' + service_name: 'fail2ban' + config_file_path: '/etc/fail2ban/fail2ban.local' + jail_file_path: '/etc/fail2ban/jail.local' + init_file_path: '/etc/sysconfig/fail2ban' + pid_file_path: '/var/run/fail2ban.pid' + log_file_path: '/var/log/fail2ban/fail2ban.log' + config_dir_path: '/etc/fail2ban' + filter_dir_path: '/etc/fail2ban/filter.d' + action_dir_path: '/etc/fail2ban/action.d' + jail_dir_path: '/etc/fail2ban/jail.d' + log_dir_path: '/var/log/fail2ban' + process_name: 'fail2ban-server' + process_user: 'fail2ban' + process_group: 'fail2ban' diff --git a/data/fail2ban/osfamily/Debian.yaml b/data/fail2ban/osfamily/Debian.yaml index 2266876c..7cd07172 100644 --- a/data/fail2ban/osfamily/Debian.yaml +++ b/data/fail2ban/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - fail2ban::settings: - init_file_path: '/etc/default/fail2ban' - pid_file_path: '/var/run/fail2ban/fail2ban.pid' - log_file_path: '/var/log/fail2ban.log' +fail2ban::settings: + init_file_path: '/etc/default/fail2ban' + pid_file_path: '/var/run/fail2ban/fail2ban.pid' + log_file_path: '/var/log/fail2ban.log' diff --git a/data/foreman/default.yaml b/data/foreman/default.yaml index ddca2e58..b08ec310 100644 --- a/data/foreman/default.yaml +++ b/data/foreman/default.yaml @@ -1,22 +1,21 @@ --- - foreman::settings: - package_name: 'foreman-installer' - service_name: 'foreman' - config_file_path: '/etc/foreman/config.yml' - config_dir_path: '/etc/foreman' - pid_file_path: '/var/run/foreman/foreman.pid' - log_file_path: - - '/var/log/foreman/production.log' - - '/var/log/foreman/error.log' - log_dir_path: '/var/log/foreman' - process_user: 'foreman' - process_group: 'foreman' - tp_prerequisites: - - puppet-agent - - puppetserver - exec_postinstall: - foreman_installer: - command: 'foreman-installer -l warning' - creates: '/etc/foreman/settings.yaml' - logoutput: true - +foreman::settings: + package_name: 'foreman-installer' + service_name: 'foreman' + config_file_path: '/etc/foreman/config.yml' + config_dir_path: '/etc/foreman' + pid_file_path: '/var/run/foreman/foreman.pid' + log_file_path: + - '/var/log/foreman/production.log' + - '/var/log/foreman/error.log' + log_dir_path: '/var/log/foreman' + process_user: 'foreman' + process_group: 'foreman' + tp_prerequisites: + - puppet-agent + - puppetserver + exec_postinstall: + foreman_installer: + command: 'foreman-installer -l warning' + creates: '/etc/foreman/settings.yaml' + logoutput: true diff --git a/data/foreman/operatingsystem/Debian8.yaml b/data/foreman/operatingsystem/Debian8.yaml index a71f503a..af96ed64 100644 --- a/data/foreman/operatingsystem/Debian8.yaml +++ b/data/foreman/operatingsystem/Debian8.yaml @@ -1,3 +1,3 @@ --- - foreman::settings: - apt_release: 'jessie' +foreman::settings: + apt_release: 'jessie' diff --git a/data/foreman/operatingsystem/Ubuntu16.04.yaml b/data/foreman/operatingsystem/Ubuntu16.04.yaml index 0c3a33b6..fe84d869 100644 --- a/data/foreman/operatingsystem/Ubuntu16.04.yaml +++ b/data/foreman/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,3 @@ --- - foreman::settings: - apt_release: 'xenial' +foreman::settings: + apt_release: 'xenial' diff --git a/data/foreman/osfamily/Debian.yaml b/data/foreman/osfamily/Debian.yaml index e76b2b55..15304625 100644 --- a/data/foreman/osfamily/Debian.yaml +++ b/data/foreman/osfamily/Debian.yaml @@ -1,9 +1,9 @@ --- - foreman::settings: - init_file_path: '/etc/default/foreman' - repo_url: 'http://deb.theforeman.org/' - key: '563278F6' - key_url: 'https://deb.theforeman.org/pubkey.gpg' - apt_repos: '1.14' - package_prerequisites: - - ca-certificates +foreman::settings: + init_file_path: '/etc/default/foreman' + repo_url: 'http://deb.theforeman.org/' + key: '563278F6' + key_url: 'https://deb.theforeman.org/pubkey.gpg' + apt_repos: '1.14' + package_prerequisites: + - ca-certificates diff --git a/data/foreman/osfamily/RedHat.yaml b/data/foreman/osfamily/RedHat.yaml index 01c95afc..bf18cfc0 100644 --- a/data/foreman/osfamily/RedHat.yaml +++ b/data/foreman/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - foreman::settings: - init_file_path: '/etc/sysconfig/foreman' - repo_package_name: 'foreman-release' +foreman::settings: + init_file_path: '/etc/sysconfig/foreman' + repo_package_name: 'foreman-release' diff --git a/data/foreman/osfamily/RedHat7.yaml b/data/foreman/osfamily/RedHat7.yaml index db941da2..6ca8000e 100644 --- a/data/foreman/osfamily/RedHat7.yaml +++ b/data/foreman/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- - foreman::settings: - repo_package_url: 'https://yum.theforeman.org/releases/1.14/el7/x86_64/foreman-release.rpm' +foreman::settings: + repo_package_url: 'https://yum.theforeman.org/releases/1.14/el7/x86_64/foreman-release.rpm' diff --git a/data/freeradius/default.yaml b/data/freeradius/default.yaml index 7156c151..a37ae86e 100644 --- a/data/freeradius/default.yaml +++ b/data/freeradius/default.yaml @@ -1,15 +1,15 @@ --- - freeradius::settings: - package_name: 'freeradius' - service_name: 'radiusd' - config_file_path: '/etc/raddb/radiusd.conf' - config_file_group: 'radiusd' - pid_file_path: '/var/run/radiusd/radiusd.pid' - log_file_path: '/var/log/radius/radius.log' - config_dir_path: '/etc/raddb' - log_dir_path: '/var/log/radius' - data_dir_path: '/var/lib/radiusd' - tcp_port: '1812' - process_name: 'radiusd' - process_user: 'radiusd' - process_group: 'radiusd' +freeradius::settings: + package_name: 'freeradius' + service_name: 'radiusd' + config_file_path: '/etc/raddb/radiusd.conf' + config_file_group: 'radiusd' + pid_file_path: '/var/run/radiusd/radiusd.pid' + log_file_path: '/var/log/radius/radius.log' + config_dir_path: '/etc/raddb' + log_dir_path: '/var/log/radius' + data_dir_path: '/var/lib/radiusd' + tcp_port: '1812' + process_name: 'radiusd' + process_user: 'radiusd' + process_group: 'radiusd' diff --git a/data/freeradius/osfamily/Debian.yaml b/data/freeradius/osfamily/Debian.yaml index 15d17c97..7b594ec4 100644 --- a/data/freeradius/osfamily/Debian.yaml +++ b/data/freeradius/osfamily/Debian.yaml @@ -1,15 +1,15 @@ --- - freeradius::settings: - service_name: 'freeradius' - process_name: 'freeradius' - process_user: 'freerad' - process_group: 'freerad' - init_file_path: '/etc/default/freeradius' - config_file_path: '/etc/freeradius/radiusd.conf' - config_file_mode: '0640' - config_file_group: 'freerad' - config_dir_path: '/etc/freeradius' - pid_file_path: '/var/run/freeradius/freeradius.pid' - data_dir_path: '/var/lib/freeradius' - log_file_path: '/var/log/freeradius/radius.log' - log_dir_path: '/var/log/freeradius' +freeradius::settings: + service_name: 'freeradius' + process_name: 'freeradius' + process_user: 'freerad' + process_group: 'freerad' + init_file_path: '/etc/default/freeradius' + config_file_path: '/etc/freeradius/radiusd.conf' + config_file_mode: '0640' + config_file_group: 'freerad' + config_dir_path: '/etc/freeradius' + pid_file_path: '/var/run/freeradius/freeradius.pid' + data_dir_path: '/var/lib/freeradius' + log_file_path: '/var/log/freeradius/radius.log' + log_dir_path: '/var/log/freeradius' diff --git a/data/freeradius/osfamily/RedHat.yaml b/data/freeradius/osfamily/RedHat.yaml index ff99badc..8bfb2c11 100644 --- a/data/freeradius/osfamily/RedHat.yaml +++ b/data/freeradius/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - freeradius::settings: - init_file_path: '/etc/sysconfig/radiusd' +freeradius::settings: + init_file_path: "/etc/sysconfig/radiusd" diff --git a/data/git/default.yaml b/data/git/default.yaml index 92ed2a6c..30bfcc4f 100644 --- a/data/git/default.yaml +++ b/data/git/default.yaml @@ -5,4 +5,4 @@ git::settings: git_source: 'https://github.com/git/git' docker_image: 'bitnami/git' user_config_dir: '$HOME/.git' - user_config_path: '$HOME/.gitconfig' \ No newline at end of file + user_config_path: '$HOME/.gitconfig' diff --git a/data/git/osfamily/Suse.yaml b/data/git/osfamily/Suse.yaml index 167a875d..8f5ce9a1 100644 --- a/data/git/osfamily/Suse.yaml +++ b/data/git/osfamily/Suse.yaml @@ -1,3 +1,3 @@ --- git::settings: - package_name: 'git-core' \ No newline at end of file + package_name: 'git-core' diff --git a/data/git/osfamily/windows.yaml b/data/git/osfamily/windows.yaml index fd4b8e54..b9335d01 100644 --- a/data/git/osfamily/windows.yaml +++ b/data/git/osfamily/windows.yaml @@ -3,4 +3,4 @@ git::settings: winget_package_name: 'Git.Git' choco_package_name: 'git' user_config_dir: '%HOMEPATH%/.git' - user_config_path: '%HOMEPATH%/.gitconfig' \ No newline at end of file + user_config_path: '%HOMEPATH%/.gitconfig' diff --git a/data/gitlab-cli/default.yaml b/data/gitlab-cli/default.yaml index 332474ec..dec0f710 100644 --- a/data/gitlab-cli/default.yaml +++ b/data/gitlab-cli/default.yaml @@ -1,7 +1,7 @@ --- - gitlab-cli::settings: - package_name: 'gitlab' - package_provider: 'puppet_gem' - tp_prerequisites: - - ruby - - ruby-dev +gitlab-cli::settings: + package_name: 'gitlab' + package_provider: 'puppet_gem' + tp_prerequisites: + - ruby + - ruby-dev diff --git a/data/gitlab-runner/default.yaml b/data/gitlab-runner/default.yaml index 57bc14d8..f75529dd 100644 --- a/data/gitlab-runner/default.yaml +++ b/data/gitlab-runner/default.yaml @@ -1,6 +1,6 @@ --- - gitlab-runner::settings: - package_name: 'gitlab-runner' - service_name: 'gitlab-runner' - config_file_path: '/etc/gitlab-runner/config.toml' - config_dir_path: '/etc/gitlab-runner' +gitlab-runner::settings: + package_name: 'gitlab-runner' + service_name: 'gitlab-runner' + config_file_path: '/etc/gitlab-runner/config.toml' + config_dir_path: '/etc/gitlab-runner' diff --git a/data/gitlab-runner/osfamily/Debian.yaml b/data/gitlab-runner/osfamily/Debian.yaml index 1bb5773e..32f2e644 100644 --- a/data/gitlab-runner/osfamily/Debian.yaml +++ b/data/gitlab-runner/osfamily/Debian.yaml @@ -1,7 +1,6 @@ --- - gitlab-runner::settings: - exec_prerequisites: - repo_setup: - command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash' - creates: '/etc/apt/sources.list.d/runner_gitlab-runner.list' - +gitlab-runner::settings: + exec_prerequisites: + repo_setup: + command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash' + creates: '/etc/apt/sources.list.d/runner_gitlab-runner.list' diff --git a/data/gitlab-runner/osfamily/RedHat.yaml b/data/gitlab-runner/osfamily/RedHat.yaml index eda93973..48ecce44 100644 --- a/data/gitlab-runner/osfamily/RedHat.yaml +++ b/data/gitlab-runner/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - gitlab-runner::settings: - exec_prerequisites: - repo_setup: - command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.rpm.sh | bash' - creates: '/etc/yum.repos.d/runner_gitlab-runner.repo' +gitlab-runner::settings: + exec_prerequisites: + repo_setup: + command: 'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.rpm.sh | bash' + creates: '/etc/yum.repos.d/runner_gitlab-runner.repo' diff --git a/data/glance/default.yaml b/data/glance/default.yaml index 91e72bd2..3d93d057 100644 --- a/data/glance/default.yaml +++ b/data/glance/default.yaml @@ -1,10 +1,10 @@ --- - glance::settings: - config_file_path: '/etc/glance/glance.conf' - config_dir_path: '/etc/glance' - pid_file_path: '/var/run/glance.pid' - log_file_path: '/var/log/glance/glance.log' - log_dir_path: '/var/log/glance' - process_name: 'glance' - process_user: 'glance' - process_group: 'glance' +glance::settings: + config_file_path: '/etc/glance/glance.conf' + config_dir_path: '/etc/glance' + pid_file_path: '/var/run/glance.pid' + log_file_path: '/var/log/glance/glance.log' + log_dir_path: '/var/log/glance' + process_name: 'glance' + process_user: 'glance' + process_group: 'glance' diff --git a/data/glance/osfamily/Debian.yaml b/data/glance/osfamily/Debian.yaml index e14b1615..7b0e0c25 100644 --- a/data/glance/osfamily/Debian.yaml +++ b/data/glance/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - glance::settings: - package_name: 'glance' - init_file_path: '/etc/default/glance' +glance::settings: + package_name: 'glance' + init_file_path: '/etc/default/glance' diff --git a/data/glance/osfamily/RedHat.yaml b/data/glance/osfamily/RedHat.yaml index 6a2f5beb..f9f83558 100644 --- a/data/glance/osfamily/RedHat.yaml +++ b/data/glance/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - glance::settings: - package_name: 'openstack-glance' - init_file_path: '/etc/sysconfig/glance' +glance::settings: + package_name: 'openstack-glance' + init_file_path: '/etc/sysconfig/glance' diff --git a/data/go-server/default.yaml b/data/go-server/default.yaml index 83a4b7f0..5fa87bbc 100644 --- a/data/go-server/default.yaml +++ b/data/go-server/default.yaml @@ -1,17 +1,17 @@ --- - go-server::settings: - package_name: 'go-server' - service_name: 'go-server' - config_file_path: '/etc/go/log4j.properties' - config_dir_path: '/etc/go' - pid_file_path: '/var/run/go-server.pid' - log_file_path: '/var/log/go-server/go-server.log' - log_dir_path: '/var/log/go-server' - work_dir_path: '/var/lib/go-server' - process_name: 'java' - process_extra_name: 'go-server' - process_user: 'go' - process_group: 'go' - tcp_port: - - '8153' - - '8154' +go-server::settings: + package_name: 'go-server' + service_name: 'go-server' + config_file_path: '/etc/go/log4j.properties' + config_dir_path: '/etc/go' + pid_file_path: '/var/run/go-server.pid' + log_file_path: '/var/log/go-server/go-server.log' + log_dir_path: '/var/log/go-server' + work_dir_path: '/var/lib/go-server' + process_name: 'java' + process_extra_name: 'go-server' + process_user: 'go' + process_group: 'go' + tcp_port: + - '8153' + - '8154' diff --git a/data/go-server/osfamily/Debian.yaml b/data/go-server/osfamily/Debian.yaml index 6989176e..30b597da 100644 --- a/data/go-server/osfamily/Debian.yaml +++ b/data/go-server/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - go-server::settings: - init_file_path: '/etc/default/go-server' - repo_url: 'http://dl.bintray.com/gocd/gocd-deb' - apt_repos: 'main' - apt_release: 'stable' +go-server::settings: + init_file_path: '/etc/default/go-server' + repo_url: 'http://dl.bintray.com/gocd/gocd-deb' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/go-server/osfamily/RedHat.yaml b/data/go-server/osfamily/RedHat.yaml index b312ed90..b2e6f7c1 100644 --- a/data/go-server/osfamily/RedHat.yaml +++ b/data/go-server/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - go-server::settings: - init_file_path: '/etc/sysconfig/go-server' - repo_url: 'http://dl.bintray.com/gocd/gocd-rpm' +go-server::settings: + init_file_path: '/etc/sysconfig/go-server' + repo_url: 'http://dl.bintray.com/gocd/gocd-rpm' diff --git a/data/grafana/default.yaml b/data/grafana/default.yaml index 8ed8c18a..95404a4d 100644 --- a/data/grafana/default.yaml +++ b/data/grafana/default.yaml @@ -1,20 +1,19 @@ --- - grafana::settings: - package_name: 'grafana' - service_name: 'grafana-server' - key_url: 'https://packages.grafana.com/gpg.key' - config_file_path: '/etc/grafana/grafana.ini' - custom_file_path: '/etc/grafana/custom.ini' - ldap_file_path: '/etc/grafana/ldap.toml' - config_dir_path: '/etc/grafana' - datasources_dir_path: '/etc/grafana/provisioning/datasources' - dashboards_dir_path: '/etc/grafana/provisioning/dashboards' - provisioning_dir_path: '/etc/grafana/provisioning' - pid_file_path: '/var/run/grafana/grafana-server.pid' - log_file_path: '/var/log/grafana/grafana.log' - log_dir_path: '/var/log/grafana' - process_name: 'grafana-server' - process_user: 'grafana' - process_group: 'grafana' - tcp_port: '3000' - +grafana::settings: + package_name: 'grafana' + service_name: 'grafana-server' + key_url: 'https://packages.grafana.com/gpg.key' + config_file_path: '/etc/grafana/grafana.ini' + custom_file_path: '/etc/grafana/custom.ini' + ldap_file_path: '/etc/grafana/ldap.toml' + config_dir_path: '/etc/grafana' + datasources_dir_path: '/etc/grafana/provisioning/datasources' + dashboards_dir_path: '/etc/grafana/provisioning/dashboards' + provisioning_dir_path: '/etc/grafana/provisioning' + pid_file_path: '/var/run/grafana/grafana-server.pid' + log_file_path: '/var/log/grafana/grafana.log' + log_dir_path: '/var/log/grafana' + process_name: 'grafana-server' + process_user: 'grafana' + process_group: 'grafana' + tcp_port: '3000' diff --git a/data/grafana/osfamily/Debian.yaml b/data/grafana/osfamily/Debian.yaml index 132d72f7..79b6b9f2 100644 --- a/data/grafana/osfamily/Debian.yaml +++ b/data/grafana/osfamily/Debian.yaml @@ -1,10 +1,10 @@ --- - grafana::settings: - init_file_path: '/etc/default/grafana-server' - repo_url: 'https://packages.grafana.com/oss/deb' - apt_repos: 'main' - apt_release: 'stable' - key: 'D59097AB' - package_prerequisites: - - 'libfontconfig1' - - 'adduser' +grafana::settings: + init_file_path: '/etc/default/grafana-server' + repo_url: 'https://packages.grafana.com/oss/deb' + apt_repos: 'main' + apt_release: 'stable' + key: 'D59097AB' + package_prerequisites: + - 'libfontconfig1' + - 'adduser' diff --git a/data/grafana/osfamily/RedHat.yaml b/data/grafana/osfamily/RedHat.yaml index 8afd74fc..1d97e599 100644 --- a/data/grafana/osfamily/RedHat.yaml +++ b/data/grafana/osfamily/RedHat.yaml @@ -1,9 +1,9 @@ --- - grafana::settings: - init_file_path: '/etc/sysconfig/grafana-server' - repo_url: 'https://packages.grafana.com/oss/rpm' - key: 'D59097AB' - package_prerequisites: - - 'initscripts' - - 'fontconfig' - - 'urw-fonts' +grafana::settings: + init_file_path: '/etc/sysconfig/grafana-server' + repo_url: 'https://packages.grafana.com/oss/rpm' + key: 'D59097AB' + package_prerequisites: + - 'initscripts' + - 'fontconfig' + - 'urw-fonts' diff --git a/data/graylog2/default.yaml b/data/graylog2/default.yaml index a90c2146..770269e5 100644 --- a/data/graylog2/default.yaml +++ b/data/graylog2/default.yaml @@ -1,13 +1,13 @@ --- - graylog2::settings: - package_name: 'graylog2-server' - service_name: 'graylog2-server' - config_file_path: '/etc/graylog2.conf' - config_dir_path: '/etc/graylog2' - conf_dir_path: '/etc/graylog2/conf.d' - pid_file_path: '/var/run/graylog2.pid' - process_name: 'java' - process_extra_name: 'graylog2' - process_user: 'graylog2' - process_group: 'graylog2' - udp_port: '514' +graylog2::settings: + package_name: 'graylog2-server' + service_name: 'graylog2-server' + config_file_path: '/etc/graylog2.conf' + config_dir_path: '/etc/graylog2' + conf_dir_path: '/etc/graylog2/conf.d' + pid_file_path: '/var/run/graylog2.pid' + process_name: 'java' + process_extra_name: 'graylog2' + process_user: 'graylog2' + process_group: 'graylog2' + udp_port: '514' diff --git a/data/graylog2/osfamily/Debian.yaml b/data/graylog2/osfamily/Debian.yaml index 61b951d7..9beb1063 100644 --- a/data/graylog2/osfamily/Debian.yaml +++ b/data/graylog2/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - graylog2::settings: - init_file_path: '/etc/default/graylog2' +graylog2::settings: + init_file_path: '/etc/default/graylog2' diff --git a/data/graylog2/osfamily/RedHat.yaml b/data/graylog2/osfamily/RedHat.yaml index 4bfe528c..877496da 100644 --- a/data/graylog2/osfamily/RedHat.yaml +++ b/data/graylog2/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - graylog2::settings: - init_file_path: '/etc/sysconfig/graylog2' +graylog2::settings: + init_file_path: '/etc/sysconfig/graylog2' diff --git a/data/haproxy/default.yaml b/data/haproxy/default.yaml index 9503b438..43c7ee99 100644 --- a/data/haproxy/default.yaml +++ b/data/haproxy/default.yaml @@ -1,16 +1,16 @@ --- - haproxy::settings: - package_name: 'haproxy' - service_name: 'haproxy' - config_file_path: '/etc/haproxy/haproxy.cfg' - config_dir_path: '/etc/haproxy' - conf_dir_path: '/etc/haproxy/conf.d' - pid_file_path: '/var/run/haproxy.pid' - log_file_path: '/var/log/haproxy/haproxy.log' - log_dir_path: '/var/log/haproxy' - process_name: 'haproxy' - process_user: 'haproxy' - process_group: 'haproxy' - tcp_port: - - '80' - - '443' +haproxy::settings: + package_name: 'haproxy' + service_name: 'haproxy' + config_file_path: '/etc/haproxy/haproxy.cfg' + config_dir_path: '/etc/haproxy' + conf_dir_path: '/etc/haproxy/conf.d' + pid_file_path: '/var/run/haproxy.pid' + log_file_path: '/var/log/haproxy/haproxy.log' + log_dir_path: '/var/log/haproxy' + process_name: 'haproxy' + process_user: 'haproxy' + process_group: 'haproxy' + tcp_port: + - '80' + - '443' diff --git a/data/haproxy/osfamily/Debian.yaml b/data/haproxy/osfamily/Debian.yaml index 985741fe..0df52a13 100644 --- a/data/haproxy/osfamily/Debian.yaml +++ b/data/haproxy/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - haproxy::settings: - init_file_path: '/etc/default/haproxy' +haproxy::settings: + init_file_path: '/etc/default/haproxy' diff --git a/data/haproxy/osfamily/RedHat.yaml b/data/haproxy/osfamily/RedHat.yaml index fe44c19e..bebf7959 100644 --- a/data/haproxy/osfamily/RedHat.yaml +++ b/data/haproxy/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - haproxy::settings: - init_file_path: '/etc/sysconfig/haproxy' +haproxy::settings: + init_file_path: '/etc/sysconfig/haproxy' diff --git a/data/hashicorp_repo/default.yaml b/data/hashicorp_repo/default.yaml index 54ad037e..b15056d8 100644 --- a/data/hashicorp_repo/default.yaml +++ b/data/hashicorp_repo/default.yaml @@ -1,4 +1,3 @@ --- hashicorp_repo::settings: upstream_repo: true - \ No newline at end of file diff --git a/data/haveged/default.yaml b/data/haveged/default.yaml index e8e8004f..3dbcf95a 100644 --- a/data/haveged/default.yaml +++ b/data/haveged/default.yaml @@ -1,3 +1,3 @@ --- - haveged::settings: - package_name: 'haveged' +haveged::settings: + package_name: 'haveged' diff --git a/data/hdm/default.yaml b/data/hdm/default.yaml index 456cd0ff..55b14589 100644 --- a/data/hdm/default.yaml +++ b/data/hdm/default.yaml @@ -4,5 +4,5 @@ hdm::settings: config_file_path: '/etc/hdm/hdm.conf' config_dir_path: '/etc/hdm' tcp_port: '8042' - log_file_path: [ '/opt/hdm/log/production.log' ] + log_file_path: ['/opt/hdm/log/production.log'] log_dir_path: '/opt/hdm/log' diff --git a/data/heartbeat/default.yaml b/data/heartbeat/default.yaml index b1f03493..fd283ef6 100644 --- a/data/heartbeat/default.yaml +++ b/data/heartbeat/default.yaml @@ -1,14 +1,14 @@ --- - heartbeat::settings: - package_name: 'heartbeat' - service_name: 'heartbeat' - config_file_path: '/etc/ha.d/ha.cf' - pid_file_path: '/var/run/heartbeat/heartbeat.pid' - log_file_path: - - '/var/log/ha-log' - - '/var/log/ha-debug' - config_dir_path: '/etc/ha.d' - data_dir_path: '/var/lib/heartbeat' - process_name: 'heartbeat' - process_user: 'root' - process_group: 'root' +heartbeat::settings: + package_name: 'heartbeat' + service_name: 'heartbeat' + config_file_path: '/etc/ha.d/ha.cf' + pid_file_path: '/var/run/heartbeat/heartbeat.pid' + log_file_path: + - '/var/log/ha-log' + - '/var/log/ha-debug' + config_dir_path: '/etc/ha.d' + data_dir_path: '/var/lib/heartbeat' + process_name: 'heartbeat' + process_user: 'root' + process_group: 'root' diff --git a/data/heartbeat/osfamily/Debian.yaml b/data/heartbeat/osfamily/Debian.yaml index 48bfa399..ab92d21c 100644 --- a/data/heartbeat/osfamily/Debian.yaml +++ b/data/heartbeat/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - heartbeat::settings: - init_file_path: '/etc/default/heartbeat' +heartbeat::settings: + init_file_path: '/etc/default/heartbeat' diff --git a/data/heartbeat/osfamily/RedHat.yaml b/data/heartbeat/osfamily/RedHat.yaml index 85f6530c..99e231e8 100644 --- a/data/heartbeat/osfamily/RedHat.yaml +++ b/data/heartbeat/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - heartbeat::settings: - init_file_path: '/etc/sysconfig/heartbeat' +heartbeat::settings: + init_file_path: '/etc/sysconfig/heartbeat' diff --git a/data/hosts/default.yaml b/data/hosts/default.yaml index 5fa213fc..b1d2cec6 100644 --- a/data/hosts/default.yaml +++ b/data/hosts/default.yaml @@ -1,3 +1,3 @@ --- - hosts::settings: - config_file_path: '/etc/hosts' +hosts::settings: + config_file_path: '/etc/hosts' diff --git a/data/icinga/default.yaml b/data/icinga/default.yaml index e601b824..ad92fa79 100644 --- a/data/icinga/default.yaml +++ b/data/icinga/default.yaml @@ -1,14 +1,14 @@ --- - icinga::settings: - package_name: 'icinga' - service_name: 'icinga' - config_file_path: '/etc/icinga/icinga.conf' - config_dir_path: '/etc/icinga' - conf_dir_path: '/etc/icinga/conf.d' - pid_file_path: '/var/run/icinga.pid' - log_file_path: '/var/log/icinga/icinga.log' - log_dir_path: '/var/log/icinga' - data_dir_path: '/var/lib/icinga' - process_name: 'icinga' - process_user: 'icinga' - process_group: 'icinga' +icinga::settings: + package_name: 'icinga' + service_name: 'icinga' + config_file_path: '/etc/icinga/icinga.conf' + config_dir_path: '/etc/icinga' + conf_dir_path: '/etc/icinga/conf.d' + pid_file_path: '/var/run/icinga.pid' + log_file_path: '/var/log/icinga/icinga.log' + log_dir_path: '/var/log/icinga' + data_dir_path: '/var/lib/icinga' + process_name: 'icinga' + process_user: 'icinga' + process_group: 'icinga' diff --git a/data/icinga/hiera.yaml b/data/icinga/hiera.yaml index b8dc1a89..dfd3d93f 100644 --- a/data/icinga/hiera.yaml +++ b/data/icinga/hiera.yaml @@ -1,5 +1,5 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/icinga/osfamily/Debian.yaml b/data/icinga/osfamily/Debian.yaml index 5122a7e9..cac8a6e7 100644 --- a/data/icinga/osfamily/Debian.yaml +++ b/data/icinga/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - icinga::settings: - init_file_path: '/etc/default/icinga' - process_user: 'nagios' - process_group: 'nagios' - pid_file_path: '/var/run/icinga/icinga.pid' +icinga::settings: + init_file_path: '/etc/default/icinga' + process_user: 'nagios' + process_group: 'nagios' + pid_file_path: '/var/run/icinga/icinga.pid' diff --git a/data/icinga/osfamily/RedHat.yaml b/data/icinga/osfamily/RedHat.yaml index edb1dfab..da96793b 100644 --- a/data/icinga/osfamily/RedHat.yaml +++ b/data/icinga/osfamily/RedHat.yaml @@ -1,7 +1,7 @@ --- - icinga::settings: - init_file_path: '/etc/sysconfig/icinga' - config_file_owner: 'icinga' - config_file_group: 'icinga' - config_file_mode: '664' +icinga::settings: + init_file_path: '/etc/sysconfig/icinga' + config_file_owner: 'icinga' + config_file_group: 'icinga' + config_file_mode: '664' diff --git a/data/icinga2/default.yaml b/data/icinga2/default.yaml index d6cd0506..d212dd9a 100644 --- a/data/icinga2/default.yaml +++ b/data/icinga2/default.yaml @@ -1,16 +1,16 @@ --- - icinga2::settings: - package_name: 'icinga2' - service_name: 'icinga2' - config_file_path: '/etc/icinga2/icinga2.conf' - config_dir_path: '/etc/icinga2' - conf_dir_path: '/etc/icinga2/conf.d' - features_dir_path: '/etc/icinga2/features-enabled' - pid_file_path: '/var/run/icinga2/icinga2.pid' - log_file_path: - - '/var/log/icinga2/icinga2.log' - - '/var/log/icinga2/error.log' - log_dir_path: '/var/log/icinga2' - process_name: 'icinga2' - process_user: 'icinga' - process_group: 'icinga' +icinga2::settings: + package_name: 'icinga2' + service_name: 'icinga2' + config_file_path: '/etc/icinga2/icinga2.conf' + config_dir_path: '/etc/icinga2' + conf_dir_path: '/etc/icinga2/conf.d' + features_dir_path: '/etc/icinga2/features-enabled' + pid_file_path: '/var/run/icinga2/icinga2.pid' + log_file_path: + - '/var/log/icinga2/icinga2.log' + - '/var/log/icinga2/error.log' + log_dir_path: '/var/log/icinga2' + process_name: 'icinga2' + process_user: 'icinga' + process_group: 'icinga' diff --git a/data/icinga2/osfamily/Debian.yaml b/data/icinga2/osfamily/Debian.yaml index 5a62e467..d44f2516 100644 --- a/data/icinga2/osfamily/Debian.yaml +++ b/data/icinga2/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - icinga2::settings: - init_file_path: '/etc/default/icinga2' +icinga2::settings: + init_file_path: '/etc/default/icinga2' diff --git a/data/icinga2/osfamily/RedHat.yaml b/data/icinga2/osfamily/RedHat.yaml index 508e34d2..76b4bdaf 100644 --- a/data/icinga2/osfamily/RedHat.yaml +++ b/data/icinga2/osfamily/RedHat.yaml @@ -1,10 +1,8 @@ --- - icinga2::settings: - init_file_path: '/etc/sysconfig/icinga2' - config_file_owner: 'icinga' - config_file_owner: 'icinga' - config_file_mode: '0640' - repo_package_name: 'icinga-rpm-release' - tp_prerequisites: - - epel - +icinga2::settings: + init_file_path: '/etc/sysconfig/icinga2' + config_file_owner: 'icinga' + config_file_mode: '0640' + repo_package_name: 'icinga-rpm-release' + tp_prerequisites: + - epel diff --git a/data/icinga2/osfamily/RedHat5.yaml b/data/icinga2/osfamily/RedHat5.yaml index f7bf65ef..f1115f61 100644 --- a/data/icinga2/osfamily/RedHat5.yaml +++ b/data/icinga2/osfamily/RedHat5.yaml @@ -1,3 +1,3 @@ --- - icinga2::settings: - repo_package_url: 'https://packages.icinga.com/epel/5/release/noarch/icinga-rpm-release-5-1.el5.centos.noarch.rpm' +icinga2::settings: + repo_package_url: 'https://packages.icinga.com/epel/5/release/noarch/icinga-rpm-release-5-1.el5.centos.noarch.rpm' diff --git a/data/icinga2/osfamily/RedHat6.yaml b/data/icinga2/osfamily/RedHat6.yaml index c9706900..c0a0607d 100644 --- a/data/icinga2/osfamily/RedHat6.yaml +++ b/data/icinga2/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- - icinga2::settings: - repo_package_url: 'https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.centos.noarch.rpm' +icinga2::settings: + repo_package_url: 'https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.centos.noarch.rpm' diff --git a/data/icinga2/osfamily/RedHat7.yaml b/data/icinga2/osfamily/RedHat7.yaml index 283cca6e..b4db8c43 100644 --- a/data/icinga2/osfamily/RedHat7.yaml +++ b/data/icinga2/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- - icinga2::settings: - repo_package_url: 'https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm' +icinga2::settings: + repo_package_url: 'https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm' diff --git a/data/icingaweb2/default.yaml b/data/icingaweb2/default.yaml index 1137e982..6f6ed89d 100644 --- a/data/icingaweb2/default.yaml +++ b/data/icingaweb2/default.yaml @@ -1,10 +1,10 @@ --- - icingaweb2::settings: - package_name: 'icingaweb2' - config_file_path: '/etc/icingaweb2/icingaweb2.conf' - config_dir_path: '/etc/icingaweb2' - conf_dir_path: '/etc/icingaweb2/conf.d' - modules_dir_path: '/etc/icingaweb2/modules' - log_file_path: '/var/log/icingaweb2/icingaweb2.log' - log_dir_path: '/var/log/icingaweb2' - config_dir_mode: '0775' +icingaweb2::settings: + package_name: 'icingaweb2' + config_file_path: '/etc/icingaweb2/icingaweb2.conf' + config_dir_path: '/etc/icingaweb2' + conf_dir_path: '/etc/icingaweb2/conf.d' + modules_dir_path: '/etc/icingaweb2/modules' + log_file_path: '/var/log/icingaweb2/icingaweb2.log' + log_dir_path: '/var/log/icingaweb2' + config_dir_mode: '0775' diff --git a/data/icingaweb2/osfamily/Debian.yaml b/data/icingaweb2/osfamily/Debian.yaml index 5cfea244..5b4b8591 100644 --- a/data/icingaweb2/osfamily/Debian.yaml +++ b/data/icingaweb2/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - icingaweb2::settings: - init_file_path: '/etc/default/icingaweb2' +icingaweb2::settings: + init_file_path: '/etc/default/icingaweb2' diff --git a/data/icingaweb2/osfamily/RedHat.yaml b/data/icingaweb2/osfamily/RedHat.yaml index 26e73347..96dca9ef 100644 --- a/data/icingaweb2/osfamily/RedHat.yaml +++ b/data/icingaweb2/osfamily/RedHat.yaml @@ -1,9 +1,8 @@ --- - icingaweb2::settings: - init_file_path: '/etc/sysconfig/icingaweb2' - config_file_owner: 'icinga' - config_file_owner: 'icinga' - config_file_mode: '0640' - repo_package_name: 'icinga-rpm-release' - tp_prerequisites: - - scl +icingaweb2::settings: + init_file_path: '/etc/sysconfig/icingaweb2' + config_file_owner: 'icinga' + config_file_mode: '0640' + repo_package_name: 'icinga-rpm-release' + tp_prerequisites: + - scl diff --git a/data/icingaweb2/osfamily/RedHat5.yaml b/data/icingaweb2/osfamily/RedHat5.yaml index ea988ad7..03e55cec 100644 --- a/data/icingaweb2/osfamily/RedHat5.yaml +++ b/data/icingaweb2/osfamily/RedHat5.yaml @@ -1,3 +1,3 @@ --- - icingaweb2::settings: - repo_package_url: 'https://packages.icinga.com/epel/5/release/noarch/icinga-rpm-release-5-1.el5.centos.noarch.rpm' +icingaweb2::settings: + repo_package_url: 'https://packages.icinga.com/epel/5/release/noarch/icinga-rpm-release-5-1.el5.centos.noarch.rpm' diff --git a/data/icingaweb2/osfamily/RedHat6.yaml b/data/icingaweb2/osfamily/RedHat6.yaml index 14b5f6ca..2499fc8f 100644 --- a/data/icingaweb2/osfamily/RedHat6.yaml +++ b/data/icingaweb2/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- - icingaweb2::settings: - repo_package_url: 'https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.centos.noarch.rpm' +icingaweb2::settings: + repo_package_url: 'https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.centos.noarch.rpm' diff --git a/data/icingaweb2/osfamily/RedHat7.yaml b/data/icingaweb2/osfamily/RedHat7.yaml index bf4e56b3..0d8d70f1 100644 --- a/data/icingaweb2/osfamily/RedHat7.yaml +++ b/data/icingaweb2/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- - icingaweb2::settings: - repo_package_url: 'https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm' +icingaweb2::settings: + repo_package_url: 'https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm' diff --git a/data/influxdb/default.yaml b/data/influxdb/default.yaml index 9a2ef3ef..34bc525f 100644 --- a/data/influxdb/default.yaml +++ b/data/influxdb/default.yaml @@ -1,17 +1,17 @@ --- - influxdb::settings: - package_name: 'influxdb' - service_name: 'influxdb' - config_file_path: '/etc/influxdb/influxdb.conf' - config_dir_path: '/etc/influxdb' - pid_file_path: '/var/run/influxdb.pid' - log_file_path: '/var/log/influxdb/influxdb.log' - log_dir_path: '/var/log/influxdb' - process_name: 'influxd' - process_user: 'influxdb' - process_group: 'influxdb' - tcp_port: - - 8088 - - 8086 - key: '87F70D56' - key_url: 'https://repos.influxdata.com/influxdb.key' +influxdb::settings: + package_name: 'influxdb' + service_name: 'influxdb' + config_file_path: '/etc/influxdb/influxdb.conf' + config_dir_path: '/etc/influxdb' + pid_file_path: '/var/run/influxdb.pid' + log_file_path: '/var/log/influxdb/influxdb.log' + log_dir_path: '/var/log/influxdb' + process_name: 'influxd' + process_user: 'influxdb' + process_group: 'influxdb' + tcp_port: + - 8088 + - 8086 + key: '87F70D56' + key_url: 'https://repos.influxdata.com/influxdb.key' diff --git a/data/influxdb/operatingsystem/Debian7.yaml b/data/influxdb/operatingsystem/Debian7.yaml index 2324f9fc..900f32f5 100644 --- a/data/influxdb/operatingsystem/Debian7.yaml +++ b/data/influxdb/operatingsystem/Debian7.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - apt_release: 'wheezy' +influxdb::settings: + apt_release: 'wheezy' diff --git a/data/influxdb/operatingsystem/Debian8.yaml b/data/influxdb/operatingsystem/Debian8.yaml index f7dfbfe0..459cc4e7 100644 --- a/data/influxdb/operatingsystem/Debian8.yaml +++ b/data/influxdb/operatingsystem/Debian8.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - apt_release: 'jessie' +influxdb::settings: + apt_release: 'jessie' diff --git a/data/influxdb/operatingsystem/Debian9.yaml b/data/influxdb/operatingsystem/Debian9.yaml index 315ddca0..d0b46435 100644 --- a/data/influxdb/operatingsystem/Debian9.yaml +++ b/data/influxdb/operatingsystem/Debian9.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - apt_release: 'stretch' +influxdb::settings: + apt_release: 'stretch' diff --git a/data/influxdb/operatingsystem/Ubuntu.yaml b/data/influxdb/operatingsystem/Ubuntu.yaml index 40cbeca9..ab0ea043 100644 --- a/data/influxdb/operatingsystem/Ubuntu.yaml +++ b/data/influxdb/operatingsystem/Ubuntu.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - repo_url: 'https://repos.influxdata.com/ubuntu' +influxdb::settings: + repo_url: 'https://repos.influxdata.com/ubuntu' diff --git a/data/influxdb/operatingsystem/Ubuntu12.04.yaml b/data/influxdb/operatingsystem/Ubuntu12.04.yaml index 3090eeab..03fe4571 100644 --- a/data/influxdb/operatingsystem/Ubuntu12.04.yaml +++ b/data/influxdb/operatingsystem/Ubuntu12.04.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - apt_release: 'precise' +influxdb::settings: + apt_release: 'precise' diff --git a/data/influxdb/operatingsystem/Ubuntu14.04.yaml b/data/influxdb/operatingsystem/Ubuntu14.04.yaml index 0c3b248d..41e08bbe 100644 --- a/data/influxdb/operatingsystem/Ubuntu14.04.yaml +++ b/data/influxdb/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - apt_release: 'trusty' +influxdb::settings: + apt_release: 'trusty' diff --git a/data/influxdb/operatingsystem/Ubuntu14.10.yaml b/data/influxdb/operatingsystem/Ubuntu14.10.yaml index 14b94ac6..55a62530 100644 --- a/data/influxdb/operatingsystem/Ubuntu14.10.yaml +++ b/data/influxdb/operatingsystem/Ubuntu14.10.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - apt_release: 'ubuntu-utopic' +influxdb::settings: + apt_release: 'ubuntu-utopic' diff --git a/data/influxdb/operatingsystem/Ubuntu16.04.yaml b/data/influxdb/operatingsystem/Ubuntu16.04.yaml index b94d632e..ebf3f382 100644 --- a/data/influxdb/operatingsystem/Ubuntu16.04.yaml +++ b/data/influxdb/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - apt_release: 'xenial' +influxdb::settings: + apt_release: 'xenial' diff --git a/data/influxdb/osfamily/Debian.yaml b/data/influxdb/osfamily/Debian.yaml index 2e46b1eb..c0c109e3 100644 --- a/data/influxdb/osfamily/Debian.yaml +++ b/data/influxdb/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - influxdb::settings: - init_file_path: '/etc/default/influxdb' - repo_url: 'https://repos.influxdata.com/debian/pool/stable/i/influxdb/' - apt_repos: 'main' - apt_release: 'stable' +influxdb::settings: + init_file_path: '/etc/default/influxdb' + repo_url: 'https://repos.influxdata.com/debian/pool/stable/i/influxdb/' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/influxdb/osfamily/RedHat.yaml b/data/influxdb/osfamily/RedHat.yaml index aa7e4f44..65376311 100644 --- a/data/influxdb/osfamily/RedHat.yaml +++ b/data/influxdb/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - init_file_path: '/etc/sysconfig/influxdb' +influxdb::settings: + init_file_path: '/etc/sysconfig/influxdb' diff --git a/data/influxdb/osfamily/RedHat6.yaml b/data/influxdb/osfamily/RedHat6.yaml index 754b755c..df53e74e 100644 --- a/data/influxdb/osfamily/RedHat6.yaml +++ b/data/influxdb/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - repo_url: 'https://repos.influxdata.com/rhel/6/x86_64/stable/' +influxdb::settings: + repo_url: 'https://repos.influxdata.com/rhel/6/x86_64/stable/' diff --git a/data/influxdb/osfamily/RedHat7.yaml b/data/influxdb/osfamily/RedHat7.yaml index 9b1b5bc3..a1bb7526 100644 --- a/data/influxdb/osfamily/RedHat7.yaml +++ b/data/influxdb/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- - influxdb::settings: - repo_url: 'https://repos.influxdata.com/rhel/7/x86_64/stable/' +influxdb::settings: + repo_url: 'https://repos.influxdata.com/rhel/7/x86_64/stable/' diff --git a/data/iotop/default.yaml b/data/iotop/default.yaml index da47c644..97bc1310 100644 --- a/data/iotop/default.yaml +++ b/data/iotop/default.yaml @@ -1,3 +1,3 @@ --- - iotop::settings: - package_name: 'iotop' +iotop::settings: + package_name: 'iotop' diff --git a/data/iptraf/default.yaml b/data/iptraf/default.yaml index e5924942..fa3dc89c 100644 --- a/data/iptraf/default.yaml +++ b/data/iptraf/default.yaml @@ -1,3 +1,3 @@ --- - iptraf::settings: - package_name: 'iptraf' +iptraf::settings: + package_name: 'iptraf' diff --git a/data/iptraf/operatingsystem/Debian-11.yaml b/data/iptraf/operatingsystem/Debian-11.yaml index b67cd214..54500244 100644 --- a/data/iptraf/operatingsystem/Debian-11.yaml +++ b/data/iptraf/operatingsystem/Debian-11.yaml @@ -1,3 +1,3 @@ --- - iptraf::settings: - package_name: 'iptraf-ng' +iptraf::settings: + package_name: 'iptraf-ng' diff --git a/data/iptraf/osfamily/RedHat.yaml b/data/iptraf/osfamily/RedHat.yaml index b67cd214..54500244 100644 --- a/data/iptraf/osfamily/RedHat.yaml +++ b/data/iptraf/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - iptraf::settings: - package_name: 'iptraf-ng' +iptraf::settings: + package_name: 'iptraf-ng' diff --git a/data/jboss/default.yaml b/data/jboss/default.yaml index 1738ebaf..3cc050ae 100644 --- a/data/jboss/default.yaml +++ b/data/jboss/default.yaml @@ -1,14 +1,14 @@ --- - jboss::settings: - package_name: 'jboss' - service_name: 'jboss' - config_file_path: '/etc/jboss/jboss.conf' - config_dir_path: '/etc/jboss' - conf_dir_path: '/etc/jboss/conf.d' - pid_file_path: '/var/run/jboss.pid' - log_file_path: '/var/log/jboss/jboss.log' - log_dir_path: '/var/log/jboss' - process_name: 'jboss' - process_user: 'jboss' - process_group: 'jboss' - tcp_port: '8080' +jboss::settings: + package_name: 'jboss' + service_name: 'jboss' + config_file_path: '/etc/jboss/jboss.conf' + config_dir_path: '/etc/jboss' + conf_dir_path: '/etc/jboss/conf.d' + pid_file_path: '/var/run/jboss.pid' + log_file_path: '/var/log/jboss/jboss.log' + log_dir_path: '/var/log/jboss' + process_name: 'jboss' + process_user: 'jboss' + process_group: 'jboss' + tcp_port: '8080' diff --git a/data/jboss/osfamily/Debian.yaml b/data/jboss/osfamily/Debian.yaml index 748fcede..73db5efd 100644 --- a/data/jboss/osfamily/Debian.yaml +++ b/data/jboss/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - jboss::settings: - init_file_path: '/etc/default/jboss' +jboss::settings: + init_file_path: '/etc/default/jboss' diff --git a/data/jboss/osfamily/RedHat.yaml b/data/jboss/osfamily/RedHat.yaml index 2defce15..ef469141 100644 --- a/data/jboss/osfamily/RedHat.yaml +++ b/data/jboss/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - jboss::settings: - init_file_path: '/etc/sysconfig/jboss' +jboss::settings: + init_file_path: '/etc/sysconfig/jboss' diff --git a/data/jenkins/default.yaml b/data/jenkins/default.yaml index 7b950f2f..cba19371 100644 --- a/data/jenkins/default.yaml +++ b/data/jenkins/default.yaml @@ -1,14 +1,14 @@ --- - jenkins::settings: - package_name: 'jenkins' - service_name: 'jenkins' - config_dir_path: '/etc/jenkins' - conf_dir_path: '/etc/jenkins/conf.d' - pid_file_path: '/var/run/jenkins.pid' - log_file_path: '/var/log/jenkins/jenkins.log' - log_dir_path: '/var/log/jenkins' - process_name: 'java' - process_extra_name: 'jenkins' - process_user: 'jenkins' - process_group: 'jenkins' - tcp_port: '8080' +jenkins::settings: + package_name: 'jenkins' + service_name: 'jenkins' + config_dir_path: '/etc/jenkins' + conf_dir_path: '/etc/jenkins/conf.d' + pid_file_path: '/var/run/jenkins.pid' + log_file_path: '/var/log/jenkins/jenkins.log' + log_dir_path: '/var/log/jenkins' + process_name: 'java' + process_extra_name: 'jenkins' + process_user: 'jenkins' + process_group: 'jenkins' + tcp_port: '8080' diff --git a/data/jenkins/osfamily/Debian.yaml b/data/jenkins/osfamily/Debian.yaml index df297b61..9ca0adc8 100644 --- a/data/jenkins/osfamily/Debian.yaml +++ b/data/jenkins/osfamily/Debian.yaml @@ -1,8 +1,8 @@ --- - jenkins::settings: - pid_file_path: '/var/run/jenkins/jenkins.pid' - init_file_path: '/etc/default/jenkins' - repo_url: 'https://pkg.jenkins.io/debian-stable' - key: 'D50582E6' - key_url: 'https://pkg.jenkins.io/debian-stable/jenkins.io.key' - apt_repos: 'binary/' +jenkins::settings: + pid_file_path: '/var/run/jenkins/jenkins.pid' + init_file_path: '/etc/default/jenkins' + repo_url: 'https://pkg.jenkins.io/debian-stable' + key: 'D50582E6' + key_url: 'https://pkg.jenkins.io/debian-stable/jenkins.io.key' + apt_repos: 'binary/' diff --git a/data/jenkins/osfamily/RedHat.yaml b/data/jenkins/osfamily/RedHat.yaml index 2293818e..8d52dc7e 100644 --- a/data/jenkins/osfamily/RedHat.yaml +++ b/data/jenkins/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - jenkins::settings: - init_file_path: '/etc/sysconfig/jenkins' - repo_url: 'http://pkg.jenkins.io/redhat-stable' - # key: 'D88E42B4' - key_url: 'https://pkg.jenkins.io/redhat-stable/jenkins.io.key' +jenkins::settings: + init_file_path: '/etc/sysconfig/jenkins' + repo_url: 'http://pkg.jenkins.io/redhat-stable' + # key: 'D88E42B4' + key_url: 'https://pkg.jenkins.io/redhat-stable/jenkins.io.key' diff --git a/data/kedro/default.yaml b/data/kedro/default.yaml index 2148ae51..cb305b04 100644 --- a/data/kedro/default.yaml +++ b/data/kedro/default.yaml @@ -2,4 +2,3 @@ kedro: package_name: kedro package_provider: 'pip' - diff --git a/data/keepalived/default.yaml b/data/keepalived/default.yaml index 3498e406..c4e3c1b0 100644 --- a/data/keepalived/default.yaml +++ b/data/keepalived/default.yaml @@ -1,11 +1,11 @@ --- - keepalived::settings: - package_name: 'keepalived' - service_name: 'keepalived' - config_file_path: '/etc/keepalived/keepalived.conf' - config_dir_path: '/etc/keepalived' - init_file_path: '/etc/sysconfig/keepalived' - log_file_path: '/var/log/messages' - process_name: 'keepalived' - process_user: 'root' - process_group: 'root' +keepalived::settings: + package_name: 'keepalived' + service_name: 'keepalived' + config_file_path: '/etc/keepalived/keepalived.conf' + config_dir_path: '/etc/keepalived' + init_file_path: '/etc/sysconfig/keepalived' + log_file_path: '/var/log/messages' + process_name: 'keepalived' + process_user: 'root' + process_group: 'root' diff --git a/data/keepalived/osfamily/Debian.yaml b/data/keepalived/osfamily/Debian.yaml index 965a7c89..2a679666 100644 --- a/data/keepalived/osfamily/Debian.yaml +++ b/data/keepalived/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - keepalived::settings: - init_file_path: '/etc/default/keepalived' +keepalived::settings: + init_file_path: '/etc/default/keepalived' diff --git a/data/keystone/default.yaml b/data/keystone/default.yaml index 4b6aac9e..125536aa 100644 --- a/data/keystone/default.yaml +++ b/data/keystone/default.yaml @@ -1,11 +1,11 @@ --- - keystone::settings: - service_name: 'keystone' - config_file_path: '/etc/keystone/keystone.conf' - config_dir_path: '/etc/keystone' - pid_file_path: '/var/run/keystone.pid' - log_file_path: '/var/log/keystone/keystone.log' - log_dir_path: '/var/log/keystone' - process_name: 'keystone' - process_user: 'keystone' - process_group: 'keystone' +keystone::settings: + service_name: 'keystone' + config_file_path: '/etc/keystone/keystone.conf' + config_dir_path: '/etc/keystone' + pid_file_path: '/var/run/keystone.pid' + log_file_path: '/var/log/keystone/keystone.log' + log_dir_path: '/var/log/keystone' + process_name: 'keystone' + process_user: 'keystone' + process_group: 'keystone' diff --git a/data/keystone/osfamily/Debian.yaml b/data/keystone/osfamily/Debian.yaml index 9bdbd7ec..197885ee 100644 --- a/data/keystone/osfamily/Debian.yaml +++ b/data/keystone/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - keystone::settings: - package_name: - - 'python-keystone' - - 'keystone' - init_file_path: '/etc/default/keystone' +keystone::settings: + package_name: + - 'python-keystone' + - 'keystone' + init_file_path: '/etc/default/keystone' diff --git a/data/keystone/osfamily/RedHat.yaml b/data/keystone/osfamily/RedHat.yaml index c1c05dad..622aa5a3 100644 --- a/data/keystone/osfamily/RedHat.yaml +++ b/data/keystone/osfamily/RedHat.yaml @@ -1,7 +1,7 @@ --- - keystone::settings: - package_name: - - 'python-keystone' - - 'openstack-keystone' - service_name: 'openstack-keystone' - init_file_path: '/etc/sysconfig/keystone' +keystone::settings: + package_name: + - 'python-keystone' + - 'openstack-keystone' + service_name: 'openstack-keystone' + init_file_path: '/etc/sysconfig/keystone' diff --git a/data/libvirt/default.yaml b/data/libvirt/default.yaml index ce4b26d8..5603159d 100644 --- a/data/libvirt/default.yaml +++ b/data/libvirt/default.yaml @@ -1,14 +1,14 @@ --- - libvirt::settings: - package_name: 'libvirt' - service_name: 'libvirtd' - config_file_path: '/etc/libvirt/libvirtd.conf' - pid_file_path: '/var/run/libvirt/network/default.pid' - log_file_path: '/var/log/libvirt/libvirtd.log' - config_dir_path: '/etc/libvirt' - conf_dir_path: '/etc/libvirt/conf.d' - log_dir_path: '/var/log/libvirt' - data_dir_path: '/var/lib/libvirt' - process_name: 'libvirtd' - process_user: 'root' - process_group: 'root' +libvirt::settings: + package_name: 'libvirt' + service_name: 'libvirtd' + config_file_path: '/etc/libvirt/libvirtd.conf' + pid_file_path: '/var/run/libvirt/network/default.pid' + log_file_path: '/var/log/libvirt/libvirtd.log' + config_dir_path: '/etc/libvirt' + conf_dir_path: '/etc/libvirt/conf.d' + log_dir_path: '/var/log/libvirt' + data_dir_path: '/var/lib/libvirt' + process_name: 'libvirtd' + process_user: 'root' + process_group: 'root' diff --git a/data/libvirt/osfamily/Debian.yaml b/data/libvirt/osfamily/Debian.yaml index 7b02e386..805b0765 100644 --- a/data/libvirt/osfamily/Debian.yaml +++ b/data/libvirt/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - libvirt::settings: - package_name: 'libvirt-bin' - service_name: 'libvirt-bin' - init_file_path: '/etc/default/libvirt-bin' +libvirt::settings: + package_name: 'libvirt-bin' + service_name: 'libvirt-bin' + init_file_path: '/etc/default/libvirt-bin' diff --git a/data/libvirt/osfamily/RedHat.yaml b/data/libvirt/osfamily/RedHat.yaml index 53fe1336..5f000f09 100644 --- a/data/libvirt/osfamily/RedHat.yaml +++ b/data/libvirt/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - libvirt::settings: - init_file_path: '/etc/sysconfig/libvirtd' +libvirt::settings: + init_file_path: '/etc/sysconfig/libvirtd' diff --git a/data/lighttpd/default.yaml b/data/lighttpd/default.yaml index 7e605d86..243f1ae6 100644 --- a/data/lighttpd/default.yaml +++ b/data/lighttpd/default.yaml @@ -1,16 +1,16 @@ --- - lighttpd::settings: - package_name: 'lighttpd' - service_name: 'lighttpd' - config_file_path: '/etc/lighttpd/lighttpd.conf' - init_file_path: '/etc/sysconfig/lighttpd' - pid_file_path: '/var/run/lighttpd.pid' - log_file_path: '/var/log/lighttpd/lighttpd.log' - config_dir_path: '/etc/lighttpd' - conf_dir_path: '/etc/lighttpd/conf.d' - log_dir_path: '/var/log/lighttpd' - data_dir_path: '/var/www' - tcp_port: '80' - process_name: 'lighttpd' - process_user: 'lighttpd' - process_group: 'lighttpd' +lighttpd::settings: + package_name: 'lighttpd' + service_name: 'lighttpd' + config_file_path: '/etc/lighttpd/lighttpd.conf' + init_file_path: '/etc/sysconfig/lighttpd' + pid_file_path: '/var/run/lighttpd.pid' + log_file_path: '/var/log/lighttpd/lighttpd.log' + config_dir_path: '/etc/lighttpd' + conf_dir_path: '/etc/lighttpd/conf.d' + log_dir_path: '/var/log/lighttpd' + data_dir_path: '/var/www' + tcp_port: '80' + process_name: 'lighttpd' + process_user: 'lighttpd' + process_group: 'lighttpd' diff --git a/data/lighttpd/osfamily/Debian.yaml b/data/lighttpd/osfamily/Debian.yaml index e2fd6f0b..b6fdd735 100644 --- a/data/lighttpd/osfamily/Debian.yaml +++ b/data/lighttpd/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - lighttpd::settings: - init_file_path: '/etc/default/lighttpd' - conf_dir_path: '/etc/lighttpd/conf-enabled' +lighttpd::settings: + init_file_path: '/etc/default/lighttpd' + conf_dir_path: '/etc/lighttpd/conf-enabled' diff --git a/data/logrotate/default.yaml b/data/logrotate/default.yaml index 12a6ea1c..635cd6c5 100644 --- a/data/logrotate/default.yaml +++ b/data/logrotate/default.yaml @@ -1,6 +1,6 @@ --- - logrotate::settings: - package_name: 'logrotate' - config_file_path: '/etc/logrotate.conf' - config_dir_path: '/etc/logrotate.d' - conf_dir_path: '/etc/logrotate.d' +logrotate::settings: + package_name: 'logrotate' + config_file_path: '/etc/logrotate.conf' + config_dir_path: '/etc/logrotate.d' + conf_dir_path: '/etc/logrotate.d' diff --git a/data/lsb-release/default.yaml b/data/lsb-release/default.yaml index 4accc495..9c00c3f3 100644 --- a/data/lsb-release/default.yaml +++ b/data/lsb-release/default.yaml @@ -1,3 +1,3 @@ --- - lsb-release::settings: - package_name: 'lsb-release' +lsb-release::settings: + package_name: 'lsb-release' diff --git a/data/lsb-release/osfamily/Debian.yaml b/data/lsb-release/osfamily/Debian.yaml index 4accc495..9c00c3f3 100644 --- a/data/lsb-release/osfamily/Debian.yaml +++ b/data/lsb-release/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - lsb-release::settings: - package_name: 'lsb-release' +lsb-release::settings: + package_name: 'lsb-release' diff --git a/data/lsb-release/osfamily/RedHat.yaml b/data/lsb-release/osfamily/RedHat.yaml index 24dd16a8..5846266e 100644 --- a/data/lsb-release/osfamily/RedHat.yaml +++ b/data/lsb-release/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - lsb-release::settings: - package_name: 'redhat-lsb' +lsb-release::settings: + package_name: 'redhat-lsb' diff --git a/data/lsb/default.yaml b/data/lsb/default.yaml index ef464670..b5fa46a2 100644 --- a/data/lsb/default.yaml +++ b/data/lsb/default.yaml @@ -1,3 +1,3 @@ --- - lsb::settings: - package_name: 'lsb' +lsb::settings: + package_name: 'lsb' diff --git a/data/lsb/osfamily/Debian.yaml b/data/lsb/osfamily/Debian.yaml index 4c2e17c5..ea2c8be9 100644 --- a/data/lsb/osfamily/Debian.yaml +++ b/data/lsb/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - lsb::settings: - package_name: 'lsb-base' +lsb::settings: + package_name: 'lsb-base' diff --git a/data/lsb/osfamily/RedHat.yaml b/data/lsb/osfamily/RedHat.yaml index d5a9461c..1461aad9 100644 --- a/data/lsb/osfamily/RedHat.yaml +++ b/data/lsb/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - lsb::settings: - package_name: 'redhat-lsb-core' +lsb::settings: + package_name: 'redhat-lsb-core' diff --git a/data/lsb/osfamily/Suse.yaml b/data/lsb/osfamily/Suse.yaml index 2c6752ce..6693fa42 100644 --- a/data/lsb/osfamily/Suse.yaml +++ b/data/lsb/osfamily/Suse.yaml @@ -1,3 +1,3 @@ --- - lsb::settings: - package_name: 'lsb-release' +lsb::settings: + package_name: 'lsb-release' diff --git a/data/lsof/default.yaml b/data/lsof/default.yaml index 8f7abf54..978a35d1 100644 --- a/data/lsof/default.yaml +++ b/data/lsof/default.yaml @@ -1,3 +1,3 @@ --- - lsof::settings: - package_name: 'lsof' +lsof::settings: + package_name: 'lsof' diff --git a/data/mailx/default.yaml b/data/mailx/default.yaml index a7622ac3..ef92c9c8 100644 --- a/data/mailx/default.yaml +++ b/data/mailx/default.yaml @@ -1,4 +1,4 @@ --- - mailx::settings: - package_name: 'mailx' - config_file_path: '/etc/mail.rc' +mailx::settings: + package_name: 'mailx' + config_file_path: '/etc/mail.rc' diff --git a/data/mailx/osfamily/Debian.yaml b/data/mailx/osfamily/Debian.yaml index 31b6ef8b..e7879426 100644 --- a/data/mailx/osfamily/Debian.yaml +++ b/data/mailx/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - mailx::settings: - package_name: 'bsd-mailx' +mailx::settings: + package_name: 'bsd-mailx' diff --git a/data/make/default.yaml b/data/make/default.yaml index 4992c512..37a403e5 100644 --- a/data/make/default.yaml +++ b/data/make/default.yaml @@ -1,3 +1,3 @@ --- - make::settings: - package_name: 'make' +make::settings: + package_name: 'make' diff --git a/data/mariadb/default.yaml b/data/mariadb/default.yaml index 230618ff..6c4fb463 100644 --- a/data/mariadb/default.yaml +++ b/data/mariadb/default.yaml @@ -1,15 +1,15 @@ --- - mariadb::settings: - package_name: 'mariadb' - service_name: 'mariadb' - config_file_path: '/etc/my.cnf' - server_file_path: '/etc/my.cnf.d/server.cnf' - config_dir_path: '/etc/my.cnf.d' - pid_file_path: '/var/run/mariadb.pid' - log_file_path: '/var/log/mariadb/mariadb.log' - log_dir_path: '/var/log/mariadb' - data_dir_path: '/var/lib/mysql' - process_name: 'mysqld' - process_user: 'mysql' - process_group: 'mysql' - tcp_port: '3306' +mariadb::settings: + package_name: 'mariadb' + service_name: 'mariadb' + config_file_path: '/etc/my.cnf' + server_file_path: '/etc/my.cnf.d/server.cnf' + config_dir_path: '/etc/my.cnf.d' + pid_file_path: '/var/run/mariadb.pid' + log_file_path: '/var/log/mariadb/mariadb.log' + log_dir_path: '/var/log/mariadb' + data_dir_path: '/var/lib/mysql' + process_name: 'mysqld' + process_user: 'mysql' + process_group: 'mysql' + tcp_port: '3306' diff --git a/data/mariadb/osfamily/Debian.yaml b/data/mariadb/osfamily/Debian.yaml index c7b1332b..e42efcc1 100644 --- a/data/mariadb/osfamily/Debian.yaml +++ b/data/mariadb/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - mariadb::settings: - package_name: 'mariadb-server' - init_file_path: '/etc/default/mysql' +mariadb::settings: + package_name: 'mariadb-server' + init_file_path: '/etc/default/mysql' diff --git a/data/mariadb/osfamily/RedHat.yaml b/data/mariadb/osfamily/RedHat.yaml index 903be669..cf39e9ac 100644 --- a/data/mariadb/osfamily/RedHat.yaml +++ b/data/mariadb/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - mariadb::settings: - package_name: 'mariadb-server' - init_file_path: '/etc/sysconfig/mariadb' +mariadb::settings: + package_name: 'mariadb-server' + init_file_path: '/etc/sysconfig/mariadb' diff --git a/data/mcollective/default.yaml b/data/mcollective/default.yaml index b5bb7785..9beb842c 100644 --- a/data/mcollective/default.yaml +++ b/data/mcollective/default.yaml @@ -1,12 +1,12 @@ --- - mcollective::settings: - package_name: 'mcollective' - service_name: 'mcollective' - config_file_path: '/etc/mcollective/server.cfg' - config_dir_path: '/etc/mcollective' - pid_file_path: '/var/run/mcollective.pid' - log_file_path: '/var/log/mcollective.log' - log_dir_path: '/var/log/mcollective' - process_user: 'mcollective' - process_group: 'mcollective' - tcp_port: '61613' +mcollective::settings: + package_name: 'mcollective' + service_name: 'mcollective' + config_file_path: '/etc/mcollective/server.cfg' + config_dir_path: '/etc/mcollective' + pid_file_path: '/var/run/mcollective.pid' + log_file_path: '/var/log/mcollective.log' + log_dir_path: '/var/log/mcollective' + process_user: 'mcollective' + process_group: 'mcollective' + tcp_port: '61613' diff --git a/data/mcollective/hiera.yaml b/data/mcollective/hiera.yaml index b8dc1a89..dfd3d93f 100644 --- a/data/mcollective/hiera.yaml +++ b/data/mcollective/hiera.yaml @@ -1,5 +1,5 @@ --- - :hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - default +:hierarchy: + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - default diff --git a/data/mcollective/osfamily/Debian.yaml b/data/mcollective/osfamily/Debian.yaml index 3c177aca..72553135 100644 --- a/data/mcollective/osfamily/Debian.yaml +++ b/data/mcollective/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - mcollective::settings: - process_name: 'mcollectived' - init_file_path: '/etc/default/mcollective' - data_dir_path: '/usr/share/mcollective' +mcollective::settings: + process_name: 'mcollectived' + init_file_path: '/etc/default/mcollective' + data_dir_path: '/usr/share/mcollective' diff --git a/data/mcollective/osfamily/RedHat.yaml b/data/mcollective/osfamily/RedHat.yaml index 26a68012..018d0cc2 100644 --- a/data/mcollective/osfamily/RedHat.yaml +++ b/data/mcollective/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - mcollective::settings: - process_name: 'ruby' - process_extra_name: 'mcollectived' - data_dir_path: '/usr/libexec/mcollective' - init_file_path: '/etc/sysconfig/mcollective' +mcollective::settings: + process_name: 'ruby' + process_extra_name: 'mcollectived' + data_dir_path: '/usr/libexec/mcollective' + init_file_path: '/etc/sysconfig/mcollective' diff --git a/data/mdadm/default.yaml b/data/mdadm/default.yaml index cf61e96b..514a127f 100644 --- a/data/mdadm/default.yaml +++ b/data/mdadm/default.yaml @@ -1,10 +1,10 @@ --- - mdadm::settings: - package_name: 'mdadm' - service_name: 'mdadm' - config_file_path: '/etc/mdadm/mdadm.conf' - config_dir_path: '/etc/mdadm' - pid_file_path: '/run/mdadm/monitor.pid' - process_name: 'mdadm' - process_user: 'root' - process_group: 'root' +mdadm::settings: + package_name: 'mdadm' + service_name: 'mdadm' + config_file_path: '/etc/mdadm/mdadm.conf' + config_dir_path: '/etc/mdadm' + pid_file_path: '/run/mdadm/monitor.pid' + process_name: 'mdadm' + process_user: 'root' + process_group: 'root' diff --git a/data/memcached/default.yaml b/data/memcached/default.yaml index 9eff64d1..673c1385 100644 --- a/data/memcached/default.yaml +++ b/data/memcached/default.yaml @@ -1,12 +1,12 @@ --- - memcached::settings: - package_name: 'memcached' - service_name: 'memcached' - config_file_path: '/etc/memcached.conf' - pid_file_path: '/var/run/memcached.pid' - log_file_path: '/var/log/memcached/memcached.log' - log_dir_path: '/var/log/memcached' - process_name: 'memcached' - process_user: 'memcached' - process_group: 'memcached' - tcp_port: '11211' +memcached::settings: + package_name: 'memcached' + service_name: 'memcached' + config_file_path: '/etc/memcached.conf' + pid_file_path: '/var/run/memcached.pid' + log_file_path: '/var/log/memcached/memcached.log' + log_dir_path: '/var/log/memcached' + process_name: 'memcached' + process_user: 'memcached' + process_group: 'memcached' + tcp_port: '11211' diff --git a/data/memcached/osfamily/Debian.yaml b/data/memcached/osfamily/Debian.yaml index 7d8dc934..76fa64a3 100644 --- a/data/memcached/osfamily/Debian.yaml +++ b/data/memcached/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - memcached::settings: - init_file_path: '/etc/default/memcached' +memcached::settings: + init_file_path: '/etc/default/memcached' diff --git a/data/memcached/osfamily/RedHat.yaml b/data/memcached/osfamily/RedHat.yaml index 000dfd4a..45a78427 100644 --- a/data/memcached/osfamily/RedHat.yaml +++ b/data/memcached/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - memcached::settings: - config_file_path: '/etc/sysconfig/memcached' - init_file_path: '/etc/sysconfig/memcached' +memcached::settings: + config_file_path: '/etc/sysconfig/memcached' + init_file_path: '/etc/sysconfig/memcached' diff --git a/data/microsoft_repo/default.yaml b/data/microsoft_repo/default.yaml index b34c4ecd..d19f2c00 100644 --- a/data/microsoft_repo/default.yaml +++ b/data/microsoft_repo/default.yaml @@ -1,4 +1,3 @@ --- microsoft_repo::settings: upstream_repo: true - \ No newline at end of file diff --git a/data/mlocate/default.yaml b/data/mlocate/default.yaml index db3c1173..00199f8e 100644 --- a/data/mlocate/default.yaml +++ b/data/mlocate/default.yaml @@ -1,3 +1,3 @@ --- - mlocate::settings: - package_name: 'mlocate' +mlocate::settings: + package_name: 'mlocate' diff --git a/data/mongodb-mms-automation-agent/default.yaml b/data/mongodb-mms-automation-agent/default.yaml index b415cb6b..c13e9e54 100644 --- a/data/mongodb-mms-automation-agent/default.yaml +++ b/data/mongodb-mms-automation-agent/default.yaml @@ -1,12 +1,12 @@ --- - mongodb-mms-automation-agent::settings: - package_name: 'mongodb-mms-automation-agent' - service_name: 'mongodb-mms-automation-agent' - config_file_path: '/etc/mongodb-mms/automation-agent.config' - pid_file_path: '/var/run/mongodb-mms-automation-agent.pid' - log_file_path: '/var/log/mongodb-mms/automation-agent.log' - config_dir_path: '/etc/mongodb-mms' - log_dir_path: '/var/log/mongodb-mms' - process_name: 'mongodb-mms-automation-agent' - process_user: 'mongodb-mms-agent' - process_group: 'mongodb-mms-agent' +mongodb-mms-automation-agent::settings: + package_name: 'mongodb-mms-automation-agent' + service_name: 'mongodb-mms-automation-agent' + config_file_path: '/etc/mongodb-mms/automation-agent.config' + pid_file_path: '/var/run/mongodb-mms-automation-agent.pid' + log_file_path: '/var/log/mongodb-mms/automation-agent.log' + config_dir_path: '/etc/mongodb-mms' + log_dir_path: '/var/log/mongodb-mms' + process_name: 'mongodb-mms-automation-agent' + process_user: 'mongodb-mms-agent' + process_group: 'mongodb-mms-agent' diff --git a/data/mongodb-mms-automation-agent/osfamily/Debian.yaml b/data/mongodb-mms-automation-agent/osfamily/Debian.yaml index 5f7ba7f5..286a9c6e 100644 --- a/data/mongodb-mms-automation-agent/osfamily/Debian.yaml +++ b/data/mongodb-mms-automation-agent/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - mongodb-mms-automation-agent::settings: - init_file_path: '/etc/init/mongodb-mms-automation-agent.conf' +mongodb-mms-automation-agent::settings: + init_file_path: '/etc/init/mongodb-mms-automation-agent.conf' diff --git a/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml b/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml index 4e4d2127..306c2f02 100644 --- a/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml +++ b/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - mongodb-mms-automation-agent::settings: - init_file_path: '/etc/sysconfig/mongodb-mms-automation-agent' +mongodb-mms-automation-agent::settings: + init_file_path: '/etc/sysconfig/mongodb-mms-automation-agent' diff --git a/data/mongodb-mms-backup-agent/default.yaml b/data/mongodb-mms-backup-agent/default.yaml index e1a01667..7510ce42 100644 --- a/data/mongodb-mms-backup-agent/default.yaml +++ b/data/mongodb-mms-backup-agent/default.yaml @@ -1,12 +1,12 @@ --- - mongodb-mms-backup-agent::settings: - package_name: 'mongodb-mms-backup-agent' - service_name: 'mongodb-mms-backup-agent' - config_file_path: '/etc/mongodb-mms/backup-agent.config' - pid_file_path: '/var/run/mongodb-mms-backup-agent.pid' - log_file_path: '/var/log/mongodb-mms/backup-agent.log' - config_dir_path: '/etc/mongodb-mms' - log_dir_path: '/var/log/mongodb-mms' - process_name: 'mongodb-mms-backup-agent' - process_user: 'mongodb-mms-agent' - process_group: 'mongodb-mms-agent' +mongodb-mms-backup-agent::settings: + package_name: 'mongodb-mms-backup-agent' + service_name: 'mongodb-mms-backup-agent' + config_file_path: '/etc/mongodb-mms/backup-agent.config' + pid_file_path: '/var/run/mongodb-mms-backup-agent.pid' + log_file_path: '/var/log/mongodb-mms/backup-agent.log' + config_dir_path: '/etc/mongodb-mms' + log_dir_path: '/var/log/mongodb-mms' + process_name: 'mongodb-mms-backup-agent' + process_user: 'mongodb-mms-agent' + process_group: 'mongodb-mms-agent' diff --git a/data/mongodb-mms-backup-agent/osfamily/Debian.yaml b/data/mongodb-mms-backup-agent/osfamily/Debian.yaml index 86f49aad..631a9a71 100644 --- a/data/mongodb-mms-backup-agent/osfamily/Debian.yaml +++ b/data/mongodb-mms-backup-agent/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - mongodb-mms-backup-agent::settings: - init_file_path: '/etc/init/mongodb-mms-backup-agent.conf' +mongodb-mms-backup-agent::settings: + init_file_path: '/etc/init/mongodb-mms-backup-agent.conf' diff --git a/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml b/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml index 2d57c183..d5fc978d 100644 --- a/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml +++ b/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - mongodb-mms-backup-agent::settings: - init_file_path: '/etc/sysconfig/mongodb-mms-backup-agent' +mongodb-mms-backup-agent::settings: + init_file_path: '/etc/sysconfig/mongodb-mms-backup-agent' diff --git a/data/mongodb-mms-monitoring-agent/default.yaml b/data/mongodb-mms-monitoring-agent/default.yaml index 947b79f5..1edbb199 100644 --- a/data/mongodb-mms-monitoring-agent/default.yaml +++ b/data/mongodb-mms-monitoring-agent/default.yaml @@ -1,12 +1,12 @@ --- - mongodb-mms-monitoring-agent::settings: - package_name: 'mongodb-mms-monitoring-agent' - service_name: 'mongodb-mms-monitoring-agent' - config_file_path: '/etc/mongodb-mms/monitoring-agent.config' - pid_file_path: '/var/run/mongodb-mms-monitoring-agent.pid' - log_file_path: '/var/log/mongodb-mms/monitoring-agent.log' - config_dir_path: '/etc/mongodb-mms' - log_dir_path: '/var/log/mongodb-mms' - process_name: 'mongodb-mms-monitoring-agent' - process_user: 'mongodb-mms-agent' - process_group: 'mongodb-mms-agent' +mongodb-mms-monitoring-agent::settings: + package_name: 'mongodb-mms-monitoring-agent' + service_name: 'mongodb-mms-monitoring-agent' + config_file_path: '/etc/mongodb-mms/monitoring-agent.config' + pid_file_path: '/var/run/mongodb-mms-monitoring-agent.pid' + log_file_path: '/var/log/mongodb-mms/monitoring-agent.log' + config_dir_path: '/etc/mongodb-mms' + log_dir_path: '/var/log/mongodb-mms' + process_name: 'mongodb-mms-monitoring-agent' + process_user: 'mongodb-mms-agent' + process_group: 'mongodb-mms-agent' diff --git a/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml b/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml index 0faf6c8c..4856737d 100644 --- a/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml +++ b/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - mongodb-mms-monitoring-agent::settings: - init_file_path: '/etc/init/mongodb-mms-monitoring-agent.conf' +mongodb-mms-monitoring-agent::settings: + init_file_path: '/etc/init/mongodb-mms-monitoring-agent.conf' diff --git a/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml b/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml index 609bc5c4..bdc1de0f 100644 --- a/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml +++ b/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - mongodb-mms-monitoring-agent::settings: - init_file_path: '/etc/sysconfig/mongodb-mms-monitoring-agent' +mongodb-mms-monitoring-agent::settings: + init_file_path: '/etc/sysconfig/mongodb-mms-monitoring-agent' diff --git a/data/mongodb-mms/default.yaml b/data/mongodb-mms/default.yaml index 81b88ac4..58b5ba10 100644 --- a/data/mongodb-mms/default.yaml +++ b/data/mongodb-mms/default.yaml @@ -1,12 +1,12 @@ --- - mongodb-mms::settings: - package_name: 'mongodb-mms' - service_name: 'mongodb-mms' - config_file_path: '/opt/mongodb/mms/conf/mms.conf' - log_file_path: '/opt/mongodb/mms/logs/daemon.log' - pid_file_path: '/opt/mongodb/mms/tmp/mms-0.pid' - config_dir_path: '/opt/mongodb/mms/conf' - log_dir_path: '/opt/mongodb/mms/logs' - process_name: 'mongodb-mms' - process_user: 'mongodb-mms-agent' - process_group: 'mongodb-mms-agent' +mongodb-mms::settings: + package_name: 'mongodb-mms' + service_name: 'mongodb-mms' + config_file_path: '/opt/mongodb/mms/conf/mms.conf' + log_file_path: '/opt/mongodb/mms/logs/daemon.log' + pid_file_path: '/opt/mongodb/mms/tmp/mms-0.pid' + config_dir_path: '/opt/mongodb/mms/conf' + log_dir_path: '/opt/mongodb/mms/logs' + process_name: 'mongodb-mms' + process_user: 'mongodb-mms-agent' + process_group: 'mongodb-mms-agent' diff --git a/data/mongodb-mms/osfamily/Debian.yaml b/data/mongodb-mms/osfamily/Debian.yaml index 929ee16e..4eee375c 100644 --- a/data/mongodb-mms/osfamily/Debian.yaml +++ b/data/mongodb-mms/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - mongodb-mms::settings: - init_file_path: '/etc/init/mongodb-mms.conf' +mongodb-mms::settings: + init_file_path: '/etc/init/mongodb-mms.conf' diff --git a/data/mongodb-mms/osfamily/RedHat.yaml b/data/mongodb-mms/osfamily/RedHat.yaml index 6e7d1221..ffa94310 100644 --- a/data/mongodb-mms/osfamily/RedHat.yaml +++ b/data/mongodb-mms/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - mongodb-mms::settings: - init_file_path: '/etc/sysconfig/mongodb-mms' +mongodb-mms::settings: + init_file_path: '/etc/sysconfig/mongodb-mms' diff --git a/data/mongodb/osfamily/Debian.yaml b/data/mongodb/osfamily/Debian.yaml index af08a1c7..8521ea2d 100644 --- a/data/mongodb/osfamily/Debian.yaml +++ b/data/mongodb/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - mongodb::settings: - pid_file_path: '/var/run/mongodb/mongodb.pid' - init_file_path: '/etc/default/mongodb' +mongodb::settings: + pid_file_path: '/var/run/mongodb/mongodb.pid' + init_file_path: '/etc/default/mongodb' diff --git a/data/mongodb/osfamily/RedHat.yaml b/data/mongodb/osfamily/RedHat.yaml index 754477c2..03944b74 100644 --- a/data/mongodb/osfamily/RedHat.yaml +++ b/data/mongodb/osfamily/RedHat.yaml @@ -1,9 +1,8 @@ --- - mongodb::settings: - service_name: 'mongod' - init_file_path: '/etc/sysconfig/mongod' - config_file_path: '/etc/mongod.conf' - pid_file_path: '/var/run/mongodb/mongod.pid' - log_file_path: '/var/log/mongodb/mongod.log' - data_dir_path: '/var/lib/mongodb' - +mongodb::settings: + service_name: 'mongod' + init_file_path: '/etc/sysconfig/mongod' + config_file_path: '/etc/mongod.conf' + pid_file_path: '/var/run/mongodb/mongod.pid' + log_file_path: '/var/log/mongodb/mongod.log' + data_dir_path: '/var/lib/mongodb' diff --git a/data/monit/default.yaml b/data/monit/default.yaml index 352f7f3c..94afef16 100644 --- a/data/monit/default.yaml +++ b/data/monit/default.yaml @@ -1,13 +1,13 @@ --- - monit::settings: - package_name: 'monit' - service_name: 'monit' - config_file_path: '/etc/monit.conf' - config_file_mode: '0600' - config_dir_path: '/etc/monit' - conf_dir_path: '/etc/monit.d' - pid_file_path: '/var/run/monit.pid' - log_file_path: '/var/log/monit.log' - process_name: 'monit' - process_user: 'root' - process_group: 'root' +monit::settings: + package_name: 'monit' + service_name: 'monit' + config_file_path: '/etc/monit.conf' + config_file_mode: '0600' + config_dir_path: '/etc/monit' + conf_dir_path: '/etc/monit.d' + pid_file_path: '/var/run/monit.pid' + log_file_path: '/var/log/monit.log' + process_name: 'monit' + process_user: 'root' + process_group: 'root' diff --git a/data/monit/osfamily/Debian.yaml b/data/monit/osfamily/Debian.yaml index 3d70c57f..8ba77c84 100644 --- a/data/monit/osfamily/Debian.yaml +++ b/data/monit/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - monit::settings: - config_file_path: '/etc/monit/monitrc' - conf_dir_path: '/etc/monit/conf.d' - init_file_path: '/etc/default/monit' +monit::settings: + config_file_path: '/etc/monit/monitrc' + conf_dir_path: '/etc/monit/conf.d' + init_file_path: '/etc/default/monit' diff --git a/data/monit/osfamily/RedHat.yaml b/data/monit/osfamily/RedHat.yaml index 9915a8df..2b9be5d5 100644 --- a/data/monit/osfamily/RedHat.yaml +++ b/data/monit/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - monit::settings: - init_file_path: '/etc/sysconfig/monit' +monit::settings: + init_file_path: '/etc/sysconfig/monit' diff --git a/data/motd/default.yaml b/data/motd/default.yaml index c6479134..1ecdf5b1 100644 --- a/data/motd/default.yaml +++ b/data/motd/default.yaml @@ -1,3 +1,3 @@ --- - motd::settings: - config_file_path: '/etc/motd' +motd::settings: + config_file_path: '/etc/motd' diff --git a/data/motd/lsbdistcodename/wheezy.yaml b/data/motd/lsbdistcodename/wheezy.yaml index c6479134..1ecdf5b1 100644 --- a/data/motd/lsbdistcodename/wheezy.yaml +++ b/data/motd/lsbdistcodename/wheezy.yaml @@ -1,3 +1,3 @@ --- - motd::settings: - config_file_path: '/etc/motd' +motd::settings: + config_file_path: '/etc/motd' diff --git a/data/motd/operatingsystem/Debian.yaml b/data/motd/operatingsystem/Debian.yaml index 748dd033..1ea08202 100644 --- a/data/motd/operatingsystem/Debian.yaml +++ b/data/motd/operatingsystem/Debian.yaml @@ -1,3 +1,3 @@ --- - motd::settings: - config_file_path: '/etc/motd.last' +motd::settings: + config_file_path: '/etc/motd.last' diff --git a/data/motd/operatingsystem/Solaris.yaml b/data/motd/operatingsystem/Solaris.yaml index 030133e6..9b3a7469 100644 --- a/data/motd/operatingsystem/Solaris.yaml +++ b/data/motd/operatingsystem/Solaris.yaml @@ -1,3 +1,3 @@ --- - motd::settings: - config_file_group: 'sys' +motd::settings: + config_file_group: 'sys' diff --git a/data/msmtp/default.yaml b/data/msmtp/default.yaml index b71d7f26..cc7740e7 100644 --- a/data/msmtp/default.yaml +++ b/data/msmtp/default.yaml @@ -1,6 +1,6 @@ --- - msmtp::settings: - package_name: 'msmtp' - config_file_path: '/etc/msmtprc' - process_user: 'msmtp' - process_group: 'msmtp' +msmtp::settings: + package_name: 'msmtp' + config_file_path: '/etc/msmtprc' + process_user: 'msmtp' + process_group: 'msmtp' diff --git a/data/msmtp/osfamily/Debian.yaml b/data/msmtp/osfamily/Debian.yaml index ea4aa27e..d17af271 100644 --- a/data/msmtp/osfamily/Debian.yaml +++ b/data/msmtp/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - msmtp::settings: - package_name: 'msmtp-mta' +msmtp::settings: + package_name: 'msmtp-mta' diff --git a/data/multipath/default.yaml b/data/multipath/default.yaml index 5c1e856c..0b50a084 100644 --- a/data/multipath/default.yaml +++ b/data/multipath/default.yaml @@ -1,10 +1,10 @@ --- - multipath::settings: - package_name: 'multipath' - service_name: 'multipathd' - config_file_path: '/etc/multipath/multipath.conf' - config_dir_path: '/etc/multipath' - pid_file_path: '/var/run/multipathd.pid' - process_name: 'multipathd' - process_user: 'root' - process_group: 'root' +multipath::settings: + package_name: 'multipath' + service_name: 'multipathd' + config_file_path: '/etc/multipath/multipath.conf' + config_dir_path: '/etc/multipath' + pid_file_path: '/var/run/multipathd.pid' + process_name: 'multipathd' + process_user: 'root' + process_group: 'root' diff --git a/data/multipath/osfamily/Debian.yaml b/data/multipath/osfamily/Debian.yaml index 2e858fcb..44b3e965 100644 --- a/data/multipath/osfamily/Debian.yaml +++ b/data/multipath/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - multipath::settings: - package_name: 'multipath-tools' - service_name: 'multipath-tools' - config_file_path: '/etc/multipath.conf' - init_file_path: '/etc/default/multipath-tools' +multipath::settings: + package_name: 'multipath-tools' + service_name: 'multipath-tools' + config_file_path: '/etc/multipath.conf' + init_file_path: '/etc/default/multipath-tools' diff --git a/data/multipath/osfamily/RedHat.yaml b/data/multipath/osfamily/RedHat.yaml index 78d99be0..c95f374a 100644 --- a/data/multipath/osfamily/RedHat.yaml +++ b/data/multipath/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - multipath::settings: - package_name: 'device-mapper-multipath' - service_name: 'multipathd' - init_file_path: '/etc/sysconfig/multipath' - config_file_path: '/etc/multipath.conf' +multipath::settings: + package_name: 'device-mapper-multipath' + service_name: 'multipathd' + init_file_path: '/etc/sysconfig/multipath' + config_file_path: '/etc/multipath.conf' diff --git a/data/multipath/osfamily/Suse.yaml b/data/multipath/osfamily/Suse.yaml index bfa7fb93..be2026c9 100644 --- a/data/multipath/osfamily/Suse.yaml +++ b/data/multipath/osfamily/Suse.yaml @@ -1,4 +1,4 @@ --- - multipath::settings: - package_name: 'multipath-tools' - service_name: 'multipath-tools' \ No newline at end of file +multipath::settings: + package_name: 'multipath-tools' + service_name: 'multipath-tools' \ No newline at end of file diff --git a/data/multitail/default.yaml b/data/multitail/default.yaml index f8deeac1..02d09fb0 100644 --- a/data/multitail/default.yaml +++ b/data/multitail/default.yaml @@ -1,3 +1,3 @@ --- - multitail::settings: - package_name: 'multitail' +multitail::settings: + package_name: 'multitail' diff --git a/data/munin-node/default.yaml b/data/munin-node/default.yaml index 382c0761..7252286f 100644 --- a/data/munin-node/default.yaml +++ b/data/munin-node/default.yaml @@ -1,16 +1,16 @@ --- - munin-node::settings: - package_name: 'munin-node' - service_name: 'munin-node' - config_file_path: '/etc/munin/munin-node.conf' - config_dir_path: '/etc/munin' - conf_dir_path: '/etc/munin/munin-conf.d' - plugins_conf_dir_path: '/etc/munin/plugin-conf.d' - plugins_dir_path: '/usr/share/munin/plugins' - pid_file_path: '/var/run/munin/munin-node.pid' - log_file_path: '/var/log/munin/munin.log' - log_dir_path: '/var/log/munin' - process_name: 'munin-node' - process_user: 'munin' - process_group: 'munin' - tcp_port: '4949' +munin-node::settings: + package_name: 'munin-node' + service_name: 'munin-node' + config_file_path: '/etc/munin/munin-node.conf' + config_dir_path: '/etc/munin' + conf_dir_path: '/etc/munin/munin-conf.d' + plugins_conf_dir_path: '/etc/munin/plugin-conf.d' + plugins_dir_path: '/usr/share/munin/plugins' + pid_file_path: '/var/run/munin/munin-node.pid' + log_file_path: '/var/log/munin/munin.log' + log_dir_path: '/var/log/munin' + process_name: 'munin-node' + process_user: 'munin' + process_group: 'munin' + tcp_port: '4949' diff --git a/data/munin-node/osfamily/Debian.yaml b/data/munin-node/osfamily/Debian.yaml index b38ce6ac..1550b638 100644 --- a/data/munin-node/osfamily/Debian.yaml +++ b/data/munin-node/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - munin-node::settings: - init_file_path: '/etc/default/munin' +munin-node::settings: + init_file_path: '/etc/default/munin' diff --git a/data/munin-node/osfamily/OpenBSD.yaml b/data/munin-node/osfamily/OpenBSD.yaml index cb6f1575..ae82b8c8 100644 --- a/data/munin-node/osfamily/OpenBSD.yaml +++ b/data/munin-node/osfamily/OpenBSD.yaml @@ -1,3 +1,3 @@ --- - munin-node::settings: - log_file_path: '/var/log/munin/munin-node.log' +munin-node::settings: + log_file_path: '/var/log/munin/munin-node.log' diff --git a/data/munin-node/osfamily/RedHat.yaml b/data/munin-node/osfamily/RedHat.yaml index 96bc4b8a..2517d463 100644 --- a/data/munin-node/osfamily/RedHat.yaml +++ b/data/munin-node/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - munin-node::settings: - log_file_path: '/var/log/munin-node/munin-node.log' - init_file_path: '/etc/sysconfig/munin' +munin-node::settings: + log_file_path: '/var/log/munin-node/munin-node.log' + init_file_path: '/etc/sysconfig/munin' diff --git a/data/munin/default.yaml b/data/munin/default.yaml index 4e0445b3..933eb87d 100644 --- a/data/munin/default.yaml +++ b/data/munin/default.yaml @@ -1,8 +1,8 @@ --- - munin::settings: - package_name: 'munin' - config_file_path: '/etc/munin/munin.conf' - config_dir_path: '/etc/munin' - conf_dir_path: '/etc/munin/munin.d' - log_file_path: '/var/log/munin/munin.log' - log_dir_path: '/var/log/munin' +munin::settings: + package_name: 'munin' + config_file_path: '/etc/munin/munin.conf' + config_dir_path: '/etc/munin' + conf_dir_path: '/etc/munin/munin.d' + log_file_path: '/var/log/munin/munin.log' + log_dir_path: '/var/log/munin' diff --git a/data/munin/osfamily/Debian.yaml b/data/munin/osfamily/Debian.yaml index 5314eee4..96537fd9 100644 --- a/data/munin/osfamily/Debian.yaml +++ b/data/munin/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - munin::settings: - www_dir_path: '/var/cache/munin/www' +munin::settings: + www_dir_path: '/var/cache/munin/www' diff --git a/data/munin/osfamily/RedHat.yaml b/data/munin/osfamily/RedHat.yaml index a451067e..997cce49 100644 --- a/data/munin/osfamily/RedHat.yaml +++ b/data/munin/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - munin::settings: - www_dir_path: '/var/www/html/munin' +munin::settings: + www_dir_path: '/var/www/html/munin' diff --git a/data/mysql/default.yaml b/data/mysql/default.yaml index a0eb2ae2..2f90cb4a 100644 --- a/data/mysql/default.yaml +++ b/data/mysql/default.yaml @@ -1,14 +1,14 @@ --- - mysql::settings: - package_name: 'mysql-server' - service_name: 'mysql' - config_file_path: '/etc/mysql/my.cnf' - config_dir_path: '/etc/mysql' - data_dir_path: '/var/lib/mysql' - pid_file_path: '/var/run/mysqld/mysqld.pid' - log_file_path: '/var/log/mysql.log' - log_dir_path: '/var/log/mysql' - process_name: 'mysqld' - process_user: 'mysql' - process_group: 'mysql' - tcp_port: '3306' +mysql::settings: + package_name: 'mysql-server' + service_name: 'mysql' + config_file_path: '/etc/mysql/my.cnf' + config_dir_path: '/etc/mysql' + data_dir_path: '/var/lib/mysql' + pid_file_path: '/var/run/mysqld/mysqld.pid' + log_file_path: '/var/log/mysql.log' + log_dir_path: '/var/log/mysql' + process_name: 'mysqld' + process_user: 'mysql' + process_group: 'mysql' + tcp_port: '3306' diff --git a/data/mysql/osfamily/Debian.yaml b/data/mysql/osfamily/Debian.yaml index 6fa77d03..e9bfa309 100644 --- a/data/mysql/osfamily/Debian.yaml +++ b/data/mysql/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - mysql::settings: - init_file_path: '/etc/default/mysql' +mysql::settings: + init_file_path: '/etc/default/mysql' diff --git a/data/mysql/osfamily/FreeBSD.yaml b/data/mysql/osfamily/FreeBSD.yaml index 406df2ca..da32ca8e 100644 --- a/data/mysql/osfamily/FreeBSD.yaml +++ b/data/mysql/osfamily/FreeBSD.yaml @@ -1,6 +1,6 @@ --- - mysql::settings: - package_name: 'databases/mysql56-server' - service_name: 'mysql-server' - config_file_path: '/etc/my.cnf' +mysql::settings: + package_name: 'databases/mysql56-server' + service_name: 'mysql-server' + config_file_path: '/etc/my.cnf' diff --git a/data/mysql/osfamily/RedHat.yaml b/data/mysql/osfamily/RedHat.yaml index ef381c06..704c4455 100644 --- a/data/mysql/osfamily/RedHat.yaml +++ b/data/mysql/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - mysql::settings: - service_name: 'mysqld' - config_file_path: '/etc/my.cnf' - init_file_path: '/etc/sysconfig/mysqld' +mysql::settings: + service_name: 'mysqld' + config_file_path: '/etc/my.cnf' + init_file_path: '/etc/sysconfig/mysqld' diff --git a/data/nagios/default.yaml b/data/nagios/default.yaml index a0fc0fcc..01718491 100644 --- a/data/nagios/default.yaml +++ b/data/nagios/default.yaml @@ -1,12 +1,12 @@ --- - nagios::settings: - package_name: 'nagios' - service_name: 'nagios' - config_file_path: '/etc/nagios/nagios.cfg' - config_dir_path: '/etc/nagios' - pid_file_path: '/var/run/nagios.pid' - log_file_path: '/var/log/nagios/nagios.log' - log_dir_path: '/var/log/nagios' - process_name: 'nagios' - process_user: 'nagios' - process_group: 'nagios' +nagios::settings: + package_name: 'nagios' + service_name: 'nagios' + config_file_path: '/etc/nagios/nagios.cfg' + config_dir_path: '/etc/nagios' + pid_file_path: '/var/run/nagios.pid' + log_file_path: '/var/log/nagios/nagios.log' + log_dir_path: '/var/log/nagios' + process_name: 'nagios' + process_user: 'nagios' + process_group: 'nagios' diff --git a/data/nagios/osfamily/Debian.yaml b/data/nagios/osfamily/Debian.yaml index 007a9f9e..d8847557 100644 --- a/data/nagios/osfamily/Debian.yaml +++ b/data/nagios/osfamily/Debian.yaml @@ -1,13 +1,13 @@ --- - nagios::settings: - package_name: 'nagios3' - service_name: 'nagios3' - config_file_path: '/etc/nagios3/nagios.cfg' - config_dir_path: '/etc/nagios3' - pid_file_path: '/var/run/nagios3/nagios3.pid' - log_file_path: '/var/log/nagios3/nagios.log' - log_dir_path: '/var/log/nagios3' - process_name: 'nagios3' - process_user: 'nagios' - process_group: 'nagios' - init_file_path: '/etc/default/nagios3' +nagios::settings: + package_name: 'nagios3' + service_name: 'nagios3' + config_file_path: '/etc/nagios3/nagios.cfg' + config_dir_path: '/etc/nagios3' + pid_file_path: '/var/run/nagios3/nagios3.pid' + log_file_path: '/var/log/nagios3/nagios.log' + log_dir_path: '/var/log/nagios3' + process_name: 'nagios3' + process_user: 'nagios' + process_group: 'nagios' + init_file_path: '/etc/default/nagios3' diff --git a/data/nagios/osfamily/RedHat.yaml b/data/nagios/osfamily/RedHat.yaml index 355b3a6d..6ece78b3 100644 --- a/data/nagios/osfamily/RedHat.yaml +++ b/data/nagios/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - nagios::settings: - config_file_mode: '0664' - config_file_owner: 'nagios' - config_file_group: 'nagios' - init_file_path: '/etc/sysconfig/nagios' +nagios::settings: + config_file_mode: '0664' + config_file_owner: 'nagios' + config_file_group: 'nagios' + init_file_path: '/etc/sysconfig/nagios' diff --git a/data/nano/default.yaml b/data/nano/default.yaml index 1ad8747b..43e949bc 100644 --- a/data/nano/default.yaml +++ b/data/nano/default.yaml @@ -1,3 +1,3 @@ --- - nano::settings: - package_name: 'nano' +nano::settings: + package_name: 'nano' diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index 6c5fea46..dace912e 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -11,7 +11,7 @@ nats-server::settings: config_file_path: '/etc/nats/nats-server.conf' config_dir_path: '/etc/nats' -# tp 4 settings + # tp 4 settings install_method: 'file' description: 'NATS is an open-source, high-performance, cloud native messaging system.' docker_image: 'nats' diff --git a/data/newrelic/default.yaml b/data/newrelic/default.yaml index 471fadfc..bd26659b 100644 --- a/data/newrelic/default.yaml +++ b/data/newrelic/default.yaml @@ -1,12 +1,12 @@ --- - newrelic::settings: - package_name: 'newrelic-sysmond' - service_name: 'newrelic-sysmond' - config_file_path: '/etc/newrelic/nrsysmond.cfg' - config_dir_path: '/etc/newrelic' - pid_file_path: '/var/run/nrsysmond.pid' - log_file_path: '/var/log/newrelic/nrsysmond.log' - log_dir_path: '/var/log/newrelic' - process_name: 'nrsysmond' - process_user: 'newrelic' - process_group: 'newrelic' +newrelic::settings: + package_name: 'newrelic-sysmond' + service_name: 'newrelic-sysmond' + config_file_path: '/etc/newrelic/nrsysmond.cfg' + config_dir_path: '/etc/newrelic' + pid_file_path: '/var/run/nrsysmond.pid' + log_file_path: '/var/log/newrelic/nrsysmond.log' + log_dir_path: '/var/log/newrelic' + process_name: 'nrsysmond' + process_user: 'newrelic' + process_group: 'newrelic' diff --git a/data/newrelic/osfamily/Debian.yaml b/data/newrelic/osfamily/Debian.yaml index 3d829177..6474e6f7 100644 --- a/data/newrelic/osfamily/Debian.yaml +++ b/data/newrelic/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - newrelic::settings: - init_file_path: '/etc/default/newrelic-nrsysmond' +newrelic::settings: + init_file_path: '/etc/default/newrelic-nrsysmond' diff --git a/data/newrelic/osfamily/RedHat.yaml b/data/newrelic/osfamily/RedHat.yaml index 6024e2e8..30cf0b53 100644 --- a/data/newrelic/osfamily/RedHat.yaml +++ b/data/newrelic/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - newrelic::settings: - init_file_path: '/etc/sysconfig/newrelic-sysmond' +newrelic::settings: + init_file_path: '/etc/sysconfig/newrelic-sysmond' diff --git a/data/nfs-client/default.yaml b/data/nfs-client/default.yaml index bb8ce3c2..cd690cb8 100644 --- a/data/nfs-client/default.yaml +++ b/data/nfs-client/default.yaml @@ -1,3 +1,3 @@ --- - nfs-client::settings: - service_name: 'rpcbind' +nfs-client::settings: + service_name: 'rpcbind' diff --git a/data/nfs-client/osfamily/Debian.yaml b/data/nfs-client/osfamily/Debian.yaml index 9525f5cc..b6da9d4a 100644 --- a/data/nfs-client/osfamily/Debian.yaml +++ b/data/nfs-client/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - nfs-client::settings: - package_name: 'nfs-common' - init_file_path: '/etc/default/nfs-common' +nfs-client::settings: + package_name: 'nfs-common' + init_file_path: '/etc/default/nfs-common' diff --git a/data/nfs-client/osfamily/RedHat.yaml b/data/nfs-client/osfamily/RedHat.yaml index 49d62550..2619d144 100644 --- a/data/nfs-client/osfamily/RedHat.yaml +++ b/data/nfs-client/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - nfs-client::settings: - package_name: 'nfs-utils' - init_file_path: '/etc/sysconfig/nfs-common' +nfs-client::settings: + package_name: 'nfs-utils' + init_file_path: '/etc/sysconfig/nfs-common' diff --git a/data/nfs-client/osfamily/Suse.yaml b/data/nfs-client/osfamily/Suse.yaml index e1e2b814..21372140 100644 --- a/data/nfs-client/osfamily/Suse.yaml +++ b/data/nfs-client/osfamily/Suse.yaml @@ -1,4 +1,4 @@ --- - nfs-client::settings: - package_name: 'nfs-client' - init_file_path: '/etc/sysconfig/nfs-client' +nfs-client::settings: + package_name: 'nfs-client' + init_file_path: '/etc/sysconfig/nfs-client' diff --git a/data/nfs-server/default.yaml b/data/nfs-server/default.yaml index 3c89a6d7..0a36be0a 100644 --- a/data/nfs-server/default.yaml +++ b/data/nfs-server/default.yaml @@ -1,4 +1,4 @@ --- - nfs-server::settings: - config_file_path: '/etc/exports' - tcp_port: '2049' +nfs-server::settings: + config_file_path: '/etc/exports' + tcp_port: '2049' diff --git a/data/nfs-server/osfamily/Debian.yaml b/data/nfs-server/osfamily/Debian.yaml index 4dd71dfb..a4683ab8 100644 --- a/data/nfs-server/osfamily/Debian.yaml +++ b/data/nfs-server/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - nfs-server::settings: - package_name: 'nfs-kernel-server' - service_name: 'nfs-kernel-server' +nfs-server::settings: + package_name: 'nfs-kernel-server' + service_name: 'nfs-kernel-server' diff --git a/data/nfs-server/osfamily/RedHat.yaml b/data/nfs-server/osfamily/RedHat.yaml index bbceb5ef..b5744e8d 100644 --- a/data/nfs-server/osfamily/RedHat.yaml +++ b/data/nfs-server/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - nfs-server::settings: - service_name: 'nfs-server' - init_file_path: '/etc/sysconfig/nfs' +nfs-server::settings: + service_name: 'nfs-server' + init_file_path: '/etc/sysconfig/nfs' diff --git a/data/nfs-server/osfamily/RedHat6.yaml b/data/nfs-server/osfamily/RedHat6.yaml index 67bdb833..4a27ed3a 100644 --- a/data/nfs-server/osfamily/RedHat6.yaml +++ b/data/nfs-server/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- - nfs-server::settings: - service_name: 'nfs' +nfs-server::settings: + service_name: 'nfs' diff --git a/data/nfs-server/osfamily/Suse.yaml b/data/nfs-server/osfamily/Suse.yaml index 4dd71dfb..a4683ab8 100644 --- a/data/nfs-server/osfamily/Suse.yaml +++ b/data/nfs-server/osfamily/Suse.yaml @@ -1,4 +1,4 @@ --- - nfs-server::settings: - package_name: 'nfs-kernel-server' - service_name: 'nfs-kernel-server' +nfs-server::settings: + package_name: 'nfs-kernel-server' + service_name: 'nfs-kernel-server' diff --git a/data/nfs/default.yaml b/data/nfs/default.yaml index 5794f445..1228bd18 100644 --- a/data/nfs/default.yaml +++ b/data/nfs/default.yaml @@ -1,9 +1,9 @@ --- - nfs::settings: - service_name: 'nfs' - config_file_path: '/etc/exports' - pid_file_path: '/var/run/nfs.pid' - process_name: 'nfs' - process_user: 'root' - process_group: 'root' - tcp_port: '2049' +nfs::settings: + service_name: 'nfs' + config_file_path: '/etc/exports' + pid_file_path: '/var/run/nfs.pid' + process_name: 'nfs' + process_user: 'root' + process_group: 'root' + tcp_port: '2049' diff --git a/data/nfs/osfamily/Debian.yaml b/data/nfs/osfamily/Debian.yaml index 8ecb256a..208de89d 100644 --- a/data/nfs/osfamily/Debian.yaml +++ b/data/nfs/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - nfs::settings: - package_name: 'nfs-kernel-server' - service_name: 'nfs-kernel-server' - init_file_path: '/etc/default/nfs' +nfs::settings: + package_name: 'nfs-kernel-server' + service_name: 'nfs-kernel-server' + init_file_path: '/etc/default/nfs' diff --git a/data/nfs/osfamily/RedHat.yaml b/data/nfs/osfamily/RedHat.yaml index 092df8ad..ff56ee22 100644 --- a/data/nfs/osfamily/RedHat.yaml +++ b/data/nfs/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - nfs::settings: - package_name: 'nfs-utils' - process_name: 'nfsd' - init_file_path: '/etc/sysconfig/nfs' +nfs::settings: + package_name: 'nfs-utils' + process_name: 'nfsd' + init_file_path: '/etc/sysconfig/nfs' diff --git a/data/nginx/default.yaml b/data/nginx/default.yaml index f42831d0..19a626e5 100644 --- a/data/nginx/default.yaml +++ b/data/nginx/default.yaml @@ -1,22 +1,22 @@ --- - nginx::settings: - package_name: 'nginx' - service_name: 'nginx' - config_file_path: '/etc/nginx/nginx.conf' - init_file_path: '/etc/sysconfig/nginx' - pid_file_path: '/var/run/nginx.pid' - log_file_path: - - '/var/log/nginx/access.log' - - '/var/log/nginx/error.log' - config_dir_path: '/etc/nginx' - conf_dir_path: '/etc/nginx/conf.d' - log_dir_path: '/var/log/nginx' - data_dir_path: '/usr/share/nginx/html' - tcp_port: '80' - process_name: 'nginx' - process_user: 'nginx' - process_group: 'nginx' - nodaemon_args: -g 'daemon off;' - validate_cmd: - config: 'nginx -t -c %' - version_command: 'nginx -v' +nginx::settings: + package_name: 'nginx' + service_name: 'nginx' + config_file_path: '/etc/nginx/nginx.conf' + init_file_path: '/etc/sysconfig/nginx' + pid_file_path: '/var/run/nginx.pid' + log_file_path: + - '/var/log/nginx/access.log' + - '/var/log/nginx/error.log' + config_dir_path: '/etc/nginx' + conf_dir_path: '/etc/nginx/conf.d' + log_dir_path: '/var/log/nginx' + data_dir_path: '/usr/share/nginx/html' + tcp_port: '80' + process_name: 'nginx' + process_user: 'nginx' + process_group: 'nginx' + nodaemon_args: -g 'daemon off;' + validate_cmd: + config: 'nginx -t -c %' + version_command: 'nginx -v' diff --git a/data/nginx/osfamily/Debian.yaml b/data/nginx/osfamily/Debian.yaml index 85c9d659..4413ce07 100644 --- a/data/nginx/osfamily/Debian.yaml +++ b/data/nginx/osfamily/Debian.yaml @@ -1,9 +1,9 @@ --- - nginx::settings: - init_file_path: '/etc/default/nginx' - process_user: 'www-data' - process_group: 'www-data' - mods-available_dir_path: '/etc/nginx/modules-available' - mods-enabled_dir_path: '/etc/nginx/modules-enabled' - sites-available_dir_path: '/etc/nginx/sites-available' - sites-enabled_dir_path: '/etc/nginx/sites-enabled' +nginx::settings: + init_file_path: '/etc/default/nginx' + process_user: 'www-data' + process_group: 'www-data' + mods-available_dir_path: '/etc/nginx/modules-available' + mods-enabled_dir_path: '/etc/nginx/modules-enabled' + sites-available_dir_path: '/etc/nginx/sites-available' + sites-enabled_dir_path: '/etc/nginx/sites-enabled' diff --git a/data/nodejs/upstream/osfamily/Debian.yaml b/data/nodejs/upstream/osfamily/Debian.yaml index f71cd28f..1009a859 100644 --- a/data/nodejs/upstream/osfamily/Debian.yaml +++ b/data/nodejs/upstream/osfamily/Debian.yaml @@ -5,4 +5,4 @@ nodejs::settings: command: 'curl -L https://deb.nodesource.com/setup_lts.x | bash' unless: 'dpkg -qa | grep nodesource-release' package_prerequisites: - - build-essential + - build-essential diff --git a/data/nodejs/upstream/osfamily/RedHat.yaml b/data/nodejs/upstream/osfamily/RedHat.yaml index 1639e09f..3246460b 100644 --- a/data/nodejs/upstream/osfamily/RedHat.yaml +++ b/data/nodejs/upstream/osfamily/RedHat.yaml @@ -9,5 +9,3 @@ nodejs::settings: - make tp_prerequisites: - epel - - diff --git a/data/nomad-enterprise/default.yaml b/data/nomad-enterprise/default.yaml index bef6aeae..ba10b22c 100644 --- a/data/nomad-enterprise/default.yaml +++ b/data/nomad-enterprise/default.yaml @@ -12,5 +12,3 @@ nomad-enterprise::settings: - 4646 - 4647 - 4648 - - diff --git a/data/nomad-enterprise/upstream/default.yaml b/data/nomad-enterprise/upstream/default.yaml index 1b533aae..49fdb76a 100644 --- a/data/nomad-enterprise/upstream/default.yaml +++ b/data/nomad-enterprise/upstream/default.yaml @@ -1,4 +1,4 @@ --- nomad-enterprise::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} diff --git a/data/nova/default.yaml b/data/nova/default.yaml index 25bc3f92..cdca1352 100644 --- a/data/nova/default.yaml +++ b/data/nova/default.yaml @@ -1,9 +1,9 @@ --- - nova::settings: - config_file_path: '/etc/nova/nova.conf' - config_dir_path: '/etc/nova' - log_file_path: '/var/log/nova/nova.log' - log_dir_path: '/var/log/nova' - process_name: 'nova' - process_user: 'nova' - process_group: 'nova' +nova::settings: + config_file_path: '/etc/nova/nova.conf' + config_dir_path: '/etc/nova' + log_file_path: '/var/log/nova/nova.log' + log_dir_path: '/var/log/nova' + process_name: 'nova' + process_user: 'nova' + process_group: 'nova' diff --git a/data/nova/osfamily/Debian.yaml b/data/nova/osfamily/Debian.yaml index 90c05413..6eacf387 100644 --- a/data/nova/osfamily/Debian.yaml +++ b/data/nova/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - nova::settings: - package_name: - - 'python-nova' - - 'nova-common' - init_file_path: '/etc/default/nova' +nova::settings: + package_name: + - 'python-nova' + - 'nova-common' + init_file_path: '/etc/default/nova' diff --git a/data/nova/osfamily/RedHat.yaml b/data/nova/osfamily/RedHat.yaml index 7414685a..2e57c575 100644 --- a/data/nova/osfamily/RedHat.yaml +++ b/data/nova/osfamily/RedHat.yaml @@ -1,7 +1,6 @@ --- - nova::settings: - package_name: - - 'python-nova' - - 'openstack-nova-common' - init_file_path: '/etc/sysconfig/nova' - +nova::settings: + package_name: + - 'python-nova' + - 'openstack-nova-common' + init_file_path: '/etc/sysconfig/nova' diff --git a/data/nrpe/default.yaml b/data/nrpe/default.yaml index 06d964bc..5a0ee888 100644 --- a/data/nrpe/default.yaml +++ b/data/nrpe/default.yaml @@ -1,12 +1,12 @@ --- - nrpe::settings: - package_name: 'nrpe' - service_name: 'nrpe' - config_file_path: '/etc/nagios/nrpe.cfg' - config_dir_path: '/etc/nrpe.d' - conf_dir_path: '/etc/nrpe.d' - pid_file_path: '/var/run/nrpe.pid' - process_name: 'nrpe' - process_user: 'nrpe' - process_group: 'nrpe' - tcp_port: '5666' +nrpe::settings: + package_name: 'nrpe' + service_name: 'nrpe' + config_file_path: '/etc/nagios/nrpe.cfg' + config_dir_path: '/etc/nrpe.d' + conf_dir_path: '/etc/nrpe.d' + pid_file_path: '/var/run/nrpe.pid' + process_name: 'nrpe' + process_user: 'nrpe' + process_group: 'nrpe' + tcp_port: '5666' diff --git a/data/nrpe/osfamily/Debian.yaml b/data/nrpe/osfamily/Debian.yaml index 52a33757..ba612ece 100644 --- a/data/nrpe/osfamily/Debian.yaml +++ b/data/nrpe/osfamily/Debian.yaml @@ -1,9 +1,9 @@ --- - nrpe::settings: - package_name: 'nagios-nrpe-server' - service_name: 'nagios-nrpe-server' - config_dir_path: '/etc/nagios/nrpe.d' - conf_dir_path: '/etc/nagios/nrpe.d' - process_user: 'nagios' - pid_file_path: '/var/run/nagios/nrpe.pid' - init_file_path: '/etc/default/nagios-nrpe-server' +nrpe::settings: + package_name: 'nagios-nrpe-server' + service_name: 'nagios-nrpe-server' + config_dir_path: '/etc/nagios/nrpe.d' + conf_dir_path: '/etc/nagios/nrpe.d' + process_user: 'nagios' + pid_file_path: '/var/run/nagios/nrpe.pid' + init_file_path: '/etc/default/nagios-nrpe-server' diff --git a/data/nrpe/osfamily/OpenBSD.yaml b/data/nrpe/osfamily/OpenBSD.yaml index b9fb0a11..b61ed3d0 100644 --- a/data/nrpe/osfamily/OpenBSD.yaml +++ b/data/nrpe/osfamily/OpenBSD.yaml @@ -1,5 +1,5 @@ --- - nrpe::settings: - process_user: '_nrpe' - pid_file_path: '/var/run/nrpe/nrpe.pid' - service_name: 'nagios-nrpe-server' +nrpe::settings: + process_user: '_nrpe' + pid_file_path: '/var/run/nrpe/nrpe.pid' + service_name: 'nagios-nrpe-server' diff --git a/data/nrpe/osfamily/RedHat.yaml b/data/nrpe/osfamily/RedHat.yaml index 6c468afc..11fdd90f 100644 --- a/data/nrpe/osfamily/RedHat.yaml +++ b/data/nrpe/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - nrpe::settings: - pid_file_path: '/var/run/nrpe/nrpe.pid' - init_file_path: '/etc/sysconfig/nrpe' +nrpe::settings: + pid_file_path: '/var/run/nrpe/nrpe.pid' + init_file_path: '/etc/sysconfig/nrpe' diff --git a/data/nrpe/osfamily/Solaris.yaml b/data/nrpe/osfamily/Solaris.yaml index 5e2bc2f8..92118dcb 100644 --- a/data/nrpe/osfamily/Solaris.yaml +++ b/data/nrpe/osfamily/Solaris.yaml @@ -1,9 +1,9 @@ --- - nrpe::settings: - service_name: 'cswnrpe' - process_user: 'nagios' - config_file_path: '/etc/opt/csw/nrpe.cfg' - config_dir_path: '/etc/opt/csw/nrpe.d' - conf_dir_path: '/etc/opt/csw/nrpe.d' - init_file_path: '/etc/opt/csw/nrpe-init' - pid_file_path: '/var/run/nrpe.pid' +nrpe::settings: + service_name: 'cswnrpe' + process_user: 'nagios' + config_file_path: '/etc/opt/csw/nrpe.cfg' + config_dir_path: '/etc/opt/csw/nrpe.d' + conf_dir_path: '/etc/opt/csw/nrpe.d' + init_file_path: '/etc/opt/csw/nrpe-init' + pid_file_path: '/var/run/nrpe.pid' diff --git a/data/ntp/default.yaml b/data/ntp/default.yaml index fedb23ee..a49dc334 100644 --- a/data/ntp/default.yaml +++ b/data/ntp/default.yaml @@ -1,12 +1,12 @@ --- - ntp::settings: - package_name: 'ntp' - service_name: 'ntp' - config_file_path: '/etc/ntp.conf' - config_dir_path: '/etc/ntp' - conf_dir_path: '/etc/ntp/conf.d' - pid_file_path: '/var/run/ntpd.pid' - process_name: 'ntpd' - process_user: 'ntp' - process_group: 'ntp' - udp_port: '123' +ntp::settings: + package_name: 'ntp' + service_name: 'ntp' + config_file_path: '/etc/ntp.conf' + config_dir_path: '/etc/ntp' + conf_dir_path: '/etc/ntp/conf.d' + pid_file_path: '/var/run/ntpd.pid' + process_name: 'ntpd' + process_user: 'ntp' + process_group: 'ntp' + udp_port: '123' diff --git a/data/ntp/osfamily/Debian.yaml b/data/ntp/osfamily/Debian.yaml index e8c03e3b..a63a831e 100644 --- a/data/ntp/osfamily/Debian.yaml +++ b/data/ntp/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - ntp::settings: - init_file_path: '/etc/default/ntp' +ntp::settings: + init_file_path: '/etc/default/ntp' diff --git a/data/ntp/osfamily/RedHat.yaml b/data/ntp/osfamily/RedHat.yaml index bcd614bd..ce8ecaa1 100644 --- a/data/ntp/osfamily/RedHat.yaml +++ b/data/ntp/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - ntp::settings: - service_name: 'ntpd' - init_file_path: '/etc/sysconfig/ntpd' +ntp::settings: + service_name: 'ntpd' + init_file_path: '/etc/sysconfig/ntpd' diff --git a/data/ntp/osfamily/Suse.yaml b/data/ntp/osfamily/Suse.yaml index b5758bac..90d58b4a 100644 --- a/data/ntp/osfamily/Suse.yaml +++ b/data/ntp/osfamily/Suse.yaml @@ -1,4 +1,4 @@ --- - ntp::settings: - config_file_mode: '0640' - config_file_group: 'ntp' +ntp::settings: + config_file_mode: '0640' + config_file_group: 'ntp' diff --git a/data/ntpdate/default.yaml b/data/ntpdate/default.yaml index 8ee55217..ca66ecaa 100644 --- a/data/ntpdate/default.yaml +++ b/data/ntpdate/default.yaml @@ -1,3 +1,3 @@ --- - ntpdate::settings: - package_name: 'ntpdate' +ntpdate::settings: + package_name: 'ntpdate' diff --git a/data/ntpdate/osfamily/RedHat8.yaml b/data/ntpdate/osfamily/RedHat8.yaml index 2395c902..de722d50 100644 --- a/data/ntpdate/osfamily/RedHat8.yaml +++ b/data/ntpdate/osfamily/RedHat8.yaml @@ -1,3 +1,3 @@ --- - ntpdate::settings: - package_name: '' +ntpdate::settings: + package_name: '' diff --git a/data/nuclei/default.yaml b/data/nuclei/default.yaml index d6d85c82..b4896d8a 100644 --- a/data/nuclei/default.yaml +++ b/data/nuclei/default.yaml @@ -9,7 +9,7 @@ nuclei::settings: validate_cmd: 'nuclei' config_dir_path: '$HOME/.config/nuclei' -# tp 4 settings + # tp 4 settings install_method: 'file' description: 'Fast and customizable vulnerability scanner based on simple YAML based DSL.' docker_image: 'projectdiscovery/nuclei' diff --git a/data/octocatalog-diff/default.yaml b/data/octocatalog-diff/default.yaml index 71e46cd8..b6ad964f 100644 --- a/data/octocatalog-diff/default.yaml +++ b/data/octocatalog-diff/default.yaml @@ -1,11 +1,11 @@ --- - octocatalog-diff::settings: - package_name: 'octocatalog-diff' - package_provider: 'gem' - config_file_path: '/etc/octocatalog-diff.cfg.rb' - tp_prerequisites: - - ruby - - ruby-dev - - make - package_prerequisites: - - cmake +octocatalog-diff::settings: + package_name: 'octocatalog-diff' + package_provider: 'gem' + config_file_path: '/etc/octocatalog-diff.cfg.rb' + tp_prerequisites: + - ruby + - ruby-dev + - make + package_prerequisites: + - cmake diff --git a/data/octocatalog-diff/osfamily/Debian.yaml b/data/octocatalog-diff/osfamily/Debian.yaml index ce3fdffe..bac9fa36 100644 --- a/data/octocatalog-diff/osfamily/Debian.yaml +++ b/data/octocatalog-diff/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - octocatalog-diff::settings: - package_prerequisites: - - cmake - - pkgconf +octocatalog-diff::settings: + package_prerequisites: + - cmake + - pkgconf diff --git a/data/openjdk-jdk/default.yaml b/data/openjdk-jdk/default.yaml index 52e9caea..73a13816 100644 --- a/data/openjdk-jdk/default.yaml +++ b/data/openjdk-jdk/default.yaml @@ -1,2 +1,2 @@ --- - openjdk-jdk::settings: +openjdk-jdk::settings: diff --git a/data/openjdk-jdk/operatingsystem/Debian9.yaml b/data/openjdk-jdk/operatingsystem/Debian9.yaml index 3c63bcd2..56c5de50 100644 --- a/data/openjdk-jdk/operatingsystem/Debian9.yaml +++ b/data/openjdk-jdk/operatingsystem/Debian9.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-8-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-8-jdk' diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu.yaml index 3c63bcd2..56c5de50 100644 --- a/data/openjdk-jdk/operatingsystem/Ubuntu.yaml +++ b/data/openjdk-jdk/operatingsystem/Ubuntu.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-8-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-8-jdk' diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml index d6cbb7b6..24d78536 100644 --- a/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml +++ b/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-6-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-6-jdk' diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml index d6cbb7b6..24d78536 100644 --- a/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml +++ b/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-6-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-6-jdk' diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml index 3c63bcd2..56c5de50 100644 --- a/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml +++ b/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-8-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-8-jdk' diff --git a/data/openjdk-jdk/osfamily/Debian.yaml b/data/openjdk-jdk/osfamily/Debian.yaml index 4a0acb47..77015955 100644 --- a/data/openjdk-jdk/osfamily/Debian.yaml +++ b/data/openjdk-jdk/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-7-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-7-jdk' diff --git a/data/openjdk-jdk/osfamily/Debian15.10.yaml b/data/openjdk-jdk/osfamily/Debian15.10.yaml index 3c63bcd2..56c5de50 100644 --- a/data/openjdk-jdk/osfamily/Debian15.10.yaml +++ b/data/openjdk-jdk/osfamily/Debian15.10.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-8-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-8-jdk' diff --git a/data/openjdk-jdk/osfamily/Debian5.yaml b/data/openjdk-jdk/osfamily/Debian5.yaml index d6cbb7b6..24d78536 100644 --- a/data/openjdk-jdk/osfamily/Debian5.yaml +++ b/data/openjdk-jdk/osfamily/Debian5.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-6-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-6-jdk' diff --git a/data/openjdk-jdk/osfamily/Debian6.yaml b/data/openjdk-jdk/osfamily/Debian6.yaml index d6cbb7b6..24d78536 100644 --- a/data/openjdk-jdk/osfamily/Debian6.yaml +++ b/data/openjdk-jdk/osfamily/Debian6.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'openjdk-6-jdk' +openjdk-jdk::settings: + package_name: 'openjdk-6-jdk' diff --git a/data/openjdk-jdk/osfamily/OpenBSD.yaml b/data/openjdk-jdk/osfamily/OpenBSD.yaml index 72299d4b..bcd437d0 100644 --- a/data/openjdk-jdk/osfamily/OpenBSD.yaml +++ b/data/openjdk-jdk/osfamily/OpenBSD.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'jdk' +openjdk-jdk::settings: + package_name: 'jdk' diff --git a/data/openjdk-jdk/osfamily/RedHat6.yaml b/data/openjdk-jdk/osfamily/RedHat6.yaml index 9eaeef4e..6c0668bd 100644 --- a/data/openjdk-jdk/osfamily/RedHat6.yaml +++ b/data/openjdk-jdk/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'java-1.6.0-openjdk-devel' +openjdk-jdk::settings: + package_name: 'java-1.6.0-openjdk-devel' diff --git a/data/openjdk-jdk/osfamily/RedHat7.yaml b/data/openjdk-jdk/osfamily/RedHat7.yaml index a1ef2fb2..e2912741 100644 --- a/data/openjdk-jdk/osfamily/RedHat7.yaml +++ b/data/openjdk-jdk/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- - openjdk-jdk::settings: - package_name: 'java-1.8.0-openjdk-devel' +openjdk-jdk::settings: + package_name: 'java-1.8.0-openjdk-devel' diff --git a/data/openjdk-jre/default.yaml b/data/openjdk-jre/default.yaml index ea5fd7c8..6e8b29bd 100644 --- a/data/openjdk-jre/default.yaml +++ b/data/openjdk-jre/default.yaml @@ -1,2 +1,2 @@ --- - openjdk-jre::settings: +openjdk-jre::settings: diff --git a/data/openjdk-jre/operatingsystem/Debian9.yaml b/data/openjdk-jre/operatingsystem/Debian9.yaml index a682bc33..0a8e92b4 100644 --- a/data/openjdk-jre/operatingsystem/Debian9.yaml +++ b/data/openjdk-jre/operatingsystem/Debian9.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-8-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-8-jre-headless' diff --git a/data/openjdk-jre/operatingsystem/Ubuntu.yaml b/data/openjdk-jre/operatingsystem/Ubuntu.yaml index a682bc33..0a8e92b4 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-8-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-8-jre-headless' diff --git a/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml b/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml index 2d2abfe4..4998ec06 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-6-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-6-jre-headless' diff --git a/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml b/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml index 2d2abfe4..4998ec06 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-6-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-6-jre-headless' diff --git a/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml b/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml index a682bc33..0a8e92b4 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-8-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-8-jre-headless' diff --git a/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml b/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml index a682bc33..0a8e92b4 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-8-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-8-jre-headless' diff --git a/data/openjdk-jre/osfamily/Debian.yaml b/data/openjdk-jre/osfamily/Debian.yaml index 11ef473c..aabb5dc4 100644 --- a/data/openjdk-jre/osfamily/Debian.yaml +++ b/data/openjdk-jre/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-7-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-7-jre-headless' diff --git a/data/openjdk-jre/osfamily/Debian5.yaml b/data/openjdk-jre/osfamily/Debian5.yaml index 2d2abfe4..4998ec06 100644 --- a/data/openjdk-jre/osfamily/Debian5.yaml +++ b/data/openjdk-jre/osfamily/Debian5.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-6-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-6-jre-headless' diff --git a/data/openjdk-jre/osfamily/Debian6.yaml b/data/openjdk-jre/osfamily/Debian6.yaml index 2d2abfe4..4998ec06 100644 --- a/data/openjdk-jre/osfamily/Debian6.yaml +++ b/data/openjdk-jre/osfamily/Debian6.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'openjdk-6-jre-headless' +openjdk-jre::settings: + package_name: 'openjdk-6-jre-headless' diff --git a/data/openjdk-jre/osfamily/OpenBSD.yaml b/data/openjdk-jre/osfamily/OpenBSD.yaml index 01eb29be..87423fc8 100644 --- a/data/openjdk-jre/osfamily/OpenBSD.yaml +++ b/data/openjdk-jre/osfamily/OpenBSD.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'jre' +openjdk-jre::settings: + package_name: 'jre' diff --git a/data/openjdk-jre/osfamily/RedHat6.yaml b/data/openjdk-jre/osfamily/RedHat6.yaml index 2eb060cd..434202f8 100644 --- a/data/openjdk-jre/osfamily/RedHat6.yaml +++ b/data/openjdk-jre/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'java-1.6.0-openjdk' +openjdk-jre::settings: + package_name: 'java-1.6.0-openjdk' diff --git a/data/openjdk-jre/osfamily/RedHat7.yaml b/data/openjdk-jre/osfamily/RedHat7.yaml index 88a83c06..46210d09 100644 --- a/data/openjdk-jre/osfamily/RedHat7.yaml +++ b/data/openjdk-jre/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'java-1.8.0-openjdk' +openjdk-jre::settings: + package_name: 'java-1.8.0-openjdk' diff --git a/data/openjdk-jre/osfamily/Suse.yaml b/data/openjdk-jre/osfamily/Suse.yaml index 54b711b3..561cbb1c 100644 --- a/data/openjdk-jre/osfamily/Suse.yaml +++ b/data/openjdk-jre/osfamily/Suse.yaml @@ -1,3 +1,3 @@ --- - openjdk-jre::settings: - package_name: 'java-1_7_0-openjdk' +openjdk-jre::settings: + package_name: 'java-1_7_0-openjdk' diff --git a/data/openntpd/default.yaml b/data/openntpd/default.yaml index 9e9c1f2b..c4c5399c 100644 --- a/data/openntpd/default.yaml +++ b/data/openntpd/default.yaml @@ -1,12 +1,12 @@ --- - openntpd::settings: - package_name: 'openntpd' - service_name: 'openntpd' - config_file_path: '/etc/openntpd/ntpd.conf' - init_file_path: '/etc/sysconfig/openntpd' - pid_file_path: '/var/run/openntpd.pid' - config_dir_path: '/etc/openntpd' - udp_port: '123' - process_name: 'ntpd' - process_user: 'openntpd' - process_group: 'openntpd' +openntpd::settings: + package_name: 'openntpd' + service_name: 'openntpd' + config_file_path: '/etc/openntpd/ntpd.conf' + init_file_path: '/etc/sysconfig/openntpd' + pid_file_path: '/var/run/openntpd.pid' + config_dir_path: '/etc/openntpd' + udp_port: '123' + process_name: 'ntpd' + process_user: 'openntpd' + process_group: 'openntpd' diff --git a/data/openntpd/osfamily/Debian.yaml b/data/openntpd/osfamily/Debian.yaml index 0b66d2cb..9bbebacd 100644 --- a/data/openntpd/osfamily/Debian.yaml +++ b/data/openntpd/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - openntpd::settings: - init_file_path: '/etc/default/openntpd' +openntpd::settings: + init_file_path: '/etc/default/openntpd' diff --git a/data/openntpd/osfamily/OpenBSD.yaml b/data/openntpd/osfamily/OpenBSD.yaml index 8ccdc9a7..0a3ba0bd 100644 --- a/data/openntpd/osfamily/OpenBSD.yaml +++ b/data/openntpd/osfamily/OpenBSD.yaml @@ -1,9 +1,9 @@ --- - openntpd::settings: - package_name: '' - service_name: 'ntpd' - config_file_path: '/etc/ntpd.conf' - init_file_path: '' - config_dir_path: '' - process_user: '_ntp' - process_group: '_ntp' +openntpd::settings: + package_name: '' + service_name: 'ntpd' + config_file_path: '/etc/ntpd.conf' + init_file_path: '' + config_dir_path: '' + process_user: '_ntp' + process_group: '_ntp' diff --git a/data/openswan/default.yaml b/data/openswan/default.yaml index c026c412..2ff64042 100644 --- a/data/openswan/default.yaml +++ b/data/openswan/default.yaml @@ -1,18 +1,18 @@ --- - openswan::settings: - package_name: 'openswan' - service_name: 'ipsec' - config_file_path: '/etc/ipsec.conf' - secrets_file_path: '/etc/ipsec.secrets' - config_dir_path: '/etc/ipsec.d' - connections_dir_path: '/etc/ipsec.d/connections' - secrets_dir_path: '/etc/ipsec.d/secrets' - udp_port: - - '500' - - '4500' - process_name: 'pluto' - process_user: 'root' - process_group: 'root' - pid_file_path: '/var/run/pluto' - log_file_path: '/var/log/pluto/peer' - log_dir_path: '/var/log/pluto' +openswan::settings: + package_name: 'openswan' + service_name: 'ipsec' + config_file_path: '/etc/ipsec.conf' + secrets_file_path: '/etc/ipsec.secrets' + config_dir_path: '/etc/ipsec.d' + connections_dir_path: '/etc/ipsec.d/connections' + secrets_dir_path: '/etc/ipsec.d/secrets' + udp_port: + - '500' + - '4500' + process_name: 'pluto' + process_user: 'root' + process_group: 'root' + pid_file_path: '/var/run/pluto' + log_file_path: '/var/log/pluto/peer' + log_dir_path: '/var/log/pluto' diff --git a/data/openvpn/default.yaml b/data/openvpn/default.yaml index 56acf740..c2557c34 100644 --- a/data/openvpn/default.yaml +++ b/data/openvpn/default.yaml @@ -1,13 +1,13 @@ --- - openvpn::settings: - package_name: 'openvpn' - service_name: 'openvpn' - config_file_path: '/etc/openvpn/openvpn.conf' - config_dir_path: '/etc/openvpn' - pid_file_path: '/var/run/openvpn.pid' - log_file_path: '/var/log/openvpn/openvpn.log' - log_dir_path: '/var/log/openvpn' - process_name: 'openvpn' - process_user: 'openvpn' - process_group: 'openvpn' - tcp_port: '1194' +openvpn::settings: + package_name: 'openvpn' + service_name: 'openvpn' + config_file_path: '/etc/openvpn/openvpn.conf' + config_dir_path: '/etc/openvpn' + pid_file_path: '/var/run/openvpn.pid' + log_file_path: '/var/log/openvpn/openvpn.log' + log_dir_path: '/var/log/openvpn' + process_name: 'openvpn' + process_user: 'openvpn' + process_group: 'openvpn' + tcp_port: '1194' diff --git a/data/openvpn/osfamily/Debian.yaml b/data/openvpn/osfamily/Debian.yaml index 0077b737..ff206d48 100644 --- a/data/openvpn/osfamily/Debian.yaml +++ b/data/openvpn/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - openvpn::settings: - process_user: 'nobody' - init_file_path: '/etc/default/openvpn' +openvpn::settings: + process_user: 'nobody' + init_file_path: '/etc/default/openvpn' diff --git a/data/openvpn/osfamily/RedHat.yaml b/data/openvpn/osfamily/RedHat.yaml index b9fe88ac..e4447a78 100644 --- a/data/openvpn/osfamily/RedHat.yaml +++ b/data/openvpn/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - openvpn::settings: - init_file_path: '/etc/sysconfig/openvpn' +openvpn::settings: + init_file_path: '/etc/sysconfig/openvpn' diff --git a/data/openvswitch/default.yaml b/data/openvswitch/default.yaml index 108eea1e..660ff2a7 100644 --- a/data/openvswitch/default.yaml +++ b/data/openvswitch/default.yaml @@ -1,12 +1,12 @@ --- - openvswitch::settings: - package_name: 'openvswitch-switch' - service_name: 'openvswitch-switch' - config_dir_path: '/etc/openvswitch' - conf_dir_path: '/etc/openvswitch/conf.d' - pid_file_path: '/var/run/openvswitch.pid' - log_file_path: '/var/log/openvswitch/openvswitch.log' - log_dir_path: '/var/log/openvswitch' - process_name: 'openvswitch' - process_user: 'openvswitch' - process_group: 'openvswitch' +openvswitch::settings: + package_name: 'openvswitch-switch' + service_name: 'openvswitch-switch' + config_dir_path: '/etc/openvswitch' + conf_dir_path: '/etc/openvswitch/conf.d' + pid_file_path: '/var/run/openvswitch.pid' + log_file_path: '/var/log/openvswitch/openvswitch.log' + log_dir_path: '/var/log/openvswitch' + process_name: 'openvswitch' + process_user: 'openvswitch' + process_group: 'openvswitch' diff --git a/data/openvswitch/osfamily/Debian.yaml b/data/openvswitch/osfamily/Debian.yaml index f48d2fd4..4e1abf6f 100644 --- a/data/openvswitch/osfamily/Debian.yaml +++ b/data/openvswitch/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - openvswitch::settings: - init_file_path: '/etc/default/openvswitch-switch' +openvswitch::settings: + init_file_path: '/etc/default/openvswitch-switch' diff --git a/data/openvswitch/osfamily/RedHat.yaml b/data/openvswitch/osfamily/RedHat.yaml index 7bb9b163..36445e89 100644 --- a/data/openvswitch/osfamily/RedHat.yaml +++ b/data/openvswitch/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - openvswitch::settings: - init_file_path: '/etc/sysconfig/openvswitch-switch' +openvswitch::settings: + init_file_path: '/etc/sysconfig/openvswitch-switch' diff --git a/data/orientdb/default.yaml b/data/orientdb/default.yaml index 15305b50..c48756ba 100644 --- a/data/orientdb/default.yaml +++ b/data/orientdb/default.yaml @@ -1,16 +1,16 @@ --- - orientdb::settings: - package_name: 'orientdb' - service_name: 'orientdb' - config_file_path: '/etc/orientdb/orientdb.conf' - config_dir_path: '/etc/orientdb' - conf_dir_path: '/etc/orientdb/conf.d' - pid_file_path: '/var/run/orientdb.pid' - log_file_path: '/var/log/orientdb/orient-server.logl.0' - log_dir_path: '/var/log/orientdb' - data_dir_path: '/var/lib/orientdb' - process_name: 'java' - process_extra_name: 'orientdb' - process_user: 'orientdb' - process_group: 'orientdb' - tcp_port: '2424' +orientdb::settings: + package_name: 'orientdb' + service_name: 'orientdb' + config_file_path: '/etc/orientdb/orientdb.conf' + config_dir_path: '/etc/orientdb' + conf_dir_path: '/etc/orientdb/conf.d' + pid_file_path: '/var/run/orientdb.pid' + log_file_path: '/var/log/orientdb/orient-server.logl.0' + log_dir_path: '/var/log/orientdb' + data_dir_path: '/var/lib/orientdb' + process_name: 'java' + process_extra_name: 'orientdb' + process_user: 'orientdb' + process_group: 'orientdb' + tcp_port: '2424' diff --git a/data/orientdb/osfamily/Debian.yaml b/data/orientdb/osfamily/Debian.yaml index 849faee4..4033e069 100644 --- a/data/orientdb/osfamily/Debian.yaml +++ b/data/orientdb/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - orientdb::settings: - init_file_path: '/etc/default/orientdb' +orientdb::settings: + init_file_path: '/etc/default/orientdb' diff --git a/data/orientdb/osfamily/RedHat.yaml b/data/orientdb/osfamily/RedHat.yaml index 75225291..d436b016 100644 --- a/data/orientdb/osfamily/RedHat.yaml +++ b/data/orientdb/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - orientdb::settings: - init_file_path: '/etc/sysconfig/orientdb' +orientdb::settings: + init_file_path: '/etc/sysconfig/orientdb' diff --git a/data/pacemaker/default.yaml b/data/pacemaker/default.yaml index 5a2747c5..c4954aff 100644 --- a/data/pacemaker/default.yaml +++ b/data/pacemaker/default.yaml @@ -1,10 +1,10 @@ --- - pacemaker::settings: - package_name: 'pacemaker' - service_name: 'pacemaker' - pid_file_path: '/var/run/pacemaker.pid' - log_file_path: '/var/log/pacemaker/pacemaker.log' - log_dir_path: '/var/log/pacemaker' - process_name: 'pacemakerd' - process_user: 'pacemaker' - process_group: 'pacemaker' +pacemaker::settings: + package_name: 'pacemaker' + service_name: 'pacemaker' + pid_file_path: '/var/run/pacemaker.pid' + log_file_path: '/var/log/pacemaker/pacemaker.log' + log_dir_path: '/var/log/pacemaker' + process_name: 'pacemakerd' + process_user: 'pacemaker' + process_group: 'pacemaker' diff --git a/data/pacemaker/osfamily/Debian.yaml b/data/pacemaker/osfamily/Debian.yaml index ca657c8d..3e8ff6c0 100644 --- a/data/pacemaker/osfamily/Debian.yaml +++ b/data/pacemaker/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - pacemaker::settings: - init_file_path: '/etc/default/pacemaker' +pacemaker::settings: + init_file_path: '/etc/default/pacemaker' diff --git a/data/pacemaker/osfamily/RedHat.yaml b/data/pacemaker/osfamily/RedHat.yaml index ad6aebc3..55e04382 100644 --- a/data/pacemaker/osfamily/RedHat.yaml +++ b/data/pacemaker/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - pacemaker::settings: - init_file_path: '/etc/sysconfig/pacemaker' +pacemaker::settings: + init_file_path: '/etc/sysconfig/pacemaker' diff --git a/data/packer/default.yaml b/data/packer/default.yaml index 80e2476b..48466d66 100644 --- a/data/packer/default.yaml +++ b/data/packer/default.yaml @@ -3,4 +3,3 @@ packer::settings: upstream_repo: true package_name: 'packer' process_name: 'packer' - diff --git a/data/packer/upstream/default.yaml b/data/packer/upstream/default.yaml index e9500357..f9dc43b3 100644 --- a/data/packer/upstream/default.yaml +++ b/data/packer/upstream/default.yaml @@ -1,4 +1,4 @@ --- packer::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} diff --git a/data/pam/default.yaml b/data/pam/default.yaml index 8a331e43..1b597304 100644 --- a/data/pam/default.yaml +++ b/data/pam/default.yaml @@ -1,6 +1,6 @@ --- - pam::settings: - package_name: 'pam' - config_file_path: '/etc/pam.conf' - config_dir_path: '/etc/pam.d' - conf_dir_path: '/etc/pam.d' +pam::settings: + package_name: 'pam' + config_file_path: '/etc/pam.conf' + config_dir_path: '/etc/pam.d' + conf_dir_path: '/etc/pam.d' diff --git a/data/passenger-apache/default.yaml b/data/passenger-apache/default.yaml index 0286b5f3..bb159c52 100644 --- a/data/passenger-apache/default.yaml +++ b/data/passenger-apache/default.yaml @@ -1,3 +1,3 @@ --- - passenger-apache::settings: - package_name: 'passenger-apache' +passenger-apache::settings: + package_name: 'passenger-apache' diff --git a/data/passenger-apache/osfamily/Debian.yaml b/data/passenger-apache/osfamily/Debian.yaml index da4371d5..19e55c09 100644 --- a/data/passenger-apache/osfamily/Debian.yaml +++ b/data/passenger-apache/osfamily/Debian.yaml @@ -1,8 +1,7 @@ --- - passenger-apache::settings: - repo_url: 'https://oss-binaries.phusionpassenger.com/apt/passenger' - key: '561F9B9CAC40B2F7' - apt_repos: 'main' - apt_key_server: 'http://keyserver.ubuntu.com' - package_name: 'libapache2-mod-passenger' - +passenger-apache::settings: + repo_url: 'https://oss-binaries.phusionpassenger.com/apt/passenger' + key: '561F9B9CAC40B2F7' + apt_repos: 'main' + apt_key_server: 'http://keyserver.ubuntu.com' + package_name: 'libapache2-mod-passenger' diff --git a/data/passenger-nginx/default.yaml b/data/passenger-nginx/default.yaml index d2822317..cd5373bb 100644 --- a/data/passenger-nginx/default.yaml +++ b/data/passenger-nginx/default.yaml @@ -1,3 +1,3 @@ --- - passenger-nginx::settings: - package_name: 'passenger-nginx' +passenger-nginx::settings: + package_name: 'passenger-nginx' diff --git a/data/passenger-nginx/osfamily/Debian.yaml b/data/passenger-nginx/osfamily/Debian.yaml index ef8ba9d4..ad1bc106 100644 --- a/data/passenger-nginx/osfamily/Debian.yaml +++ b/data/passenger-nginx/osfamily/Debian.yaml @@ -5,4 +5,3 @@ passenger-nginx::settings: apt_repos: 'main' apt_key_server: 'http://keyserver.ubuntu.com' package_name: 'libnginx-mod-http-passenger' - \ No newline at end of file diff --git a/data/passenger-nginx/osfamily/RedHat.yaml b/data/passenger-nginx/osfamily/RedHat.yaml index fe642d24..5f7bee07 100644 --- a/data/passenger-nginx/osfamily/RedHat.yaml +++ b/data/passenger-nginx/osfamily/RedHat.yaml @@ -9,4 +9,3 @@ passenger-nginx::settings: package_prerequisites: - pygpgme - nginx - diff --git a/data/pgbouncer/upstream/default.yaml b/data/pgbouncer/upstream/default.yaml index 1c2948f2..600a3188 100644 --- a/data/pgbouncer/upstream/default.yaml +++ b/data/pgbouncer/upstream/default.yaml @@ -1,4 +1,4 @@ --- pgbouncer::settings: key: 'B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8' - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' + key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' diff --git a/data/pgbouncer/upstream/operatingsystem/Debian9.yaml b/data/pgbouncer/upstream/operatingsystem/Debian9.yaml index 041919a7..9626432a 100644 --- a/data/pgbouncer/upstream/operatingsystem/Debian9.yaml +++ b/data/pgbouncer/upstream/operatingsystem/Debian9.yaml @@ -2,4 +2,3 @@ pgbouncer::settings: repo_url: 'http://apt.postgresql.org/pub/repos/apt' apt_release: 'stretch-pgdg main' - \ No newline at end of file diff --git a/data/php-fpm/default.yaml b/data/php-fpm/default.yaml index 9013fd1b..667e4b7f 100644 --- a/data/php-fpm/default.yaml +++ b/data/php-fpm/default.yaml @@ -1,11 +1,11 @@ --- - php-fpm::settings: - package_name: 'php-fpm' - service_name: 'php-fpm' - config_file_path: '/etc/php-fpm.conf' - config_dir_path: '/etc/php-fpm' - conf_dir_path: '/etc/php-fpm.d' - pid_file_path: '/var/run/php-fpm/php-fpm.pid' - log_file_path: '/var/log/php-fpm/error.log' - log_dir_path: '/var/log/php-fpm' - process_name: 'php-fpm' +php-fpm::settings: + package_name: 'php-fpm' + service_name: 'php-fpm' + config_file_path: '/etc/php-fpm.conf' + config_dir_path: '/etc/php-fpm' + conf_dir_path: '/etc/php-fpm.d' + pid_file_path: '/var/run/php-fpm/php-fpm.pid' + log_file_path: '/var/log/php-fpm/error.log' + log_dir_path: '/var/log/php-fpm' + process_name: 'php-fpm' diff --git a/data/php-fpm/osfamily/Debian.yaml b/data/php-fpm/osfamily/Debian.yaml index b79ee1d1..892df555 100644 --- a/data/php-fpm/osfamily/Debian.yaml +++ b/data/php-fpm/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - php-fpm::settings: - init_file_path: '/etc/default/php-fpm' +php-fpm::settings: + init_file_path: '/etc/default/php-fpm' diff --git a/data/php-fpm/osfamily/RedHat.yaml b/data/php-fpm/osfamily/RedHat.yaml index 1c14028a..20ef08ac 100644 --- a/data/php-fpm/osfamily/RedHat.yaml +++ b/data/php-fpm/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - php-fpm::settings: - init_file_path: '/etc/sysconfig/php-fpm' +php-fpm::settings: + init_file_path: '/etc/sysconfig/php-fpm' diff --git a/data/php/default.yaml b/data/php/default.yaml index 2c983625..6d0b6520 100644 --- a/data/php/default.yaml +++ b/data/php/default.yaml @@ -1,6 +1,6 @@ --- - php::settings: - package_name: 'php' - config_file_path: '/etc/php.ini' - config_dir_path: '/etc/php' - conf_dir_path: '/etc/php/conf.d' +php::settings: + package_name: 'php' + config_file_path: '/etc/php.ini' + config_dir_path: '/etc/php' + conf_dir_path: '/etc/php/conf.d' diff --git a/data/php/osfamily/Debian.yaml b/data/php/osfamily/Debian.yaml index 3e9ffe35..c54f0d35 100644 --- a/data/php/osfamily/Debian.yaml +++ b/data/php/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - php::settings: - package_name: 'php5' - config_file_path: '/etc/php5/apache2/php.ini' - config_dir_path: '/etc/php5' - conf_dir_path: '/etc/php5/conf.d' +php::settings: + package_name: 'php5' + config_file_path: '/etc/php5/apache2/php.ini' + config_dir_path: '/etc/php5' + conf_dir_path: '/etc/php5/conf.d' diff --git a/data/php/osfamily/RedHat.yaml b/data/php/osfamily/RedHat.yaml index eb850910..92a59c1e 100644 --- a/data/php/osfamily/RedHat.yaml +++ b/data/php/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - php::settings: - config_file_path: '/etc/php.ini' - config_dir_path: '/etc/php.d' - conf_dir_path: '/etc/php.d' +php::settings: + config_file_path: '/etc/php.ini' + config_dir_path: '/etc/php.d' + conf_dir_path: '/etc/php.d' diff --git a/data/php/osfamily/Suse.yaml b/data/php/osfamily/Suse.yaml index 3e9ffe35..c54f0d35 100644 --- a/data/php/osfamily/Suse.yaml +++ b/data/php/osfamily/Suse.yaml @@ -1,6 +1,6 @@ --- - php::settings: - package_name: 'php5' - config_file_path: '/etc/php5/apache2/php.ini' - config_dir_path: '/etc/php5' - conf_dir_path: '/etc/php5/conf.d' +php::settings: + package_name: 'php5' + config_file_path: '/etc/php5/apache2/php.ini' + config_dir_path: '/etc/php5' + conf_dir_path: '/etc/php5/conf.d' diff --git a/data/postfix/osfamily/Debian.yaml b/data/postfix/osfamily/Debian.yaml index fa8b942f..450c0e7b 100644 --- a/data/postfix/osfamily/Debian.yaml +++ b/data/postfix/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- postfix::settings: - log_file_path: '/var/log/mail.log' + log_file_path: '/var/log/mail.log' init_file_path: '/etc/default/postfix' daemon_dir_path: '/usr/lib/postfix/sbin' diff --git a/data/postgresql/default.yaml b/data/postgresql/default.yaml index 2c3e9e63..2bd07f2b 100644 --- a/data/postgresql/default.yaml +++ b/data/postgresql/default.yaml @@ -1,14 +1,14 @@ --- - postgresql::settings: - package_name: 'postgresql' - service_name: 'postgresql' - config_file_path: '/var/lib/pgsql/data/postgresql.conf' - config_dir_path: '/var/lib/pgsql/data' - data_dir_path: '/var/lib/pgsql/data' - pid_file_path: '/var/run/postgresql/.s.PGSQL.5432' - log_file_path: '/var/lib/pgsql/data/pg_log/postgresql.log' - log_dir_path: '/var/lib/pgsql/data/pg_log' - process_name: 'postgres' - process_user: 'postgres' - process_group: 'postgres' - tcp_port: '5432' +postgresql::settings: + package_name: 'postgresql' + service_name: 'postgresql' + config_file_path: '/var/lib/pgsql/data/postgresql.conf' + config_dir_path: '/var/lib/pgsql/data' + data_dir_path: '/var/lib/pgsql/data' + pid_file_path: '/var/run/postgresql/.s.PGSQL.5432' + log_file_path: '/var/lib/pgsql/data/pg_log/postgresql.log' + log_dir_path: '/var/lib/pgsql/data/pg_log' + process_name: 'postgres' + process_user: 'postgres' + process_group: 'postgres' + tcp_port: '5432' diff --git a/data/postgresql/osfamily/Debian.yaml b/data/postgresql/osfamily/Debian.yaml index 53473979..e812277b 100644 --- a/data/postgresql/osfamily/Debian.yaml +++ b/data/postgresql/osfamily/Debian.yaml @@ -1,8 +1,8 @@ --- - postgresql::settings: - config_file_path: '/etc/postgresql/9.3/main/postgresql.conf' - config_dir_path: '/etc/postgresql/9.3/main' - data_dir_path: '/var/lib/postgresql/9.3/main' - log_file_path: '/var/log/postgresql/postgresql-9.3-main.log' - log_dir_path: '/var/log/postgresql' - init_file_path: '/etc/default/postgresql' +postgresql::settings: + config_file_path: '/etc/postgresql/9.3/main/postgresql.conf' + config_dir_path: '/etc/postgresql/9.3/main' + data_dir_path: '/var/lib/postgresql/9.3/main' + log_file_path: '/var/log/postgresql/postgresql-9.3-main.log' + log_dir_path: '/var/log/postgresql' + init_file_path: '/etc/default/postgresql' diff --git a/data/postgresql/osfamily/RedHat.yaml b/data/postgresql/osfamily/RedHat.yaml index c52b945c..71986a38 100644 --- a/data/postgresql/osfamily/RedHat.yaml +++ b/data/postgresql/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - postgresql::settings: - init_file_path: '/etc/sysconfig/postgresql' +postgresql::settings: + init_file_path: '/etc/sysconfig/postgresql' diff --git a/data/profile/default.yaml b/data/profile/default.yaml index 11d39bc1..6f2bea17 100644 --- a/data/profile/default.yaml +++ b/data/profile/default.yaml @@ -1,5 +1,5 @@ --- - profile::settings: - config_dir_path: '/etc/profile.d' - config_file_path: '/etc/profile' - conf_dir_path: '/etc/profile.d' +profile::settings: + config_dir_path: '/etc/profile.d' + config_file_path: '/etc/profile' + conf_dir_path: '/etc/profile.d' diff --git a/data/proftpd/default.yaml b/data/proftpd/default.yaml index f1f6f20d..afc40e23 100644 --- a/data/proftpd/default.yaml +++ b/data/proftpd/default.yaml @@ -1,14 +1,14 @@ --- - proftpd::settings: - package_name: 'proftpd' - service_name: 'proftpd' - config_file_path: '/etc/proftpd/proftpd.conf' - config_dir_path: '/etc/proftpd' - conf_dir_path: '/etc/proftpd/conf.d' - pid_file_path: '/var/run/proftpd.pid' - log_file_path: '/var/log/proftpd/proftpd.log' - log_dir_path: '/var/log/proftpd' - process_name: 'proftpd' - process_user: 'proftpd' - process_group: 'proftpd' - tcp_port: '21' +proftpd::settings: + package_name: 'proftpd' + service_name: 'proftpd' + config_file_path: '/etc/proftpd/proftpd.conf' + config_dir_path: '/etc/proftpd' + conf_dir_path: '/etc/proftpd/conf.d' + pid_file_path: '/var/run/proftpd.pid' + log_file_path: '/var/log/proftpd/proftpd.log' + log_dir_path: '/var/log/proftpd' + process_name: 'proftpd' + process_user: 'proftpd' + process_group: 'proftpd' + tcp_port: '21' diff --git a/data/proftpd/osfamily/Debian.yaml b/data/proftpd/osfamily/Debian.yaml index 60c51901..2d9db3e3 100644 --- a/data/proftpd/osfamily/Debian.yaml +++ b/data/proftpd/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - proftpd::settings: - init_file_path: '/etc/default/proftpd' +proftpd::settings: + init_file_path: '/etc/default/proftpd' diff --git a/data/proftpd/osfamily/RedHat.yaml b/data/proftpd/osfamily/RedHat.yaml index 1cfecdfa..4db7fa9e 100644 --- a/data/proftpd/osfamily/RedHat.yaml +++ b/data/proftpd/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - proftpd::settings: - init_file_path: '/etc/sysconfig/proftpd' +proftpd::settings: + init_file_path: '/etc/sysconfig/proftpd' diff --git a/data/prometheus/default.yaml b/data/prometheus/default.yaml index 932ed8ab..dde83a62 100644 --- a/data/prometheus/default.yaml +++ b/data/prometheus/default.yaml @@ -14,7 +14,7 @@ prometheus::settings: config_file_group: prometheus config_file_mode: '0660' config_file_format: yaml -# validate_cmd: 'prometheus validate' + # validate_cmd: 'prometheus validate' pid_file_path: '' init_file_path: '/etc/sysconfig/prometheus.conf' log_file_path: @@ -24,7 +24,7 @@ prometheus::settings: log_dir_path: '/var/log/prometheus' -# tp 4 settings + # tp 4 settings install_method: 'file' description: 'The Prometheus monitoring system and time series database' website: 'https://prometheus.io/' @@ -119,7 +119,7 @@ prometheus::settings: mode: '0755' prometheus.yml: path: '/etc/prometheus/prometheus.yml' - mode: '0644' + mode: '0644' resources: file: /etc/prometheus: @@ -136,8 +136,8 @@ prometheus::settings: ExecStart: '/usr/local/bin/prometheus --config.file /etc/prometheus/prometheus.yml' manage_service: true manage_user: true -# systemd_symlink: '/etc/systemd/system/multi-user.target.wants/prometheus.service' #default -# systemd_template: 'tinydata/prometheus/systemd.epp' + # systemd_symlink: '/etc/systemd/system/multi-user.target.wants/prometheus.service' #default + # systemd_template: 'tinydata/prometheus/systemd.epp' build: enable: false diff --git a/data/psmisc/default.yaml b/data/psmisc/default.yaml index 27e96be7..59042422 100644 --- a/data/psmisc/default.yaml +++ b/data/psmisc/default.yaml @@ -1,3 +1,3 @@ --- - psmisc::settings: - package_name: 'psmisc' +psmisc::settings: + package_name: 'psmisc' diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml index 64e0c37a..dcfb1542 100644 --- a/data/puppet-agent/default.yaml +++ b/data/puppet-agent/default.yaml @@ -2,7 +2,7 @@ puppet-agent::settings: upstream_repo: true package_name: 'puppet-agent' - service_name: [ 'puppet', 'pxp-agent' ] + service_name: ['puppet', 'pxp-agent'] config_file_path: '/etc/puppetlabs/puppet/puppet.conf' config_dir_path: '/etc/puppetlabs/puppet' pid_file_path: '/var/run/puppetlabs/agent.pid' @@ -14,6 +14,3 @@ puppet-agent::settings: log_dir_path: - '/var/log/puppetlabs/puppet' - '/var/log/puppetlabs/pxp-agent' - process_name: 'puppet' - process_user: 'root' - process_group: 'root' \ No newline at end of file diff --git a/data/puppet-agent/upstream/default.yaml b/data/puppet-agent/upstream/default.yaml index 98cea29b..87041d7c 100644 --- a/data/puppet-agent/upstream/default.yaml +++ b/data/puppet-agent/upstream/default.yaml @@ -5,7 +5,7 @@ puppet-agent::settings: # tp 4 settings - + files: config: path: '/etc/puppetlabs/puppet/puppet.conf' @@ -58,7 +58,7 @@ puppet-agent::settings: clientbucketdir: path: /opt/puppetlabs/puppet/cache/clientbucket clientyamldir: - path: /opt/puppetlabs/puppet/cache/client_yaml + path: /opt/puppetlabs/puppet/cache/client_yaml codedir: path: /etc/puppetlabs/code confdir: diff --git a/data/puppet/upstream/osfamily/windows.yaml b/data/puppet/upstream/osfamily/windows.yaml index 64a7438b..0819f1ed 100644 --- a/data/puppet/upstream/osfamily/windows.yaml +++ b/data/puppet/upstream/osfamily/windows.yaml @@ -14,4 +14,3 @@ puppet::settings: process_user: 'LocalSystem' process_group: 'LocalSystem' winget_package_name: 'Puppet.puppet-agent' - \ No newline at end of file diff --git a/data/pwgen/default.yaml b/data/pwgen/default.yaml index 78fb94bf..22f29324 100644 --- a/data/pwgen/default.yaml +++ b/data/pwgen/default.yaml @@ -1,3 +1,3 @@ --- - pwgen::settings: - package_name: 'pwgen' +pwgen::settings: + package_name: 'pwgen' diff --git a/data/pwgen/operatingsystem/OracleLinux.yaml b/data/pwgen/operatingsystem/OracleLinux.yaml index 7242d7fe..09c500c3 100644 --- a/data/pwgen/operatingsystem/OracleLinux.yaml +++ b/data/pwgen/operatingsystem/OracleLinux.yaml @@ -1,3 +1,3 @@ --- - pwgen::settings: - package_name: '' +pwgen::settings: + package_name: '' diff --git a/data/python-pip/osfamily/RedHat7.yaml b/data/python-pip/osfamily/RedHat7.yaml index 1cf425ad..17d6ca57 100644 --- a/data/python-pip/osfamily/RedHat7.yaml +++ b/data/python-pip/osfamily/RedHat7.yaml @@ -1,3 +1,3 @@ --- python-pip::settings: - package_name: 'python3-pip' \ No newline at end of file + package_name: 'python3-pip' \ No newline at end of file diff --git a/data/quagga/default.yaml b/data/quagga/default.yaml index b6e90d83..c6c38768 100644 --- a/data/quagga/default.yaml +++ b/data/quagga/default.yaml @@ -1,13 +1,13 @@ --- - quagga::settings: - package_name: 'quagga' - service_name: 'quagga' - config_file_path: '/etc/quagga/daemons' - config_dir_path: '/etc/quagga' - conf_dir_path: '/etc/quagga/conf.d' - pid_file_path: '/var/run/quagga.pid' - log_file_path: '/var/log/quagga/quagga.log' - log_dir_path: '/var/log/quagga' - process_name: 'quagga' - process_user: 'quagga' - process_group: 'quagga' +quagga::settings: + package_name: 'quagga' + service_name: 'quagga' + config_file_path: '/etc/quagga/daemons' + config_dir_path: '/etc/quagga' + conf_dir_path: '/etc/quagga/conf.d' + pid_file_path: '/var/run/quagga.pid' + log_file_path: '/var/log/quagga/quagga.log' + log_dir_path: '/var/log/quagga' + process_name: 'quagga' + process_user: 'quagga' + process_group: 'quagga' diff --git a/data/quagga/osfamily/Debian.yaml b/data/quagga/osfamily/Debian.yaml index a7740067..06e262d9 100644 --- a/data/quagga/osfamily/Debian.yaml +++ b/data/quagga/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - quagga::settings: - init_file_path: '/etc/default/quagga' +quagga::settings: + init_file_path: '/etc/default/quagga' diff --git a/data/quagga/osfamily/RedHat.yaml b/data/quagga/osfamily/RedHat.yaml index 376967d1..44e2878d 100644 --- a/data/quagga/osfamily/RedHat.yaml +++ b/data/quagga/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - quagga::settings: - init_file_path: '/etc/sysconfig/quagga' +quagga::settings: + init_file_path: '/etc/sysconfig/quagga' diff --git a/data/quantum/default.yaml b/data/quantum/default.yaml index bf9a86c5..21ca04b5 100644 --- a/data/quantum/default.yaml +++ b/data/quantum/default.yaml @@ -1,10 +1,10 @@ --- - quantum::settings: - config_file_path: '/etc/quantum/quantum.conf' - config_dir_path: '/etc/quantum' - pid_file_path: '/var/run/quantum.pid' - log_file_path: '/var/log/quantum/quantum.log' - log_dir_path: '/var/log/quantum' - process_name: 'quantum' - process_user: 'quantum' - process_group: 'quantum' +quantum::settings: + config_file_path: '/etc/quantum/quantum.conf' + config_dir_path: '/etc/quantum' + pid_file_path: '/var/run/quantum.pid' + log_file_path: '/var/log/quantum/quantum.log' + log_dir_path: '/var/log/quantum' + process_name: 'quantum' + process_user: 'quantum' + process_group: 'quantum' diff --git a/data/quantum/osfamily/Debian.yaml b/data/quantum/osfamily/Debian.yaml index b5df5e0c..20746f9c 100644 --- a/data/quantum/osfamily/Debian.yaml +++ b/data/quantum/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - quantum::settings: - package_name: 'quantum-server' - service_name: 'quantum-server' - init_file_path: '/etc/default/quantum' +quantum::settings: + package_name: 'quantum-server' + service_name: 'quantum-server' + init_file_path: '/etc/default/quantum' diff --git a/data/quantum/osfamily/RedHat.yaml b/data/quantum/osfamily/RedHat.yaml index f3951f30..31b6bf60 100644 --- a/data/quantum/osfamily/RedHat.yaml +++ b/data/quantum/osfamily/RedHat.yaml @@ -1,6 +1,5 @@ --- - quantum::settings: - package_name: 'openstack-quantum' - service_name: 'openstack-quantum-server' - init_file_path: '/etc/sysconfig/quantum' - +quantum::settings: + package_name: 'openstack-quantum' + service_name: 'openstack-quantum-server' + init_file_path: '/etc/sysconfig/quantum' diff --git a/data/r10k/default.yaml b/data/r10k/default.yaml index cc7a9b3b..8e37d2d3 100644 --- a/data/r10k/default.yaml +++ b/data/r10k/default.yaml @@ -1,7 +1,7 @@ --- - r10k::settings: - package_name: 'r10k' - package_provider: 'gem' - config_file_path: '/etc/r10k.yaml' - tp_prerequisites: - - ruby +r10k::settings: + package_name: 'r10k' + package_provider: 'gem' + config_file_path: '/etc/r10k.yaml' + tp_prerequisites: + - ruby diff --git a/data/rabbitmq/default.yaml b/data/rabbitmq/default.yaml index 26980acf..a918f136 100644 --- a/data/rabbitmq/default.yaml +++ b/data/rabbitmq/default.yaml @@ -1,13 +1,13 @@ --- - rabbitmq::settings: - package_name: 'rabbitmq' - service_name: 'rabbitmq' - config_file_path: '/etc/rabbitmq/rabbitmq.config' - config_dir_path: '/etc/rabbitmq' - pid_file_path: '/var/run/rabbitmq.pid' - log_file_path: '/var/log/rabbitmq/rabbitmq.log' - log_dir_path: '/var/log/rabbitmq' - process_name: 'rabbitmq' - process_user: 'rabbitmq' - process_group: 'rabbitmq' - tcp_port: '5672' +rabbitmq::settings: + package_name: 'rabbitmq' + service_name: 'rabbitmq' + config_file_path: '/etc/rabbitmq/rabbitmq.config' + config_dir_path: '/etc/rabbitmq' + pid_file_path: '/var/run/rabbitmq.pid' + log_file_path: '/var/log/rabbitmq/rabbitmq.log' + log_dir_path: '/var/log/rabbitmq' + process_name: 'rabbitmq' + process_user: 'rabbitmq' + process_group: 'rabbitmq' + tcp_port: '5672' diff --git a/data/rabbitmq/osfamily/Debian.yaml b/data/rabbitmq/osfamily/Debian.yaml index 60a443ed..ca0ab75d 100644 --- a/data/rabbitmq/osfamily/Debian.yaml +++ b/data/rabbitmq/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - rabbitmq::settings: - package_name: 'rabbitmq-server' - service_name: 'rabbitmq-server' - init_file_path: '/etc/default/rabbitmq-server' +rabbitmq::settings: + package_name: 'rabbitmq-server' + service_name: 'rabbitmq-server' + init_file_path: '/etc/default/rabbitmq-server' diff --git a/data/rabbitmq/osfamily/RedHat.yaml b/data/rabbitmq/osfamily/RedHat.yaml index d74eb82c..f00cb5cc 100644 --- a/data/rabbitmq/osfamily/RedHat.yaml +++ b/data/rabbitmq/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - rabbitmq::settings: - package_name: 'rabbitmq-server' - service_name: 'rabbitmq-server' - init_file_path: '/etc/sysconfig/rabbitmq-server' +rabbitmq::settings: + package_name: 'rabbitmq-server' + service_name: 'rabbitmq-server' + init_file_path: '/etc/sysconfig/rabbitmq-server' diff --git a/data/rails/default.yaml b/data/rails/default.yaml index 53be91d1..b6909592 100644 --- a/data/rails/default.yaml +++ b/data/rails/default.yaml @@ -1,3 +1,3 @@ --- - rails::settings: - package_name: 'rails' +rails::settings: + package_name: 'rails' diff --git a/data/rails/osfamily/Debian.yaml b/data/rails/osfamily/Debian.yaml index 7ab28769..df0db60d 100644 --- a/data/rails/osfamily/Debian.yaml +++ b/data/rails/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - rails::settings: - package_prerequisites: - - 'ruby-dev' - - 'zlib1g-dev' +rails::settings: + package_prerequisites: + - 'ruby-dev' + - 'zlib1g-dev' diff --git a/data/rails/osfamily/RedHat.yaml b/data/rails/osfamily/RedHat.yaml index 36a9cea5..5c9d2147 100644 --- a/data/rails/osfamily/RedHat.yaml +++ b/data/rails/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - rails::settings: - package_prerequisites: - - 'ruby-devel' - - 'zlib-devel' +rails::settings: + package_prerequisites: + - 'ruby-devel' + - 'zlib-devel' diff --git a/data/redis/default.yaml b/data/redis/default.yaml index d24ef627..cae5f4a9 100644 --- a/data/redis/default.yaml +++ b/data/redis/default.yaml @@ -1,13 +1,13 @@ --- - redis::settings: - package_name: 'redis' - service_name: 'redis' - config_file_path: '/etc/redis/redis.conf' - config_dir_path: '/etc/redis' - tcp_port: '6379' - pid_file_path: '/var/run/redis.pid' - log_file_path: '/var/log/redis.log' - process_user: 'redis' - process_group: 'redis' - process_name: 'redis-server' - process_args: '/etc/redis/redis.conf' +redis::settings: + package_name: 'redis' + service_name: 'redis' + config_file_path: '/etc/redis/redis.conf' + config_dir_path: '/etc/redis' + tcp_port: '6379' + pid_file_path: '/var/run/redis.pid' + log_file_path: '/var/log/redis.log' + process_user: 'redis' + process_group: 'redis' + process_name: 'redis-server' + process_args: '/etc/redis/redis.conf' diff --git a/data/redis/operatingsystem/testos-0.0.1.yaml b/data/redis/operatingsystem/testos-0.0.1.yaml index f125fece..20d60e15 100644 --- a/data/redis/operatingsystem/testos-0.0.1.yaml +++ b/data/redis/operatingsystem/testos-0.0.1.yaml @@ -1,11 +1,11 @@ --- - redis::settings: - package_name: 'redis-testos001' - service_name: 'redis-testos001' - service_ensure: 'stopped' - service_enable: 'false' - config_file_path: '/etc/redis-testos001/redis.conf' - config_file_owner: 'test' - config_file_group: 'test' - config_file_mode: '0644' - config_dir_path: '/etc/redis-testos001' +redis::settings: + package_name: 'redis-testos001' + service_name: 'redis-testos001' + service_ensure: 'stopped' + service_enable: 'false' + config_file_path: '/etc/redis-testos001/redis.conf' + config_file_owner: 'test' + config_file_group: 'test' + config_file_mode: '0644' + config_dir_path: '/etc/redis-testos001' diff --git a/data/redis/operatingsystem/testos.yaml b/data/redis/operatingsystem/testos.yaml index 367b5707..f314dd97 100644 --- a/data/redis/operatingsystem/testos.yaml +++ b/data/redis/operatingsystem/testos.yaml @@ -1,11 +1,11 @@ --- - redis::settings: - package_name: 'redis-testos' - service_name: 'redis-testos' - service_ensure: 'stopped' - service_enable: 'false' - config_file_path: '/etc/redis-testos/redis.conf' - config_file_owner: 'test' - config_file_group: 'test' - config_file_mode: '0644' - config_dir_path: '/etc/redis-testos' +redis::settings: + package_name: 'redis-testos' + service_name: 'redis-testos' + service_ensure: 'stopped' + service_enable: 'false' + config_file_path: '/etc/redis-testos/redis.conf' + config_file_owner: 'test' + config_file_group: 'test' + config_file_mode: '0644' + config_dir_path: '/etc/redis-testos' diff --git a/data/redis/osfamily/Debian.yaml b/data/redis/osfamily/Debian.yaml index 433f3dc6..f227e3b3 100644 --- a/data/redis/osfamily/Debian.yaml +++ b/data/redis/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - redis::settings: - init_file_path: '/etc/default/redis-server' - package_name: 'redis-server' - service_name: 'redis-server' +redis::settings: + init_file_path: '/etc/default/redis-server' + package_name: 'redis-server' + service_name: 'redis-server' diff --git a/data/redis/osfamily/RedHat.yaml b/data/redis/osfamily/RedHat.yaml index 73c76388..13bd3eec 100644 --- a/data/redis/osfamily/RedHat.yaml +++ b/data/redis/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - redis::settings: - config_file_path: '/etc/redis.conf' - process_args: '/etc/redis.conf --daemonize no' +redis::settings: + config_file_path: '/etc/redis.conf' + process_args: '/etc/redis.conf --daemonize no' diff --git a/data/redis/osfamily/test.yaml b/data/redis/osfamily/test.yaml index 5b884e9b..d46fd364 100644 --- a/data/redis/osfamily/test.yaml +++ b/data/redis/osfamily/test.yaml @@ -1,17 +1,17 @@ --- - redis::settings: - package_name: 'redis-test' - service_name: 'redis-test' - service_ensure: 'stopped' - service_enable: 'false' - config_file_path: '/etc/redis-test/redis.conf' - config_file_template: 'tinydata/redis/test.conf.erb' - init_file_path: '/etc/sysconfig/redis-test' - init_file_template: 'tinydata/redis/test.conf.erb' - config_file_owner: 'test' - config_file_group: 'test' - config_file_mode: '0644' - config_dir_path: '/etc/redis-test' - config_dir_owner: 'test' - config_dir_group: 'test' - config_dir_mode: '0755' +redis::settings: + package_name: 'redis-test' + service_name: 'redis-test' + service_ensure: 'stopped' + service_enable: 'false' + config_file_path: '/etc/redis-test/redis.conf' + config_file_template: 'tinydata/redis/test.conf.erb' + init_file_path: '/etc/sysconfig/redis-test' + init_file_template: 'tinydata/redis/test.conf.erb' + config_file_owner: 'test' + config_file_group: 'test' + config_file_mode: '0644' + config_dir_path: '/etc/redis-test' + config_dir_owner: 'test' + config_dir_group: 'test' + config_dir_mode: '0755' diff --git a/data/reference/default.yaml b/data/reference/default.yaml index 7fb41766..53c45d43 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -1,19 +1,21 @@ --- -# This reference data shows all the possible tinydata settings for a sample application (called 'reference') +# This reference data shows all the possible tinydata settings for a +# sample application (called 'reference') # -# The main APPNAME::settings key below is looked up by the tp_lookup function in tp module manifests. -# It's an hash whose values are looked up in deep merge mode across the hierarchies -# defined in the hiera.yaml configuration file specific for each managed app. +# The main APPNAME::settings key below is looked up by the tp_lookup function +# in tp module manifests. It's an hash whose values are looked up in deep merge +# mode across the hierarchies defined in the hiera.yaml configuration file +# specific for each managed app. # -# You don't have to set all these settings, but be sure that what's set is correct, otherwise tp may try to do weird -# things or plainly fail with wrong data. +# You don't have to set all these settings, but be sure that what's set is +# correct, otherwise tp may try to do weird things or plainly fail with wrong data. # Settings marked with v3 are used by every (not ancient) version of tp module. They are going to be deprecated (but still supported) from tp 4 # Settings marked with v4 are used by tp module starting from version 4. # Some of them are used, as technology preview, in tp version 3.8.0 onwards. # Note that in every template used by the tp::conf define you can access to these settings -# (so that you can automatically configure in your own templates the right paths and names for +# (so that you can automatically configure in your own templates the right paths and names for # different underlying OSes) via the $settings variable (an hash with the settings values merged across the hierarchy). # For example to get the name of the user running a given app (as a service) you can use something like: # User <%= @settings['process_user'] %> # In erb templates @@ -22,7 +24,7 @@ # Port: <%= $settings['ports']['main']['port'] %> # Protocol: <%= $settings['ports']['main']['protocol'] %> # Note: Be sure the referred settings (and subkeys) exist in your tinydata to avoid errors like: -# Evaluation Error: Operator '[]' is not applicable to an Undef Value. +# Evaluation Error: Operator '[]' is not applicable to an Undef Value. # You can override these settings directly from tp defines using the parameter settings_hash (legacy) or, # starting from tp 4, also the parameter my_settings. Their content must be an hash, with the same structure @@ -35,139 +37,139 @@ # ProTip: Use as existing app one of the example ones like: "sample", "sample_desktop" ... reference::settings: -# If the app needs other apps, installed via tp. -# Key used in tp::install (and tp::install::*) -# Valids values: String, Array, Hash of tp::install resources with (in case of Hash) -# their parameters. v3 and v4 compatible. -# These resources, as every other prerequisites, are installed if tp::auto_prereq is set to true. -# If auto_prereq is set to false, the user is responsible for managing the prerequisites, when needed. + # If the app needs other apps, installed via tp. + # Key used in tp::install (and tp::install::*) + # Valids values: String, Array, Hash of tp::install resources with (in case of Hash) + # their parameters. v3 and v4 compatible. + # These resources, as every other prerequisites, are installed if tp::auto_prereq is set to true. + # If auto_prereq is set to false, the user is responsible for managing the prerequisites, when needed. tp_prerequisites: {} -# If to use the upstream repo from the app developer or not (if it exists and is defined in tinydata) + # If to use the upstream repo from the app developer or not (if it exists and is defined in tinydata) upstream_repo: false -# The name of the package to install. Must be available on the system or via the configured repo -# v3 and v4 compatible. + # The name of the package to install. Must be available on the system or via the configured repo + # v3 and v4 compatible. package_name: 'reference' -# The provider to use for the package resource. Tinydata defaults are: -# - chocolatey on windows (you need to install chocolatey by yourself) -# - homebrew on Darwin (you need to install homebrew by yourself) -# - Puppet's default package provider for the other OSes + # The provider to use for the package resource. Tinydata defaults are: + # - chocolatey on windows (you need to install chocolatey by yourself) + # - homebrew on Darwin (you need to install homebrew by yourself) + # - Puppet's default package provider for the other OSes package_provider: ~ -# The source argument of the package resource. The value is passed to the tp::url_replace function -# which automatically replaces the following variables in the string: -# $OS with downcase($facts['kernel']) -# $ARCH with $facts['os']['architecture'] (with some mapping to match GitHub default names of archs) -# $VERSION with the version of the package (if set via $ensure, $version or in $settings.releases.latest_version) -# For example, this could be: -# package_source: 'https://github.com/reference/reference/releases/download/v$VERSION/reference_$VERSION_$OS_$ARCH.msi' -# This works only with Puppet providers that accept a source argument + # The source argument of the package resource. The value is passed to the tp::url_replace function + # which automatically replaces the following variables in the string: + # $OS with downcase($facts['kernel']) + # $ARCH with $facts['os']['architecture'] (with some mapping to match GitHub default names of archs) + # $VERSION with the version of the package (if set via $ensure, $version or in $settings.releases.latest_version) + # For example, this could be: + # package_source: 'https://github.com/reference/reference/releases/download/v$VERSION/reference_$VERSION_$OS_$ARCH.msi' + # This works only with Puppet providers that accept a source argument package_source: ~ -# The install_options argument of the package resource. + # The install_options argument of the package resource. package_install_options: [] -# An optional hash of parameters to pass to the package resource. They are merged and can override -# or extend the above default package parameters (ensure,provider,source,install_options) -# Note that is you set both package_source: foo and package_params: { source: 'bar' } the latter (bar) -# will be used. Same for the provider and install_options arguments. + # An optional hash of parameters to pass to the package resource. They are merged and can override + # or extend the above default package parameters (ensure,provider,source,install_options) + # Note that is you set both package_source: foo and package_params: { source: 'bar' } the latter (bar) + # will be used. Same for the provider and install_options arguments. package_params: {} -# The name of the service to manage. When present, the relevant service resource is managed. + # The name of the service to manage. When present, the relevant service resource is managed. service_name: 'reference' -# An optional hash of parameters to pass to the service resource. They are merged and can override -# or extend the default service parameters (ensure/enable/require) + # An optional hash of parameters to pass to the service resource. They are merged and can override + # or extend the default service parameters (ensure/enable/require) service_params: {} -# The name of the process of the managed application. This is used by the tp test, tp info and -# tp debug commands automatically show relevant information + # The name of the process of the managed application. This is used by the tp test, tp info and + # tp debug commands automatically show relevant information process_name: 'reference' -# The name of the user used by the app when it runs as a service. This is used by the tp::service -# define when configuring automatically the systemd unit files. + # The name of the user used by the app when it runs as a service. This is used by the tp::service + # define when configuring automatically the systemd unit files. process_user: 'root' -# The name of the group used by the app when it runs a service. This is used by tp::service as well + # The name of the group used by the app when it runs a service. This is used by tp::service as well process_group: 'root' -# The path of the "main" configuration file of the app. When it's not clear what's the main -# config file, choice is arbitrarily left to the tinydata developer. -# This is the file managed when you use the tp::conf define without further arguments like path. -# tp::conf { 'reference': content => "whatever" } will manage the file in the path below. -# v3 format. v4 format equivalent is files.config.path + # The path of the "main" configuration file of the app. When it's not clear what's the main + # config file, choice is arbitrarily left to the tinydata developer. + # This is the file managed when you use the tp::conf define without further arguments like path. + # tp::conf { 'reference': content => "whatever" } will manage the file in the path below. + # v3 format. v4 format equivalent is files.config.path config_file_path: '/etc/reference/reference.conf' -# The format of the main configuration file. Can be any of the following: -# yaml, json, hcl (TODO), inifile, inifile_with_stanzas, spaced, spaced_with_stanzas -# When this setting is present you can directly configure the content of a file, via tp::conf -# without specifying a template or a sttic source. For example, Hiera data as follows: -# tp::confs: -# reference: -# my_options: -# foo: bar -# my: baz -# Or the analog Puppet code: -# tp::conf { 'reference': -# my_options => { -# foo => 'bar', -# my => 'baz', -# } -# } -# Will create /etc/reference/reference.conf in yaml format as follows: -# --- -# foo: bar -# my: baz -# v3 format. v4 format equivalent is files.config.format + # The format of the main configuration file. Can be any of the following: + # yaml, json, hcl (TODO), inifile, inifile_with_stanzas, spaced, spaced_with_stanzas + # When this setting is present you can directly configure the content of a file, via tp::conf + # without specifying a template or a sttic source. For example, Hiera data as follows: + # tp::confs: + # reference: + # my_options: + # foo: bar + # my: baz + # Or the analog Puppet code: + # tp::conf { 'reference': + # my_options => { + # foo => 'bar', + # my => 'baz', + # } + # } + # Will create /etc/reference/reference.conf in yaml format as follows: + # --- + # foo: bar + # my: baz + # v3 format. v4 format equivalent is files.config.format config_file_format: yaml -# The eventual value of Puppet's validate_cmd argument for the main configuration file resource, when managed via tp::conf. -# This allows you to automatically validate the syntax of your configurations before changing them via Puppet -# Note the % which is the default placeholder for the file to validate (keep it) -# v3 format. v4 format equivalent is files.config.validate_cmd + # The eventual value of Puppet's validate_cmd argument for the main configuration file resource, when managed via tp::conf. + # This allows you to automatically validate the syntax of your configurations before changing them via Puppet + # Note the % which is the default placeholder for the file to validate (keep it) + # v3 format. v4 format equivalent is files.config.validate_cmd validate_cmd: 'reference validate %' -# The path of the pid file, if any. This is used by the tp info and tp debug commands to show info based the pid of the process -# v3 format. v4 format equivalent is files.pid.path + # The path of the pid file, if any. This is used by the tp info and tp debug commands to show info based the pid of the process + # v3 format. v4 format equivalent is files.pid.path pid_file_path: '/run/reference.pid' -# The path of the service configuration file (not the systemd unit file or init script, but the file that they uses to configure the service) -# v3 format. v4 format equivalent is files.init.path + # The path of the service configuration file (not the systemd unit file or init script, but the file that they uses to configure the service) + # v3 format. v4 format equivalent is files.init.path init_file_path: '/etc/sysconfig/reference.conf' -# The path[s] of the log file[s] of the app. This is used by the tp log and tp info commands to tail logs or show info on the app -# v3 format. v4 format equivalent is files.log.path + # The path[s] of the log file[s] of the app. This is used by the tp log and tp info commands to tail logs or show info on the app + # v3 format. v4 format equivalent is files.log.path log_file_path: - '/var/log/reference/reference.log' -# The path of the directory where the app stores its configurations. This is the default path used by the tp::dir define. -# v3 format. v4 format equivalent is dirs.config.path + # The path of the directory where the app stores its configurations. This is the default path used by the tp::dir define. + # v3 format. v4 format equivalent is dirs.config.path config_dir_path: '/etc/reference' -# The path where the app stores its log (if different by general log dirs like /var/log) -# v3 format. v4 format equivalent is dirs.log.path + # The path where the app stores its log (if different by general log dirs like /var/log) + # v3 format. v4 format equivalent is dirs.log.path log_dir_path: - '/var/log/reference' -# An v4 hash of files related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. -# They are used by tp::conf to manage files without the need to specify their path, and also can be used by tp info and tp debug commands. -# The common keys are: -# config : the main configuration file. It's path is used when you use tp::conf { 'appname': } -# init : the init script or systemd unit file configuration file. It's path is used when you use tp::conf { 'appname::init': } -# systemd: the systemd unit file. It's path is used when you use tp::conf { 'appname::systemd': } -# pid : the pid file. -# Any other string can be used to refer to other app specific files. Syntax and usage is similar. For example on nuclei -# tinydata you can have -# templates: the .templates-config.json file, which can be configured with tp::conf { 'nuclei::templates': } -# For each file the following subkeys can be used: -# path : the path of the file (required) -# format : the format of the file (optional, possible values are yaml, json, , inifile, inifile_with_stanzas, spaced, spaced_with_stanzas config_file_format) -# validate_cmd: the validate_cmd argument for the file resource used to validate its syntax before it's changed by Puppet (optional) -# mode : the mode of the file (optional) -# owner : the owner of the file (optional) -# group : the group of the file (optional) + # An v4 hash of files related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. + # They are used by tp::conf to manage files without the need to specify their path, and also can be used by tp info and tp debug commands. + # The common keys are: + # config : the main configuration file. It's path is used when you use tp::conf { 'appname': } + # init : the init script or systemd unit file configuration file. It's path is used when you use tp::conf { 'appname::init': } + # systemd: the systemd unit file. It's path is used when you use tp::conf { 'appname::systemd': } + # pid : the pid file. + # Any other string can be used to refer to other app specific files. Syntax and usage is similar. For example on nuclei + # tinydata you can have + # templates: the .templates-config.json file, which can be configured with tp::conf { 'nuclei::templates': } + # For each file the following subkeys can be used: + # path : the path of the file (required) + # format : the format of the file (optional, possible values are yaml, json, , inifile, inifile_with_stanzas, spaced, spaced_with_stanzas config_file_format) + # validate_cmd: the validate_cmd argument for the file resource used to validate its syntax before it's changed by Puppet (optional) + # mode : the mode of the file (optional) + # owner : the owner of the file (optional) + # group : the group of the file (optional) files: config: path: '/etc/reference/reference.conf' @@ -180,21 +182,21 @@ reference::settings: pid: path: '/run/reference.pid' -# An v4 hash of directories related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. -# They are used by tp::dir to manage the directories without the need to specify their path, and also can be used by tp info and tp debug commands. -# The common keys are: -# config : the main configuration directory. It's path is used when you use tp::dir { 'appname': } -# conf : a configuration directory for additional configuration files which are automatically added to the app's configuration (the dot conf files). -# It's path is used when you use tp::dir { 'appname::conf': } -# log : the log directory. It's path is used when you use tp::dir { 'appname::log': } (usually you don't need to manage it) -# home : the app's home directory if applicable -# data : the directory where the app stores its data -# Also for dirs you can have additional keys which refer to dirs specific to the app. -# For each dir the following subkeys can be used: -# path : the path of the dir (required) -# mode : the mode of the dir (optional) -# owner : the owner of the dir (optional) -# group : the group of the dir (optional) + # An v4 hash of directories related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. + # They are used by tp::dir to manage the directories without the need to specify their path, and also can be used by tp info and tp debug commands. + # The common keys are: + # config : the main configuration directory. It's path is used when you use tp::dir { 'appname': } + # conf : a configuration directory for additional configuration files which are automatically added to the app's configuration (the dot conf files). + # It's path is used when you use tp::dir { 'appname::conf': } + # log : the log directory. It's path is used when you use tp::dir { 'appname::log': } (usually you don't need to manage it) + # home : the app's home directory if applicable + # data : the directory where the app stores its data + # Also for dirs you can have additional keys which refer to dirs specific to the app. + # For each dir the following subkeys can be used: + # path : the path of the dir (required) + # mode : the mode of the dir (optional) + # owner : the owner of the dir (optional) + # group : the group of the dir (optional) dirs: config: path: '/etc/reference' @@ -205,68 +207,68 @@ reference::settings: home: path: /var/lib/reference -# This is a v4 hash equivalent to the files hash. It's used when Puppet is running as a not provileged user. -# So, given the examples in this doc, when you apply a manifest with tp::conf { 'reference': } the default -# path used will be /etc/reference/reference.conf if Puppet is running as root (on Linux and Mac) while -# if Puppet is running as a normal user the same define will manage the file $HOME/.reference/reference.conf -# Remember that you can always specify the path of the file to manage with tp::conf { 'reference': path => '/path/to/file' } + # This is a v4 hash equivalent to the files hash. It's used when Puppet is running as a not provileged user. + # So, given the examples in this doc, when you apply a manifest with tp::conf { 'reference': } the default + # path used will be /etc/reference/reference.conf if Puppet is running as root (on Linux and Mac) while + # if Puppet is running as a normal user the same define will manage the file $HOME/.reference/reference.conf + # Remember that you can always specify the path of the file to manage with tp::conf { 'reference': path => '/path/to/file' } user_files: config: path: '$HOME/.reference/reference.conf' -# This is a v4 hash equivalent to the dirs hash. It's used when Puppet is running as a not provileged user. -# Same logic as for user_files. + # This is a v4 hash equivalent to the dirs hash. It's used when Puppet is running as a not provileged user. + # Same logic as for user_files. user_dirs: config: path: '$HOME/.reference' -# This is v4 setting which allows you specify how the app has to be installed. -# What is set here in tinydata can be overridden by the tp::install argument install_method. -# Note however that not all the install methods might be available (or have the required tinydata) -# for all the apps and OS. -# Possible values are: -# package: the app is installed from a system package and managed by Puppet's package resource. This is usually the default value. -# file : the app is installed from a file downloaded and eventually extracted from an archive. Details under the release setting. -# source : the app is installed and eventually compiled from the git source repository. Details under the build setting. -# image : the app is installed as a Docker image. Details under the image setting. + # This is v4 setting which allows you specify how the app has to be installed. + # What is set here in tinydata can be overridden by the tp::install argument install_method. + # Note however that not all the install methods might be available (or have the required tinydata) + # for all the apps and OS. + # Possible values are: + # package: the app is installed from a system package and managed by Puppet's package resource. This is usually the default value. + # file : the app is installed from a file downloaded and eventually extracted from an archive. Details under the release setting. + # source : the app is installed and eventually compiled from the git source repository. Details under the build setting. + # image : the app is installed as a Docker image. Details under the image setting. install_method: 'package' -# The description of the app. It's used by tp command. v4. + # The description of the app. It's used by tp command. v4. description: 'reference_packages description' -# The name or the url of the official container image of the app. v3 format. The v4 equivalent is image.name + # The name or the url of the official container image of the app. v3 format. The v4 equivalent is image.name docker_image: 'reference/reference' -# The official website of the application. v4. Used by tp command. + # The official website of the application. v4. Used by tp command. website: 'https://reference.com' -# The tickets/issues page of the application. v4. Currently still not used. + # The tickets/issues page of the application. v4. Currently still not used. issues: 'https://github.com/reference/reference/issues' -# The git repository of the application. Used by tp::source and tp::install (with install_method = source). v4. + # The git repository of the application. Used by tp::source and tp::install (with install_method = source). v4. git_source: 'https://github.com/reference/reference' -# An hash of extra commands to execute when running the tp info command or tp::info task. v3 and v4 compatible. -# The keys are the names of the commands (ie: tp info APP list), the values are the actual commands to execute. + # An hash of extra commands to execute when running the tp info command or tp::info task. v3 and v4 compatible. + # The keys are the names of the commands (ie: tp info APP list), the values are the actual commands to execute. info_commands: list: 'reference list' -# An hash of extra commands to execute when running the tp debug command or tp::debug task. v3 and v4 compatible. -# The keys are the names of the commands (ie: tp debug APP list), the values are the actual commands to execute. + # An hash of extra commands to execute when running the tp debug command or tp::debug task. v3 and v4 compatible. + # The keys are the names of the commands (ie: tp debug APP list), the values are the actual commands to execute. debug_commands: list: 'reference debug' -# An hash of extra commands used to test if the application is running or installed correctly. -# They are executed when running the tp test command or the tp::test task. v3 and v4 compatible. + # An hash of extra commands used to test if the application is running or installed correctly. + # They are executed when running the tp test command or the tp::test task. v3 and v4 compatible. test_commands: status: 'reference status' -# The command to run to show the application's version. By default it's used appname --version, if a different command -# or argument is needed. Specify it here. v3 and v4 compatible. + # The command to run to show the application's version. By default it's used appname --version, if a different command + # or argument is needed. Specify it here. v3 and v4 compatible. version_command: 'reference version' -# An hash of commands to execute when running the tp::run command or the tp::run task. v3 and v4 compatible. -# Experimental feature yet to be implemented. Format of the subkeys might change. + # An hash of commands to execute when running the tp::run command or the tp::run task. v3 and v4 compatible. + # Experimental feature yet to be implemented. Format of the subkeys might change. run_commands: start: command: 'reference start' @@ -282,22 +284,22 @@ reference::settings: restart: command: 'reference restart' -# The main tcp port used by the application, if applicable. v3 only. Replaced by v4 ports.main.port and ports.main.protocol: tcp + # The main tcp port used by the application, if applicable. v3 only. Replaced by v4 ports.main.port and ports.main.protocol: tcp tcp_port: 42 -# The main udp port used by the application, if applicable. v3 only. Replaced by v4 ports.main.port and ports.main.protocol: udp + # The main udp port used by the application, if applicable. v3 only. Replaced by v4 ports.main.port and ports.main.protocol: udp udp_port: 42 -# A v4 hash of all the ports used by the application. -# The keys are the names of the ports, common names are (other names can be application specific): -# main: the main port used by the application -# ssl : the main port used by the application for ssl connections -# For each port name the values are hashes with the following keys: -# port : the port number (required) -# protocol : the protocol used (optional, default tcp) -# listen : the address to listen on (optional, default is based on the app's default) -# These settings are used by tp test and tp info commands and by tp::install with install_method=image -# to automatically map the app's port from host to container (see details under image setting). + # A v4 hash of all the ports used by the application. + # The keys are the names of the ports, common names are (other names can be application specific): + # main: the main port used by the application + # ssl : the main port used by the application for ssl connections + # For each port name the values are hashes with the following keys: + # port : the port number (required) + # protocol : the protocol used (optional, default tcp) + # listen : the address to listen on (optional, default is based on the app's default) + # These settings are used by tp test and tp info commands and by tp::install with install_method=image + # to automatically map the app's port from host to container (see details under image setting). ports: main: port: 42 @@ -307,8 +309,8 @@ reference::settings: port: 4432 protocol: tcp -# Configurations to manage app as a container image. v4 only. -# Used by tp::install with install_method=image + # Configurations to manage app as a container image. v4 only. + # Used by tp::install with install_method=image image: # The name of the image to use. Passed to docker pull. # Can be a full url like quay.io/argoproj/argocd or just the @@ -359,7 +361,7 @@ reference::settings: # maps systemd_options into a valid Systemd unit file in ini file format with stanza. You probably don't need to set this. systemd_template: 'tp/inifile_with_stanzas.erb' -# A v4 setting used by the tp::build define. + # A v4 setting used by the tp::build define. build: # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) # to apply before building the app. The values of each resource (here tp::install) can be a string, an array @@ -367,7 +369,7 @@ reference::settings: prerequisites: tp::install: - build-essential - # The commands to run execute in order to build the app + # The commands to run execute in order to build the app execs: configure: command: './configure' @@ -376,14 +378,14 @@ reference::settings: setup: command: 'make install' -# A v4 setting used by the tp::install define to install the app when install_method=file + # A v4 setting used by the tp::install define to install the app when install_method=file releases: # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) # to apply before installing the app with install_method=file . The values of each resource can be a string, # an array or an hash of resource titles with the relevant arguments prerequisites: {} - # The application latest known version released. This can be set the $version parameter of tp::install + # The application latest known version released. This can be set the $version parameter of tp::install # In the future, this value is going to be automatically updated, but it's likely to not be updated. # It's used when no specific version is set via tp::install. latest_version: '1.0.0' @@ -397,24 +399,24 @@ reference::settings: release_url: 'https://github.com/reference/reference/releases/download/reference-$VERSION/reference-$VERSION.tar.gz' # If release_url is not set then the url is built using the following values: $base_url/$base_path/$file_name - # Note that base_url and base_path are optional if release_url is set (they are useful if you get release files + # Note that base_url and base_path are optional if release_url is set (they are useful if you get release files # from a local repository). file_name is mandatory. base_url: 'https://github.com/reference/reference/releases/download' base_path: 'releases/download/reference-$VERSION' file_name: 'reference-$VERSION.tar.gz' - # The format of the archive. Needed to find the right way to decompress it + # The format of the archive. Needed to find the right way to decompress it file_format: tar.gz # Url of the latest release of an app, in case it's a fixed url which never changes and always points to - # the latest version of the app. + # the latest version of the app. latest_url: ~ # The name of the directory extracted from the archive. This gets variables replacement as well. # If not set, the file name without the file_format extension will be used. - # If empty the archive is not extracted into a directory but contains direclty one more files. - # When this happens, the extracted_file setting is used to specify the name of an extracted file. - # If extracted_dir is not an empty string, then extracted_file is ignored. + # If empty the archive is not extracted into a directory but contains direclty one more files. + # When this happens, the extracted_file setting is used to specify the name of an extracted file. + # If extracted_dir is not an empty string, then extracted_file is ignored. extracted_dir: 'reference-$VERSION' extracted_file: '' @@ -431,4 +433,3 @@ reference::settings: resources: {} manage_service: true manage_user: false - diff --git a/data/reference/hiera.yaml b/data/reference/hiera.yaml index 4b10fbcc..fcd4bfdc 100644 --- a/data/reference/hiera.yaml +++ b/data/reference/hiera.yaml @@ -14,15 +14,15 @@ # As in Hiera lookup is done from top to bottom, according to the merge method specified # when calling the tp_lookup function # Starting from tp version 3.8 the merge method has changed from 'merge' to 'deep_merge' -# This is not expected to have any impact on the existing TinyData but is required by -# the more complex tinydata v4 settings +# This is not expected to have any impact on the existing TinyData but is required by +# the more complex tinydata v4 settings # The lower levels in the hierarchy generally use a default to configure general settings # valid for all the apps (and in some cases different for OS and OS versions) # For each app you can have a different hiera.yaml with more or less levels # A minimal recommended hierarchy is as follows: -# - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" +# - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" # - "%{title}/osfamily/%{osfamily}" # - "%{title}/default" # - "default/%{operatingsystem}%{operatingsystemmajrelease}" @@ -30,7 +30,7 @@ # - default # That maps respectively to the following files in the tinydata module: -# Example with the app redis on RedHat9 +# Example with the app redis on RedHat9 # - data/redis/osfamily/RedHat9.yaml # - data/redis/osfamily/RedHat.yaml # - data/redis/default.yaml diff --git a/data/reference/osfamily/Darwin.yaml b/data/reference/osfamily/Darwin.yaml index 1c0e6be3..0edcb020 100644 --- a/data/reference/osfamily/Darwin.yaml +++ b/data/reference/osfamily/Darwin.yaml @@ -1,6 +1,6 @@ --- reference::settings: - # Name of brew package to install. This parameter is optional and currently + # Name of brew package to install. This parameter is optional and currently # redundant, as on MacOS brew is always used to manage packages and # the package_name setting is enough to define what package to install # via the homebrew provider. diff --git a/data/rinse/default.yaml b/data/rinse/default.yaml index 686657e4..319ecd8a 100644 --- a/data/rinse/default.yaml +++ b/data/rinse/default.yaml @@ -1,5 +1,5 @@ --- - rinse::settings: - package_name: 'rinse' - config_file_path: '/etc/rinse/rinse.conf' - config_dir_path: '/etc/rinse' +rinse::settings: + package_name: 'rinse' + config_file_path: '/etc/rinse/rinse.conf' + config_dir_path: '/etc/rinse' diff --git a/data/rinse/osfamily/Debian.yaml b/data/rinse/osfamily/Debian.yaml index 7705d06e..5b443365 100644 --- a/data/rinse/osfamily/Debian.yaml +++ b/data/rinse/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - rinse::settings: - config_file_path: '/etc/rinse/rinse.conf' +rinse::settings: + config_file_path: '/etc/rinse/rinse.conf' diff --git a/data/rpmfusion-free/osfamily/CentOS8.yaml b/data/rpmfusion-free/osfamily/CentOS8.yaml index 9a3fecce..b49a2d46 100644 --- a/data/rpmfusion-free/osfamily/CentOS8.yaml +++ b/data/rpmfusion-free/osfamily/CentOS8.yaml @@ -3,4 +3,4 @@ rpmfusion-free::settings: exec_postinstall: enable_pmfusion_free: command: 'dnf config-manager --enable PowerTools' - unless: 'dnf repolist | grep PowerTools' \ No newline at end of file + unless: 'dnf repolist | grep PowerTools' diff --git a/data/rpmfusion-free/osfamily/RedHat8.yaml b/data/rpmfusion-free/osfamily/RedHat8.yaml index de406b40..e56dc7c4 100644 --- a/data/rpmfusion-free/osfamily/RedHat8.yaml +++ b/data/rpmfusion-free/osfamily/RedHat8.yaml @@ -1,7 +1,7 @@ --- rpmfusion-free::settings: - repo_package_url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm' + repo_package_url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm exec_postinstall: enable_pmfusion_free: - command: 'subscription-manager repos --enable "codeready-builder-for-rhel-8-$(uname -m)-rpms"' - unless: 'subscription-manager list --consumed | grep codeready-builder-for-rhel-8-$(uname -m)-rpms' \ No newline at end of file + command: subscription-manager repos --enable "codeready-builder-for-rhel-8-$(uname -m)-rpms" + unless: subscription-manager list --consumed | grep codeready-builder-for-rhel-8-$(uname -m)-rpms diff --git a/data/rsync/default.yaml b/data/rsync/default.yaml index 68de780b..c30b5694 100644 --- a/data/rsync/default.yaml +++ b/data/rsync/default.yaml @@ -1,10 +1,10 @@ --- - rsync::settings: - package_name: 'rsync' - service_name: 'rsync' - config_file_path: '/etc/rsyncd.conf' - pid_file_path: '/var/run/rsync.pid' - process_name: 'rsync' - process_user: 'root' - process_group: 'root' - tcp_port: '873' +rsync::settings: + package_name: 'rsync' + service_name: 'rsync' + config_file_path: '/etc/rsyncd.conf' + pid_file_path: '/var/run/rsync.pid' + process_name: 'rsync' + process_user: 'root' + process_group: 'root' + tcp_port: '873' diff --git a/data/rsync/osfamily/Debian.yaml b/data/rsync/osfamily/Debian.yaml index 1710cda5..590b380d 100644 --- a/data/rsync/osfamily/Debian.yaml +++ b/data/rsync/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - rsync::settings: - init_file_path: '/etc/default/rsync' +rsync::settings: + init_file_path: '/etc/default/rsync' diff --git a/data/rsync/osfamily/FreeBSD.yaml b/data/rsync/osfamily/FreeBSD.yaml index 8e216e4a..55857727 100644 --- a/data/rsync/osfamily/FreeBSD.yaml +++ b/data/rsync/osfamily/FreeBSD.yaml @@ -1,8 +1,8 @@ --- - rsync::settings: - service_name: 'rsyncd' - config_file_path: '/usr/local/etc/rsyncd.conf' - process_name: 'rsync' - process_group: 'wheel' - tcp_port: '873' +rsync::settings: + service_name: 'rsyncd' + config_file_path: '/usr/local/etc/rsyncd.conf' + process_name: 'rsync' + process_group: 'wheel' + tcp_port: '873' diff --git a/data/rsync/osfamily/RedHat.yaml b/data/rsync/osfamily/RedHat.yaml index da417785..2d56d2b1 100644 --- a/data/rsync/osfamily/RedHat.yaml +++ b/data/rsync/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - rsync::settings: - init_file_path: '/etc/sysconfig/rsync' +rsync::settings: + init_file_path: '/etc/sysconfig/rsync' diff --git a/data/rsyslog-relp/default.yaml b/data/rsyslog-relp/default.yaml index 988144f9..3995ba95 100644 --- a/data/rsyslog-relp/default.yaml +++ b/data/rsyslog-relp/default.yaml @@ -1,3 +1,3 @@ --- - rsyslog-relp::settings: - package_name: 'rsyslog-relp' +rsyslog-relp::settings: + package_name: 'rsyslog-relp' diff --git a/data/ruby-dev/default.yaml b/data/ruby-dev/default.yaml index a7132a84..8dfcfd91 100644 --- a/data/ruby-dev/default.yaml +++ b/data/ruby-dev/default.yaml @@ -1,3 +1,3 @@ --- - ruby-dev::settings: - package_name: 'ruby-dev' +ruby-dev::settings: + package_name: 'ruby-dev' diff --git a/data/ruby-dev/osfamily/Debian.yaml b/data/ruby-dev/osfamily/Debian.yaml index a7132a84..8dfcfd91 100644 --- a/data/ruby-dev/osfamily/Debian.yaml +++ b/data/ruby-dev/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - ruby-dev::settings: - package_name: 'ruby-dev' +ruby-dev::settings: + package_name: 'ruby-dev' diff --git a/data/ruby-dev/osfamily/RedHat.yaml b/data/ruby-dev/osfamily/RedHat.yaml index cada3588..ce30cc8a 100644 --- a/data/ruby-dev/osfamily/RedHat.yaml +++ b/data/ruby-dev/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - ruby-dev::settings: - package_name: 'ruby-devel' +ruby-dev::settings: + package_name: 'ruby-devel' diff --git a/data/ruby-dev/osfamily/Suse.yaml b/data/ruby-dev/osfamily/Suse.yaml index cada3588..ce30cc8a 100644 --- a/data/ruby-dev/osfamily/Suse.yaml +++ b/data/ruby-dev/osfamily/Suse.yaml @@ -1,3 +1,3 @@ --- - ruby-dev::settings: - package_name: 'ruby-devel' +ruby-dev::settings: + package_name: 'ruby-devel' diff --git a/data/ruby/default.yaml b/data/ruby/default.yaml index eb9bbf09..64d4e988 100644 --- a/data/ruby/default.yaml +++ b/data/ruby/default.yaml @@ -1,3 +1,3 @@ --- - ruby::settings: - package_name: 'ruby' +ruby::settings: + package_name: 'ruby' diff --git a/data/ruby/osfamily/RedHat6.yaml b/data/ruby/osfamily/RedHat6.yaml index 971b8bf6..08a37ed3 100644 --- a/data/ruby/osfamily/RedHat6.yaml +++ b/data/ruby/osfamily/RedHat6.yaml @@ -1,3 +1,3 @@ --- - ruby::settings: - package_name: 'rubygems' +ruby::settings: + package_name: 'rubygems' diff --git a/data/rundeck/default.yaml b/data/rundeck/default.yaml index 402e3f2c..663334d9 100644 --- a/data/rundeck/default.yaml +++ b/data/rundeck/default.yaml @@ -1,20 +1,20 @@ --- - rundeck::settings: - package_name: 'rundeck' - service_name: 'rundeckd' - config_file_path: '/etc/rundeck/framework.properties' - init_file_path: '/etc/rundeck/profile' - config_dir_path: '/etc/rundeck' - ssl_dir_path: '/etc/rundeck/ssl' - pid_file_path: '/var/run/rundeckd.pid' - log_file_path: '/var/log/rundeck/rundeck.log' - log_dir_path: '/var/log/rundeck' - projects_dir_path: '/var/rundeck/projects' - process_name: 'rundeck' - process_user: 'rundeck' - process_group: 'rundeck' - config_file_owner: 'rundeck' - config_file_group: 'rundeck' - config_file_mode: '0640' - tp_prerequisites: - - 'openjdk-jdk' +rundeck::settings: + package_name: 'rundeck' + service_name: 'rundeckd' + config_file_path: '/etc/rundeck/framework.properties' + init_file_path: '/etc/rundeck/profile' + config_dir_path: '/etc/rundeck' + ssl_dir_path: '/etc/rundeck/ssl' + pid_file_path: '/var/run/rundeckd.pid' + log_file_path: '/var/log/rundeck/rundeck.log' + log_dir_path: '/var/log/rundeck' + projects_dir_path: '/var/rundeck/projects' + process_name: 'rundeck' + process_user: 'rundeck' + process_group: 'rundeck' + config_file_owner: 'rundeck' + config_file_group: 'rundeck' + config_file_mode: '0640' + tp_prerequisites: + - 'openjdk-jdk' diff --git a/data/rundeck/osfamily/Debian.yaml b/data/rundeck/osfamily/Debian.yaml index 074f35a1..bb76d39b 100644 --- a/data/rundeck/osfamily/Debian.yaml +++ b/data/rundeck/osfamily/Debian.yaml @@ -1,2 +1,2 @@ --- - rundeck::settings: +rundeck::settings: diff --git a/data/rundeck/osfamily/RedHat.yaml b/data/rundeck/osfamily/RedHat.yaml index 41a37579..3b755515 100644 --- a/data/rundeck/osfamily/RedHat.yaml +++ b/data/rundeck/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - rundeck::settings: - repo_package_url: 'http://repo.rundeck.org/latest.rpm' - repo_package_name: 'rundeck-repo' +rundeck::settings: + repo_package_url: 'http://repo.rundeck.org/latest.rpm' + repo_package_name: 'rundeck-repo' diff --git a/data/samba/default.yaml b/data/samba/default.yaml index e15f552d..35be646a 100644 --- a/data/samba/default.yaml +++ b/data/samba/default.yaml @@ -1,14 +1,14 @@ --- - samba::settings: - package_name: 'samba' - service_name: 'smb' - config_file_path: '/etc/samba/smb.conf' - config_dir_path: '/etc/samba' - init_file_path: '/etc/sysconfig/samba' - tcp_port: '445' - pid_file_path: '/var/run/smbd.pid' - log_file_path: - - '/var/log/samba/log.smbd' - - '/var/log/samba/log.nmbd' - process_user: 'samba' - process_group: 'samba' +samba::settings: + package_name: 'samba' + service_name: 'smb' + config_file_path: '/etc/samba/smb.conf' + config_dir_path: '/etc/samba' + init_file_path: '/etc/sysconfig/samba' + tcp_port: '445' + pid_file_path: '/var/run/smbd.pid' + log_file_path: + - '/var/log/samba/log.smbd' + - '/var/log/samba/log.nmbd' + process_user: 'samba' + process_group: 'samba' diff --git a/data/samba/operatingsystem/Debian9.yaml b/data/samba/operatingsystem/Debian9.yaml index 52191279..353ef147 100644 --- a/data/samba/operatingsystem/Debian9.yaml +++ b/data/samba/operatingsystem/Debian9.yaml @@ -1,3 +1,3 @@ --- - samba::settings: - service_name: 'smb' +samba::settings: + service_name: 'smb' diff --git a/data/samba/osfamily/Debian.yaml b/data/samba/osfamily/Debian.yaml index 492fd31e..a641a24e 100644 --- a/data/samba/osfamily/Debian.yaml +++ b/data/samba/osfamily/Debian.yaml @@ -1,6 +1,6 @@ --- - samba::settings: - service_name: 'samba' - init_file_path: '/etc/default/samba' - pid_file_path: '/var/run/samba/smbd.pid' +samba::settings: + service_name: 'samba' + init_file_path: '/etc/default/samba' + pid_file_path: '/var/run/samba/smbd.pid' diff --git a/data/samba/osfamily/Suse.yaml b/data/samba/osfamily/Suse.yaml index a117da5d..d0101a0d 100644 --- a/data/samba/osfamily/Suse.yaml +++ b/data/samba/osfamily/Suse.yaml @@ -1,5 +1,5 @@ --- - samba::settings: - log_file_path: - - '/var/log/samba/log.smbd' - - '/var/log/samba/cores/smbd' +samba::settings: + log_file_path: + - '/var/log/samba/log.smbd' + - '/var/log/samba/cores/smbd' diff --git a/data/sample/default.yaml b/data/sample/default.yaml index 8779e1c6..b6b30396 100644 --- a/data/sample/default.yaml +++ b/data/sample/default.yaml @@ -10,7 +10,7 @@ sample::settings: process_group: 'root' config_file_path: '/etc/sample/sample.conf' config_file_format: yaml -# validate_cmd: 'sample validate' + # validate_cmd: 'sample validate' pid_file_path: '/run/sample.pid' init_file_path: '/etc/sysconfig/sample.conf' log_file_path: @@ -19,7 +19,7 @@ sample::settings: log_dir_path: - '/var/log/sample' -# tp 4 settings + # tp 4 settings install_method: 'package' description: 'sample description' docker_image: 'sample/sample' diff --git a/data/sample/osfamily/windows.yaml b/data/sample/osfamily/windows.yaml index 1a965a9a..18eaff30 100644 --- a/data/sample/osfamily/windows.yaml +++ b/data/sample/osfamily/windows.yaml @@ -10,7 +10,7 @@ sample::settings: user_config_file_path: '%APPDATA%\sample\sample.conf' user_config_dir_path: '%APPDATA%\sample' -# If exe or msi package is available for direct download: + # If exe or msi package is available for direct download: package_provider: 'windows' package_source: 'https://github.com/sample/sample/releases/download/v$VERSION/sample_$VERSION_$OS_$ARCH.msi' diff --git a/data/scikit-learn/default.yaml b/data/scikit-learn/default.yaml index 163db1fc..90517c3d 100644 --- a/data/scikit-learn/default.yaml +++ b/data/scikit-learn/default.yaml @@ -2,4 +2,3 @@ scikit-learn: package_name: 'scikit-learn' package_provider: 'pip' - diff --git a/data/screen/default.yaml b/data/screen/default.yaml index 6c4f030a..77ca6ca4 100644 --- a/data/screen/default.yaml +++ b/data/screen/default.yaml @@ -1,4 +1,4 @@ --- - screen::settings: - package_name: 'screen' - config_file_path: '/etc/screenrc' +screen::settings: + package_name: 'screen' + config_file_path: '/etc/screenrc' diff --git a/data/sendmail/default.yaml b/data/sendmail/default.yaml index 8c9ec5a4..c938aec8 100644 --- a/data/sendmail/default.yaml +++ b/data/sendmail/default.yaml @@ -1,12 +1,12 @@ --- - sendmail::settings: - package_name: 'sendmail' - service_name: 'sendmail' - config_file_path: '/etc/mail/sendmail.mc' - config_dir_path: '/etc/mail' - pid_file_path: '/var/run/sendmail.pid' - log_file_path: '/var/log/maillog' - process_name: 'sendmail' - process_user: 'root' - process_group: 'root' - tcp_port: '25' +sendmail::settings: + package_name: 'sendmail' + service_name: 'sendmail' + config_file_path: '/etc/mail/sendmail.mc' + config_dir_path: '/etc/mail' + pid_file_path: '/var/run/sendmail.pid' + log_file_path: '/var/log/maillog' + process_name: 'sendmail' + process_user: 'root' + process_group: 'root' + tcp_port: '25' diff --git a/data/sendmail/osfamily/Debian.yaml b/data/sendmail/osfamily/Debian.yaml index 6f1d7cf4..9865d9ff 100644 --- a/data/sendmail/osfamily/Debian.yaml +++ b/data/sendmail/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - sendmail::settings: - package_name: 'sendmail-bin' - log_file_path: '/var/log/mail.log' - init_file_path: '/etc/default/sendmail' +sendmail::settings: + package_name: 'sendmail-bin' + log_file_path: '/var/log/mail.log' + init_file_path: '/etc/default/sendmail' diff --git a/data/sendmail/osfamily/RedHat.yaml b/data/sendmail/osfamily/RedHat.yaml index 222912ae..ff9d0227 100644 --- a/data/sendmail/osfamily/RedHat.yaml +++ b/data/sendmail/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- - sendmail::settings: - package_name: 'sendmail-cf' - init_file_path: '/etc/sysconfig/sendmail' +sendmail::settings: + package_name: 'sendmail-cf' + init_file_path: '/etc/sysconfig/sendmail' diff --git a/data/sensu/default.yaml b/data/sensu/default.yaml index b625dbcc..57cfa2b6 100644 --- a/data/sensu/default.yaml +++ b/data/sensu/default.yaml @@ -20,4 +20,4 @@ sensu::settings: process_name: 'sensu' process_user: 'sensu' process_group: 'sensu' - init_file_path: '/etc/default/sensu' + init_file_path: '/etc/default/sensu' diff --git a/data/serf/default.yaml b/data/serf/default.yaml index 4c0eb7fa..3cd04f93 100644 --- a/data/serf/default.yaml +++ b/data/serf/default.yaml @@ -14,18 +14,18 @@ serf::settings: sub_commands: - 'agent': 'Runs a Serf agent' - 'event': 'Send a custom event through the Serf cluster' - 'force-leave': 'Forces a member of the cluster to enter the "left" state' - 'info': 'Provides debugging information for operators' - 'join': 'Tell Serf agent to join cluster' - 'keygen': 'Generates a new encryption key' - 'keys': 'Manipulate the internal encryption keyring used by Serf' - 'leave': 'Gracefully leaves the Serf cluster and shuts down' - 'members': 'Lists the members of a Serf cluster' - 'monitor': 'Stream logs from a Serf agent' - 'query': 'Send a query to the Serf cluster' - 'reachability': 'Test network reachability' - 'rtt': 'Estimates network round trip time between nodes' - 'tags': 'Modify tags of a running Serf agent' - 'version': 'Prints the Serf version' \ No newline at end of file + 'agent': 'Runs a Serf agent' + 'event': 'Send a custom event through the Serf cluster' + 'force-leave': 'Forces a member of the cluster to enter the "left" state' + 'info': 'Provides debugging information for operators' + 'join': 'Tell Serf agent to join cluster' + 'keygen': 'Generates a new encryption key' + 'keys': 'Manipulate the internal encryption keyring used by Serf' + 'leave': 'Gracefully leaves the Serf cluster and shuts down' + 'members': 'Lists the members of a Serf cluster' + 'monitor': 'Stream logs from a Serf agent' + 'query': 'Send a query to the Serf cluster' + 'reachability': 'Test network reachability' + 'rtt': 'Estimates network round trip time between nodes' + 'tags': 'Modify tags of a running Serf agent' + 'version': 'Prints the Serf version' \ No newline at end of file diff --git a/data/snmp/default.yaml b/data/snmp/default.yaml index b34b576e..0cdf07d2 100644 --- a/data/snmp/default.yaml +++ b/data/snmp/default.yaml @@ -1,3 +1,3 @@ --- - snmp::settings: - package_name: 'snmp' +snmp::settings: + package_name: 'snmp' diff --git a/data/snmp/osfamily/Debian.yaml b/data/snmp/osfamily/Debian.yaml index fbf24279..040a3ed9 100644 --- a/data/snmp/osfamily/Debian.yaml +++ b/data/snmp/osfamily/Debian.yaml @@ -1,5 +1,4 @@ ---- - snmp::settings: - config_file_path: '/etc/snmp/snmp.conf' - config_dir_path: '/etc/snmp/' - +--- +snmp::settings: + config_file_path: '/etc/snmp/snmp.conf' + config_dir_path: '/etc/snmp/' diff --git a/data/snmp/osfamily/RedHat.yaml b/data/snmp/osfamily/RedHat.yaml index c0d0288a..233bdd0e 100644 --- a/data/snmp/osfamily/RedHat.yaml +++ b/data/snmp/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - snmp::settings: - package_name: 'net-snmp-utils' +snmp::settings: + package_name: 'net-snmp-utils' diff --git a/data/snmp/osfamily/Solaris.yaml b/data/snmp/osfamily/Solaris.yaml index 04b7fbe0..7ae7ff58 100644 --- a/data/snmp/osfamily/Solaris.yaml +++ b/data/snmp/osfamily/Solaris.yaml @@ -1,3 +1,3 @@ --- - snmp::settings: - package_name: 'net-snmp' +snmp::settings: + package_name: 'net-snmp' diff --git a/data/snmp/osfamily/Suse.yaml b/data/snmp/osfamily/Suse.yaml index 4d1cf055..233bdd0e 100644 --- a/data/snmp/osfamily/Suse.yaml +++ b/data/snmp/osfamily/Suse.yaml @@ -1,4 +1,3 @@ --- - snmp::settings: - package_name: 'net-snmp-utils' - +snmp::settings: + package_name: 'net-snmp-utils' diff --git a/data/snmp/osfamily/Ubuntu.yaml b/data/snmp/osfamily/Ubuntu.yaml index fbf24279..040a3ed9 100644 --- a/data/snmp/osfamily/Ubuntu.yaml +++ b/data/snmp/osfamily/Ubuntu.yaml @@ -1,5 +1,4 @@ ---- - snmp::settings: - config_file_path: '/etc/snmp/snmp.conf' - config_dir_path: '/etc/snmp/' - +--- +snmp::settings: + config_file_path: '/etc/snmp/snmp.conf' + config_dir_path: '/etc/snmp/' diff --git a/data/snmpd/default.yaml b/data/snmpd/default.yaml index 15c9384f..2db5d3af 100644 --- a/data/snmpd/default.yaml +++ b/data/snmpd/default.yaml @@ -1,13 +1,13 @@ --- - snmpd::settings: - package_name: 'snmpd' - service_name: 'snmpd' - config_file_path: '/etc/snmp/snmpd.conf' - config_dir_path: '/etc/snmp' - pid_file_path: '/var/run/snmpd.pid' - log_file_path: '/var/log/snmpd/snmpd.log' - log_dir_path: '/var/log/snmpd' - process_name: 'snmpd' - process_user: 'snmpd' - process_group: 'snmpd' - udp_port: '161' +snmpd::settings: + package_name: 'snmpd' + service_name: 'snmpd' + config_file_path: '/etc/snmp/snmpd.conf' + config_dir_path: '/etc/snmp' + pid_file_path: '/var/run/snmpd.pid' + log_file_path: '/var/log/snmpd/snmpd.log' + log_dir_path: '/var/log/snmpd' + process_name: 'snmpd' + process_user: 'snmpd' + process_group: 'snmpd' + udp_port: '161' diff --git a/data/snmpd/osfamily/Debian.yaml b/data/snmpd/osfamily/Debian.yaml index a92fa122..b8d448b7 100644 --- a/data/snmpd/osfamily/Debian.yaml +++ b/data/snmpd/osfamily/Debian.yaml @@ -1,7 +1,7 @@ --- - snmpd::settings: - config_file_mode: '0600' - config_dir_path: '/etc/snmp' - process_user: 'snmp' - process_group: 'snmp' - init_file_path: '/etc/default/snmpd' +snmpd::settings: + config_file_mode: '0600' + config_dir_path: '/etc/snmp' + process_user: 'snmp' + process_group: 'snmp' + init_file_path: '/etc/default/snmpd' diff --git a/data/snmpd/osfamily/OpenBSD.yaml b/data/snmpd/osfamily/OpenBSD.yaml index 0c52adad..84614119 100644 --- a/data/snmpd/osfamily/OpenBSD.yaml +++ b/data/snmpd/osfamily/OpenBSD.yaml @@ -1,6 +1,6 @@ --- - snmpd::settings: - package_name: 'net-snmp' - service_name: 'netsnmpd' - config_file_path: '/etc/snmp/snmpd.conf' - config_dir_path: '/etc/snmp' +snmpd::settings: + package_name: 'net-snmp' + service_name: 'netsnmpd' + config_file_path: '/etc/snmp/snmpd.conf' + config_dir_path: '/etc/snmp' diff --git a/data/snmpd/osfamily/RedHat.yaml b/data/snmpd/osfamily/RedHat.yaml index deb565c1..91258695 100644 --- a/data/snmpd/osfamily/RedHat.yaml +++ b/data/snmpd/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - snmpd::settings: - package_name: 'net-snmp' - config_file_mode: '0600' - init_file_path: '/etc/sysconfig/snmpd.options' +snmpd::settings: + package_name: 'net-snmp' + config_file_mode: '0600' + init_file_path: '/etc/sysconfig/snmpd.options' diff --git a/data/snmpd/osfamily/Solaris.yaml b/data/snmpd/osfamily/Solaris.yaml index 17b92ae1..c4dfe4b8 100644 --- a/data/snmpd/osfamily/Solaris.yaml +++ b/data/snmpd/osfamily/Solaris.yaml @@ -1,8 +1,8 @@ --- - snmpd::settings: - package_name: 'net-snmp' - service_name: 'net-snmp' - config_file_path: '/etc/net-snmp/snmp/snmpd.conf' - config_file_mode: '0444' - config_file_group: 'bin' - config_dir_path: '/etc/net-snmp/snmp' +snmpd::settings: + package_name: 'net-snmp' + service_name: 'net-snmp' + config_file_path: '/etc/net-snmp/snmp/snmpd.conf' + config_file_mode: '0444' + config_file_group: 'bin' + config_dir_path: '/etc/net-snmp/snmp' diff --git a/data/snmpd/osfamily/Suse.yaml b/data/snmpd/osfamily/Suse.yaml index 27f313d2..2e4c73f5 100644 --- a/data/snmpd/osfamily/Suse.yaml +++ b/data/snmpd/osfamily/Suse.yaml @@ -1,4 +1,3 @@ --- - snmpd::settings: - package_name: 'net-snmp' - +snmpd::settings: + package_name: 'net-snmp' diff --git a/data/spiderfoot/default.yaml b/data/spiderfoot/default.yaml index 11a2dcf0..f8dd5fbe 100644 --- a/data/spiderfoot/default.yaml +++ b/data/spiderfoot/default.yaml @@ -15,7 +15,7 @@ spiderfoot::settings: git_source: 'https://github.com/smicallef/spiderfoot' -# tp 4 settings + # tp 4 settings description: 'SpiderFoot automates OSINT so you can find what matters, faster.' website: 'https://www.spiderfoot.net/' diff --git a/data/spiderfoot/operatingsystem/Debian10.yaml b/data/spiderfoot/operatingsystem/Debian10.yaml index 7c95b7ca..72c3c60b 100644 --- a/data/spiderfoot/operatingsystem/Debian10.yaml +++ b/data/spiderfoot/operatingsystem/Debian10.yaml @@ -1,3 +1,4 @@ +--- spiderfoot::settings: build: execs: diff --git a/data/spiderfoot/operatingsystem/Debian9.yaml b/data/spiderfoot/operatingsystem/Debian9.yaml index 7c95b7ca..72c3c60b 100644 --- a/data/spiderfoot/operatingsystem/Debian9.yaml +++ b/data/spiderfoot/operatingsystem/Debian9.yaml @@ -1,3 +1,4 @@ +--- spiderfoot::settings: build: execs: diff --git a/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml b/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml index 7c95b7ca..72c3c60b 100644 --- a/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml +++ b/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,4 @@ +--- spiderfoot::settings: build: execs: diff --git a/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml b/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml index 7c95b7ca..72c3c60b 100644 --- a/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml +++ b/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml @@ -1,3 +1,4 @@ +--- spiderfoot::settings: build: execs: diff --git a/data/squid/default.yaml b/data/squid/default.yaml index 38ca732e..863afa4b 100644 --- a/data/squid/default.yaml +++ b/data/squid/default.yaml @@ -1,11 +1,11 @@ --- - squid::settings: - package_name: 'squid' - service_name: 'squid' - config_file_path: '/etc/squid/squid.conf' - config_dir_path: '/etc/squid' - pid_file_path: '/var/run/squid.pid' - process_name: 'squid' - process_user: 'squid' - process_group: 'squid' - tcp_port: '3128' +squid::settings: + package_name: 'squid' + service_name: 'squid' + config_file_path: '/etc/squid/squid.conf' + config_dir_path: '/etc/squid' + pid_file_path: '/var/run/squid.pid' + process_name: 'squid' + process_user: 'squid' + process_group: 'squid' + tcp_port: '3128' diff --git a/data/squid/osfamily/Debian9.yaml b/data/squid/osfamily/Debian9.yaml index e808b700..82c72ed6 100644 --- a/data/squid/osfamily/Debian9.yaml +++ b/data/squid/osfamily/Debian9.yaml @@ -1,7 +1,7 @@ --- - squid::settings: - package_name: 'squid3' - service_name: 'squid3' - config_file_path: '/etc/squid3/squid.conf' - config_dir_path: '/etc/squid3' - pid_file_path: '/var/run/squid3.pid' +squid::settings: + package_name: 'squid3' + service_name: 'squid3' + config_file_path: '/etc/squid3/squid.conf' + config_dir_path: '/etc/squid3' + pid_file_path: '/var/run/squid3.pid' diff --git a/data/ssmtp/default.yaml b/data/ssmtp/default.yaml index 24d2cd18..4b80172d 100644 --- a/data/ssmtp/default.yaml +++ b/data/ssmtp/default.yaml @@ -1,7 +1,7 @@ --- - ssmtp::settings: - package_name: 'ssmtp' - config_file_path: '/etc/ssmtp/ssmtp.conf' - config_file_group: 'mail' - config_file_mode: '0640' - config_dir_path: '/etc/ssmtp' +ssmtp::settings: + package_name: 'ssmtp' + config_file_path: '/etc/ssmtp/ssmtp.conf' + config_file_group: 'mail' + config_file_mode: '0640' + config_dir_path: '/etc/ssmtp' diff --git a/data/strace/default.yaml b/data/strace/default.yaml index fc0be5ed..f42d283c 100644 --- a/data/strace/default.yaml +++ b/data/strace/default.yaml @@ -1,3 +1,3 @@ --- - strace::settings: - package_name: 'strace' +strace::settings: + package_name: 'strace' diff --git a/data/subversion/default.yaml b/data/subversion/default.yaml index 4c3c618e..8763a2df 100644 --- a/data/subversion/default.yaml +++ b/data/subversion/default.yaml @@ -1,5 +1,5 @@ --- - subversion::settings: - package_name: 'subversion' - config_file_path: '/etc/subversion/config.conf' - config_dir_path: '/etc/subversion' +subversion::settings: + package_name: 'subversion' + config_file_path: '/etc/subversion/config.conf' + config_dir_path: '/etc/subversion' diff --git a/data/sudo/default.yaml b/data/sudo/default.yaml index 45fe7ce9..58515cc6 100644 --- a/data/sudo/default.yaml +++ b/data/sudo/default.yaml @@ -1,5 +1,5 @@ --- - sudo::settings: - config_file_path: '/etc/sudoers' - config_file_mode: '0440' - config_dir_path: '/etc/sudoers.d' +sudo::settings: + config_file_path: '/etc/sudoers' + config_file_mode: '0440' + config_dir_path: '/etc/sudoers.d' diff --git a/data/supervisor/default.yaml b/data/supervisor/default.yaml index 8ce1d7da..a3749db8 100644 --- a/data/supervisor/default.yaml +++ b/data/supervisor/default.yaml @@ -1,12 +1,12 @@ --- - supervisor::settings: - package_name: 'supervisor' - service_name: 'supervisor' - config_dir_path: '/etc/supervisor' - conf_dir_path: '/etc/supervisor/conf.d' - pid_file_path: '/var/run/supervisor.pid' - log_file_path: '/var/log/supervisor.log' - log_dir_path: '/var/log/supervisor' - process_name: 'supervisord' - nodaemon_args: '--nodaemon' - config_file_extension: 'conf' +supervisor::settings: + package_name: 'supervisor' + service_name: 'supervisor' + config_dir_path: '/etc/supervisor' + conf_dir_path: '/etc/supervisor/conf.d' + pid_file_path: '/var/run/supervisor.pid' + log_file_path: '/var/log/supervisor.log' + log_dir_path: '/var/log/supervisor' + process_name: 'supervisord' + nodaemon_args: '--nodaemon' + config_file_extension: 'conf' diff --git a/data/supervisor/osfamily/Debian.yaml b/data/supervisor/osfamily/Debian.yaml index bd4e0786..11f5971f 100644 --- a/data/supervisor/osfamily/Debian.yaml +++ b/data/supervisor/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- - supervisor::settings: - init_file_path: '/etc/default/supervisor' - config_file_path: '/etc/supervisor/supervisord.conf' - process_args: '-c /etc/supervisor/supervisord.conf' +supervisor::settings: + init_file_path: '/etc/default/supervisor' + config_file_path: '/etc/supervisor/supervisord.conf' + process_args: '-c /etc/supervisor/supervisord.conf' diff --git a/data/supervisor/osfamily/Linux.yaml b/data/supervisor/osfamily/Linux.yaml index cd1081a3..4e2b4aad 100644 --- a/data/supervisor/osfamily/Linux.yaml +++ b/data/supervisor/osfamily/Linux.yaml @@ -1,6 +1,6 @@ --- - supervisor::settings: - config_file_path: '/etc/supervisord.conf' - config_dir_path: '' - conf_dir_path: '' - service_name: 'supervisord' +supervisor::settings: + config_file_path: '/etc/supervisord.conf' + config_dir_path: '' + conf_dir_path: '' + service_name: 'supervisord' diff --git a/data/supervisor/osfamily/RedHat.yaml b/data/supervisor/osfamily/RedHat.yaml index b15f6b5b..5efdf152 100644 --- a/data/supervisor/osfamily/RedHat.yaml +++ b/data/supervisor/osfamily/RedHat.yaml @@ -1,7 +1,7 @@ --- - supervisor::settings: - config_file_path: '/etc/supervisord.conf' - config_dir_path: '/etc/supervisord.d' - conf_dir_path: '/etc/supervisord.d' - process_args: '-c /etc/supervisord.conf' - config_file_extension: 'ini' +supervisor::settings: + config_file_path: '/etc/supervisord.conf' + config_dir_path: '/etc/supervisord.d' + conf_dir_path: '/etc/supervisord.d' + process_args: '-c /etc/supervisord.conf' + config_file_extension: 'ini' diff --git a/data/supervisor/osfamily/RedHat6.yaml b/data/supervisor/osfamily/RedHat6.yaml index d650ef00..6c4dd075 100644 --- a/data/supervisor/osfamily/RedHat6.yaml +++ b/data/supervisor/osfamily/RedHat6.yaml @@ -1,5 +1,5 @@ --- - supervisor::settings: - config_file_path: '/etc/supervisord.conf' - config_dir_path: '' - conf_dir_path: '' +supervisor::settings: + config_file_path: '/etc/supervisord.conf' + config_dir_path: '' + conf_dir_path: '' diff --git a/data/sysfs/default.yaml b/data/sysfs/default.yaml index d1b9cf48..7472297b 100644 --- a/data/sysfs/default.yaml +++ b/data/sysfs/default.yaml @@ -1,7 +1,7 @@ --- - sysfs::settings: - package_name: 'sysfsutils' - service_name: 'sysfsutils' - config_file_path: '/etc/sysfs.conf' - config_dir_path: '/etc/sysfs.d' - conf_dir_path: '/etc/sysfs.d' +sysfs::settings: + package_name: 'sysfsutils' + service_name: 'sysfsutils' + config_file_path: '/etc/sysfs.conf' + config_dir_path: '/etc/sysfs.d' + conf_dir_path: '/etc/sysfs.d' diff --git a/data/sysinternals/default.yaml b/data/sysinternals/default.yaml index 6128b383..9207d498 100644 --- a/data/sysinternals/default.yaml +++ b/data/sysinternals/default.yaml @@ -1,6 +1,6 @@ --- sysinternals::settings: - package_name: sysinternalsebpf # It's not the full sysinternals suite (on Linux) + package_name: sysinternalsebpf # It's not the full sysinternals suite (on Linux) website_url: 'https://learn.microsoft.com/sysinternals/' git_source: 'https://github.com/Sysinternals/SysinternalsEBPF.git' tp_prerequisites: diff --git a/data/sysklogd/default.yaml b/data/sysklogd/default.yaml index f7578f44..0a575548 100644 --- a/data/sysklogd/default.yaml +++ b/data/sysklogd/default.yaml @@ -1,11 +1,11 @@ --- - sysklogd::settings: - package_name: 'sysklogd' - service_name: 'syslog' - config_file_path: '/etc/syslog.conf' - init_file_path: '/etc/sysconfig/sysklogd' - pid_file_path: '/var/run/syslogd.pid' - log_file_path: '/var/log/messages' - process_name: 'syslogd' - process_user: 'syslog' - process_group: 'syslog' +sysklogd::settings: + package_name: 'sysklogd' + service_name: 'syslog' + config_file_path: '/etc/syslog.conf' + init_file_path: '/etc/sysconfig/sysklogd' + pid_file_path: '/var/run/syslogd.pid' + log_file_path: '/var/log/messages' + process_name: 'syslogd' + process_user: 'syslog' + process_group: 'syslog' diff --git a/data/sysklogd/osfamily/Debian.yaml b/data/sysklogd/osfamily/Debian.yaml index 37739ec0..89ddabda 100644 --- a/data/sysklogd/osfamily/Debian.yaml +++ b/data/sysklogd/osfamily/Debian.yaml @@ -1,4 +1,4 @@ --- - sysklogd::settings: - init_file_path: '/etc/default/sysklogd' - log_file_path: '/var/log/syslog' +sysklogd::settings: + init_file_path: '/etc/default/sysklogd' + log_file_path: '/var/log/syslog' diff --git a/data/syslog-ng/default.yaml b/data/syslog-ng/default.yaml index 9407fd55..a56a7fdd 100644 --- a/data/syslog-ng/default.yaml +++ b/data/syslog-ng/default.yaml @@ -1,10 +1,10 @@ --- - syslog-ng::settings: - package_name: 'syslog-ng' - service_name: 'syslog-ng' - config_file_path: '/etc/syslog-ng/syslog-ng.conf' - config_dir_path: '/etc/syslog-ng' - pid_file_path: '/var/run/syslog-ng.pid' - process_name: 'syslog-ng' - process_user: 'syslog-ng' - process_group: 'syslog-ng' +syslog-ng::settings: + package_name: 'syslog-ng' + service_name: 'syslog-ng' + config_file_path: '/etc/syslog-ng/syslog-ng.conf' + config_dir_path: '/etc/syslog-ng' + pid_file_path: '/var/run/syslog-ng.pid' + process_name: 'syslog-ng' + process_user: 'syslog-ng' + process_group: 'syslog-ng' diff --git a/data/syslog-ng/osfamily/Debian.yaml b/data/syslog-ng/osfamily/Debian.yaml index 6622d0bd..3c79f37e 100644 --- a/data/syslog-ng/osfamily/Debian.yaml +++ b/data/syslog-ng/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - syslog-ng::settings: - init_file_path: '/etc/default/syslog-ng' +syslog-ng::settings: + init_file_path: '/etc/default/syslog-ng' diff --git a/data/syslog-ng/osfamily/RedHat.yaml b/data/syslog-ng/osfamily/RedHat.yaml index 0e321c46..dc286daf 100644 --- a/data/syslog-ng/osfamily/RedHat.yaml +++ b/data/syslog-ng/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - syslog-ng::settings: - init_file_path: '/etc/sysconfig/syslog-ng' +syslog-ng::settings: + init_file_path: '/etc/sysconfig/syslog-ng' diff --git a/data/sysstat/default.yaml b/data/sysstat/default.yaml index a975f7d2..4671ce7f 100644 --- a/data/sysstat/default.yaml +++ b/data/sysstat/default.yaml @@ -1,8 +1,8 @@ --- - sysstat::settings: - package_name: 'sysstat' - service_name: 'sysstat' - config_file_path: '/etc/sysstat/sysstat' - config_dir_path: '/etc/sysstat' - log_file_path: '/var/log/sysstat/sa' - log_dir_path: '/var/log/sysstat' +sysstat::settings: + package_name: 'sysstat' + service_name: 'sysstat' + config_file_path: '/etc/sysstat/sysstat' + config_dir_path: '/etc/sysstat' + log_file_path: '/var/log/sysstat/sa' + log_dir_path: '/var/log/sysstat' diff --git a/data/sysstat/osfamily/Debian.yaml b/data/sysstat/osfamily/Debian.yaml index a0aae45e..b5ca3674 100644 --- a/data/sysstat/osfamily/Debian.yaml +++ b/data/sysstat/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - sysstat::settings: - init_file_path: '/etc/default/sysstat' +sysstat::settings: + init_file_path: '/etc/default/sysstat' diff --git a/data/sysstat/osfamily/RedHat.yaml b/data/sysstat/osfamily/RedHat.yaml index 4963d1db..c3ceed9a 100644 --- a/data/sysstat/osfamily/RedHat.yaml +++ b/data/sysstat/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - sysstat::settings: - init_file_path: '/etc/sysconfig/sysstat' +sysstat::settings: + init_file_path: '/etc/sysconfig/sysstat' diff --git a/data/tcpdump/default.yaml b/data/tcpdump/default.yaml index bcc51c67..8654a979 100644 --- a/data/tcpdump/default.yaml +++ b/data/tcpdump/default.yaml @@ -1,3 +1,3 @@ --- - tcpdump::settings: - package_name: 'tcpdump' +tcpdump::settings: + package_name: 'tcpdump' diff --git a/data/telnet/default.yaml b/data/telnet/default.yaml index cba11df3..b165e622 100644 --- a/data/telnet/default.yaml +++ b/data/telnet/default.yaml @@ -1,3 +1,3 @@ --- - telnet::settings: - package_name: 'telnet' +telnet::settings: + package_name: 'telnet' diff --git a/data/tftpd/default.yaml b/data/tftpd/default.yaml index ac482e8e..7b49482e 100644 --- a/data/tftpd/default.yaml +++ b/data/tftpd/default.yaml @@ -1,14 +1,14 @@ --- - tftpd::settings: - package_name: 'tftpd' - service_name: 'tftpd' - config_file_path: '/etc/tftpd/tftpd.conf' - config_dir_path: '/etc/tftpd' - data_dir_path: '/tftproot' - init_file_path: '/etc/sysconfig/tftpd-hpa' - udp_port: '69' - pid_file_path: '/var/run/tftpd.pid' - log_file_path: '/var/log/messages' - process_name: 'in.tftpd' - process_user: 'root' - process_group: 'root' +tftpd::settings: + package_name: 'tftpd' + service_name: 'tftpd' + config_file_path: '/etc/tftpd/tftpd.conf' + config_dir_path: '/etc/tftpd' + data_dir_path: '/tftproot' + init_file_path: '/etc/sysconfig/tftpd-hpa' + udp_port: '69' + pid_file_path: '/var/run/tftpd.pid' + log_file_path: '/var/log/messages' + process_name: 'in.tftpd' + process_user: 'root' + process_group: 'root' diff --git a/data/tftpd/osfamily/Debian.yaml b/data/tftpd/osfamily/Debian.yaml index caeb1ffa..8be43791 100644 --- a/data/tftpd/osfamily/Debian.yaml +++ b/data/tftpd/osfamily/Debian.yaml @@ -1,8 +1,8 @@ --- - tftpd::settings: - package_name: 'tftpd-hpa' - service_name: 'tftpd-hpa' - init_file_path: '/etc/default/tftpd-hpa' - pid_file_path: '/var/run/tftpd-hpa.pid' - log_file_path: '/var/log/syslog' - data_dir_path: '/srv/tftp' +tftpd::settings: + package_name: 'tftpd-hpa' + service_name: 'tftpd-hpa' + init_file_path: '/etc/default/tftpd-hpa' + pid_file_path: '/var/run/tftpd-hpa.pid' + log_file_path: '/var/log/syslog' + data_dir_path: '/srv/tftp' diff --git a/data/tinc/default.yaml b/data/tinc/default.yaml index 9a89a0d4..9772a01c 100644 --- a/data/tinc/default.yaml +++ b/data/tinc/default.yaml @@ -1,14 +1,14 @@ --- - tinc::settings: - package_name: 'tinc' - service_name: 'tinc' - config_file_path: '/etc/tinc/tinc.conf' - config_dir_path: '/etc/tinc' - conf_dir_path: '/etc/tinc/conf.d' - pid_file_path: '/var/run/tinc.pid' - log_file_path: '/var/log/tinc/tinc.log' - log_dir_path: '/var/log/tinc' - process_name: 'tincd' - process_user: 'tinc' - process_group: 'tinc' - tcp_port: '655' +tinc::settings: + package_name: 'tinc' + service_name: 'tinc' + config_file_path: '/etc/tinc/tinc.conf' + config_dir_path: '/etc/tinc' + conf_dir_path: '/etc/tinc/conf.d' + pid_file_path: '/var/run/tinc.pid' + log_file_path: '/var/log/tinc/tinc.log' + log_dir_path: '/var/log/tinc' + process_name: 'tincd' + process_user: 'tinc' + process_group: 'tinc' + tcp_port: '655' diff --git a/data/tinc/osfamily/Debian.yaml b/data/tinc/osfamily/Debian.yaml index f05aa927..1bc8dff2 100644 --- a/data/tinc/osfamily/Debian.yaml +++ b/data/tinc/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - tinc::settings: - init_file_path: '/etc/default/tinc' +tinc::settings: + init_file_path: '/etc/default/tinc' diff --git a/data/tinc/osfamily/RedHat.yaml b/data/tinc/osfamily/RedHat.yaml index f6eb003f..b6e0af46 100644 --- a/data/tinc/osfamily/RedHat.yaml +++ b/data/tinc/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - tinc::settings: - init_file_path: '/etc/sysconfig/tinc' +tinc::settings: + init_file_path: '/etc/sysconfig/tinc' diff --git a/data/tree/default.yaml b/data/tree/default.yaml index af2132d5..97685587 100644 --- a/data/tree/default.yaml +++ b/data/tree/default.yaml @@ -1,3 +1,3 @@ --- - tree::settings: - package_name: 'tree' +tree::settings: + package_name: 'tree' diff --git a/data/trickle/default.yaml b/data/trickle/default.yaml index 0f8429a3..f423ce22 100644 --- a/data/trickle/default.yaml +++ b/data/trickle/default.yaml @@ -1,3 +1,3 @@ --- - trickle::settings: - package_name: 'trickle' +trickle::settings: + package_name: 'trickle' diff --git a/data/trickle/operatingsystem/OracleLinux.yaml b/data/trickle/operatingsystem/OracleLinux.yaml index 4c86eed2..33f5fbff 100644 --- a/data/trickle/operatingsystem/OracleLinux.yaml +++ b/data/trickle/operatingsystem/OracleLinux.yaml @@ -1,3 +1,3 @@ --- - trickle::settings: - package_name: '' +trickle::settings: + package_name: '' diff --git a/data/unzip/default.yaml b/data/unzip/default.yaml index e451bb69..e3b4e419 100644 --- a/data/unzip/default.yaml +++ b/data/unzip/default.yaml @@ -1,3 +1,3 @@ --- - unzip::settings: - package_name: 'unzip' +unzip::settings: + package_name: 'unzip' diff --git a/data/unzip/osfamily/windows.yaml b/data/unzip/osfamily/windows.yaml index d8497c2a..76c67573 100644 --- a/data/unzip/osfamily/windows.yaml +++ b/data/unzip/osfamily/windows.yaml @@ -1,3 +1,3 @@ --- - unzip::settings: - package_name: 'zip' +unzip::settings: + package_name: 'zip' diff --git a/data/varnish/default.yaml b/data/varnish/default.yaml index 6be27196..f2572c50 100644 --- a/data/varnish/default.yaml +++ b/data/varnish/default.yaml @@ -1,15 +1,15 @@ --- - varnish::settings: - package_name: 'varnish' - service_name: 'varnish' - config_file_path: '/etc/varnish/default.vcl' - config_dir_path: '/etc/varnish' - conf_dir_path: '/etc/varnish/conf.d' - pid_file_path: '/var/run/varnish.pid' - log_file_path: '/var/log/varnish/varnish.log' - log_dir_path: '/var/log/varnish' - process_name: 'varnish' - process_user: 'varnish' - process_group: 'varnish' - tcp_port: '6081' - nodaemon_args: '-F' +varnish::settings: + package_name: 'varnish' + service_name: 'varnish' + config_file_path: '/etc/varnish/default.vcl' + config_dir_path: '/etc/varnish' + conf_dir_path: '/etc/varnish/conf.d' + pid_file_path: '/var/run/varnish.pid' + log_file_path: '/var/log/varnish/varnish.log' + log_dir_path: '/var/log/varnish' + process_name: 'varnish' + process_user: 'varnish' + process_group: 'varnish' + tcp_port: '6081' + nodaemon_args: '-F' diff --git a/data/varnish/osfamily/Debian.yaml b/data/varnish/osfamily/Debian.yaml index 06d9247e..32978618 100644 --- a/data/varnish/osfamily/Debian.yaml +++ b/data/varnish/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - varnish::settings: - init_file_path: '/etc/default/varnish' +varnish::settings: + init_file_path: '/etc/default/varnish' diff --git a/data/varnish/osfamily/RedHat.yaml b/data/varnish/osfamily/RedHat.yaml index 4d5bc71a..396c337b 100644 --- a/data/varnish/osfamily/RedHat.yaml +++ b/data/varnish/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - varnish::settings: - init_file_path: '/etc/sysconfig/varnish' +varnish::settings: + init_file_path: '/etc/sysconfig/varnish' diff --git a/data/varnish/osfamily/Suse12.yaml b/data/varnish/osfamily/Suse12.yaml index 40690c87..03479f0b 100644 --- a/data/varnish/osfamily/Suse12.yaml +++ b/data/varnish/osfamily/Suse12.yaml @@ -1,7 +1,7 @@ --- - varnish::settings: - zypper_repofile_url: 'http://download.opensuse.org/repositories/server:/http/SLE_12/server:http.repo' - repo_name: 'server_http' - init_file_path: '/etc/sysconfig/varnish' - config_file_path: '/etc/varnish/vcl.conf' - pid_file_path: '/var/run/varnishd.pid' +varnish::settings: + zypper_repofile_url: 'http://download.opensuse.org/repositories/server:/http/SLE_12/server:http.repo' + repo_name: 'server_http' + init_file_path: '/etc/sysconfig/varnish' + config_file_path: '/etc/varnish/vcl.conf' + pid_file_path: '/var/run/varnishd.pid' diff --git a/data/vault-enterprise/default.yaml b/data/vault-enterprise/default.yaml index 65cea939..3ef1e2dd 100644 --- a/data/vault-enterprise/default.yaml +++ b/data/vault-enterprise/default.yaml @@ -9,4 +9,3 @@ vault-enterprise::settings: data_dir_path: '/opt/vault' config_file_format: 'hcl' tcp_port: 8200 - diff --git a/data/vault/default.yaml b/data/vault/default.yaml index 1a303e50..cb4b13c8 100644 --- a/data/vault/default.yaml +++ b/data/vault/default.yaml @@ -12,4 +12,3 @@ vault::settings: git_source: https://github.com/hashicorp/vault.git info_commands: vault_status: 'vault status' - diff --git a/data/vault/upstream/default.yaml b/data/vault/upstream/default.yaml index 35358eff..89b239bd 100644 --- a/data/vault/upstream/default.yaml +++ b/data/vault/upstream/default.yaml @@ -1,4 +1,4 @@ --- vault::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} diff --git a/data/vim/default.yaml b/data/vim/default.yaml index a9fb6609..9ba0953b 100644 --- a/data/vim/default.yaml +++ b/data/vim/default.yaml @@ -1,5 +1,5 @@ --- - vim::settings: - package_name: 'vim' - config_file_path: '/etc/vim/vimrc' - config_dir_path: '/etc/vim' +vim::settings: + package_name: 'vim' + config_file_path: '/etc/vim/vimrc' + config_dir_path: '/etc/vim' diff --git a/data/vim/hiera.yaml b/data/vim/hiera.yaml index 19fa9ae9..037b0e42 100644 --- a/data/vim/hiera.yaml +++ b/data/vim/hiera.yaml @@ -1,5 +1,7 @@ --- :hierarchy: + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" - "default/%{operatingsystem}" diff --git a/data/vim/operatingsystem/Fedora36.yaml b/data/vim/operatingsystem/Fedora36.yaml new file mode 100644 index 00000000..b75108ce --- /dev/null +++ b/data/vim/operatingsystem/Fedora36.yaml @@ -0,0 +1,4 @@ +--- +vim::settings: + config_file_path: '/etc/vimrc' + package_name: 'vim-enhanced' diff --git a/data/vim/osfamily/RedHat.yaml b/data/vim/osfamily/RedHat.yaml index e6cc53d6..ab6779fe 100644 --- a/data/vim/osfamily/RedHat.yaml +++ b/data/vim/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - vim::settings: - config_file_path: '/etc/vimrc' +vim::settings: + config_file_path: '/etc/vimrc' diff --git a/data/vim/osfamily/RedHat8.yaml b/data/vim/osfamily/RedHat8.yaml new file mode 100644 index 00000000..b75108ce --- /dev/null +++ b/data/vim/osfamily/RedHat8.yaml @@ -0,0 +1,4 @@ +--- +vim::settings: + config_file_path: '/etc/vimrc' + package_name: 'vim-enhanced' diff --git a/data/vim/osfamily/RedHat9.yaml b/data/vim/osfamily/RedHat9.yaml new file mode 100644 index 00000000..b75108ce --- /dev/null +++ b/data/vim/osfamily/RedHat9.yaml @@ -0,0 +1,4 @@ +--- +vim::settings: + config_file_path: '/etc/vimrc' + package_name: 'vim-enhanced' diff --git a/data/virtualbox/default.yaml b/data/virtualbox/default.yaml index 21649e58..5834a1cb 100644 --- a/data/virtualbox/default.yaml +++ b/data/virtualbox/default.yaml @@ -1,5 +1,5 @@ --- - virtualbox::settings: - package_name: 'virtualbox-6.0' - service_name: 'vboxdrv' - config_dir_path: '/etc/vbox' +virtualbox::settings: + package_name: 'virtualbox-6.0' + service_name: 'vboxdrv' + config_dir_path: '/etc/vbox' diff --git a/data/virtualbox/operatingsystem/Debian7.yaml b/data/virtualbox/operatingsystem/Debian7.yaml index 6d3bf48b..d5aaa34c 100644 --- a/data/virtualbox/operatingsystem/Debian7.yaml +++ b/data/virtualbox/operatingsystem/Debian7.yaml @@ -1,4 +1,4 @@ --- - virtualbox::settings: - key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' - key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' +virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu14.04.yaml b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml index 6d3bf48b..d5aaa34c 100644 --- a/data/virtualbox/operatingsystem/Ubuntu14.04.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml @@ -1,4 +1,4 @@ --- - virtualbox::settings: - key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' - key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' +virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu14.10.yaml b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml index 6d3bf48b..d5aaa34c 100644 --- a/data/virtualbox/operatingsystem/Ubuntu14.10.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml @@ -1,4 +1,4 @@ --- - virtualbox::settings: - key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' - key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' +virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu15.04.yaml b/data/virtualbox/operatingsystem/Ubuntu15.04.yaml index 6d3bf48b..d5aaa34c 100644 --- a/data/virtualbox/operatingsystem/Ubuntu15.04.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu15.04.yaml @@ -1,4 +1,4 @@ --- - virtualbox::settings: - key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' - key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' +virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu15.10.yaml b/data/virtualbox/operatingsystem/Ubuntu15.10.yaml index 6d3bf48b..d5aaa34c 100644 --- a/data/virtualbox/operatingsystem/Ubuntu15.10.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu15.10.yaml @@ -1,4 +1,4 @@ --- - virtualbox::settings: - key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' - key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' +virtualbox::settings: + key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/operatingsystem/Ubuntu18.04.yaml b/data/virtualbox/operatingsystem/Ubuntu18.04.yaml index 77fb05da..73ed9775 100644 --- a/data/virtualbox/operatingsystem/Ubuntu18.04.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu18.04.yaml @@ -1,6 +1,5 @@ --- - virtualbox::settings: - key: 'B9F8 D658 297A F3EF C18D 5CDF A2F6 83C5 2980 AECF' - key_url: 'https://www.virtualbox.org/download/oracle_vbox_2016.asc' - apt_repos: 'contrib' - +virtualbox::settings: + key: 'B9F8 D658 297A F3EF C18D 5CDF A2F6 83C5 2980 AECF' + key_url: 'https://www.virtualbox.org/download/oracle_vbox_2016.asc' + apt_repos: 'contrib' diff --git a/data/virtualbox/osfamily/Debian.yaml b/data/virtualbox/osfamily/Debian.yaml index b71a9085..9cf1520b 100644 --- a/data/virtualbox/osfamily/Debian.yaml +++ b/data/virtualbox/osfamily/Debian.yaml @@ -1,10 +1,9 @@ --- - virtualbox::settings: - repo_url: 'https://download.virtualbox.org/virtualbox/debian' - key: 'B9F8 D658 297A F3EF C18D 5CDF A2F6 83C5 2980 AECF' - key_url: 'https://www.virtualbox.org/download/oracle_vbox_2016.asc' - apt_repos: 'contrib' - # Keys for Debian < 8 and Ubuntu < 16.04 - # key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' - # key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' - +virtualbox::settings: + repo_url: 'https://download.virtualbox.org/virtualbox/debian' + key: 'B9F8 D658 297A F3EF C18D 5CDF A2F6 83C5 2980 AECF' + key_url: 'https://www.virtualbox.org/download/oracle_vbox_2016.asc' + apt_repos: 'contrib' + # Keys for Debian < 8 and Ubuntu < 16.04 + # key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' + # key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' diff --git a/data/virtualbox/osfamily/RedHat.yaml b/data/virtualbox/osfamily/RedHat.yaml index 9c3f93e7..b60be963 100644 --- a/data/virtualbox/osfamily/RedHat.yaml +++ b/data/virtualbox/osfamily/RedHat.yaml @@ -1,9 +1,9 @@ --- - virtualbox::settings: - key: '7B0FAB3A' - repo_url: 'http://download.virtualbox.org/virtualbox/rpm/el/$releasever/$basearch' - key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' - package_prerequisites: - - gcc - - make - - kernel-devel +virtualbox::settings: + key: '7B0FAB3A' + repo_url: 'http://download.virtualbox.org/virtualbox/rpm/el/$releasever/$basearch' + key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + package_prerequisites: + - gcc + - make + - kernel-devel diff --git a/data/vsftpd/default.yaml b/data/vsftpd/default.yaml index 41a22a2a..603fc6fc 100644 --- a/data/vsftpd/default.yaml +++ b/data/vsftpd/default.yaml @@ -1,13 +1,13 @@ --- - vsftpd::settings: - package_name: 'vsftpd' - service_name: 'vsftpd' - config_file_path: '/etc/vsftpd/vsftpd.conf' - config_dir_path: '/etc/vsftpd' - pid_file_path: '/var/run/vsftpd.pid' - log_file_path: '/var/log/vsftpd/vsftpd.log' - log_dir_path: '/var/log/vsftpd' - process_name: 'vsftpd' - process_user: 'vsftpd' - process_group: 'vsftpd' - tcp_port: '21' +vsftpd::settings: + package_name: 'vsftpd' + service_name: 'vsftpd' + config_file_path: '/etc/vsftpd/vsftpd.conf' + config_dir_path: '/etc/vsftpd' + pid_file_path: '/var/run/vsftpd.pid' + log_file_path: '/var/log/vsftpd/vsftpd.log' + log_dir_path: '/var/log/vsftpd' + process_name: 'vsftpd' + process_user: 'vsftpd' + process_group: 'vsftpd' + tcp_port: '21' diff --git a/data/vsftpd/osfamily/Debian.yaml b/data/vsftpd/osfamily/Debian.yaml index 82a20c4f..5a7b313c 100644 --- a/data/vsftpd/osfamily/Debian.yaml +++ b/data/vsftpd/osfamily/Debian.yaml @@ -1,8 +1,8 @@ --- - vsftpd::settings: - process_user: 'root' - config_file_path: '/etc/vsftpd.conf' - pid_file_path: '/var/run/vsftpd/vsftpd.pid' - data_dir_path: '/srv/ftp' - log_file_path: '/var/log/vsftpd.log' - init_file_path: '/etc/default/vsftpd' +vsftpd::settings: + process_user: 'root' + config_file_path: '/etc/vsftpd.conf' + pid_file_path: '/var/run/vsftpd/vsftpd.pid' + data_dir_path: '/srv/ftp' + log_file_path: '/var/log/vsftpd.log' + init_file_path: '/etc/default/vsftpd' diff --git a/data/vsftpd/osfamily/RedHat.yaml b/data/vsftpd/osfamily/RedHat.yaml index 7e52b624..9968b491 100644 --- a/data/vsftpd/osfamily/RedHat.yaml +++ b/data/vsftpd/osfamily/RedHat.yaml @@ -1,5 +1,5 @@ --- - vsftpd::settings: - data_dir_path: '/var/ftp/pub' - log_file_path: '/var/log/xferlog' - init_file_path: '/etc/sysconfig/vsftpd' +vsftpd::settings: + data_dir_path: '/var/ftp/pub' + log_file_path: '/var/log/xferlog' + init_file_path: '/etc/sysconfig/vsftpd' diff --git a/data/wpscan/default.yaml b/data/wpscan/default.yaml index f77a0678..4f315bd6 100644 --- a/data/wpscan/default.yaml +++ b/data/wpscan/default.yaml @@ -1,14 +1,14 @@ --- - wpscan::settings: - source_url: 'https://github.com/wpscanteam/wpscan.git' - source_format: 'git' - destination_dir: '/opt/wpscan' - prerequisite_packages: - bundler: - provider: gem - preinstall_exec: - postinstall_exec: - bundle_install: - command: 'bundle install --without test' - tp_prerequisites: - - ruby +wpscan::settings: + source_url: 'https://github.com/wpscanteam/wpscan.git' + source_format: 'git' + destination_dir: '/opt/wpscan' + prerequisite_packages: + bundler: + provider: gem + preinstall_exec: + postinstall_exec: + bundle_install: + command: 'bundle install --without test' + tp_prerequisites: + - ruby diff --git a/data/xinetd/default.yaml b/data/xinetd/default.yaml index 3e3a198b..2a75b7be 100644 --- a/data/xinetd/default.yaml +++ b/data/xinetd/default.yaml @@ -1,11 +1,11 @@ --- - xinetd::settings: - package_name: 'xinetd' - service_name: 'xinetd' - config_file_path: '/etc/xinetd.conf' - init_file_path: '/etc/sysconfig/xinetd' - pid_file_path: '/var/run/xinetd.pid' - config_dir_path: '/etc/xinetd.d' - process_name: 'xinetd' - process_user: 'xinetd' - process_group: 'xinetd' +xinetd::settings: + package_name: 'xinetd' + service_name: 'xinetd' + config_file_path: '/etc/xinetd.conf' + init_file_path: '/etc/sysconfig/xinetd' + pid_file_path: '/var/run/xinetd.pid' + config_dir_path: '/etc/xinetd.d' + process_name: 'xinetd' + process_user: 'xinetd' + process_group: 'xinetd' diff --git a/data/xinetd/osfamily/Debian.yaml b/data/xinetd/osfamily/Debian.yaml index d1f051b7..d8230475 100644 --- a/data/xinetd/osfamily/Debian.yaml +++ b/data/xinetd/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - xinetd::settings: - init_file_path: '/etc/default/xinetd' +xinetd::settings: + init_file_path: '/etc/default/xinetd' diff --git a/data/yarn/default.yaml b/data/yarn/default.yaml index c88e7550..d68b8c02 100644 --- a/data/yarn/default.yaml +++ b/data/yarn/default.yaml @@ -1,3 +1,3 @@ --- - yarn::settings: - package_name: 'yarn' +yarn::settings: + package_name: 'yarn' diff --git a/data/yarn/osfamily/Debian.yaml b/data/yarn/osfamily/Debian.yaml index 5f048e3e..63e2d9d4 100644 --- a/data/yarn/osfamily/Debian.yaml +++ b/data/yarn/osfamily/Debian.yaml @@ -1,7 +1,7 @@ --- - yarn::settings: - repo_url: 'https://dl.yarnpkg.com/debian/' - key: 'D88E42B4' - key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg' - apt_repos: 'main' - apt_release: 'stable' +yarn::settings: + repo_url: 'https://dl.yarnpkg.com/debian/' + key: 'D88E42B4' + key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/yarn/osfamily/RedHat.yaml b/data/yarn/osfamily/RedHat.yaml index 2b9eeda2..fe5279e3 100644 --- a/data/yarn/osfamily/RedHat.yaml +++ b/data/yarn/osfamily/RedHat.yaml @@ -1,6 +1,6 @@ --- - yarn::settings: - repo_file_url_tofix: 'https://dl.yarnpkg.com/rpm/yarn.repo' - repo_description: 'Yarn Repository' - repo_url: 'https://dl.yarnpkg.com/rpm/' - key_url: 'https://dl.yarnpkg.com/rpm/pubkey.gpg' +yarn::settings: + repo_file_url_tofix: 'https://dl.yarnpkg.com/rpm/yarn.repo' + repo_description: 'Yarn Repository' + repo_url: 'https://dl.yarnpkg.com/rpm/' + key_url: 'https://dl.yarnpkg.com/rpm/pubkey.gpg' diff --git a/data/yum-cron/default.yaml b/data/yum-cron/default.yaml index bfdd9cef..f5909166 100644 --- a/data/yum-cron/default.yaml +++ b/data/yum-cron/default.yaml @@ -1,6 +1,6 @@ --- - yum-cron::settings: - package_name: 'yum-cron' - service_name: 'yum-cron' - config_file_path: '/etc/yum/yum-cron.conf' - log_file_path: '/var/log/yum.log' +yum-cron::settings: + package_name: 'yum-cron' + service_name: 'yum-cron' + config_file_path: '/etc/yum/yum-cron.conf' + log_file_path: '/var/log/yum.log' diff --git a/data/zabbix-agent/default.yaml b/data/zabbix-agent/default.yaml index b8f16db2..bc24cc49 100644 --- a/data/zabbix-agent/default.yaml +++ b/data/zabbix-agent/default.yaml @@ -1,13 +1,13 @@ --- - zabbix-agent::settings: - package_name: 'zabbix-agent' - service_name: 'zabbix-agent' - config_file_path: '/etc/zabbix/zabbix_agentd.conf' - config_dir_path: '/etc/zabbix' - pid_file_path: '/var/run/zabbix/zabbix_agentd.pid' - log_file_path: '/var/log/zabbix-agent/zabbix_agentd.log' - log_dir_path: '/var/log/zabbix-agent' - process_name: 'zabbix_agentd' - process_user: 'zabbix' - process_group: 'zabbix' - tcp_port: '10050' +zabbix-agent::settings: + package_name: 'zabbix-agent' + service_name: 'zabbix-agent' + config_file_path: '/etc/zabbix/zabbix_agentd.conf' + config_dir_path: '/etc/zabbix' + pid_file_path: '/var/run/zabbix/zabbix_agentd.pid' + log_file_path: '/var/log/zabbix-agent/zabbix_agentd.log' + log_dir_path: '/var/log/zabbix-agent' + process_name: 'zabbix_agentd' + process_user: 'zabbix' + process_group: 'zabbix' + tcp_port: '10050' diff --git a/data/zabbix-agent/osfamily/Debian.yaml b/data/zabbix-agent/osfamily/Debian.yaml index bb63e998..53b88c4c 100644 --- a/data/zabbix-agent/osfamily/Debian.yaml +++ b/data/zabbix-agent/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- - zabbix-agent::settings: - init_file_path: '/etc/default/zabbix-agent' +zabbix-agent::settings: + init_file_path: '/etc/default/zabbix-agent' diff --git a/data/zabbix-agent/osfamily/RedHat.yaml b/data/zabbix-agent/osfamily/RedHat.yaml index cf91d706..e23095b3 100644 --- a/data/zabbix-agent/osfamily/RedHat.yaml +++ b/data/zabbix-agent/osfamily/RedHat.yaml @@ -1,3 +1,3 @@ --- - zabbix-agent::settings: - init_file_path: '/etc/sysconfig/zabbix-agent' +zabbix-agent::settings: + init_file_path: '/etc/sysconfig/zabbix-agent' diff --git a/data/zabbix-agent/osfamily/Suse.yaml b/data/zabbix-agent/osfamily/Suse.yaml index f34a9048..68cc7f51 100644 --- a/data/zabbix-agent/osfamily/Suse.yaml +++ b/data/zabbix-agent/osfamily/Suse.yaml @@ -1,6 +1,6 @@ --- - zabbix-agent::settings: - zypper_repofile_url: 'http://download.opensuse.org/repositories/server:/monitoring/SLE_12/' - repo_name: 'server_monitoring' - service_name: 'zabbix-agentd' +zabbix-agent::settings: + zypper_repofile_url: 'http://download.opensuse.org/repositories/server:/monitoring/SLE_12/' + repo_name: 'server_monitoring' + service_name: 'zabbix-agentd' diff --git a/data/zeek/upstream/operatingsystem/Darwin.yaml b/data/zeek/upstream/operatingsystem/Darwin.yaml index 4f9b3a95..115321d4 100644 --- a/data/zeek/upstream/operatingsystem/Darwin.yaml +++ b/data/zeek/upstream/operatingsystem/Darwin.yaml @@ -1,4 +1,4 @@ --- - zeek::settings: - package_source: https://download.zeek.com/mac/stable/Docker.dmg +zeek::settings: + package_source: https://download.zeek.com/mac/stable/Docker.dmg diff --git a/data/zeek/upstream/osfamily/Debian.yaml b/data/zeek/upstream/osfamily/Debian.yaml index 18e614fb..fb46cfb3 100644 --- a/data/zeek/upstream/osfamily/Debian.yaml +++ b/data/zeek/upstream/osfamily/Debian.yaml @@ -1,3 +1,3 @@ --- zeek:settings: - key: '' + key: '' From 787cd119e556a65a3b3840f6befa42d6c8a7e253 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 1 Feb 2023 23:00:59 +0100 Subject: [PATCH 250/284] v4 tinydata (#59) * Nats-server data * Nuclei tinydata * Docker on new OSes * Updated reference and other v4 tinydata * More v4 data structure refinements + v3tov4 conversion script * Docs on reference data * Defining v4 structure * More preparations for v4 * Yaml lints * Yaml lints 2 --- data/activemq/default.yaml | 4 +- data/default.yaml | 59 +- data/default/AlmaLinux.yaml | 4 + data/default/CentOS.yaml | 4 + data/default/Darwin.yaml | 10 +- data/default/Debian.yaml | 7 + data/default/Debian10.yaml | 5 + data/default/Debian11.yaml | 7 +- data/default/Debian5.yaml | 5 + data/default/Debian6.yaml | 5 + data/default/Debian7.yaml | 5 + data/default/Debian8.yaml | 5 + data/default/Debian9.yaml | 5 + data/default/Devuan4.yaml | 11 +- data/default/FreeBSD.yaml | 4 + data/default/OpenBSD.yaml | 4 + data/default/OracleLinux.yaml | 5 + data/default/RedHat.yaml | 5 + data/default/Rocky.yaml | 5 + data/default/Ubuntu.yaml | 4 + data/default/Ubuntu15.04.yaml | 5 + data/default/Ubuntu15.10.yaml | 5 + data/default/Ubuntu16.04.yaml | 5 + data/default/Ubuntu16.10.yaml | 5 + data/default/Ubuntu17.04.yaml | 5 + data/default/Ubuntu17.10.yaml | 5 + data/default/Ubuntu18.04.yaml | 5 + data/default/Ubuntu18.10.yaml | 5 + data/default/Ubuntu19.04.yaml | 5 + data/default/Ubuntu19.10.yaml | 5 + data/default/Ubuntu20.04.yaml | 5 + data/default/Ubuntu20.10.yaml | 5 + data/default/Ubuntu21.04.yaml | 5 + data/default/Ubuntu21.10.yaml | 5 + data/default/Ubuntu22.04.yaml | 6 + data/nats-server/default.yaml | 32 +- data/nuclei/default.yaml | 25 +- data/prometheus/default.yaml | 12 +- data/puppet-agent/upstream/default.yaml | 1 - data/reference/default.yaml | 505 +++++++++++++++--- data/sample/default.yaml | 12 +- data/spiderfoot/default.yaml | 20 +- data/spiderfoot/operatingsystem/Debian10.yaml | 2 +- data/spiderfoot/operatingsystem/Debian9.yaml | 2 +- .../operatingsystem/Ubuntu16.04.yaml | 2 +- .../operatingsystem/Ubuntu18.04.yaml | 2 +- data/spiderfoot/osfamily/windows.yaml | 2 +- metadata.json | 2 +- scripts/convert_v3_to_v4.rb | 131 +++++ 49 files changed, 850 insertions(+), 139 deletions(-) create mode 100644 scripts/convert_v3_to_v4.rb diff --git a/data/activemq/default.yaml b/data/activemq/default.yaml index 5a8f7ffb..261dc690 100644 --- a/data/activemq/default.yaml +++ b/data/activemq/default.yaml @@ -4,7 +4,7 @@ activemq::settings: service_name: 'activemq' config_file_path: '/etc/activemq/activemq.xml' config_dir_path: '/etc/activemq' - tpp_port: '8161' + tcp_port: '8161' pid_file_path: '/var/run/activemq/activemq.pid' log_file_path: '/var/log/activemq' process_name: 'java' @@ -18,4 +18,4 @@ activemq::settings: list: 'activemq list' test_commands: status: 'activemq status' - docker_image: 'apache/activemq' \ No newline at end of file + docker_image: 'apache/activemq' diff --git a/data/default.yaml b/data/default.yaml index 68636f2c..e9033393 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -9,7 +9,60 @@ default::settings: config_file_mode: '0644' config_dir_owner: 'root' config_dir_group: 'root' - config_dir_mode: '0755' + config_dir_mode: '0644' config_dir_purge: false - config_dir_recurse: true - install_method: 'package' \ No newline at end of file + config_dir_recurse: false + install_method: 'package' + + packages: + main: + ensure: present + source: ~ + install_options: [] + params: {} + providers: {} + manage: true + devel: + name: '$TITLE-devel' + ensure: present + manage: false + doc: + name: '$TITLE-doc' + ensure: present + manage: false + libs: + name: '$TITLE-libs' + ensure: present + manage: false + + services: + main: + process_user: root + process_group: root + ensure: running + enable: true + params: {} + + files: + config: + owner: 'root' + group: 'root' + mode: '0644' + init: + owner: 'root' + group: 'root' + mode: '0644' + format: 'inifile' + systemd: + owner: 'root' + group: 'root' + mode: '0644' + format: 'inifile_with_stanzas' + + dirs: + config: + owner: 'root' + group: 'root' + conf: + owner: 'root' + group: 'root' diff --git a/data/default/AlmaLinux.yaml b/data/default/AlmaLinux.yaml index 60d78539..c508fcc0 100755 --- a/data/default/AlmaLinux.yaml +++ b/data/default/AlmaLinux.yaml @@ -2,3 +2,7 @@ default::settings: repo_package_provider: 'rpm' init_system: 'systemd' + + repos: + default: + package_provider: 'rpm' diff --git a/data/default/CentOS.yaml b/data/default/CentOS.yaml index 60d78539..c508fcc0 100755 --- a/data/default/CentOS.yaml +++ b/data/default/CentOS.yaml @@ -2,3 +2,7 @@ default::settings: repo_package_provider: 'rpm' init_system: 'systemd' + + repos: + default: + package_provider: 'rpm' diff --git a/data/default/Darwin.yaml b/data/default/Darwin.yaml index 7bde0272..a0f53ece 100644 --- a/data/default/Darwin.yaml +++ b/data/default/Darwin.yaml @@ -2,4 +2,12 @@ default::settings: config_file_group: 'wheel' package_provider: 'homebrew' - init_systemd: 'launchd' \ No newline at end of file + init_systemd: 'launchd' + + files: + config: + group: 'wheel' + + repos: + default: + package_provider: 'homebrew' diff --git a/data/default/Debian.yaml b/data/default/Debian.yaml index 1c2cd31a..e9f3554c 100755 --- a/data/default/Debian.yaml +++ b/data/default/Debian.yaml @@ -3,3 +3,10 @@ default::settings: repo_package_provider: dpkg init_system: 'sysvinit' dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' + + repos: + default: + package_provider: dpkg + + image: + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' \ No newline at end of file diff --git a/data/default/Debian10.yaml b/data/default/Debian10.yaml index 37e26324..91e324ef 100644 --- a/data/default/Debian10.yaml +++ b/data/default/Debian10.yaml @@ -2,3 +2,8 @@ default::settings: apt_release: 'buster' init_system: 'systemd' + + repos: + default: + apt: + release: 'buster' diff --git a/data/default/Debian11.yaml b/data/default/Debian11.yaml index bce05e45..e694386d 100644 --- a/data/default/Debian11.yaml +++ b/data/default/Debian11.yaml @@ -1,4 +1,9 @@ --- default::settings: apt_release: 'bullseye' - init_system: 'systemd' \ No newline at end of file + init_system: 'systemd' + + repos: + default: + apt: + release: 'bullseye' diff --git a/data/default/Debian5.yaml b/data/default/Debian5.yaml index 5ff8102e..4fedacd9 100644 --- a/data/default/Debian5.yaml +++ b/data/default/Debian5.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'lenny' + + repos: + default: + apt: + release: 'lenny' diff --git a/data/default/Debian6.yaml b/data/default/Debian6.yaml index 92098b73..9d590c0e 100644 --- a/data/default/Debian6.yaml +++ b/data/default/Debian6.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'squeeze' + + repos: + default: + apt: + release: 'squeeze' diff --git a/data/default/Debian7.yaml b/data/default/Debian7.yaml index db381a8f..4079ac47 100644 --- a/data/default/Debian7.yaml +++ b/data/default/Debian7.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'wheezy' + + repos: + default: + apt: + release: 'wheezy' diff --git a/data/default/Debian8.yaml b/data/default/Debian8.yaml index 96ed21e6..f2bd3b5b 100644 --- a/data/default/Debian8.yaml +++ b/data/default/Debian8.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'jessie' + + repos: + default: + apt: + release: 'jessie' diff --git a/data/default/Debian9.yaml b/data/default/Debian9.yaml index 4836a15c..3ebd038d 100644 --- a/data/default/Debian9.yaml +++ b/data/default/Debian9.yaml @@ -2,3 +2,8 @@ default::settings: apt_release: 'stretch' init_system: 'systemd' + + repos: + default: + apt: + release: 'stretch' diff --git a/data/default/Devuan4.yaml b/data/default/Devuan4.yaml index 712e2776..164acb26 100644 --- a/data/default/Devuan4.yaml +++ b/data/default/Devuan4.yaml @@ -2,4 +2,13 @@ default::settings: apt_release: 'chimaera' init_system: 'sysvinit' - service_provider: 'sysvinit' \ No newline at end of file + service_provider: 'sysvinit' + + repos: + default: + apt: + release: 'chimaera' + + services: + main: + provider: 'sysvinit' diff --git a/data/default/FreeBSD.yaml b/data/default/FreeBSD.yaml index 14c9468b..7ba670c6 100644 --- a/data/default/FreeBSD.yaml +++ b/data/default/FreeBSD.yaml @@ -1,3 +1,7 @@ --- default::settings: config_file_group: 'wheel' + + files: + config: + group: 'wheel' diff --git a/data/default/OpenBSD.yaml b/data/default/OpenBSD.yaml index 14c9468b..7ba670c6 100644 --- a/data/default/OpenBSD.yaml +++ b/data/default/OpenBSD.yaml @@ -1,3 +1,7 @@ --- default::settings: config_file_group: 'wheel' + + files: + config: + group: 'wheel' diff --git a/data/default/OracleLinux.yaml b/data/default/OracleLinux.yaml index 60d78539..9b829fd2 100755 --- a/data/default/OracleLinux.yaml +++ b/data/default/OracleLinux.yaml @@ -2,3 +2,8 @@ default::settings: repo_package_provider: 'rpm' init_system: 'systemd' + + + repos: + default: + package_provider: 'rpm' \ No newline at end of file diff --git a/data/default/RedHat.yaml b/data/default/RedHat.yaml index 60d78539..9b829fd2 100755 --- a/data/default/RedHat.yaml +++ b/data/default/RedHat.yaml @@ -2,3 +2,8 @@ default::settings: repo_package_provider: 'rpm' init_system: 'systemd' + + + repos: + default: + package_provider: 'rpm' \ No newline at end of file diff --git a/data/default/Rocky.yaml b/data/default/Rocky.yaml index 60d78539..9b829fd2 100755 --- a/data/default/Rocky.yaml +++ b/data/default/Rocky.yaml @@ -2,3 +2,8 @@ default::settings: repo_package_provider: 'rpm' init_system: 'systemd' + + + repos: + default: + package_provider: 'rpm' \ No newline at end of file diff --git a/data/default/Ubuntu.yaml b/data/default/Ubuntu.yaml index 0ab744e5..0df39a71 100755 --- a/data/default/Ubuntu.yaml +++ b/data/default/Ubuntu.yaml @@ -2,3 +2,7 @@ default::settings: repo_package_provider: dpkg init_system: 'systemd' + + repos: + default: + package_provider: dpkg diff --git a/data/default/Ubuntu15.04.yaml b/data/default/Ubuntu15.04.yaml index 1eb001c0..6ce2e816 100644 --- a/data/default/Ubuntu15.04.yaml +++ b/data/default/Ubuntu15.04.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'vivid' + + repos: + default: + apt: + release: 'vivid' diff --git a/data/default/Ubuntu15.10.yaml b/data/default/Ubuntu15.10.yaml index 595286cd..3f46addb 100644 --- a/data/default/Ubuntu15.10.yaml +++ b/data/default/Ubuntu15.10.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'wily' + + repos: + default: + apt: + release: 'wily' diff --git a/data/default/Ubuntu16.04.yaml b/data/default/Ubuntu16.04.yaml index e6ea3d31..c920aee7 100644 --- a/data/default/Ubuntu16.04.yaml +++ b/data/default/Ubuntu16.04.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'xenial' + + repos: + default: + apt: + release: 'xenial' diff --git a/data/default/Ubuntu16.10.yaml b/data/default/Ubuntu16.10.yaml index 16d243e2..4e71c0d9 100644 --- a/data/default/Ubuntu16.10.yaml +++ b/data/default/Ubuntu16.10.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'yakkety' + + repos: + default: + apt: + release: 'yakkety' diff --git a/data/default/Ubuntu17.04.yaml b/data/default/Ubuntu17.04.yaml index 4ce0aede..d751b5ee 100644 --- a/data/default/Ubuntu17.04.yaml +++ b/data/default/Ubuntu17.04.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'zesty' + + repos: + default: + apt: + release: 'zesty' diff --git a/data/default/Ubuntu17.10.yaml b/data/default/Ubuntu17.10.yaml index 509e6470..c3887c2b 100644 --- a/data/default/Ubuntu17.10.yaml +++ b/data/default/Ubuntu17.10.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'artful' + + repos: + default: + apt: + release: 'artful' diff --git a/data/default/Ubuntu18.04.yaml b/data/default/Ubuntu18.04.yaml index 9f7695c2..4ae415f7 100644 --- a/data/default/Ubuntu18.04.yaml +++ b/data/default/Ubuntu18.04.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'bionic' + + repos: + default: + apt: + release: 'bionic' diff --git a/data/default/Ubuntu18.10.yaml b/data/default/Ubuntu18.10.yaml index 54448eb2..6c059d3b 100644 --- a/data/default/Ubuntu18.10.yaml +++ b/data/default/Ubuntu18.10.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'cosmic' + + repos: + default: + apt: + release: 'cosmic' diff --git a/data/default/Ubuntu19.04.yaml b/data/default/Ubuntu19.04.yaml index 864f8715..873c9eaa 100644 --- a/data/default/Ubuntu19.04.yaml +++ b/data/default/Ubuntu19.04.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'disco' + + repos: + default: + apt: + release: 'disco' diff --git a/data/default/Ubuntu19.10.yaml b/data/default/Ubuntu19.10.yaml index f13a4881..c202dd1c 100644 --- a/data/default/Ubuntu19.10.yaml +++ b/data/default/Ubuntu19.10.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'eoan' + + repos: + default: + apt: + release: 'eoan' diff --git a/data/default/Ubuntu20.04.yaml b/data/default/Ubuntu20.04.yaml index 72a40f06..c6d29546 100644 --- a/data/default/Ubuntu20.04.yaml +++ b/data/default/Ubuntu20.04.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'focal' + + repos: + default: + apt: + release: 'focal' diff --git a/data/default/Ubuntu20.10.yaml b/data/default/Ubuntu20.10.yaml index beea88bd..cb874e24 100644 --- a/data/default/Ubuntu20.10.yaml +++ b/data/default/Ubuntu20.10.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'groovy' + + repos: + default: + apt: + release: 'groovy' diff --git a/data/default/Ubuntu21.04.yaml b/data/default/Ubuntu21.04.yaml index 4350f1be..b01705ea 100644 --- a/data/default/Ubuntu21.04.yaml +++ b/data/default/Ubuntu21.04.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'hirsute' + + repos: + default: + apt: + release: 'hirsute' diff --git a/data/default/Ubuntu21.10.yaml b/data/default/Ubuntu21.10.yaml index 7ddfc825..c4b2422f 100644 --- a/data/default/Ubuntu21.10.yaml +++ b/data/default/Ubuntu21.10.yaml @@ -1,3 +1,8 @@ --- default::settings: apt_release: 'impish' + + repos: + default: + apt: + release: 'impish' diff --git a/data/default/Ubuntu22.04.yaml b/data/default/Ubuntu22.04.yaml index f77845dc..e4c161a8 100644 --- a/data/default/Ubuntu22.04.yaml +++ b/data/default/Ubuntu22.04.yaml @@ -1,3 +1,9 @@ --- default::settings: apt_release: 'jammy' + + + repos: + default: + apt: + release: 'jammy' diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index dace912e..4530a941 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -55,29 +55,25 @@ nats-server::settings: tp::install: - golang execs: - build: + - name: build command: 'GO111MODULE=on go get github.com/nats-io/nats-server/v2' releases: latest_version: '2.9.11' prerequisites: {} - release_url: 'https://github.com/nats-io/nats-server/releases/download/v$VERSION/nats-server-v$VERSION-$OS-$ARCH.zip' - base_url: 'https://github.com/nats-io/nats-server' - base_path: 'releases/download/v$VERSION' + base_url: 'https://github.com/nats-io/nats-server/releases/download/v$VERSION' file_name: 'nats-server-v$VERSION-$OS-$ARCH.zip' extracted_dir: 'nats-server-v$VERSION-$OS-$ARCH' file_format: zip - - install: - enable: true - files: - nats-server: - path: '/usr/local/bin/nats-server' - mode: '0755' - systemd_options: - Service: - ExecStart: '/usr/local/bin/nats-server' - EnvironmentFile: ~ - resources: {} - manage_service: true - manage_user: false + setup: + enable: true + files: + nats-server: + path: '/usr/local/bin/nats-server' + mode: '0755' + systemd_options: + Service: + ExecStart: '/usr/local/bin/nats-server' + EnvironmentFile: ~ + manage_service: true + manage_user: false diff --git a/data/nuclei/default.yaml b/data/nuclei/default.yaml index b4896d8a..f5f77628 100644 --- a/data/nuclei/default.yaml +++ b/data/nuclei/default.yaml @@ -73,27 +73,24 @@ nuclei::settings: tp::install: - golang execs: - build: + - name: build command: 'go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest' releases: latest_version: '2.8.6' prerequisites: {} - release_url: 'https://github.com/projectdiscovery/nuclei/releases/download/v$VERSION/nuclei_$VERSION_$OS_$ARCH.zip' - base_url: 'https://github.com/projectdiscovery/nuclei' - base_path: 'releases/download/v$VERSION' + base_url: 'https://github.com/projectdiscovery/nuclei/releases/download/v$VERSION' file_name: 'nuclei_$VERSION_$OS_$ARCH.zip' extracted_dir: '' extracted_file: 'nuclei' file_format: zip - - install: - enable: true - files: - nuclei: - path: '/usr/local/bin/nuclei' - mode: '0755' - resources: {} - manage_service: false - manage_user: false + setup: + enable: true + files: + nuclei: + path: '/usr/local/bin/nuclei' + mode: '0755' + resources: {} + manage_service: false + manage_user: false diff --git a/data/prometheus/default.yaml b/data/prometheus/default.yaml index dde83a62..fef0ee28 100644 --- a/data/prometheus/default.yaml +++ b/data/prometheus/default.yaml @@ -96,9 +96,7 @@ prometheus::settings: releases: latest_version: '2.41.0' prerequisites: {} - release_url: 'https://github.com/prometheus/prometheus/releases/download/v$VERSION/prometheus-$VERSION.$OS-$ARCH.tar.gz' - base_url: 'https://github.com/prometheus/prometheus' - base_path: 'releases/download/v$VERSION' + base_url: 'https://github.com/prometheus/prometheus/releases/download/v$VERSION' file_name: 'prometheus-$VERSION.$OS-$ARCH.tar.gz' extracted_dir: 'prometheus-$VERSION.$OS-$ARCH' file_format: 'tar.gz' @@ -108,7 +106,7 @@ prometheus::settings: name: 'prom/prometheus' systemd_options: {} - install: + setup: enable: true files: prometheus: @@ -136,8 +134,6 @@ prometheus::settings: ExecStart: '/usr/local/bin/prometheus --config.file /etc/prometheus/prometheus.yml' manage_service: true manage_user: true - # systemd_symlink: '/etc/systemd/system/multi-user.target.wants/prometheus.service' #default - # systemd_template: 'tinydata/prometheus/systemd.epp' build: enable: false @@ -147,11 +143,11 @@ prometheus::settings: - golang - npm execs: - build: + - name: build command: 'go build cmd/prometheus/main.go' environment: - 'GO111MODULE=on' - setup: + - name: setup command: 'go install cmd/prometheus/main.go' environment: - 'GO111MODULE=on' diff --git a/data/puppet-agent/upstream/default.yaml b/data/puppet-agent/upstream/default.yaml index 87041d7c..6d5fd2a6 100644 --- a/data/puppet-agent/upstream/default.yaml +++ b/data/puppet-agent/upstream/default.yaml @@ -5,7 +5,6 @@ puppet-agent::settings: # tp 4 settings - files: config: path: '/etc/puppetlabs/puppet/puppet.conf' diff --git a/data/reference/default.yaml b/data/reference/default.yaml index 53c45d43..a09643fb 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -1,25 +1,25 @@ --- -# This reference data shows all the possible tinydata settings for a -# sample application (called 'reference') +# This reference data shows all the possible tinydata settings for a sample application (called 'reference') # -# The main APPNAME::settings key below is looked up by the tp_lookup function -# in tp module manifests. It's an hash whose values are looked up in deep merge -# mode across the hierarchies defined in the hiera.yaml configuration file -# specific for each managed app. +# The main APPNAME::settings key below is looked up by the tp_lookup function in tp module manifests. +# It's an hash whose values are looked up in deep merge mode across the hierarchies +# defined in the hiera.yaml configuration file specific for each managed app. # -# You don't have to set all these settings, but be sure that what's set is -# correct, otherwise tp may try to do weird things or plainly fail with wrong data. +# You don't have to set all these settings, but be sure that what's set is correct, otherwise tp may try to do weird +# things or plainly fail with wrong data. -# Settings marked with v3 are used by every (not ancient) version of tp module. They are going to be deprecated (but still supported) from tp 4 +# Settings marked with v3 are used by every version of tp module (or since they've been introduced, refer to tp CHANGELOG for details) +# They are going to be deprecated (but still supported) from tp 4 # Settings marked with v4 are used by tp module starting from version 4. -# Some of them are used, as technology preview, in tp version 3.8.0 onwards. +# When both settings v3 and v4 are set, v4 ones are used (from tp 4 onwards) +# Some v4 settings are used, as technology preview, in tp version 3.8.0 onwards. # Note that in every template used by the tp::conf define you can access to these settings # (so that you can automatically configure in your own templates the right paths and names for # different underlying OSes) via the $settings variable (an hash with the settings values merged across the hierarchy). # For example to get the name of the user running a given app (as a service) you can use something like: -# User <%= @settings['process_user'] %> # In erb templates -# User <%= $settings['process_user'] %> # In epp templates +# User <%= @settings['service']['main']['process_user'] %> # In erb templates +# User <%= $settings['service']['main']['process_user'] %> # In epp templates # This works also for nested keys like: # Port: <%= $settings['ports']['main']['port'] %> # Protocol: <%= $settings['ports']['main']['protocol'] %> @@ -37,27 +37,57 @@ # ProTip: Use as existing app one of the example ones like: "sample", "sample_desktop" ... reference::settings: + ### v3 settings + # If the app needs other apps, installed via tp. # Key used in tp::install (and tp::install::*) - # Valids values: String, Array, Hash of tp::install resources with (in case of Hash) - # their parameters. v3 and v4 compatible. + # Valid values: String, Array, Hash of tp::install resources with (in case of Hash) + # their parameters. # These resources, as every other prerequisites, are installed if tp::auto_prereq is set to true. # If auto_prereq is set to false, the user is responsible for managing the prerequisites, when needed. - tp_prerequisites: {} + # v3 format. v4 equivalent is preinstall with tp::install resources + tp_prerequisites: [] + + # A list of package prerequisites to install before the app installation. + # Valid values: String, Array, Hash of package resources + # v3 format. v4 equivalent is preinstall with package resources + package_prerequisites: [] + + # An hash of command prerequisites to run before the app installation. + # v3 format. v4 equivalent is preinstall with exec resources + exec_prerequisites: {} + + # An hash or arbirary resources to apply before the app installation. to pass to the tp::conf define. + # v3 format. v4 equivalent is preinstall with arbitrary resources + extra_prerequisites: {} + + # An hash of commands to run after the app installation. + # v3 format. v4 equivalent is postinstall with exec resources + exec_postinstall: {} + + # An hash of arbitrary resources to apply after the app installation. + # v3 format. v4 equivalent is postinstall with arbitrary resources + extra_postinstall: {} # If to use the upstream repo from the app developer or not (if it exists and is defined in tinydata) + # v3 format. v4 equivalent is repo = upstream upstream_repo: false # The name of the package to install. Must be available on the system or via the configured repo - # v3 and v4 compatible. + # v3 format. v4 equivalent is packages.main.name package_name: 'reference' # The provider to use for the package resource. Tinydata defaults are: # - chocolatey on windows (you need to install chocolatey by yourself) # - homebrew on Darwin (you need to install homebrew by yourself) # - Puppet's default package provider for the other OSes + # v3 and v4 format. package_provider: ~ + # The ensure argument of the package resource. Can be a version number, 'latest' or 'present' + # v3 format. v4 equivalent is packages.main.ensure + package_ensure: 'present' + # The source argument of the package resource. The value is passed to the tp::url_replace function # which automatically replaces the following variables in the string: # $OS with downcase($facts['kernel']) @@ -66,40 +96,61 @@ reference::settings: # For example, this could be: # package_source: 'https://github.com/reference/reference/releases/download/v$VERSION/reference_$VERSION_$OS_$ARCH.msi' # This works only with Puppet providers that accept a source argument + # v3 format. v4 equivalent is packages.main.source package_source: ~ # The install_options argument of the package resource. + # v3 format. v4 equivalent is packages.main.install_options package_install_options: [] # An optional hash of parameters to pass to the package resource. They are merged and can override # or extend the above default package parameters (ensure,provider,source,install_options) # Note that is you set both package_source: foo and package_params: { source: 'bar' } the latter (bar) # will be used. Same for the provider and install_options arguments. + # v3 format. v4 equivalent is packages.main.params package_params: {} # The name of the service to manage. When present, the relevant service resource is managed. + # v3 format. v4 equivalent is services.main.name service_name: 'reference' # An optional hash of parameters to pass to the service resource. They are merged and can override # or extend the default service parameters (ensure/enable/require) + # v3 format. v4 equivalent is services.main.params service_params: {} + # The ensure argument of the service resource. Can be 'running' or 'stopped' + # v3 format. v4 equivalent is services.main.ensure + service_ensure: 'running' + + # The enable argument of the service resource. Can be 'true' or 'false' + # v3 format. v4 equivalent is services.main.enable + service_enable: true + # The name of the process of the managed application. This is used by the tp test, tp info and # tp debug commands automatically show relevant information + # v3 format. v4 equivalent is services.main.process_name process_name: 'reference' + # An optional additional name to append to process_name when searching for the process. + # This is useful when the process name is not unique, like in the case of a Java app. + # v3 format. v4 equivalent is services.main.process_extra_name + process_extra_name: ~ + # The name of the user used by the app when it runs as a service. This is used by the tp::service # define when configuring automatically the systemd unit files. + # v3 format. v4 equivalent is services.main.process_user process_user: 'root' # The name of the group used by the app when it runs a service. This is used by tp::service as well + # v3 format. v4 equivalent is services.main.process_group process_group: 'root' # The path of the "main" configuration file of the app. When it's not clear what's the main # config file, choice is arbitrarily left to the tinydata developer. # This is the file managed when you use the tp::conf define without further arguments like path. # tp::conf { 'reference': content => "whatever" } will manage the file in the path below. - # v3 format. v4 format equivalent is files.config.path + # v3 format. v4 equivalent is files.config.path config_file_path: '/etc/reference/reference.conf' # The format of the main configuration file. Can be any of the following: @@ -122,44 +173,310 @@ reference::settings: # --- # foo: bar # my: baz - # v3 format. v4 format equivalent is files.config.format + # v3 format. v4 equivalent is files.config.format config_file_format: yaml + # The owner of the main configuration file + # v3 format. v4 equivalent is files.config.owner + config_file_owner: 'root' + + # The group of the main configuration file + # v3 format. v4 equivalent is files.config.group + config_file_group: 'root' + + # The mode of the main configuration file + # v3 format. v4 equivalent is files.config.mode + config_file_mode: '0644' + # The eventual value of Puppet's validate_cmd argument for the main configuration file resource, when managed via tp::conf. # This allows you to automatically validate the syntax of your configurations before changing them via Puppet # Note the % which is the default placeholder for the file to validate (keep it) - # v3 format. v4 format equivalent is files.config.validate_cmd + # v3 format. v4 equivalent is files.config.validate_cmd validate_cmd: 'reference validate %' # The path of the pid file, if any. This is used by the tp info and tp debug commands to show info based the pid of the process - # v3 format. v4 format equivalent is files.pid.path + # v3 format. v4 equivalent is services.main.pidfile pid_file_path: '/run/reference.pid' # The path of the service configuration file (not the systemd unit file or init script, but the file that they uses to configure the service) - # v3 format. v4 format equivalent is files.init.path + # v3 format. v4 equivalent is files.init.path init_file_path: '/etc/sysconfig/reference.conf' + # The template (erb or epp) to use for the service configuration file. + # v3 format. v4 equivalent is files.init.template + init_file_template: ~ + # The path[s] of the log file[s] of the app. This is used by the tp log and tp info commands to tail logs or show info on the app - # v3 format. v4 format equivalent is files.log.path + # v3 format. v4 equivalent is files.log.path log_file_path: - '/var/log/reference/reference.log' # The path of the directory where the app stores its configurations. This is the default path used by the tp::dir define. - # v3 format. v4 format equivalent is dirs.config.path + # v3 format. v4 equivalent is dirs.config.path config_dir_path: '/etc/reference' + # The owner of the config directory + # v3 format. v4 equivalent is dirs.config.owner + config_dir_owner: 'root' + + # The group of the config directory + # v3 format. v4 equivalent is dirs.config.group + config_dir_group: 'root' + + # The mode of the config directory + # v3 format. v4 equivalent is dirs.config.mode + config_dir_mode: '0755' + + # If to purge the config directory or not. This is the default value used by the tp::dir define. + # v3 format. v4 equivalent is dirs.config.purge + config_dir_purge: false + + # If to recurse the config directory or not. This is the default value used by the tp::dir define. + # v3 format. v4 equivalent is dirs.config.recurse + config_dir_recurse: true + + # An hash of additional parameters to pass to file resource managed by tp::dir + # v3 format. v4 equivalent is dirs.config.params + config_dir_params: {} + # The path where the app stores its log (if different by general log dirs like /var/log) - # v3 format. v4 format equivalent is dirs.log.path + # v3 format. v4 equivalent is dirs.log.path log_dir_path: - '/var/log/reference' - # An v4 hash of files related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. + # The path of the app's home. Should map to the app's user home, if any. + # v3 format. v4 equivalent is dirs.home.path + home_dir_path: '/var/lib/reference' + + # The path where the app stores its data. Might be used to automate backups. + # v3 format. v4 equivalent is dirs.data.path + data_dir_path: '/var/lib/reference' + + # The name or the url of the official container image of the app. + # v3 format. v4 equivalent is image.name + docker_image: 'reference/reference' + + # The arguments to pass to the app process to run it in the foreground. + # Might be useful to automatically manage application run inside containers. + # v3 format. v4 equivalent is services.main.nodaemon_args + nodaemon_args: '-D' + + # A list on RUN entries to prepend in Dockerfiles used to build the app. + # Some defautls are already set per osfamily, like installing wget, curl, etc. + # v3 format. v4 equivalent is image.dockerfile_prerequisites + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' + + # The main tcp port used by the application, if applicable. + # v3 format. v4 equivantent are ports.main.port and ports.main.protocol: tcp + tcp_port: 42 + + # The main udp port used by the application, if applicable. + # v3 format. v4 equivantent are ports.main.port and ports.main.protocol: udp + udp_port: 42 + + # Repositories can be configured using different settings: + # - Via release packages. Settings required: repo_package_name, repo_package_url. + # Settings optional: repo_package_provider. + # - Via a repofile (containing the repo configuration). Settings required: repo_file_url (zypper_repofile_url with Zypper) + # Settings optional: repo_filename. + # - Via repo configurations with settings depending on the package provider: + # With Zypper. Settings required: repo_name and repo_url + # With Yum. Settings required: repo_url OR yum_mirrorlist + # Settings optional: repo_filename, repo_description, yum_priority, yumrepo_params + # With Apt. Settings required: repo_url OR apt_mirrorlist + # + # The name of the repo release package, which contains all the configurations for the package's repo. + # v3 format. v4 equivalent is repos.upstream.package_name (or repos.$repo.package_name) + repo_package_name: 'reference-release' + + # The url of the repo release package. This is downloaded and installed before installing the app. + # v3 format. v4 equivalent is repos.upstream.package_url (or repos.$repo.package_url) + repo_package_url: ~ + + # The provider to use to install the repo release package. This is different from the package provider, + # which is used to install the app itself. On RedHat this is 'rpm', on Debian 'dpkg'. + # v3 format. v4 equivalent is repos.upstream.package_provider (or repos.$repo.package_provider) + repo_package_provider: ~ + + # Additional param for the package resource used to install the repo release package. + # v3 format. v4 equivalent is repos.upstream.package_params (or repos.$repo.package_params) + repo_package_params: {} + + # Url pointing to the file containing the repo configuration (as in /etc/yum/$file.repo or /etc/apt/sources.list.d/$file.list) + # This is an alternative to repo_package_url, which is used to install the repo release package. + # v3 format. v4 equivalent is repos.upstream.repofile_url (or repos.$repo.repofile_url) + repo_file_url: + + # The name of the repo file, without the .repo or .list suffixex (as in /etc/yum/$repo_filename.repo or + # /etc/apt/sources.list.d/$repo_filename.list). + # v3 format. v4 equivalent is repos.upstream.repofile_name (or repos.$repo.repofile_name) + repo_filename: 'reference' + + # The url of the repo, as configured in the repo files. + # v3 format. v4 equivalent is repos.upstream.url (or repos.$repo.url) + repo_url: ~ + + # The name of the repo, as configured in the repo files. + # v3 format. v4 equivalent is repos.upstream.name (or repos.$repo.name) + repo_name: ~ + + # The description of the repo, as configured in the repo files. + # v3 format. v4 equivalent is repos.upstream.description (or repos.$repo.description) + repo_description: ~ + + # The gpg key for the repo, as configured in the repo files. + # v3 format. v4 equivalent is repos.upstream.key (or repos.$repo.key) + key: + + # The url of the gpg key for the repo. + # v3 format. v4 equivalent is repos.upstream.key_url (or repos.$repo.key_url) + key_url: + + # Apt specific settings for the repo, as configured in the .list files. + # v3 format. v4 equivalent is repos.upstream.apt.include_src (or repos.$repo.apt.include_src) + include_src: + + # Apt specific settings for the repo, as configured in the .list files. + # It refers to the components of the repo, like 'main contrib non-free'. + # v3 format. v4 equivalent is repos.upstream.apt.components (or repos.$repo.apt.components) + apt_repos: 'main' + + # Apt specific settings. If apt_key_server and apt_key_fingerprint are set this command is run: + # apt-key adv --keyserver ${settings[apt_key_server]} --recv ${settings[apt_key_fingerprint]} + # v3 format. v4 equivalent is repos.upstream.apt.key_server (or repos.$repo.apt.key_server) + apt_key_server: ~ + # v3 format. v4 equivalent is repos.upstream.apt.key_fingerprint (or repos.$repo.apt.key_fingerprint) + apt_key_fingerprint: ~ + + # Apt specific settings. The OS release name. This setting is set in data/default so it + # should set in the app definition only when different for release dafaults (ie: stable). + # v3 format. v4 equivalent is repos.upstream.apt.release (or repos.$repo.apt.release) + apt_release: ~ + + # Apt specific settings. + # v3 format. v4 equivalent is repos.upstream.apt.pin (or repos.$repo.apt.pin) + apt_pin: + + # Yum specific settings to customise for the yumrepo resource. + # v3 format. v4 equivalent is repos.upstream.yum.params (or repos.$repo.yum.params) + yumrepo_params: {} + + # Yum specific setting for the yumrepo resource. + # v3 format. v4 equivalent is repos.upstream.yum.priority (or repos.$repo.yum.priority) + yum_priority: ~ + + # Yum specific setting for the yumrepo resource. + # v3 format. v4 equivalent is repos.upstream.yum.mirrorlist (or repos.$repo.yum.mirrorlist) + yum_mirrorlist: ~ + + # Zypper version of the repo_file_url setting. + # Used in command: zypper addrepo ${settings[zypper_repofile_url]} + # v3 format. v4 equivalent is repos.upstream.repofile_url (or repos.$repo.repofile_url) + zypper_repofile_url: ~ + + # The brew tab to use when installing a package via brew on MacOS + # v3 format. v4 equivalent is repos.upstream.brew.tap (or repos.$repo.brew.tap) + brew_tap: ~ + + + ### v4 settings + + # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) + # to apply before installing the app. The values of each resource can be a string, + # an array or an hash of resource titles with the relevant arguments + preinstall: {} + + # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) + # to apply after installing the app. The values of each resource can be a string, + # an array or an hash of resource titles with the relevant arguments + postinstall: {} + + # The name of the defauly repository to use for the app. When set it's usually 'upstream' + # to refer to a reposiotry managed directly by the app developers. + # It can be also set with an arbitrary name, as long as in hiera.yaml you have a layer + # with the $repo variable and you place in the relevant directory the necessary data. + # Data has to be placed under settings.repos.$repo + repo: ~ + + # An hash which contains one or more repositories to use for the app. + # For each repository you can specify the parameters below (here example only for upstream repo): + repos: + upstream: + name: 'reference' + description: 'reference repository' + package_name: 'reference-release' + package_url: ~ + package_provider: ~ + package_params: {} + repofile_url: ~ + repofile_name: ~ + url: ~ + key: ~ + key_url: ~ + yum: + priority: ~ + mirrorlist: ~ + baseurl: ~ + gpgcheck: ~ + gpgkey: ~ + params: {} + apt: + key_server: ~ + key_fingerprint: ~ + components: 'main' + release: 'stable' + pin: ~ + include_src: ~ + brew: + tap: ~ + + # The package provider + # v3 and v4 format. + # package_provider: ~ + + # A v4 hash of packages related to the app. + packages: + main: + name: reference + ensure: present + source: ~ + install_options: [] + params: {} + providers: + chocolatey: + name: ~ + scoop: + name: ~ + winget: + name: ~ + # Examples of other packages + client: + name: reference-client + server: + name: reference-server + + # The init system to use for the app. (Set in default settings, usually no need to override) + init_system: ~ + + services: + main: + name: reference + process_name: reference + process_extra_name: ~ + process_user: root + process_group: root + nodaemon_args: '-D' + ensure: running + enable: true + pidfile: /run/reference.pid + params: {} + + # A v4 hash of files related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. # They are used by tp::conf to manage files without the need to specify their path, and also can be used by tp info and tp debug commands. # The common keys are: # config : the main configuration file. It's path is used when you use tp::conf { 'appname': } # init : the init script or systemd unit file configuration file. It's path is used when you use tp::conf { 'appname::init': } # systemd: the systemd unit file. It's path is used when you use tp::conf { 'appname::systemd': } - # pid : the pid file. # Any other string can be used to refer to other app specific files. Syntax and usage is similar. For example on nuclei # tinydata you can have # templates: the .templates-config.json file, which can be configured with tp::conf { 'nuclei::templates': } @@ -170,6 +487,7 @@ reference::settings: # mode : the mode of the file (optional) # owner : the owner of the file (optional) # group : the group of the file (optional) + # template : the template (erb or epp) to use to render the file (optional) files: config: path: '/etc/reference/reference.conf' @@ -179,10 +497,8 @@ reference::settings: systemd: path: '/etc/systemd/system/reference.service' format: 'inifile_with_stanzas' - pid: - path: '/run/reference.pid' - # An v4 hash of directories related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. + # A v4 hash of directories related to the app. Some of the subkeys have a common meaning and usage, others can be specific to the app. # They are used by tp::dir to manage the directories without the need to specify their path, and also can be used by tp info and tp debug commands. # The common keys are: # config : the main configuration directory. It's path is used when you use tp::dir { 'appname': } @@ -197,9 +513,20 @@ reference::settings: # mode : the mode of the dir (optional) # owner : the owner of the dir (optional) # group : the group of the dir (optional) + # recurse : the recurse argument for the file resource used to manage the dir (optional) + # purge : the purge argument for the file resource used to manage the dir (optional) + # force : the force argument for the file resource used to manage the dir (optional) + # params : an hash of additional parameters to pass to the file resource used to manage the dir (optional) dirs: config: path: '/etc/reference' + mode: ~ + owner: ~ + group: ~ + recurse: ~ + purge: ~ + force: ~ + params: {} conf: path: '/etc/reference/conf.d' log: @@ -234,19 +561,7 @@ reference::settings: install_method: 'package' # The description of the app. It's used by tp command. v4. - description: 'reference_packages description' - - # The name or the url of the official container image of the app. v3 format. The v4 equivalent is image.name - docker_image: 'reference/reference' - - # The official website of the application. v4. Used by tp command. - website: 'https://reference.com' - - # The tickets/issues page of the application. v4. Currently still not used. - issues: 'https://github.com/reference/reference/issues' - - # The git repository of the application. Used by tp::source and tp::install (with install_method = source). v4. - git_source: 'https://github.com/reference/reference' + description: 'reference description' # An hash of extra commands to execute when running the tp info command or tp::info task. v3 and v4 compatible. # The keys are the names of the commands (ie: tp info APP list), the values are the actual commands to execute. @@ -267,7 +582,11 @@ reference::settings: # or argument is needed. Specify it here. v3 and v4 compatible. version_command: 'reference version' - # An hash of commands to execute when running the tp::run command or the tp::run task. v3 and v4 compatible. + # The command to run to show the application's help. By default it's used appname --help, if a different command + # or argument is needed. Specify it here. v3 and v4 compatible. + help_command: 'reference help' + + # An hash of commands to execute when running the tp::run command or the tp::run task. v4 compatible. # Experimental feature yet to be implemented. Format of the subkeys might change. run_commands: start: @@ -284,11 +603,6 @@ reference::settings: restart: command: 'reference restart' - # The main tcp port used by the application, if applicable. v3 only. Replaced by v4 ports.main.port and ports.main.protocol: tcp - tcp_port: 42 - - # The main udp port used by the application, if applicable. v3 only. Replaced by v4 ports.main.port and ports.main.protocol: udp - udp_port: 42 # A v4 hash of all the ports used by the application. # The keys are the names of the ports, common names are (other names can be application specific): @@ -315,7 +629,6 @@ reference::settings: # The name of the image to use. Passed to docker pull. # Can be a full url like quay.io/argoproj/argocd or just the # image name on Docker hub like argoproj/argocd - # This value has precendence over the docker_image value (v3) name: 'reference/reference' # The ports to map when starting the container. Different data types are supported: @@ -361,6 +674,10 @@ reference::settings: # maps systemd_options into a valid Systemd unit file in ini file format with stanza. You probably don't need to set this. systemd_template: 'tp/inifile_with_stanzas.erb' + # A list of prerequisite entries to automatically add to the app's Dockerfile when automatically + # building it. The values can be a string or an array, typically of RUN entries + dockerfile_prerequisites: ~ + # A v4 setting used by the tp::build define. build: # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) @@ -369,14 +686,37 @@ reference::settings: prerequisites: tp::install: - build-essential - # The commands to run execute in order to build the app + # The commands to run execute in order to build the app. It's a sorted array of hashes with the following keys: execs: - configure: - command: './configure' - build: + - name: configure # The name of the command + command: './configure' # The command to run + options: {} # An hash of options to pass to the exec resource + creates: ~ # The path to check for existence before running the command + onlyif: ~ # A command to run to check if the command should be run + - name: build command: 'make' - setup: + options: {} + - name: setup command: 'make install' + options: {} + + # An hash of configurations that are used to setup the application when it's compiled from source + # (install_method => source). It merges with the defaults set in settings.setup + # Check the documentations below for settings.setup for more details. v4. + setup: + enable: true + files: + reference: + path: '/usr/local/bin/reference' + mode: '0755' + systemd_options: + Service: + ExecStart: '/usr/local/bin/reference -l 127.0.0.1' + EnvironmentFile: ~ + resources: {} + manage_service: true + manage_user: false + # A v4 setting used by the tp::install define to install the app when install_method=file releases: @@ -390,19 +730,15 @@ reference::settings: # It's used when no specific version is set via tp::install. latest_version: '1.0.0' - # The full url of the application archive. This is downloaded, eventually extracted and some of its contents eventually - # copied to target paths. + # The base url of the application archive excluded the file name. The file $base_url/$file_name + # is downloaded, eventually extracted and some of its contents eventually copied to target paths. # The value is passed to the tp::url_replace function which automatically replaces, if present, the following variables: # $OS with downcase($facts['kernel']) (common values: linux, windows, darwin) # $ARCH with $facts['os']['architecture'] (common values: linux, windows, darwin) # $VERSION with the version of the package (if set via $ensure, $version or in $settings.releases.latest_version) - release_url: 'https://github.com/reference/reference/releases/download/reference-$VERSION/reference-$VERSION.tar.gz' + base_url: 'https://github.com/reference/reference/releases/download/reference-$VERSION' - # If release_url is not set then the url is built using the following values: $base_url/$base_path/$file_name - # Note that base_url and base_path are optional if release_url is set (they are useful if you get release files - # from a local repository). file_name is mandatory. - base_url: 'https://github.com/reference/reference/releases/download' - base_path: 'releases/download/reference-$VERSION' + # The file_name of the archive to download file_name: 'reference-$VERSION.tar.gz' # The format of the archive. Needed to find the right way to decompress it @@ -420,16 +756,57 @@ reference::settings: extracted_dir: 'reference-$VERSION' extracted_file: '' - install: - enable: true + # An hash of configurations that are used to setup the application when it's downloaded from a release tarball + # (install_method => file). It merges with the defaults set in settings.setup + # Check the documentations below for settings.setup for more details. v4. + setup: + enable: true + files: + reference: + path: '/usr/local/bin/reference' + mode: '0755' + systemd_options: + Service: + ExecStart: '/usr/local/bin/reference -l 127.0.0.1' + EnvironmentFile: ~ + resources: {} + manage_service: true + manage_user: false + + # The default setup settings. They are merged with settings.releases.setup and settings.source.setup + setup: + # If to enable the setup, which involves doing the configurations as defined in the other settings + enable: false + # An hash of files to copy from the directory where the app is extracted or compiled from source + # to the target path. The key is the name of the file to copy, the value is an hash with file resource + # parameters. Defaults are executable files owned by root and copied under /usr/local/bin files: reference: path: '/usr/local/bin/reference' mode: '0755' + # An hash of systemd options to use to configure the systemd unit file. Keys are the name of the relevant stanza, + # values are key/value pairs of the options. They are merged with the defaults used in tp::service systemd_options: Service: ExecStart: '/usr/local/bin/reference -l 127.0.0.1' EnvironmentFile: ~ + # An hash of resources passwd to the tp::create_everything function. resources: {} + # If to manage and configure the application service. If true, the tp::service define is called with the + # systemd_options and resources settings. manage_service: true + # If to manage the create of the user, if true the user and group are set in settings.service.main.process_user + # and settings.service.main.process_group manage_user: false + + # An hash of URLs related to the application. Additional URLs can be added for convenience. + urls: + # The official website of the application. + website: ~ + # The tickets/issues page of the application. + issues: ~ + # The documentation site of the application. + documentation: ~ + # The git repository of the application. Maps to v3 git_source + source: ~ + diff --git a/data/sample/default.yaml b/data/sample/default.yaml index b6b30396..1db1fe8c 100644 --- a/data/sample/default.yaml +++ b/data/sample/default.yaml @@ -93,25 +93,23 @@ sample::settings: tp::install: - build-essential execs: - configure: + - name: configure command: './configure' - build: + - name: build command: 'make' - setup: + - name: setup command: 'make install' releases: latest_version: ~ prerequisites: {} latest_url: ~ - release_url: 'https://github.com/sample/sample/releases/download/sample-$VERSION/sample-$VERSION.$OS-$ARCH.tar.gz' - base_url: 'https://github.com/sample/sample' - base_path: 'releases/download/sample-$VERSION' + base_url: 'https://github.com/sample/sample/releases/download/sample-$VERSION' file_name: 'sample-$VERSION.$OS-$ARCH.tar.gz' extracted_dir: 'sample-$VERSION.$OS-$ARCH' file_format: tar.gz - install: + setup: enable: true files: sample: diff --git a/data/spiderfoot/default.yaml b/data/spiderfoot/default.yaml index f8dd5fbe..c08404c6 100644 --- a/data/spiderfoot/default.yaml +++ b/data/spiderfoot/default.yaml @@ -8,8 +8,8 @@ spiderfoot::settings: service_name: 'spiderfoot' package_provider: 'pip' - process_name: 'spiderfoot' - process_user: 'spiderfoot' + process_name: 'sf.py' + process_user: 'root' process_group: 'root' git_source: 'https://github.com/smicallef/spiderfoot' @@ -32,7 +32,7 @@ spiderfoot::settings: tp::install: - python-pip execs: - build: + - name: build command: 'pip install -r requirements.txt' install_method: 'source' @@ -41,23 +41,17 @@ spiderfoot::settings: latest_version: '4.0' prerequisites: {} latest: {} - release_url: '$VERSION.tar.gz' - base_url: 'https://github.com/smicallef/spiderfoot' - base_path: 'archive/refs/tags/v$VERSION/' + base_url: 'https://github.com/smicallef/spiderfoot/archive/refs/tags/v$VERSION' file_name: 'v$VERSION.zip' extracted_dir: 'spiderfoot-$VERSION' file_format: 'zip' - install: + setup: enable: true - files: - sf.py: - path: '/usr/local/bin/sf.py' - mode: '0755' systemd_options: Service: - ExecStart: '/var/lib/tp/source/spiderfoot/sf.py -l 127.0.0.1:5001' + ExecStart: '/var/lib/tp/source/spiderfoot/sf.py -l 0.0.0.0:5001' EnvironmentFile: ~ manage_service: true - manage_user: true + manage_user: false diff --git a/data/spiderfoot/operatingsystem/Debian10.yaml b/data/spiderfoot/operatingsystem/Debian10.yaml index 72c3c60b..e0c233de 100644 --- a/data/spiderfoot/operatingsystem/Debian10.yaml +++ b/data/spiderfoot/operatingsystem/Debian10.yaml @@ -2,5 +2,5 @@ spiderfoot::settings: build: execs: - build: + - name: build command: 'pip3 install -r requirements.txt' diff --git a/data/spiderfoot/operatingsystem/Debian9.yaml b/data/spiderfoot/operatingsystem/Debian9.yaml index 72c3c60b..e0c233de 100644 --- a/data/spiderfoot/operatingsystem/Debian9.yaml +++ b/data/spiderfoot/operatingsystem/Debian9.yaml @@ -2,5 +2,5 @@ spiderfoot::settings: build: execs: - build: + - name: build command: 'pip3 install -r requirements.txt' diff --git a/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml b/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml index 72c3c60b..e0c233de 100644 --- a/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml +++ b/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml @@ -2,5 +2,5 @@ spiderfoot::settings: build: execs: - build: + - name: build command: 'pip3 install -r requirements.txt' diff --git a/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml b/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml index 72c3c60b..e0c233de 100644 --- a/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml +++ b/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml @@ -2,5 +2,5 @@ spiderfoot::settings: build: execs: - build: + - name: build command: 'pip3 install -r requirements.txt' diff --git a/data/spiderfoot/osfamily/windows.yaml b/data/spiderfoot/osfamily/windows.yaml index bfda77b0..4b0b357b 100644 --- a/data/spiderfoot/osfamily/windows.yaml +++ b/data/spiderfoot/osfamily/windows.yaml @@ -3,7 +3,7 @@ spiderfoot::settings: choco_package_name: 'spiderfoot' package_name: 'spiderfoot' - install: + setup: enable: true files: sf.py: diff --git a/metadata.json b/metadata.json index 22274b08..8cf892ef 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.5.1", + "version": "0.6.0", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb new file mode 100644 index 00000000..0ba6c620 --- /dev/null +++ b/scripts/convert_v3_to_v4.rb @@ -0,0 +1,131 @@ +require 'yaml' + +# This script converts a v3 config file to a v4 config file +# Kindly generated with the help of bots +# It's not perfect, as it doesn't handle all the cases where some data might be +# missing, but it should be good enough to convert all the existing data +# in the official tinydata module (and in custom tinydata modules) + +# Get the file path from the command line argument +file_path = ARGV[0] + +# Get the name of the file to write to from the second command line argument +# If no file name is provided, the original file will be overwritten +output_file_path = ARGV[1] || file_path + +# Load the original yaml file +original_config = YAML.load_file(file_path) + +# Get the key name that contains settings +settings_key = original_config.keys.select { |key| key.end_with?('::settings') }.first + + +# Get the package name from the original config +package_name = original_config[settings_key]['package_name'] +original_config[settings_key]["packages"] = {"main" => {"name" => package_name}} if package_name +# Get the package provider from the original config +#package_provider = original_config[settings_key]['package_provider'] +#original_config[settings_key]["packages"]["main"]["package_provider"] if package_provider + +# Get the service name from the original config +service_name = original_config[settings_key]['service_name'] +original_config[settings_key]["services"] = {"main" => {"name" => service_name}} if service_name +# Get the process name from the original config +process_name = original_config[settings_key]['process_name'] +original_config[settings_key]["services"]["main"]["process_name"] = process_name if process_name +# Get the process_extra name from the original config +process_extra_name = original_config[settings_key]['process_extra_name'] +original_config[settings_key]["services"]["main"]["process_extra_name"] = process_extra_name if process_extra_name +# Get the process user from the original config +process_user = original_config[settings_key]['process_user'] +original_config[settings_key]["services"]["main"]["process_user"] = process_user if process_user +# Get the process group from the original config +process_group = original_config[settings_key]['process_group'] +original_config[settings_key]["services"]["main"]["process_group"] = process_user if process_group +# Get the process nodaemon_args from the original config +nodaemon_args = original_config[settings_key]['nodaemon_args'] +original_config[settings_key]["services"] = {"main" => {"nodaemon_args" => nodaemon_args}} if nodaemon_args + + +# Get the config_file_path from the original config +config_file_path = original_config[settings_key]['config_file_path'] +original_config[settings_key]["files"] = {"config" => {"path" => config_file_path}} if config_file_path +original_config[settings_key]["user_files"] = {"config" => {"path" => config_file_path.gsub('/etc/','$HOME/.') }} if config_file_path +# Get the config_file_format from the original config +config_file_format = original_config[settings_key]['config_file_format'] +original_config[settings_key]["files"]["config"]["format"] = config_file_format if config_file_format +# Get the log_file_path from the original config +log_file_path = original_config[settings_key]['log_file_path'] +original_config[settings_key]["files"]["log"] = {"path" => log_file_path} if log_file_path +# Get the init_file_path from the original config +init_file_path = original_config[settings_key]['init_file_path'] +original_config[settings_key]["files"]["init"] = {"path" => init_file_path} if init_file_path + +# Get the config_dir_path from the original config +config_dir_path = original_config[settings_key]['config_dir_path'] +original_config[settings_key]["dirs"] = {"config" => {"path" => config_dir_path}} if config_dir_path +original_config[settings_key]["user_dirs"] = {"config" => {"path" => config_dir_path.gsub('/etc/','$HOME/.') }} if config_dir_path +# Get the conf_dir_path from the original config +conf_dir_path = original_config[settings_key]['conf_dir_path'] +original_config[settings_key]["dirs"]["conf"] = {"path" => conf_dir_path} if conf_dir_path +# Get the log_dir_path from the original config +log_dir_path = original_config[settings_key]['log_dir_path'] +original_config[settings_key]["dirs"]["log"] = {"path" => log_dir_path} if log_dir_path +# Get the home_dir_path from the original config +home_dir_path = original_config[settings_key]['home_dir_path'] +original_config[settings_key]["dirs"]["home"] = {"path" => home_dir_path} if home_dir_path +# Get the data_dir_path from the original config +data_dir_path = original_config[settings_key]['data_dir_path'] +original_config[settings_key]["dirs"]["data"] = {"path" => data_dir_path} if data_dir_path +# Get the ssl_dir_path from the original config +ssl_dir_path = original_config[settings_key]['ssl_dir_path'] +original_config[settings_key]["dirs"]["ssl"] = {"path" => ssl_dir_path} if ssl_dir_path + +# Get the tcp port from the original config +tcp_port = original_config[settings_key]['tcp_port'] +original_config[settings_key]["ports"] = {"main" => {"port" => tcp_port}} if tcp_port +# Get the udp port from the original config +udp_port = original_config[settings_key]['udp_port'] +original_config[settings_key]["ports"] = {"main" => {"port" => udp_port}} if udp_port + +# Get the website_url from the original config +website_url = original_config[settings_key]['website_url'] +original_config[settings_key]["urls"] = {"website" => website_url } if website_url +# Get the git_source from the original config +git_source = original_config[settings_key]['git_source'] +original_config[settings_key]["urls"]["source"] = git_source if git_source + +# Get the docker_image from the original config +docker_image = original_config[settings_key]['docker_image'] +original_config[settings_key]["image"] = {"name" => docker_image } if docker_image +# Get the dockerfile_prerequisites from the original config +dockerfile_prerequisites = original_config[settings_key]['dockerfile_prerequisites'] +original_config[settings_key]["image"] = {"dockerfile_prerequisites" => dockerfile_prerequisites } if dockerfile_prerequisites + +# Convert upstream_repo to repo = upstream +upstream_repo = original_config[settings_key]['upstream_repo'] +original_config[settings_key]["repo"] = 'upstream' if upstream_repo == true + +# Convert prerequisites +tp_prerequisites = original_config[settings_key]['tp_prerequisites'] +original_config[settings_key]["preinstall"] = { 'tp::install' => tp_prerequisites } if tp_prerequisites +exec_prerequisites = original_config[settings_key]['exec_prerequisites'] +original_config[settings_key]["preinstall"] = { 'exec' => exec_prerequisites } if exec_prerequisites +package_prerequisites = original_config[settings_key]['package_prerequisites'] +original_config[settings_key]["preinstall"] = { 'package' => package_prerequisites } if package_prerequisites + +# Convert postinstall +exec_postinstall = original_config[settings_key]['exec_postinstall'] +original_config[settings_key]["postinstall"] = { 'exec' => exec_postinstall } if exec_postinstall +extra_postinstall = original_config[settings_key]['extra_postinstall'] +original_config[settings_key]["postinstall"] = { 'extra' => extra_postinstall } if extra_postinstall + + +# Convert the config to a hash +original_config = original_config.to_hash + +# Convert the config to a yaml string +original_config = original_config.to_yaml + +# Write the merged config to output file +File.open(output_file_path, 'w') { |file| file.write(original_config.to_yaml) } From 6ae2e4f4d3f188fd6338c04773f37f1098327b94 Mon Sep 17 00:00:00 2001 From: Florus Both Date: Wed, 1 Feb 2023 19:51:00 +0100 Subject: [PATCH 251/284] fedora36+ uses python3-pip too --- data/python-pip/osfamily/Fedora36.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/python-pip/osfamily/Fedora36.yaml diff --git a/data/python-pip/osfamily/Fedora36.yaml b/data/python-pip/osfamily/Fedora36.yaml new file mode 100644 index 00000000..17d6ca57 --- /dev/null +++ b/data/python-pip/osfamily/Fedora36.yaml @@ -0,0 +1,3 @@ +--- +python-pip::settings: + package_name: 'python3-pip' \ No newline at end of file From 7af551ba4001cfe26aa7cf55e0c5afebb36b25cf Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 1 Feb 2023 23:28:50 +0100 Subject: [PATCH 252/284] Restablished defaults --- data/default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/default.yaml b/data/default.yaml index e9033393..226a0e37 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -9,9 +9,9 @@ default::settings: config_file_mode: '0644' config_dir_owner: 'root' config_dir_group: 'root' - config_dir_mode: '0644' + config_dir_mode: '0755' config_dir_purge: false - config_dir_recurse: false + config_dir_recurse: true install_method: 'package' packages: From 76afbfe1b71c69917057d00eb3ea1561f03cfc70 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 1 Feb 2023 23:38:13 +0100 Subject: [PATCH 253/284] Try to use an image that doesn't fail to push --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a79b8068..0b4d12a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: name: 'Deploy to forge' runs-on: ubuntu-latest if: github.repository_owner == 'example42' - container: puppet/puppet-dev-tools:4.x + container: puppet/puppet-dev-tools:2022-11-14-8e11537 steps: - name: Checkout repository uses: actions/checkout@v3 From 1abeea49f3eed2e2f7cf887f6922e931c3ef7fb7 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 10 Jan 2023 10:57:39 +0100 Subject: [PATCH 254/284] Nats-server data --- data/nats-server/default.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index 4530a941..3b4faeb5 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -9,9 +9,15 @@ nats-server::settings: process_user: 'root' process_group: 'root' config_file_path: '/etc/nats/nats-server.conf' - config_dir_path: '/etc/nats' + pid_file_path: '/run/nats-server.pid' + init_file_path: '/etc/sysconfig/nats-server.conf' + log_file_path: + - '/var/log/nats-server/nats-server.log' + config_dir_path: '/etc/nats-server' + log_dir_path: + - '/var/log/nats-server' - # tp 4 settings +# tp 4 settings install_method: 'file' description: 'NATS is an open-source, high-performance, cloud native messaging system.' docker_image: 'nats' @@ -59,6 +65,8 @@ nats-server::settings: command: 'GO111MODULE=on go get github.com/nats-io/nats-server/v2' releases: + base_url: 'https://github.com/nats-io/nats-server/releases/download/' + file_format: zip latest_version: '2.9.11' prerequisites: {} base_url: 'https://github.com/nats-io/nats-server/releases/download/v$VERSION' From db389f0c38d862954afd66b37b55d69d0e566983 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 10 Jan 2023 11:19:28 +0100 Subject: [PATCH 255/284] Nuclei tinydata --- data/nuclei/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/nuclei/default.yaml b/data/nuclei/default.yaml index f5f77628..76d67bbe 100644 --- a/data/nuclei/default.yaml +++ b/data/nuclei/default.yaml @@ -9,7 +9,7 @@ nuclei::settings: validate_cmd: 'nuclei' config_dir_path: '$HOME/.config/nuclei' - # tp 4 settings +# tp 4 settings install_method: 'file' description: 'Fast and customizable vulnerability scanner based on simple YAML based DSL.' docker_image: 'projectdiscovery/nuclei' From c624130f554b8814f32c43d3a0aecdc15f6a9588 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 10 Jan 2023 11:19:42 +0100 Subject: [PATCH 256/284] Docker on new OSes --- data/docker/upstream/osfamily/windows.yaml | 1 - data/nats-server/default.yaml | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/data/docker/upstream/osfamily/windows.yaml b/data/docker/upstream/osfamily/windows.yaml index 4ea34537..f2eb5d9b 100644 --- a/data/docker/upstream/osfamily/windows.yaml +++ b/data/docker/upstream/osfamily/windows.yaml @@ -1,3 +1,2 @@ ---- docker::settings: package_name: 'docker-engine' \ No newline at end of file diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index 3b4faeb5..15621d32 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -9,13 +9,7 @@ nats-server::settings: process_user: 'root' process_group: 'root' config_file_path: '/etc/nats/nats-server.conf' - pid_file_path: '/run/nats-server.pid' - init_file_path: '/etc/sysconfig/nats-server.conf' - log_file_path: - - '/var/log/nats-server/nats-server.log' - config_dir_path: '/etc/nats-server' - log_dir_path: - - '/var/log/nats-server' + config_dir_path: '/etc/nats' # tp 4 settings install_method: 'file' From 7a806d56591a21660bd4064a47bc5f9933c109e8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 12 Jan 2023 17:27:21 +0100 Subject: [PATCH 257/284] Updated reference and other v4 tinydata --- data/nats-server/default.yaml | 2 -- data/reference/default.yaml | 20 ++++++++++---------- data/reference/hiera.yaml | 8 ++++---- data/reference/osfamily/Darwin.yaml | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index 15621d32..9375c0e6 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -59,8 +59,6 @@ nats-server::settings: command: 'GO111MODULE=on go get github.com/nats-io/nats-server/v2' releases: - base_url: 'https://github.com/nats-io/nats-server/releases/download/' - file_format: zip latest_version: '2.9.11' prerequisites: {} base_url: 'https://github.com/nats-io/nats-server/releases/download/v$VERSION' diff --git a/data/reference/default.yaml b/data/reference/default.yaml index a09643fb..4ec7ea12 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -15,7 +15,7 @@ # Some v4 settings are used, as technology preview, in tp version 3.8.0 onwards. # Note that in every template used by the tp::conf define you can access to these settings -# (so that you can automatically configure in your own templates the right paths and names for +# (so that you can automatically configure in your own templates the right paths and names for # different underlying OSes) via the $settings variable (an hash with the settings values merged across the hierarchy). # For example to get the name of the user running a given app (as a service) you can use something like: # User <%= @settings['service']['main']['process_user'] %> # In erb templates @@ -24,7 +24,7 @@ # Port: <%= $settings['ports']['main']['port'] %> # Protocol: <%= $settings['ports']['main']['protocol'] %> # Note: Be sure the referred settings (and subkeys) exist in your tinydata to avoid errors like: -# Evaluation Error: Operator '[]' is not applicable to an Undef Value. +# Evaluation Error: Operator '[]' is not applicable to an Undef Value. # You can override these settings directly from tp defines using the parameter settings_hash (legacy) or, # starting from tp 4, also the parameter my_settings. Their content must be an hash, with the same structure @@ -550,7 +550,7 @@ reference::settings: path: '$HOME/.reference' # This is v4 setting which allows you specify how the app has to be installed. - # What is set here in tinydata can be overridden by the tp::install argument install_method. + # What is set here in tinydata can be overridden by the tp::install argument install_method. # Note however that not all the install methods might be available (or have the required tinydata) # for all the apps and OS. # Possible values are: @@ -574,7 +574,7 @@ reference::settings: list: 'reference debug' # An hash of extra commands used to test if the application is running or installed correctly. - # They are executed when running the tp test command or the tp::test task. v3 and v4 compatible. + # They are executed when running the tp test command or the tp::test task. v3 and v4 compatible. test_commands: status: 'reference status' @@ -725,7 +725,7 @@ reference::settings: # an array or an hash of resource titles with the relevant arguments prerequisites: {} - # The application latest known version released. This can be set the $version parameter of tp::install + # The application latest known version released. This can be set the $version parameter of tp::install # In the future, this value is going to be automatically updated, but it's likely to not be updated. # It's used when no specific version is set via tp::install. latest_version: '1.0.0' @@ -741,18 +741,18 @@ reference::settings: # The file_name of the archive to download file_name: 'reference-$VERSION.tar.gz' - # The format of the archive. Needed to find the right way to decompress it + # The format of the archive. Needed to find the right way to decompress it file_format: tar.gz # Url of the latest release of an app, in case it's a fixed url which never changes and always points to - # the latest version of the app. + # the latest version of the app. latest_url: ~ # The name of the directory extracted from the archive. This gets variables replacement as well. # If not set, the file name without the file_format extension will be used. - # If empty the archive is not extracted into a directory but contains direclty one more files. - # When this happens, the extracted_file setting is used to specify the name of an extracted file. - # If extracted_dir is not an empty string, then extracted_file is ignored. + # If empty the archive is not extracted into a directory but contains direclty one more files. + # When this happens, the extracted_file setting is used to specify the name of an extracted file. + # If extracted_dir is not an empty string, then extracted_file is ignored. extracted_dir: 'reference-$VERSION' extracted_file: '' diff --git a/data/reference/hiera.yaml b/data/reference/hiera.yaml index fcd4bfdc..4b10fbcc 100644 --- a/data/reference/hiera.yaml +++ b/data/reference/hiera.yaml @@ -14,15 +14,15 @@ # As in Hiera lookup is done from top to bottom, according to the merge method specified # when calling the tp_lookup function # Starting from tp version 3.8 the merge method has changed from 'merge' to 'deep_merge' -# This is not expected to have any impact on the existing TinyData but is required by -# the more complex tinydata v4 settings +# This is not expected to have any impact on the existing TinyData but is required by +# the more complex tinydata v4 settings # The lower levels in the hierarchy generally use a default to configure general settings # valid for all the apps (and in some cases different for OS and OS versions) # For each app you can have a different hiera.yaml with more or less levels # A minimal recommended hierarchy is as follows: -# - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" +# - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" # - "%{title}/osfamily/%{osfamily}" # - "%{title}/default" # - "default/%{operatingsystem}%{operatingsystemmajrelease}" @@ -30,7 +30,7 @@ # - default # That maps respectively to the following files in the tinydata module: -# Example with the app redis on RedHat9 +# Example with the app redis on RedHat9 # - data/redis/osfamily/RedHat9.yaml # - data/redis/osfamily/RedHat.yaml # - data/redis/default.yaml diff --git a/data/reference/osfamily/Darwin.yaml b/data/reference/osfamily/Darwin.yaml index 0edcb020..1c0e6be3 100644 --- a/data/reference/osfamily/Darwin.yaml +++ b/data/reference/osfamily/Darwin.yaml @@ -1,6 +1,6 @@ --- reference::settings: - # Name of brew package to install. This parameter is optional and currently + # Name of brew package to install. This parameter is optional and currently # redundant, as on MacOS brew is always used to manage packages and # the package_name setting is enough to define what package to install # via the homebrew provider. From fabda2177522f32227cf41292b9c46c95ca20c44 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 14 Jan 2023 11:00:47 +0100 Subject: [PATCH 258/284] More v4 data structure refinements + v3tov4 conversion script --- scripts/convert_v3_to_v4.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 0ba6c620..f308f21a 100644 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -24,8 +24,8 @@ package_name = original_config[settings_key]['package_name'] original_config[settings_key]["packages"] = {"main" => {"name" => package_name}} if package_name # Get the package provider from the original config -#package_provider = original_config[settings_key]['package_provider'] -#original_config[settings_key]["packages"]["main"]["package_provider"] if package_provider +package_provider = original_config[settings_key]['package_provider'] +original_config[settings_key]["packages"]["main"]["package_provider"] if package_provider # Get the service name from the original config service_name = original_config[settings_key]['service_name'] From 73fba94ab4d01be193730fadd591ea9f9ac218b8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 21 Jan 2023 19:07:07 +0100 Subject: [PATCH 259/284] Defining v4 structure --- data/default/Debian.yaml | 1 - data/default/Ubuntu22.04.yaml | 2 +- scripts/convert_v3_to_v4.rb | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/default/Debian.yaml b/data/default/Debian.yaml index e9f3554c..cd9cdc24 100755 --- a/data/default/Debian.yaml +++ b/data/default/Debian.yaml @@ -7,6 +7,5 @@ default::settings: repos: default: package_provider: dpkg - image: dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' \ No newline at end of file diff --git a/data/default/Ubuntu22.04.yaml b/data/default/Ubuntu22.04.yaml index e4c161a8..122a1075 100644 --- a/data/default/Ubuntu22.04.yaml +++ b/data/default/Ubuntu22.04.yaml @@ -2,7 +2,7 @@ default::settings: apt_release: 'jammy' - + repos: default: apt: diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index f308f21a..0ba6c620 100644 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -24,8 +24,8 @@ package_name = original_config[settings_key]['package_name'] original_config[settings_key]["packages"] = {"main" => {"name" => package_name}} if package_name # Get the package provider from the original config -package_provider = original_config[settings_key]['package_provider'] -original_config[settings_key]["packages"]["main"]["package_provider"] if package_provider +#package_provider = original_config[settings_key]['package_provider'] +#original_config[settings_key]["packages"]["main"]["package_provider"] if package_provider # Get the service name from the original config service_name = original_config[settings_key]['service_name'] From 5edbd257dbd680fdcdc3e74a92758e3379f3c4cb Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 1 Feb 2023 19:40:57 +0100 Subject: [PATCH 260/284] More preparations for v4 --- data/default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/default.yaml b/data/default.yaml index 226a0e37..e9033393 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -9,9 +9,9 @@ default::settings: config_file_mode: '0644' config_dir_owner: 'root' config_dir_group: 'root' - config_dir_mode: '0755' + config_dir_mode: '0644' config_dir_purge: false - config_dir_recurse: true + config_dir_recurse: false install_method: 'package' packages: From 42f71f788f12d1a1cd5ade864a31b65cd194db2b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 1 Feb 2023 20:24:46 +0100 Subject: [PATCH 261/284] Yaml lints --- .yamllint.yaml | 2 +- data/default/Ubuntu22.04.yaml | 2 +- data/docker/upstream/osfamily/windows.yaml | 1 + data/nats-server/default.yaml | 2 +- data/nuclei/default.yaml | 2 +- data/reference/default.yaml | 31 +++++++++++++++------- data/reference/hiera.yaml | 2 +- data/reference/osfamily/Darwin.yaml | 2 +- 8 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.yamllint.yaml b/.yamllint.yaml index 11ae79a5..87826d89 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -14,7 +14,7 @@ rules: level: warning empty-lines: disable empty-values: disable - float-values: disable +# float-values: disable hyphens: enable indentation: enable key-duplicates: enable diff --git a/data/default/Ubuntu22.04.yaml b/data/default/Ubuntu22.04.yaml index 122a1075..e4c161a8 100644 --- a/data/default/Ubuntu22.04.yaml +++ b/data/default/Ubuntu22.04.yaml @@ -2,7 +2,7 @@ default::settings: apt_release: 'jammy' - + repos: default: apt: diff --git a/data/docker/upstream/osfamily/windows.yaml b/data/docker/upstream/osfamily/windows.yaml index f2eb5d9b..4ea34537 100644 --- a/data/docker/upstream/osfamily/windows.yaml +++ b/data/docker/upstream/osfamily/windows.yaml @@ -1,2 +1,3 @@ +--- docker::settings: package_name: 'docker-engine' \ No newline at end of file diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index 9375c0e6..4530a941 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -11,7 +11,7 @@ nats-server::settings: config_file_path: '/etc/nats/nats-server.conf' config_dir_path: '/etc/nats' -# tp 4 settings + # tp 4 settings install_method: 'file' description: 'NATS is an open-source, high-performance, cloud native messaging system.' docker_image: 'nats' diff --git a/data/nuclei/default.yaml b/data/nuclei/default.yaml index 76d67bbe..f5f77628 100644 --- a/data/nuclei/default.yaml +++ b/data/nuclei/default.yaml @@ -9,7 +9,7 @@ nuclei::settings: validate_cmd: 'nuclei' config_dir_path: '$HOME/.config/nuclei' -# tp 4 settings + # tp 4 settings install_method: 'file' description: 'Fast and customizable vulnerability scanner based on simple YAML based DSL.' docker_image: 'projectdiscovery/nuclei' diff --git a/data/reference/default.yaml b/data/reference/default.yaml index 4ec7ea12..7bb2c1fc 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -15,7 +15,7 @@ # Some v4 settings are used, as technology preview, in tp version 3.8.0 onwards. # Note that in every template used by the tp::conf define you can access to these settings -# (so that you can automatically configure in your own templates the right paths and names for +# (so that you can automatically configure in your own templates the right paths and names for # different underlying OSes) via the $settings variable (an hash with the settings values merged across the hierarchy). # For example to get the name of the user running a given app (as a service) you can use something like: # User <%= @settings['service']['main']['process_user'] %> # In erb templates @@ -24,7 +24,7 @@ # Port: <%= $settings['ports']['main']['port'] %> # Protocol: <%= $settings['ports']['main']['protocol'] %> # Note: Be sure the referred settings (and subkeys) exist in your tinydata to avoid errors like: -# Evaluation Error: Operator '[]' is not applicable to an Undef Value. +# Evaluation Error: Operator '[]' is not applicable to an Undef Value. # You can override these settings directly from tp defines using the parameter settings_hash (legacy) or, # starting from tp 4, also the parameter my_settings. Their content must be an hash, with the same structure @@ -558,6 +558,15 @@ reference::settings: # file : the app is installed from a file downloaded and eventually extracted from an archive. Details under the release setting. # source : the app is installed and eventually compiled from the git source repository. Details under the build setting. # image : the app is installed as a Docker image. Details under the image setting. + # This is v4 setting which allows you specify how the app has to be installed. + # What is set here in tinydata can be overridden by the tp::install argument install_method. + # Note however that not all the install methods might be available (or have the required tinydata) + # for all the apps and OS. + # Possible values are: + # package: the app is installed from a system package and managed by Puppet's package resource. This is usually the default value. + # file : the app is installed from a file downloaded and eventually extracted from an archive. Details under the release setting. + # source : the app is installed and eventually compiled from the git source repository. Details under the build setting. + # image : the app is installed as a Docker image. Details under the image setting. install_method: 'package' # The description of the app. It's used by tp command. v4. @@ -574,14 +583,18 @@ reference::settings: list: 'reference debug' # An hash of extra commands used to test if the application is running or installed correctly. - # They are executed when running the tp test command or the tp::test task. v3 and v4 compatible. + # They are executed when running the tp test command or the tp::test task. v3 and v4 compatible. test_commands: status: 'reference status' + # The command to run to show the application's version. By default it's used appname --version, if a different command + # or argument is needed. Specify it here. v3 and v4 compatible. # The command to run to show the application's version. By default it's used appname --version, if a different command # or argument is needed. Specify it here. v3 and v4 compatible. version_command: 'reference version' + # The command to run to show the application's help. By default it's used appname --help, if a different command + # or argument is needed. Specify it here. v3 and v4 compatible. # The command to run to show the application's help. By default it's used appname --help, if a different command # or argument is needed. Specify it here. v3 and v4 compatible. help_command: 'reference help' @@ -725,7 +738,7 @@ reference::settings: # an array or an hash of resource titles with the relevant arguments prerequisites: {} - # The application latest known version released. This can be set the $version parameter of tp::install + # The application latest known version released. This can be set the $version parameter of tp::install # In the future, this value is going to be automatically updated, but it's likely to not be updated. # It's used when no specific version is set via tp::install. latest_version: '1.0.0' @@ -741,18 +754,18 @@ reference::settings: # The file_name of the archive to download file_name: 'reference-$VERSION.tar.gz' - # The format of the archive. Needed to find the right way to decompress it + # The format of the archive. Needed to find the right way to decompress it file_format: tar.gz # Url of the latest release of an app, in case it's a fixed url which never changes and always points to - # the latest version of the app. + # the latest version of the app. latest_url: ~ # The name of the directory extracted from the archive. This gets variables replacement as well. # If not set, the file name without the file_format extension will be used. - # If empty the archive is not extracted into a directory but contains direclty one more files. - # When this happens, the extracted_file setting is used to specify the name of an extracted file. - # If extracted_dir is not an empty string, then extracted_file is ignored. + # If empty the archive is not extracted into a directory but contains direclty one more files. + # When this happens, the extracted_file setting is used to specify the name of an extracted file. + # If extracted_dir is not an empty string, then extracted_file is ignored. extracted_dir: 'reference-$VERSION' extracted_file: '' diff --git a/data/reference/hiera.yaml b/data/reference/hiera.yaml index 4b10fbcc..92de42af 100644 --- a/data/reference/hiera.yaml +++ b/data/reference/hiera.yaml @@ -22,7 +22,7 @@ # For each app you can have a different hiera.yaml with more or less levels # A minimal recommended hierarchy is as follows: -# - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" +# - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" # - "%{title}/osfamily/%{osfamily}" # - "%{title}/default" # - "default/%{operatingsystem}%{operatingsystemmajrelease}" diff --git a/data/reference/osfamily/Darwin.yaml b/data/reference/osfamily/Darwin.yaml index 1c0e6be3..381682cf 100644 --- a/data/reference/osfamily/Darwin.yaml +++ b/data/reference/osfamily/Darwin.yaml @@ -1,6 +1,6 @@ --- reference::settings: - # Name of brew package to install. This parameter is optional and currently + # Name of brew package to install. This parameter is optional and currently # redundant, as on MacOS brew is always used to manage packages and # the package_name setting is enough to define what package to install # via the homebrew provider. From f47db31527fcd4697afb8dda3c8c109c157e0b01 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 1 Feb 2023 20:52:56 +0100 Subject: [PATCH 262/284] Yaml lints 2 --- .yamllint.yaml | 2 +- data/reference/hiera.yaml | 6 +++--- data/reference/osfamily/Darwin.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.yamllint.yaml b/.yamllint.yaml index 87826d89..11ae79a5 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -14,7 +14,7 @@ rules: level: warning empty-lines: disable empty-values: disable -# float-values: disable + float-values: disable hyphens: enable indentation: enable key-duplicates: enable diff --git a/data/reference/hiera.yaml b/data/reference/hiera.yaml index 92de42af..fcd4bfdc 100644 --- a/data/reference/hiera.yaml +++ b/data/reference/hiera.yaml @@ -14,8 +14,8 @@ # As in Hiera lookup is done from top to bottom, according to the merge method specified # when calling the tp_lookup function # Starting from tp version 3.8 the merge method has changed from 'merge' to 'deep_merge' -# This is not expected to have any impact on the existing TinyData but is required by -# the more complex tinydata v4 settings +# This is not expected to have any impact on the existing TinyData but is required by +# the more complex tinydata v4 settings # The lower levels in the hierarchy generally use a default to configure general settings # valid for all the apps (and in some cases different for OS and OS versions) @@ -30,7 +30,7 @@ # - default # That maps respectively to the following files in the tinydata module: -# Example with the app redis on RedHat9 +# Example with the app redis on RedHat9 # - data/redis/osfamily/RedHat9.yaml # - data/redis/osfamily/RedHat.yaml # - data/redis/default.yaml diff --git a/data/reference/osfamily/Darwin.yaml b/data/reference/osfamily/Darwin.yaml index 381682cf..0edcb020 100644 --- a/data/reference/osfamily/Darwin.yaml +++ b/data/reference/osfamily/Darwin.yaml @@ -1,6 +1,6 @@ --- reference::settings: - # Name of brew package to install. This parameter is optional and currently + # Name of brew package to install. This parameter is optional and currently # redundant, as on MacOS brew is always used to manage packages and # the package_name setting is enough to define what package to install # via the homebrew provider. From 05cc1cb338f487f9c048c371971dda4628c6dcf8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 2 Feb 2023 11:06:45 +0100 Subject: [PATCH 263/284] Fixing --- data/apm-server/osfamily/RedHat9.yaml | 2 +- data/auditbeat/osfamily/RedHat9.yaml | 2 +- data/microsoft_repo/upstream/default.yaml | 2 +- data/prometheus/default.yaml | 8 +++---- data/spiderfoot/default.yaml | 28 ++++++++++++---------- data/sysdig/upstream/osfamily/RedHat9.yaml | 11 +++++++++ 6 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 data/sysdig/upstream/osfamily/RedHat9.yaml diff --git a/data/apm-server/osfamily/RedHat9.yaml b/data/apm-server/osfamily/RedHat9.yaml index e73b9caa..5b73c181 100644 --- a/data/apm-server/osfamily/RedHat9.yaml +++ b/data/apm-server/osfamily/RedHat9.yaml @@ -1,5 +1,5 @@ --- -# Workaround for GPG-KEY in SHA1 https://github.com/elastic/elasticsearch/issues/85876 +# Workaround for GPG-KEY in SHA1 https://www.redhat.com/en/blog/rhel-security-sha-1-package-signatures-distrusted-rhel-9 apm-server::settings: exec_prerequisites: allow_sha1: diff --git a/data/auditbeat/osfamily/RedHat9.yaml b/data/auditbeat/osfamily/RedHat9.yaml index 1560e4f7..427d4587 100644 --- a/data/auditbeat/osfamily/RedHat9.yaml +++ b/data/auditbeat/osfamily/RedHat9.yaml @@ -1,5 +1,5 @@ --- -# Workaround for GPG-KEY in SHA1 https://github.com/elastic/elasticsearch/issues/85876 +# Workaround for GPG-KEY in SHA1 https://www.redhat.com/en/blog/rhel-security-sha-1-package-signatures-distrusted-rhel-9 auditbeat::settings: exec_prerequisites: allow_sha1: diff --git a/data/microsoft_repo/upstream/default.yaml b/data/microsoft_repo/upstream/default.yaml index cab3a474..791c8afe 100644 --- a/data/microsoft_repo/upstream/default.yaml +++ b/data/microsoft_repo/upstream/default.yaml @@ -1,4 +1,4 @@ --- microsoft_repo::settings: - repo_filename: packages-microsoft-prod + repo_filename: microsoft-prod repo_package_name: packages-microsoft-prod \ No newline at end of file diff --git a/data/prometheus/default.yaml b/data/prometheus/default.yaml index fef0ee28..cb420c06 100644 --- a/data/prometheus/default.yaml +++ b/data/prometheus/default.yaml @@ -17,11 +17,7 @@ prometheus::settings: # validate_cmd: 'prometheus validate' pid_file_path: '' init_file_path: '/etc/sysconfig/prometheus.conf' - log_file_path: - - '/var/log/prometheus/prometheus.log' - - '/var/log/prometheus/prometheus-node-exporter.log' config_dir_path: '/etc/prometheus' - log_dir_path: '/var/log/prometheus' # tp 4 settings @@ -125,6 +121,9 @@ prometheus::settings: /var/log/prometheus: ensure: directory owner: prometheus + /var/lib/prometheus: + ensure: directory + owner: prometheus exec: prometheus_init_config: command: 'touch /etc/sysconfig/prometheus.conf' @@ -132,6 +131,7 @@ prometheus::settings: systemd_options: Service: ExecStart: '/usr/local/bin/prometheus --config.file /etc/prometheus/prometheus.yml' + WorkingDirectory: '/var/lib/prometheus' manage_service: true manage_user: true diff --git a/data/spiderfoot/default.yaml b/data/spiderfoot/default.yaml index c08404c6..d1e34419 100644 --- a/data/spiderfoot/default.yaml +++ b/data/spiderfoot/default.yaml @@ -18,9 +18,6 @@ spiderfoot::settings: # tp 4 settings description: 'SpiderFoot automates OSINT so you can find what matters, faster.' - website: 'https://www.spiderfoot.net/' - issues: 'https://github.com/smicallef/spiderfoot/issues' - ports: main: port: 5001 @@ -46,12 +43,19 @@ spiderfoot::settings: extracted_dir: 'spiderfoot-$VERSION' file_format: 'zip' - setup: - enable: true - systemd_options: - Service: - ExecStart: '/var/lib/tp/source/spiderfoot/sf.py -l 0.0.0.0:5001' - EnvironmentFile: ~ - manage_service: true - manage_user: false - + source: + setup: + enable: true + systemd_options: + Service: + ExecStart: '/var/lib/tp/source/spiderfoot/sf.py -l 0.0.0.0:5001' + EnvironmentFile: ~ + WorkingDirectory: '/var/lib/tp/source/spiderfoot' + manage_service: true + manage_user: false + + urls: + website: https://www.spiderfoot.net/ + issues: https://github.com/smicallef/spiderfoot/issues + documentation: https://www.spiderfoot.net/documentation/ + source: https://github.com/smicallef/spiderfoot diff --git a/data/sysdig/upstream/osfamily/RedHat9.yaml b/data/sysdig/upstream/osfamily/RedHat9.yaml new file mode 100644 index 00000000..c55069de --- /dev/null +++ b/data/sysdig/upstream/osfamily/RedHat9.yaml @@ -0,0 +1,11 @@ +--- +# Workaround for GPG-KEY in SHA1 https://www.redhat.com/en/blog/rhel-security-sha-1-package-signatures-distrusted-rhel-9 +sysdig::settings: + exec_prerequisites: + allow_sha1: + command: '/usr/bin/update-crypto-policies --set DEFAULT:SHA1' + unless: 'rpm -qi sysdig' + exec_postinstall: + disallow_sha1: + command: '/usr/bin/update-crypto-policies --set DEFAULT' + unless: 'rpm -qi sysdig' From ae40686749d7d1fe7665578f32344c9521ebba0e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 2 Feb 2023 18:47:51 +0100 Subject: [PATCH 264/284] Updates --- data/apm-server/osfamily/RedHat9.yaml | 4 ++-- data/auditbeat/osfamily/RedHat9.yaml | 4 ++-- data/default.yaml | 4 ++-- data/sysdig/hiera.yaml | 1 + data/sysdig/upstream/osfamily/RedHat9.yaml | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/data/apm-server/osfamily/RedHat9.yaml b/data/apm-server/osfamily/RedHat9.yaml index 5b73c181..d12b337f 100644 --- a/data/apm-server/osfamily/RedHat9.yaml +++ b/data/apm-server/osfamily/RedHat9.yaml @@ -4,8 +4,8 @@ apm-server::settings: exec_prerequisites: allow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT:SHA1' - unless: 'rpm -qi apm-server' + unless: 'dnf info apm-server' exec_postinstall: disallow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT' - unless: 'rpm -qi apm-server' + onlyif: '/usr/bin/update-crypto-policies --show | grep SHA1' diff --git a/data/auditbeat/osfamily/RedHat9.yaml b/data/auditbeat/osfamily/RedHat9.yaml index 427d4587..26191d31 100644 --- a/data/auditbeat/osfamily/RedHat9.yaml +++ b/data/auditbeat/osfamily/RedHat9.yaml @@ -4,8 +4,8 @@ auditbeat::settings: exec_prerequisites: allow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT:SHA1' - unless: 'rpm -qi auditbeat' + unless: 'dnf info auditbeat' exec_postinstall: disallow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT' - unless: 'rpm -qi auditbeat' + onlyif: '/usr/bin/update-crypto-policies --show | grep SHA1' diff --git a/data/default.yaml b/data/default.yaml index e9033393..226a0e37 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -9,9 +9,9 @@ default::settings: config_file_mode: '0644' config_dir_owner: 'root' config_dir_group: 'root' - config_dir_mode: '0644' + config_dir_mode: '0755' config_dir_purge: false - config_dir_recurse: false + config_dir_recurse: true install_method: 'package' packages: diff --git a/data/sysdig/hiera.yaml b/data/sysdig/hiera.yaml index 1c820bbc..79a0789e 100644 --- a/data/sysdig/hiera.yaml +++ b/data/sysdig/hiera.yaml @@ -2,6 +2,7 @@ :hierarchy: - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/default" diff --git a/data/sysdig/upstream/osfamily/RedHat9.yaml b/data/sysdig/upstream/osfamily/RedHat9.yaml index c55069de..a21b479a 100644 --- a/data/sysdig/upstream/osfamily/RedHat9.yaml +++ b/data/sysdig/upstream/osfamily/RedHat9.yaml @@ -4,8 +4,8 @@ sysdig::settings: exec_prerequisites: allow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT:SHA1' - unless: 'rpm -qi sysdig' + unless: 'dnf info sysdig' exec_postinstall: disallow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT' - unless: 'rpm -qi sysdig' + onlyif: '/usr/bin/update-crypto-policies --show | grep SHA1' From 8d3f9382ffa9a9d9a70c5c84e842f6050011fcd8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 2 Feb 2023 18:51:12 +0100 Subject: [PATCH 265/284] Removed duplications --- data/reference/default.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/data/reference/default.yaml b/data/reference/default.yaml index 7bb2c1fc..a09643fb 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -549,15 +549,6 @@ reference::settings: config: path: '$HOME/.reference' - # This is v4 setting which allows you specify how the app has to be installed. - # What is set here in tinydata can be overridden by the tp::install argument install_method. - # Note however that not all the install methods might be available (or have the required tinydata) - # for all the apps and OS. - # Possible values are: - # package: the app is installed from a system package and managed by Puppet's package resource. This is usually the default value. - # file : the app is installed from a file downloaded and eventually extracted from an archive. Details under the release setting. - # source : the app is installed and eventually compiled from the git source repository. Details under the build setting. - # image : the app is installed as a Docker image. Details under the image setting. # This is v4 setting which allows you specify how the app has to be installed. # What is set here in tinydata can be overridden by the tp::install argument install_method. # Note however that not all the install methods might be available (or have the required tinydata) @@ -587,14 +578,10 @@ reference::settings: test_commands: status: 'reference status' - # The command to run to show the application's version. By default it's used appname --version, if a different command - # or argument is needed. Specify it here. v3 and v4 compatible. # The command to run to show the application's version. By default it's used appname --version, if a different command # or argument is needed. Specify it here. v3 and v4 compatible. version_command: 'reference version' - # The command to run to show the application's help. By default it's used appname --help, if a different command - # or argument is needed. Specify it here. v3 and v4 compatible. # The command to run to show the application's help. By default it's used appname --help, if a different command # or argument is needed. Specify it here. v3 and v4 compatible. help_command: 'reference help' From 0f5e1d7a9037e1634385fad521f1182ccdfed5b3 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 7 Feb 2023 10:56:29 +0100 Subject: [PATCH 266/284] Surfex sample implementation --- data/surfex/default.yaml | 47 ++++++++++++++++++++++++++++++++++++++++ data/surfex/hiera.yaml | 15 +++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 data/surfex/default.yaml create mode 100644 data/surfex/hiera.yaml diff --git a/data/surfex/default.yaml b/data/surfex/default.yaml new file mode 100644 index 00000000..add279a3 --- /dev/null +++ b/data/surfex/default.yaml @@ -0,0 +1,47 @@ +--- +surfex::settings: + tp_prerequisites: {} + + urls: + website: 'http://www.umr-cnrm.fr/surfex/' + documentation: 'http://www.umr-cnrm.fr/surfex/' + source: 'https://github.com/surfex/surfex' + description: 'SURFEX (Surface Externalisée, in French) is a surface modelling platform' + + # Configured: +package -source -file +image + install_method: 'file' + + build: + enable: true + prerequisites: + tp::install: + - build-essential + execs: + - name: configure + command: 'cd src ; ./configure' + # TODO: Add source of generated model + - name: build + command: 'make' + - name: setup + command: 'make installmaster' + setup: + enable: true + systemd_options: {} + resources: {} + manage_service: false + manage_user: false + + releases: + latest_version: 'v9_0_0' + prerequisites: {} + latest_url: ~ + base_url: 'https://www.umr-cnrm.fr/surfex/data/OPEN-SURFEX' + file_name: 'open_surfex_$VERSION.tar.gz' + extracted_dir: 'OPEN_SURFEX_V9' +# extracted_dir: 'open_SURFEX_V$MAJVERSION' + file_format: tar.gz + setup: + enable: true + resources: {} + manage_service: false + manage_user: false diff --git a/data/surfex/hiera.yaml b/data/surfex/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/surfex/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default From c40296eca69d309dfc92b949295bd7691984ea1a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Tue, 7 Feb 2023 11:11:30 +0100 Subject: [PATCH 267/284] Temporary nix data #70 --- data/nix/default.yaml | 95 ++++++++++++++++++++++++++++++++++ data/nix/hiera.yaml | 15 ++++++ data/nix/osfamily/Darwin.yaml | 11 ++++ data/nix/osfamily/Debian.yaml | 6 +++ data/nix/osfamily/RedHat.yaml | 3 ++ data/nix/osfamily/windows.yaml | 14 +++++ 6 files changed, 144 insertions(+) create mode 100644 data/nix/default.yaml create mode 100644 data/nix/hiera.yaml create mode 100644 data/nix/osfamily/Darwin.yaml create mode 100644 data/nix/osfamily/Debian.yaml create mode 100644 data/nix/osfamily/RedHat.yaml create mode 100644 data/nix/osfamily/windows.yaml diff --git a/data/nix/default.yaml b/data/nix/default.yaml new file mode 100644 index 00000000..035179f4 --- /dev/null +++ b/data/nix/default.yaml @@ -0,0 +1,95 @@ +--- +nix::settings: + tp_prerequisites: {} + exec_prerequisites: + install: + command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' + creates: '/nix' + + urls: + website: 'https://nixos.org' + issues: 'https://github.com/nixos/nix/issues' + documentation: 'https://nix.com/documentation' + source: 'https://github.com/nix/nix' + description: 'nix description' + + # Configured: +package -source -file +image + install_method: 'source' + + packages: [] + manage_package: false + prerequisites: + exec: + command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' + creates: '/nix' + + services: + main: + name: nix-daemon + process_name: nix + process_extra_name: ~ + process_user: root + process_group: root + nodaemon_args: '-D' + ensure: running + enable: true + pidfile: /run/nix.pid + params: {} + + + files: + config: + path: '/etc/nix/nix.conf' + init: + path: '/etc/sysconfig/nix-daemon.conf' + format: 'inifile' + systemd: + path: '/etc/systemd/system/nix-daemon.service' + format: 'inifile_with_stanzas' + + dirs: + config: + path: '/etc/nix' + metadata: + path: /nix/var/nix + log: + path: /nix/var/log + store: + path: /nix + + user_files: + config: + path: '$HOME/.config/nix/nix.conf' + + user_dirs: + config: + path: '$HOME/.config/nix' + + info_commands: + list_profile: 'nix profile list' + list_store: 'nix store ls' + debug_commands: + debug: 'nix store verify' + test_commands: + status: 'nix status' + version_command: 'nix --version' + help_command: 'nix --help' + run_commands: + start: + command: 'nix start' + + image: + name: 'nixos/nix' + systemd_options: {} + + releases: + latest_version: 2.13.2 + latest_url: ~ + base_url: 'https://releases.nixos.org/nix/nix-$VERSION/nix-$VERSION-$OS.tar.xz' + file_name: 'nix-$VERSION-$OS.tar.xz' + extracted_dir: 'nix-$VERSION-$OS' + file_format: xz + prerequisites: + exec: + command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' + creates: '/nix' diff --git a/data/nix/hiera.yaml b/data/nix/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/nix/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/nix/osfamily/Darwin.yaml b/data/nix/osfamily/Darwin.yaml new file mode 100644 index 00000000..28548fc3 --- /dev/null +++ b/data/nix/osfamily/Darwin.yaml @@ -0,0 +1,11 @@ +--- +nix::settings: + brew_package_name: 'nix' + + user_files: + config: + path: '$HOME/Library/Application\ Support/nix/nix.conf' + + user_dirs: + config: + path: '$HOME/Library/Application\ Support/nix/nix.conf' \ No newline at end of file diff --git a/data/nix/osfamily/Debian.yaml b/data/nix/osfamily/Debian.yaml new file mode 100644 index 00000000..b3ed05e4 --- /dev/null +++ b/data/nix/osfamily/Debian.yaml @@ -0,0 +1,6 @@ +--- +nix::settings: + + files: + init: + path: '/etc/default/nix' \ No newline at end of file diff --git a/data/nix/osfamily/RedHat.yaml b/data/nix/osfamily/RedHat.yaml new file mode 100644 index 00000000..4c7da897 --- /dev/null +++ b/data/nix/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +nix::settings: + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/nix/osfamily/windows.yaml b/data/nix/osfamily/windows.yaml new file mode 100644 index 00000000..98b96c60 --- /dev/null +++ b/data/nix/osfamily/windows.yaml @@ -0,0 +1,14 @@ +--- +nix::settings: + + # If exe or msi package is available for direct download: + package_provider: 'windows' + package_source: 'https://github.com/nix/nix/releases/download/v$VERSION/nix_$VERSION_$OS_$ARCH.msi' + + user_files: + config: + path: '%APPDATA%\nix\nix.conf' + + user_dirs: + config: + path: '%APPDATA%\nix' \ No newline at end of file From f3c9ce77ee2957d267f2808bda10eceebad6b992 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Feb 2023 18:49:47 +0100 Subject: [PATCH 268/284] Data for nix #70 --- data/nix/default.yaml | 40 +++++++++++++++------------------- data/nix/osfamily/Darwin.yaml | 11 ---------- data/nix/osfamily/Debian.yaml | 6 ----- data/nix/osfamily/RedHat.yaml | 3 --- data/nix/osfamily/windows.yaml | 14 ------------ 5 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 data/nix/osfamily/Darwin.yaml delete mode 100644 data/nix/osfamily/Debian.yaml delete mode 100644 data/nix/osfamily/RedHat.yaml delete mode 100644 data/nix/osfamily/windows.yaml diff --git a/data/nix/default.yaml b/data/nix/default.yaml index 035179f4..97cc3953 100644 --- a/data/nix/default.yaml +++ b/data/nix/default.yaml @@ -3,40 +3,34 @@ nix::settings: tp_prerequisites: {} exec_prerequisites: install: - command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' +# command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' + command: 'curl -L https://nixos.org/nix/install -o /tmp/nix_install ; sh /tmp/nix_install --daemon | yes' creates: '/nix' + provider: posix urls: website: 'https://nixos.org' issues: 'https://github.com/nixos/nix/issues' - documentation: 'https://nix.com/documentation' - source: 'https://github.com/nix/nix' - description: 'nix description' + documentation: 'https://nixos.org/learn.html' + source: 'https://github.com/nixos/nix' + description: 'The purely functional package manager' # Configured: +package -source -file +image - install_method: 'source' + install_method: 'package' - packages: [] + packages: {} manage_package: false - prerequisites: - exec: - command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' - creates: '/nix' services: - main: - name: nix-daemon + nix-daemon: process_name: nix process_extra_name: ~ process_user: root process_group: root nodaemon_args: '-D' - ensure: running - enable: true pidfile: /run/nix.pid params: {} - files: config: path: '/etc/nix/nix.conf' @@ -74,22 +68,24 @@ nix::settings: status: 'nix status' version_command: 'nix --version' help_command: 'nix --help' - run_commands: - start: - command: 'nix start' image: name: 'nixos/nix' systemd_options: {} - releases: + release: latest_version: 2.13.2 latest_url: ~ base_url: 'https://releases.nixos.org/nix/nix-$VERSION/nix-$VERSION-$OS.tar.xz' file_name: 'nix-$VERSION-$OS.tar.xz' extracted_dir: 'nix-$VERSION-$OS' file_format: xz - prerequisites: + + setupa: + enable: true + resources: exec: - command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' - creates: '/nix' + install_nix: + command: 'curl -L https://nixos.org/nix/install --daemon | bash' + creates: '/nix' + provider: shell \ No newline at end of file diff --git a/data/nix/osfamily/Darwin.yaml b/data/nix/osfamily/Darwin.yaml deleted file mode 100644 index 28548fc3..00000000 --- a/data/nix/osfamily/Darwin.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -nix::settings: - brew_package_name: 'nix' - - user_files: - config: - path: '$HOME/Library/Application\ Support/nix/nix.conf' - - user_dirs: - config: - path: '$HOME/Library/Application\ Support/nix/nix.conf' \ No newline at end of file diff --git a/data/nix/osfamily/Debian.yaml b/data/nix/osfamily/Debian.yaml deleted file mode 100644 index b3ed05e4..00000000 --- a/data/nix/osfamily/Debian.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -nix::settings: - - files: - init: - path: '/etc/default/nix' \ No newline at end of file diff --git a/data/nix/osfamily/RedHat.yaml b/data/nix/osfamily/RedHat.yaml deleted file mode 100644 index 4c7da897..00000000 --- a/data/nix/osfamily/RedHat.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -nix::settings: - dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/nix/osfamily/windows.yaml b/data/nix/osfamily/windows.yaml deleted file mode 100644 index 98b96c60..00000000 --- a/data/nix/osfamily/windows.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -nix::settings: - - # If exe or msi package is available for direct download: - package_provider: 'windows' - package_source: 'https://github.com/nix/nix/releases/download/v$VERSION/nix_$VERSION_$OS_$ARCH.msi' - - user_files: - config: - path: '%APPDATA%\nix\nix.conf' - - user_dirs: - config: - path: '%APPDATA%\nix' \ No newline at end of file From ce0f483aa476471e10ebf287e8d74f695d973610 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Feb 2023 18:50:38 +0100 Subject: [PATCH 269/284] Data for surkex #71 --- data/surfex/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/surfex/default.yaml b/data/surfex/default.yaml index add279a3..183573e7 100644 --- a/data/surfex/default.yaml +++ b/data/surfex/default.yaml @@ -8,8 +8,8 @@ surfex::settings: source: 'https://github.com/surfex/surfex' description: 'SURFEX (Surface Externalisée, in French) is a surface modelling platform' - # Configured: +package -source -file +image - install_method: 'file' + # Configured: -package -source +release -image + install_method: 'release' build: enable: true @@ -31,7 +31,7 @@ surfex::settings: manage_service: false manage_user: false - releases: + release: latest_version: 'v9_0_0' prerequisites: {} latest_url: ~ From 5d19484eefede3295fb86ff547d31e5b002e5f73 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Feb 2023 18:51:44 +0100 Subject: [PATCH 270/284] Data for golang #68 --- data/golang/default.yaml | 87 +++++++++++++++++++++++++++++++ data/golang/hiera.yaml | 15 ++++++ data/golang/osfamily/Darwin.yaml | 5 ++ data/golang/osfamily/Debian.yaml | 6 +++ data/golang/osfamily/RedHat.yaml | 3 ++ data/golang/osfamily/windows.yaml | 14 +++++ 6 files changed, 130 insertions(+) create mode 100644 data/golang/default.yaml create mode 100644 data/golang/hiera.yaml create mode 100644 data/golang/osfamily/Darwin.yaml create mode 100644 data/golang/osfamily/Debian.yaml create mode 100644 data/golang/osfamily/RedHat.yaml create mode 100644 data/golang/osfamily/windows.yaml diff --git a/data/golang/default.yaml b/data/golang/default.yaml new file mode 100644 index 00000000..2b7d9bbc --- /dev/null +++ b/data/golang/default.yaml @@ -0,0 +1,87 @@ +--- +golang::settings: + tp_prerequisites: {} + + urls: + website: 'https://go.dev' + issues: 'https://github.com/golang/go/issues' + documentation: 'https://go.dev/doc/' + source: 'https://github.com/golang/go' + description: 'The Go programming language' + + # Configured: +package -source -file +image + install_method: 'package' + + packages: + main: + name: golang + ensure: present + source: ~ + install_options: [] + params: {} + providers: + chocolatey: + name: golang + scoop: + name: go + winget: + name: ~ + snap: + name: go + brew: + name: go + + info_commands: + list: 'go list' + debug_commands: + debug: 'go debug' + test_commands: + status: 'go status' + version_command: 'go version' + help_command: 'go help' + run_commands: + start: + command: 'golang start' + + image: + name: 'golang' + + build: + prerequisites: + tp::install: + - build-essential + execs: + - name: configure + command: './configure' + - name: build + command: 'make' + - name: setup + command: 'make install' + setup: + enable: true + files: + golang: + path: '/usr/local/bin/golang' + mode: '0755' + systemd_options: {} + resources: {} + manage_service: false + manage_user: false + + release: + latest_version: ~ + prerequisites: {} + latest_url: ~ + base_url: 'https://go.dev/dl/go$VERSION.$OS-$ARCH.tar.gz' + file_name: 'go$VERSION.$OS-$ARCH..tar.gz' + extracted_dir: 'go$VERSION.$OS-$ARCH.tar.gz' + file_format: tar.gz + setup: + enable: true + files: + golang: + path: '/usr/local/bin/golang' + mode: '0755' + resources: {} + manage_service: false + manage_user: false diff --git a/data/golang/hiera.yaml b/data/golang/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/golang/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/golang/osfamily/Darwin.yaml b/data/golang/osfamily/Darwin.yaml new file mode 100644 index 00000000..7e96c2ca --- /dev/null +++ b/data/golang/osfamily/Darwin.yaml @@ -0,0 +1,5 @@ +--- +golang::settings: + + release: + https://go.dev/dl/go1.20.darwin-arm64.pkg \ No newline at end of file diff --git a/data/golang/osfamily/Debian.yaml b/data/golang/osfamily/Debian.yaml new file mode 100644 index 00000000..620a6a05 --- /dev/null +++ b/data/golang/osfamily/Debian.yaml @@ -0,0 +1,6 @@ +--- +golang::settings: + + files: + init: + path: '/etc/default/golang' \ No newline at end of file diff --git a/data/golang/osfamily/RedHat.yaml b/data/golang/osfamily/RedHat.yaml new file mode 100644 index 00000000..5292c963 --- /dev/null +++ b/data/golang/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +golang::settings: + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/golang/osfamily/windows.yaml b/data/golang/osfamily/windows.yaml new file mode 100644 index 00000000..39ceff9c --- /dev/null +++ b/data/golang/osfamily/windows.yaml @@ -0,0 +1,14 @@ +--- +golang::settings: + + # If exe or msi package is available for direct download: + package_provider: 'windows' + package_source: 'https://go.dev/dl/go$VERSION.$OS-$ARCH.msi' + + user_files: + config: + path: '%APPDATA%\golang\golang.conf' + + user_dirs: + config: + path: '%APPDATA%\golang' \ No newline at end of file From 6f5ffc8428fa34c35e3f1edc1a0c94359295e358 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Feb 2023 18:52:13 +0100 Subject: [PATCH 271/284] Data for mgmt #67 --- data/mgmt/default.yaml | 118 ++++++++++++++++++++++++++++++++ data/mgmt/hiera.yaml | 15 ++++ data/mgmt/osfamily/Darwin.yaml | 11 +++ data/mgmt/osfamily/Debian.yaml | 6 ++ data/mgmt/osfamily/RedHat.yaml | 3 + data/mgmt/osfamily/windows.yaml | 14 ++++ 6 files changed, 167 insertions(+) create mode 100644 data/mgmt/default.yaml create mode 100644 data/mgmt/hiera.yaml create mode 100644 data/mgmt/osfamily/Darwin.yaml create mode 100644 data/mgmt/osfamily/Debian.yaml create mode 100644 data/mgmt/osfamily/RedHat.yaml create mode 100644 data/mgmt/osfamily/windows.yaml diff --git a/data/mgmt/default.yaml b/data/mgmt/default.yaml new file mode 100644 index 00000000..050f736c --- /dev/null +++ b/data/mgmt/default.yaml @@ -0,0 +1,118 @@ +--- +mgmt::settings: + tp_prerequisites: {} + + urls: + website: 'https://github.com/purpleidea/mgmt' + issues: 'https://github.com/purpleidea/mgmt/issues' + documentation: 'https://github.com/purpleidea/mgmt/blob/master/docs/documentation.md' + source: 'https://github.com/purpleidea/mgmt' + description: 'Mgmt is a real-time automation tool.' + + # Configured: -package -source +release -image + install_method: 'release' + + packages: + main: + name: mgmt + + services: + mgmt: + process_name: mgmt + process_extra_name: ~ + process_user: root + process_group: root + nodaemon_args: '-D' + ensure: running + enable: true + pidfile: /run/mgmt.pid + params: {} + + + files: + config: + path: '/etc/mgmt/mgmt.conf' + init: + path: '/etc/sysconfig/mgmt.conf' + format: 'inifile' + systemd: + path: '/etc/systemd/system/mgmt.service' + format: 'inifile_with_stanzas' + + dirs: + config: + path: '/etc/mgmt' + conf: + path: '/etc/mgmt/conf.d' + log: + path: /var/log/mgmt + home: + path: /var/lib/mgmt + + user_files: + config: + path: '$HOME/.mgmt/mgmt.conf' + + user_dirs: + config: + path: '$HOME/.mgmt' + + ports: + main: + port: 42 + protocol: tcp + ssl: + port: 4432 + protocol: tcp + + info_commands: + list: 'mgmt list' + debug_commands: + debug: 'mgmt debug' + test_commands: + status: 'mgmt status' + version_command: 'mgmt version' + help_command: 'mgmt help' + run_commands: + start: + command: 'mgmt start' + + build: + prerequisites: + tp::install: + - golang + execs: + - name: build + command: 'make' + setup: + enable: true + files: + mgmt: + path: '/usr/local/bin/mgmt' + mode: '0755' + systemd_options: {} + resources: {} + manage_service: false + manage_user: false + + release: + latest_version: '0.0.21-1' + prerequisites: {} + latest_url: ~ + base_url: 'https://github.com/purpleidea/mgmt/releases' + file_name: 'mgmt-$VERSION.$OS-$ARCH.tar.gz' + extracted_dir: 'mgmt-$VERSION.$OS-$ARCH' + file_format: tar.gz + setup: + enable: true + files: + mgmt: + path: '/usr/local/bin/mgmt' + mode: '0755' + systemd_options: + Service: + ExecStart: '/usr/local/bin/mgmt run empty' + EnvironmentFile: ~ + resources: {} + manage_service: false + manage_user: false diff --git a/data/mgmt/hiera.yaml b/data/mgmt/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/mgmt/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/mgmt/osfamily/Darwin.yaml b/data/mgmt/osfamily/Darwin.yaml new file mode 100644 index 00000000..041afadc --- /dev/null +++ b/data/mgmt/osfamily/Darwin.yaml @@ -0,0 +1,11 @@ +--- +mgmt::settings: + brew_package_name: 'mgmt' + + user_files: + config: + path: '$HOME/Library/Application\ Support/mgmt/mgmt.conf' + + user_dirs: + config: + path: '$HOME/Library/Application\ Support/mgmt/mgmt.conf' \ No newline at end of file diff --git a/data/mgmt/osfamily/Debian.yaml b/data/mgmt/osfamily/Debian.yaml new file mode 100644 index 00000000..6542483e --- /dev/null +++ b/data/mgmt/osfamily/Debian.yaml @@ -0,0 +1,6 @@ +--- +mgmt::settings: + + files: + init: + path: '/etc/default/mgmt' \ No newline at end of file diff --git a/data/mgmt/osfamily/RedHat.yaml b/data/mgmt/osfamily/RedHat.yaml new file mode 100644 index 00000000..38eac048 --- /dev/null +++ b/data/mgmt/osfamily/RedHat.yaml @@ -0,0 +1,3 @@ +--- +mgmt::settings: + dockerfile_prerequisites: 'RUN yum install -y wget which' diff --git a/data/mgmt/osfamily/windows.yaml b/data/mgmt/osfamily/windows.yaml new file mode 100644 index 00000000..63713036 --- /dev/null +++ b/data/mgmt/osfamily/windows.yaml @@ -0,0 +1,14 @@ +--- +mgmt::settings: + + # If exe or msi package is available for direct download: + package_provider: 'windows' + package_source: 'https://github.com/mgmt/mgmt/releases/download/v$VERSION/mgmt_$VERSION_$OS_$ARCH.msi' + + user_files: + config: + path: '%APPDATA%\mgmt\mgmt.conf' + + user_dirs: + config: + path: '%APPDATA%\mgmt' \ No newline at end of file From 27fb0195a9cad8607b48303de78fc1e8198b4e99 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Feb 2023 18:52:39 +0100 Subject: [PATCH 272/284] Data for blender #65 --- data/blender/default.yaml | 72 ++++++++++++++++++++++++++++++ data/blender/hiera.yaml | 15 +++++++ data/blender/osfamily/Darwin.yaml | 8 ++++ data/blender/osfamily/Debian.yaml | 3 ++ data/blender/osfamily/windows.yaml | 4 ++ 5 files changed, 102 insertions(+) create mode 100644 data/blender/default.yaml create mode 100644 data/blender/hiera.yaml create mode 100644 data/blender/osfamily/Darwin.yaml create mode 100644 data/blender/osfamily/Debian.yaml create mode 100644 data/blender/osfamily/windows.yaml diff --git a/data/blender/default.yaml b/data/blender/default.yaml new file mode 100644 index 00000000..e668bcc1 --- /dev/null +++ b/data/blender/default.yaml @@ -0,0 +1,72 @@ +--- +blender::settings: + tp_prerequisites: {} + + urls: + website: 'https://blender.org' + support: 'https://www.blender.org/support/' + documentation: 'https://www.blender.org/get-involved/documentation/' + source: 'https://github.com/blender/blender' + description: 'Blender is the free and open source 3D creation suite' + + # Configured: +package -source -release +image + install_method: 'release' + + packages: + main: + name: blender + ensure: present + source: ~ + install_options: [] + params: {} + providers: + chocolatey: + name: + scoop: + name: blender + winget: + name: BlenderFoundation.Blender + + files: + config: + path: /usr/share/blender/$MAJVERSION/ + format: 'inifile_with_stanzas' + + dirs: + home: + path: /usr/share/blender/qON/ + + user_files: + config: + path: '$HOME/.config/blender/$MAJVERSION/' + + user_dirs: + config: + path: '$HOME/.config/blender/$MAJVERSION/' + + info_commands: + list: 'blender list' + debug_commands: + debug: 'blender debug' + test_commands: + status: 'blender status' + version_command: 'blender version' + help_command: 'blender help' + run_commands: + start: + command: 'blender start' + release: + latest_version: '3.4.1' + latest_version_major: '3.4' + destination: /usr/share/blender + base_url: 'https://mirrors.dotsrc.org/blender/release/Blender$MAJVERSION/' +# Official base url has a intermediate page. A specific mirrot is used instead. +# base_url: 'https://www.blender.org/download/release/Blender$MAJVERSION/blender-$VERSION-$OS-$ARCH' + file_name: 'blender-$VERSION-$OS-x64.tar.xz' + extracted_dir: 'blender-$VERSION-$OS-x64' + file_format: xz + extract_dir: '/usr/share/blender' + setup: + enable: true + links: + '/usr/local/bin/blender': '/usr/share/blender/blender-$VERSION-$OS-x64/blender' diff --git a/data/blender/hiera.yaml b/data/blender/hiera.yaml new file mode 100644 index 00000000..b2a2fa6a --- /dev/null +++ b/data/blender/hiera.yaml @@ -0,0 +1,15 @@ +--- +:hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" + - "default/%{operatingsystem}" + - default diff --git a/data/blender/osfamily/Darwin.yaml b/data/blender/osfamily/Darwin.yaml new file mode 100644 index 00000000..0d94cd8f --- /dev/null +++ b/data/blender/osfamily/Darwin.yaml @@ -0,0 +1,8 @@ +--- +blender::settings: + brew_package_name: 'blender' + package_provider: 'appdmg' + + packages: + main: + source: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender$MAJVERSION/blender-$VERSION-macos-$ARCH.dmg' diff --git a/data/blender/osfamily/Debian.yaml b/data/blender/osfamily/Debian.yaml new file mode 100644 index 00000000..0436a448 --- /dev/null +++ b/data/blender/osfamily/Debian.yaml @@ -0,0 +1,3 @@ +--- +blender::settings: {} + diff --git a/data/blender/osfamily/windows.yaml b/data/blender/osfamily/windows.yaml new file mode 100644 index 00000000..cb0137d9 --- /dev/null +++ b/data/blender/osfamily/windows.yaml @@ -0,0 +1,4 @@ +--- +blender::settings: + package_provider: 'windows' + package_source: 'https://www.blender.org/download/release/Blender$MAJVERSION/blender-$VERSION-windows-x64.msi' From 1647ab9d90d58495e03ed09cc31c8e1cbd5705d7 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Feb 2023 19:29:57 +0100 Subject: [PATCH 273/284] Data for icinga_repo #72 --- data/icinga_repo/default.yaml | 4 ++++ data/icinga_repo/hiera.yaml | 13 +++++++++++++ data/icinga_repo/upstream/default.yaml | 5 +++++ data/icinga_repo/upstream/operatingsystem/Ubuntu.ya | 4 ++++ data/icinga_repo/upstream/osfamily/Debian.yaml | 5 +++++ data/icinga_repo/upstream/osfamily/RedHat.yaml | 4 ++++ 6 files changed, 35 insertions(+) create mode 100644 data/icinga_repo/default.yaml create mode 100644 data/icinga_repo/hiera.yaml create mode 100644 data/icinga_repo/upstream/default.yaml create mode 100644 data/icinga_repo/upstream/operatingsystem/Ubuntu.ya create mode 100644 data/icinga_repo/upstream/osfamily/Debian.yaml create mode 100644 data/icinga_repo/upstream/osfamily/RedHat.yaml diff --git a/data/icinga_repo/default.yaml b/data/icinga_repo/default.yaml new file mode 100644 index 00000000..2c331962 --- /dev/null +++ b/data/icinga_repo/default.yaml @@ -0,0 +1,4 @@ +--- +icinga_repo::settings: + upstream_repo: true + git_source: https://github.com/Icinga/icinga2 \ No newline at end of file diff --git a/data/icinga_repo/hiera.yaml b/data/icinga_repo/hiera.yaml new file mode 100644 index 00000000..1ee1f61c --- /dev/null +++ b/data/icinga_repo/hiera.yaml @@ -0,0 +1,13 @@ +--- +:hierarchy: + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/upstream/operatingsystem/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/upstream/osfamily/%{osfamily}" + - "%{title}/upstream/default" + - "%{title}/osfamily/%{osfamily}" + - "%{title}/default" + - "default/%{operatingsystem}" + - default diff --git a/data/icinga_repo/upstream/default.yaml b/data/icinga_repo/upstream/default.yaml new file mode 100644 index 00000000..5f80a5a0 --- /dev/null +++ b/data/icinga_repo/upstream/default.yaml @@ -0,0 +1,5 @@ +--- +icinga_repo::settings: + repo_filename: icinga + repo_description: 'Icinga repository' + key_url: https://packages.icinga.com/icinga.key \ No newline at end of file diff --git a/data/icinga_repo/upstream/operatingsystem/Ubuntu.ya b/data/icinga_repo/upstream/operatingsystem/Ubuntu.ya new file mode 100644 index 00000000..c53f05c3 --- /dev/null +++ b/data/icinga_repo/upstream/operatingsystem/Ubuntu.ya @@ -0,0 +1,4 @@ +--- +icinga_repo::settings: + repo_url: 'https://packages.icinga.com/ubuntu' + diff --git a/data/icinga_repo/upstream/osfamily/Debian.yaml b/data/icinga_repo/upstream/osfamily/Debian.yaml new file mode 100644 index 00000000..998cd3a9 --- /dev/null +++ b/data/icinga_repo/upstream/osfamily/Debian.yaml @@ -0,0 +1,5 @@ +--- +icinga_repo::settings: + repo_url: 'https://packages.icinga.com/debian' + apt_repos: 'main' + apt_release: 'stable' diff --git a/data/icinga_repo/upstream/osfamily/RedHat.yaml b/data/icinga_repo/upstream/osfamily/RedHat.yaml new file mode 100644 index 00000000..e5729aca --- /dev/null +++ b/data/icinga_repo/upstream/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +icinga_repo::settings: + repo_file_url: 'https://packages.icinga.com/centos/ICINGA-release.repo' + From 883c6d3a01847e8e22ef8758090017f440dc05d0 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 15 Feb 2023 19:38:25 +0100 Subject: [PATCH 274/284] Rename releases to release, service data and other refactor --- .github/ISSUE_TEMPLATE.md | 13 +-- data/default.yaml | 8 -- data/default/Devuan4.yaml | 4 - data/icinga2/default.yaml | 54 ++++++++--- data/nats-server/default.yaml | 4 +- data/nuclei/default.yaml | 4 +- data/nuclei/osfamily/windows.yaml | 2 +- data/prometheus/default.yaml | 12 ++- data/prometheus/osfamily/RedHat.yaml | 2 +- data/reference/default.yaml | 13 ++- data/sample/default.yaml | 139 +++++++++++++++------------ data/sample/osfamily/Darwin.yaml | 2 - data/sample/osfamily/Debian.yaml | 1 - data/sample/osfamily/windows.yaml | 9 -- data/sample/osfamily/windows11.yaml | 3 - data/sample/upstream/default.yaml | 6 -- data/spiderfoot/default.yaml | 2 +- scripts/convert_v3_to_v4.rb | 13 +-- 18 files changed, 153 insertions(+), 138 deletions(-) mode change 100644 => 100755 data/icinga2/default.yaml delete mode 100644 data/sample/osfamily/windows11.yaml delete mode 100644 data/sample/upstream/default.yaml mode change 100644 => 100755 scripts/convert_v3_to_v4.rb diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index db16f01c..154f8565 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,4 +1,8 @@ -# Describe your issue +# Your tp request + +Application to manage (new or to fix): +Operating System(s) to support: +Installation Method(s): ## Labels @@ -7,10 +11,3 @@ Please use the following labels: * **tinydata request** for any request for new or updated tinydata for an application * **questions** for any error you find, doubt or clarification request -## Context - -Please provide any info useful for troubleshooting, like: - -1. Output of `facter -p` on the failing node (at least the OS related facts) -2. Version of Puppet and of the module -3. The relevant Puppet code and eventually Hiera data diff --git a/data/default.yaml b/data/default.yaml index 226a0e37..fe1a0717 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -35,14 +35,6 @@ default::settings: ensure: present manage: false - services: - main: - process_user: root - process_group: root - ensure: running - enable: true - params: {} - files: config: owner: 'root' diff --git a/data/default/Devuan4.yaml b/data/default/Devuan4.yaml index 164acb26..5d4daed8 100644 --- a/data/default/Devuan4.yaml +++ b/data/default/Devuan4.yaml @@ -8,7 +8,3 @@ default::settings: default: apt: release: 'chimaera' - - services: - main: - provider: 'sysvinit' diff --git a/data/icinga2/default.yaml b/data/icinga2/default.yaml old mode 100644 new mode 100755 index d212dd9a..d1114757 --- a/data/icinga2/default.yaml +++ b/data/icinga2/default.yaml @@ -1,16 +1,42 @@ --- icinga2::settings: - package_name: 'icinga2' - service_name: 'icinga2' - config_file_path: '/etc/icinga2/icinga2.conf' - config_dir_path: '/etc/icinga2' - conf_dir_path: '/etc/icinga2/conf.d' - features_dir_path: '/etc/icinga2/features-enabled' - pid_file_path: '/var/run/icinga2/icinga2.pid' - log_file_path: - - '/var/log/icinga2/icinga2.log' - - '/var/log/icinga2/error.log' - log_dir_path: '/var/log/icinga2' - process_name: 'icinga2' - process_user: 'icinga' - process_group: 'icinga' + package_name: icinga2 + service_name: icinga2 + config_file_path: "/etc/icinga2/icinga2.conf" + config_dir_path: "/etc/icinga2" + conf_dir_path: "/etc/icinga2/conf.d" + features_dir_path: "/etc/icinga2/features-enabled" + pid_file_path: "/var/run/icinga2/icinga2.pid" + log_file_path: &1 + - "/var/log/icinga2/icinga2.log" + - "/var/log/icinga2/error.log" + log_dir_path: "/var/log/icinga2" + process_name: icinga2 + process_user: icinga + process_group: icinga + packages: + main: + name: icinga2 + services: + icinga2: + process_name: icinga2 + process_user: icinga + process_group: icinga + files: + config: + path: "/etc/icinga2/icinga2.conf" + log: + path: *1 + user_files: + config: + path: "$HOME/.icinga2/icinga2.conf" + dirs: + config: + path: "/etc/icinga2" + conf: + path: "/etc/icinga2/conf.d" + log: + path: "/var/log/icinga2" + user_dirs: + config: + path: "$HOME/.icinga2" diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index 4530a941..14ddd710 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -12,7 +12,7 @@ nats-server::settings: config_dir_path: '/etc/nats' # tp 4 settings - install_method: 'file' + install_method: 'release' description: 'NATS is an open-source, high-performance, cloud native messaging system.' docker_image: 'nats' docker_args: '' @@ -58,7 +58,7 @@ nats-server::settings: - name: build command: 'GO111MODULE=on go get github.com/nats-io/nats-server/v2' - releases: + release: latest_version: '2.9.11' prerequisites: {} base_url: 'https://github.com/nats-io/nats-server/releases/download/v$VERSION' diff --git a/data/nuclei/default.yaml b/data/nuclei/default.yaml index f5f77628..76b600c2 100644 --- a/data/nuclei/default.yaml +++ b/data/nuclei/default.yaml @@ -10,7 +10,7 @@ nuclei::settings: config_dir_path: '$HOME/.config/nuclei' # tp 4 settings - install_method: 'file' + install_method: 'release' description: 'Fast and customizable vulnerability scanner based on simple YAML based DSL.' docker_image: 'projectdiscovery/nuclei' docker_args: '' @@ -76,7 +76,7 @@ nuclei::settings: - name: build command: 'go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest' - releases: + release: latest_version: '2.8.6' prerequisites: {} base_url: 'https://github.com/projectdiscovery/nuclei/releases/download/v$VERSION' diff --git a/data/nuclei/osfamily/windows.yaml b/data/nuclei/osfamily/windows.yaml index 9e89609f..57ff8111 100644 --- a/data/nuclei/osfamily/windows.yaml +++ b/data/nuclei/osfamily/windows.yaml @@ -1,3 +1,3 @@ --- nuclei::settings: - install_method: 'file' + install_method: 'release' diff --git a/data/prometheus/default.yaml b/data/prometheus/default.yaml index cb420c06..8e10b076 100644 --- a/data/prometheus/default.yaml +++ b/data/prometheus/default.yaml @@ -21,7 +21,7 @@ prometheus::settings: # tp 4 settings - install_method: 'file' + install_method: 'release' description: 'The Prometheus monitoring system and time series database' website: 'https://prometheus.io/' issues: 'https://github.com/prometheus/prometheus/issues' @@ -89,7 +89,7 @@ prometheus::settings: restart: command: 'prometheus restart' - releases: + release: latest_version: '2.41.0' prerequisites: {} base_url: 'https://github.com/prometheus/prometheus/releases/download/v$VERSION' @@ -97,13 +97,17 @@ prometheus::settings: extracted_dir: 'prometheus-$VERSION.$OS-$ARCH' file_format: 'tar.gz' checksum_url: 'https://github.com/prometheus/prometheus/releases/download/$VERSION/sha256sums.txt' + setup: + enable: true + manage_service: true + manage_user: true image: name: 'prom/prometheus' systemd_options: {} setup: - enable: true + enable: false files: prometheus: path: '/usr/local/bin/prometheus' @@ -132,8 +136,6 @@ prometheus::settings: Service: ExecStart: '/usr/local/bin/prometheus --config.file /etc/prometheus/prometheus.yml' WorkingDirectory: '/var/lib/prometheus' - manage_service: true - manage_user: true build: enable: false diff --git a/data/prometheus/osfamily/RedHat.yaml b/data/prometheus/osfamily/RedHat.yaml index 728c3e07..a4a99454 100644 --- a/data/prometheus/osfamily/RedHat.yaml +++ b/data/prometheus/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- prometheus::settings: dockerfile_prerequisites: 'RUN yum install -y wget which' - install_method: 'file' + install_method: 'release' diff --git a/data/reference/default.yaml b/data/reference/default.yaml index a09643fb..3927c3e1 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -92,7 +92,7 @@ reference::settings: # which automatically replaces the following variables in the string: # $OS with downcase($facts['kernel']) # $ARCH with $facts['os']['architecture'] (with some mapping to match GitHub default names of archs) - # $VERSION with the version of the package (if set via $ensure, $version or in $settings.releases.latest_version) + # $VERSION with the version of the package (if set via $ensure, $version or in $settings.release.latest_version) # For example, this could be: # package_source: 'https://github.com/reference/reference/releases/download/v$VERSION/reference_$VERSION_$OS_$ARCH.msi' # This works only with Puppet providers that accept a source argument @@ -458,9 +458,12 @@ reference::settings: # The init system to use for the app. (Set in default settings, usually no need to override) init_system: ~ + # The service provider to use + service_provider: ~ + + # Services to manage services: - main: - name: reference + reference: process_name: reference process_extra_name: ~ process_user: root @@ -719,7 +722,7 @@ reference::settings: # A v4 setting used by the tp::install define to install the app when install_method=file - releases: + : # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) # to apply before installing the app with install_method=file . The values of each resource can be a string, # an array or an hash of resource titles with the relevant arguments @@ -773,7 +776,7 @@ reference::settings: manage_service: true manage_user: false - # The default setup settings. They are merged with settings.releases.setup and settings.source.setup + # The default setup settings. They are merged with settings.$install_method.setup setup: # If to enable the setup, which involves doing the configurations as defined in the other settings enable: false diff --git a/data/sample/default.yaml b/data/sample/default.yaml index 1db1fe8c..b295deda 100644 --- a/data/sample/default.yaml +++ b/data/sample/default.yaml @@ -2,31 +2,48 @@ sample::settings: tp_prerequisites: {} - upstream_repo: false - package_name: 'sample' - service_name: 'sample' - process_name: 'sample' - process_user: 'root' - process_group: 'root' - config_file_path: '/etc/sample/sample.conf' - config_file_format: yaml - # validate_cmd: 'sample validate' - pid_file_path: '/run/sample.pid' - init_file_path: '/etc/sysconfig/sample.conf' - log_file_path: - - '/var/log/sample/sample.log' - config_dir_path: '/etc/sample' - log_dir_path: - - '/var/log/sample' + urls: + website: 'https://sample.com' + issues: 'https://github.com/sample/sample/issues' + documentation: 'https://sample.com/documentation' + source: 'https://github.com/sample/sample' + description: 'sample description' - # tp 4 settings + # Configured: +package -source -file +image install_method: 'package' - description: 'sample description' - docker_image: 'sample/sample' - docker_args: '' - website: 'https://sample.com' - issues: 'https://github.com/sample/sample/issues' - git_source: 'https://github.com/sample/sample' + + packages: + main: + name: sample + ensure: present + source: ~ + install_options: [] + params: {} + providers: + chocolatey: + name: ~ + scoop: + name: ~ + winget: + name: ~ + # Examples of other packages + client: + name: sample-client + server: + name: sample-server + + services: + sample: + process_name: sample + process_extra_name: ~ + process_user: root + process_group: root + nodaemon_args: '-D' + ensure: running + enable: true + pidfile: /run/sample.pid + params: {} + files: config: @@ -64,29 +81,23 @@ sample::settings: port: 4432 protocol: tcp - commandsTOCONF: - info: - list: 'sample list' - debug: - debug: 'sample debug' - test: + info_commands: + list: 'sample list' + debug_commands: + debug: 'sample debug' + test_commands: status: 'sample status' - version: 'sample --version' - run: - start: - command: 'sample start' - arguments: - - 'instance': - default: '' - description: 'Instance to start' - options: - config_file: - default: 'sample.conf' - value: String - description: 'Config file to use' - restart: - command: 'sample restart' + version_command: 'sample version' + help_command: 'sample help' + run_commands: + start: + command: 'sample start' + image: + name: 'sample/sample' + ports: + - 9090:9090 + systemd_options: {} build: prerequisites: @@ -99,8 +110,18 @@ sample::settings: command: 'make' - name: setup command: 'make install' + setup: + enable: true + files: + sample: + path: '/usr/local/bin/sample' + mode: '0755' + systemd_options: {} + resources: {} + manage_service: false + manage_user: false - releases: + release: latest_version: ~ prerequisites: {} latest_url: ~ @@ -108,18 +129,16 @@ sample::settings: file_name: 'sample-$VERSION.$OS-$ARCH.tar.gz' extracted_dir: 'sample-$VERSION.$OS-$ARCH' file_format: tar.gz - - setup: - enable: true - files: - sample: - path: '/usr/local/bin/sample' - mode: '0755' - systemd_options: - Service: - ExecStart: '/var/lib/tp/source/sample/sample -l 127.0.0.1' - EnvironmentFile: ~ - resources: {} - manage_service: true - manage_user: false - + setup: + enable: true + files: + sample: + path: '/usr/local/bin/sample' + mode: '0755' + systemd_options: + Service: + ExecStart: '/var/lib/tp/source/sample/sample -l 127.0.0.1' + EnvironmentFile: ~ + resources: {} + manage_service: false + manage_user: false diff --git a/data/sample/osfamily/Darwin.yaml b/data/sample/osfamily/Darwin.yaml index cd51e27e..73ba7d0a 100644 --- a/data/sample/osfamily/Darwin.yaml +++ b/data/sample/osfamily/Darwin.yaml @@ -1,8 +1,6 @@ --- sample::settings: brew_package_name: 'sample' - user_config_file_path: '$HOME/Library/Application\ Support/sample/sample.conf' - user_config_dir_path: '$HOME/Library/Application\ Support/sample/' user_files: config: diff --git a/data/sample/osfamily/Debian.yaml b/data/sample/osfamily/Debian.yaml index cda87d49..8c6299cf 100644 --- a/data/sample/osfamily/Debian.yaml +++ b/data/sample/osfamily/Debian.yaml @@ -1,6 +1,5 @@ --- sample::settings: - init_file_path: '/etc/default/sample' files: init: diff --git a/data/sample/osfamily/windows.yaml b/data/sample/osfamily/windows.yaml index 18eaff30..9098e8bf 100644 --- a/data/sample/osfamily/windows.yaml +++ b/data/sample/osfamily/windows.yaml @@ -1,14 +1,5 @@ --- sample::settings: - winget_package_name: 'sample.sample' - choco_package_name: 'sample' - package_name: 'sample' - config_file_path: 'C:\ProgramData\sample\sample\etc\sample.conf' - config_dir_path: 'C:\ProgramData\sample\sample\etc' - process_user: 'LocalSystem' - process_group: 'LocalSystem' - user_config_file_path: '%APPDATA%\sample\sample.conf' - user_config_dir_path: '%APPDATA%\sample' # If exe or msi package is available for direct download: package_provider: 'windows' diff --git a/data/sample/osfamily/windows11.yaml b/data/sample/osfamily/windows11.yaml deleted file mode 100644 index 0a50fef1..00000000 --- a/data/sample/osfamily/windows11.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -sample::settings: - package_name: 'sample.sample' diff --git a/data/sample/upstream/default.yaml b/data/sample/upstream/default.yaml deleted file mode 100644 index 998a7c92..00000000 --- a/data/sample/upstream/default.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -sample::settings: {} - -# tp_prerequisites: -# sample_repo: {} - diff --git a/data/spiderfoot/default.yaml b/data/spiderfoot/default.yaml index d1e34419..19df682b 100644 --- a/data/spiderfoot/default.yaml +++ b/data/spiderfoot/default.yaml @@ -34,7 +34,7 @@ spiderfoot::settings: install_method: 'source' - releases: + release: latest_version: '4.0' prerequisites: {} latest: {} diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb old mode 100644 new mode 100755 index 0ba6c620..6d6c54fb --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -1,3 +1,4 @@ +#!/opt/puppetlabs/puppet/bin/ruby require 'yaml' # This script converts a v3 config file to a v4 config file @@ -29,22 +30,22 @@ # Get the service name from the original config service_name = original_config[settings_key]['service_name'] -original_config[settings_key]["services"] = {"main" => {"name" => service_name}} if service_name +original_config[settings_key]["services"][service_name] if service_name # Get the process name from the original config process_name = original_config[settings_key]['process_name'] -original_config[settings_key]["services"]["main"]["process_name"] = process_name if process_name +original_config[settings_key]["services"][service_name]["process_name"] = process_name if process_name # Get the process_extra name from the original config process_extra_name = original_config[settings_key]['process_extra_name'] -original_config[settings_key]["services"]["main"]["process_extra_name"] = process_extra_name if process_extra_name +original_config[settings_key]["services"][service_name]["process_extra_name"] = process_extra_name if process_extra_name # Get the process user from the original config process_user = original_config[settings_key]['process_user'] -original_config[settings_key]["services"]["main"]["process_user"] = process_user if process_user +original_config[settings_key]["services"][service_name]["process_user"] = process_user if process_user # Get the process group from the original config process_group = original_config[settings_key]['process_group'] -original_config[settings_key]["services"]["main"]["process_group"] = process_user if process_group +original_config[settings_key]["services"][service_name]["process_group"] = process_user if process_group # Get the process nodaemon_args from the original config nodaemon_args = original_config[settings_key]['nodaemon_args'] -original_config[settings_key]["services"] = {"main" => {"nodaemon_args" => nodaemon_args}} if nodaemon_args +original_config[settings_key]["services"][service_name]["nodaemon_args"] = nodaemon_args if nodaemon_args # Get the config_file_path from the original config From d9c77be1b11dab15de17ee13e860367cbab25f86 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Thu, 16 Feb 2023 18:30:10 +0100 Subject: [PATCH 275/284] Nix fix --- data/nix/default.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/nix/default.yaml b/data/nix/default.yaml index 97cc3953..b491ba7f 100644 --- a/data/nix/default.yaml +++ b/data/nix/default.yaml @@ -4,9 +4,11 @@ nix::settings: exec_prerequisites: install: # command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' - command: 'curl -L https://nixos.org/nix/install -o /tmp/nix_install ; sh /tmp/nix_install --daemon | yes' +# command: 'curl -L https://nixos.org/nix/install -o /tmp/nix_install ; sh /tmp/nix_install --daemon | yes' + command: 'wget -O /tmp/nix_install https://nixos.org/nix/install ; sh /tmp/nix_install --daemon --yes' creates: '/nix' provider: posix + environment: [ 'HOME=/root' ] urls: website: 'https://nixos.org' From 7f7c4de5444f34a0d51000c61297521b6bfa10b8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 9 Aug 2023 20:22:53 +0200 Subject: [PATCH 276/284] Removed snmpd. Other fixes --- .rspec | 2 +- data/crowdsec_repo/upstream/default.yaml | 2 +- data/default.yaml | 11 +- data/fail2ban/osfamily/RedHat.yaml | 4 + data/reference/hiera.yaml | 6 +- data/snmp/default.yaml | 178 ++++++++++++++++++++- data/snmp/hiera.yaml | 9 ++ data/snmp/osfamily/Darwin.yaml | 11 ++ data/snmp/osfamily/Debian.yaml | 24 ++- data/{snmpd => snmp}/osfamily/OpenBSD.yaml | 2 +- data/snmp/osfamily/RedHat.yaml | 13 +- data/snmp/osfamily/Solaris.yaml | 5 + data/snmp/osfamily/Suse.yaml | 3 - data/snmp/osfamily/Ubuntu.yaml | 4 - data/snmp/osfamily/windows.yaml | 14 ++ data/snmpd/default.yaml | 13 -- data/snmpd/hiera.yaml | 6 - data/snmpd/osfamily/Debian.yaml | 7 - data/snmpd/osfamily/RedHat.yaml | 5 - data/snmpd/osfamily/Solaris.yaml | 8 - data/snmpd/osfamily/Suse.yaml | 3 - metadata.json | 2 +- scripts/github_latest_version.py | 21 +++ scripts/github_repos.txt | 34 ++++ 24 files changed, 318 insertions(+), 69 deletions(-) create mode 100644 data/fail2ban/osfamily/RedHat.yaml create mode 100644 data/snmp/osfamily/Darwin.yaml rename data/{snmpd => snmp}/osfamily/OpenBSD.yaml (88%) delete mode 100644 data/snmp/osfamily/Suse.yaml delete mode 100644 data/snmp/osfamily/Ubuntu.yaml create mode 100644 data/snmp/osfamily/windows.yaml delete mode 100644 data/snmpd/default.yaml delete mode 100644 data/snmpd/hiera.yaml delete mode 100644 data/snmpd/osfamily/Debian.yaml delete mode 100644 data/snmpd/osfamily/RedHat.yaml delete mode 100644 data/snmpd/osfamily/Solaris.yaml delete mode 100644 data/snmpd/osfamily/Suse.yaml create mode 100755 scripts/github_latest_version.py create mode 100644 scripts/github_repos.txt diff --git a/.rspec b/.rspec index 16f9cdb0..5f164763 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1,2 @@ --color ---format documentation +--format progress diff --git a/data/crowdsec_repo/upstream/default.yaml b/data/crowdsec_repo/upstream/default.yaml index 774c6221..61ef3b1e 100644 --- a/data/crowdsec_repo/upstream/default.yaml +++ b/data/crowdsec_repo/upstream/default.yaml @@ -1,6 +1,6 @@ --- crowdsec_repo::settings: - key_url: https://packagecloud.io/crowdsec/crowdsec/gpgkey + key_url: https://packagecloud.io/crowdsec/crowdsec/gpgkey https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-B78D1222C9AD2D5D.pub.gpg https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-EDE2C695EC9A5A5C.pub.gpg https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-C822EDD6B39954A1.pub.gpg https://packagecloud.io/crowdsec/crowdsec/gpgkey/crowdsec-crowdsec-FED78314A2468CCF.pub.gpg key: '6A89 E3C2 303A 901A 8899 71D3 376E D532 6E93 CD0C' apt_repos: 'main' repo_filename: crowdsec_crowdsec diff --git a/data/default.yaml b/data/default.yaml index fe1a0717..ca1ab56d 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -9,19 +9,12 @@ default::settings: config_file_mode: '0644' config_dir_owner: 'root' config_dir_group: 'root' - config_dir_mode: '0755' + config_dir_mode: '0644' config_dir_purge: false - config_dir_recurse: true + config_dir_recurse: false install_method: 'package' packages: - main: - ensure: present - source: ~ - install_options: [] - params: {} - providers: {} - manage: true devel: name: '$TITLE-devel' ensure: present diff --git a/data/fail2ban/osfamily/RedHat.yaml b/data/fail2ban/osfamily/RedHat.yaml new file mode 100644 index 00000000..c6062fc8 --- /dev/null +++ b/data/fail2ban/osfamily/RedHat.yaml @@ -0,0 +1,4 @@ +--- +fail2ban::settings: + tp_prerequisites: + - epel diff --git a/data/reference/hiera.yaml b/data/reference/hiera.yaml index fcd4bfdc..77ac7154 100644 --- a/data/reference/hiera.yaml +++ b/data/reference/hiera.yaml @@ -1,7 +1,7 @@ -# This file defines the hierathy to follow when looking for tinydata settings -# Note that even if it's called like a normal Hiera 3 configuration files +# This file defines the hierarchy to follow when looking for tinydata settings +# Note that even if it looks like a normal Hiera 3 configuration files # and has a similar logic it's NOT a Hiera configuration and is not used by Hiera -# This file is actually used by the tp_slookuo function and has the following +# This file is actually used by the tp_lookup function and has the following # limitation: # Variables interpolation is done ONLY for the following variables: # - Fact $::operatingsystemmajrelease diff --git a/data/snmp/default.yaml b/data/snmp/default.yaml index 0cdf07d2..33d2da23 100644 --- a/data/snmp/default.yaml +++ b/data/snmp/default.yaml @@ -1,3 +1,179 @@ --- snmp::settings: - package_name: 'snmp' + tp_prerequisites: {} + + package_name: 'snmpd' + service_name: 'snmpd' + config_file_path: '/etc/snmp/snmpd.conf' + config_file_mode: '0600' + config_dir_path: '/etc/snmp' + pid_file_path: '/var/run/snmpd.pid' + log_file_path: '/var/log/snmpd/snmpd.log' + log_dir_path: '/var/log/snmpd' + process_name: 'snmpd' + process_user: 'snmpd' + process_group: 'snmpd' + udp_port: '161' + + urls: + website: 'http://www.net-snmp.org/' + issues: 'https://github.com/net-snmp/net-snmp/issues' + documentation: 'https://snmpd.com/documentation' + source: 'https://github.com/net-snmp/net-snmp' + description: 'A SNMP application library, tools and daemon' + + # Configured: +package -source -file +image + install_method: 'package' + + packages: + main: + name: snmpd + ensure: present + source: ~ + install_options: [] + params: {} + providers: + chocolatey: + name: ~ + scoop: + name: ~ + winget: + name: ~ + snmptrapd: + name: snmptrapd + ensure: present + source: ~ + install_options: [] + params: {} + providers: + chocolatey: + name: ~ + scoop: + name: ~ + winget: + name: ~ + services: + snmpd: + process_name: snmpd + process_extra_name: ~ + process_user: root + process_group: root + nodaemon_args: '-D' + ensure: running + enable: true + pidfile: /var/run/snmpd.pid + params: {} + snmptrapd: + process_name: snmptrapd + process_extra_name: ~ + process_user: root + process_group: root + nodaemon_args: '-D' + ensure: stopped + enable: false + pidfile: /var/run/snmptrapd.pid + params: {} + + + files: + client: + path: '/etc/snmp/snmp.conf' + config: + path: '/etc/snmp/snmpd.conf' + mode: '0600' + init: + path: '/etc/sysconfig/snmpd' + format: 'inifile' + systemd: + path: '/etc/systemd/system/snmpd.service' + format: 'inifile_with_stanzas' + snmptrapd: + path: '/etc/snmp/snmptrapd.conf' + snmptrapd_init: + path: '/etc/sysconfig/snmptrapd' + format: 'inifile' + dirs: + config: + path: '/etc/snmp' + log: + path: /var/log/snmpd + home: + path: /var/lib/snmp + + user_files: + config: + path: '$HOME/.snmpd/snmpd.conf' + + user_dirs: + config: + path: '$HOME/.snmpd' + + ports: + main: + port: 42 + protocol: tcp + ssl: + port: 4432 + protocol: tcp + + info_commands: + list: 'snmpd list' + debug_commands: + debug: 'snmpd debug' + test_commands: + status: 'snmpd status' + version_command: 'snmpd version' + help_command: 'snmpd help' + run_commands: + start: + command: 'snmpd start' + + image: + name: 'snmpd/snmpd' + ports: + - 9090:9090 + systemd_options: {} + + build: + prerequisites: + tp::install: + - build-essential + execs: + - name: configure + command: './configure' + - name: build + command: 'make' + - name: setup + command: 'make install' + setup: + enable: true + files: + snmpd: + path: '/usr/local/bin/snmpd' + mode: '0755' + systemd_options: {} + resources: {} + manage_service: false + manage_user: false + + release: + latest_version: ~ + prerequisites: {} + latest_url: ~ + base_url: 'https://sourceforge.net/projects/net-snmp/files/net-snmp/$VERSION/' + file_name: 'net-snmp-$VERSION.tar.gz' + extracted_dir: 'net-snmp-$VERSION' + file_format: tar.gz + setup: + enable: true + files: + snmpd: + path: '/usr/local/bin/snmpd' + mode: '0755' + systemd_options: + Service: + ExecStart: '/var/lib/tp/source/snmpd/snmpd -l 127.0.0.1' + EnvironmentFile: ~ + resources: {} + manage_service: false + manage_user: false diff --git a/data/snmp/hiera.yaml b/data/snmp/hiera.yaml index 19fa9ae9..b2a2fa6a 100644 --- a/data/snmp/hiera.yaml +++ b/data/snmp/hiera.yaml @@ -1,6 +1,15 @@ --- :hierarchy: + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/operatingsystem/%{operatingsystem}" + - "%{title}/%{repo}/osfamily/%{osfamily}%{operatingsystemmajrelease}" + - "%{title}/%{repo}/osfamily/%{osfamily}" + - "%{title}/%{repo}/default" + - "%{title}/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" + - "%{title}/operatingsystem/%{operatingsystem}" + - "%{title}/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/osfamily/%{osfamily}" - "%{title}/default" + - "default/%{operatingsystem}%{operatingsystemmajrelease}" - "default/%{operatingsystem}" - default diff --git a/data/snmp/osfamily/Darwin.yaml b/data/snmp/osfamily/Darwin.yaml new file mode 100644 index 00000000..fa4f159b --- /dev/null +++ b/data/snmp/osfamily/Darwin.yaml @@ -0,0 +1,11 @@ +--- +snmp::settings: + brew_package_name: 'snmp' + + user_files: + config: + path: '$HOME/Library/Application\ Support/snmp/snmp.conf' + + user_dirs: + config: + path: '$HOME/Library/Application\ Support/snmp/snmp.conf' \ No newline at end of file diff --git a/data/snmp/osfamily/Debian.yaml b/data/snmp/osfamily/Debian.yaml index 040a3ed9..e5c83a39 100644 --- a/data/snmp/osfamily/Debian.yaml +++ b/data/snmp/osfamily/Debian.yaml @@ -1,4 +1,24 @@ --- snmp::settings: - config_file_path: '/etc/snmp/snmp.conf' - config_dir_path: '/etc/snmp/' + config_dir_path: '/etc/snmp' + process_user: 'snmp' + process_group: 'snmp' + init_file_path: '/etc/default/snmpd' + + files: + client: + path: '/etc/snmp/snmp.conf' + config: + path: '/etc/snmp/snmpd.conf' + mode: '0600' + init: + path: '/etc/default/snmpd' + format: 'inifile' + systemd: + path: '/etc/systemd/system/snmpd.service' + format: 'inifile_with_stanzas' + snmptrapd: + path: '/etc/snmp/snmptrapd.conf' + snmptrapd_init: + path: '/etc/default/snmptrapd' + format: 'inifile' \ No newline at end of file diff --git a/data/snmpd/osfamily/OpenBSD.yaml b/data/snmp/osfamily/OpenBSD.yaml similarity index 88% rename from data/snmpd/osfamily/OpenBSD.yaml rename to data/snmp/osfamily/OpenBSD.yaml index 84614119..3de51418 100644 --- a/data/snmpd/osfamily/OpenBSD.yaml +++ b/data/snmp/osfamily/OpenBSD.yaml @@ -1,5 +1,5 @@ --- -snmpd::settings: +snmp::settings: package_name: 'net-snmp' service_name: 'netsnmpd' config_file_path: '/etc/snmp/snmpd.conf' diff --git a/data/snmp/osfamily/RedHat.yaml b/data/snmp/osfamily/RedHat.yaml index 233bdd0e..2292d374 100644 --- a/data/snmp/osfamily/RedHat.yaml +++ b/data/snmp/osfamily/RedHat.yaml @@ -1,3 +1,14 @@ --- snmp::settings: - package_name: 'net-snmp-utils' + package_name: 'net-snmp' + config_file_mode: '0600' + init_file_path: '/etc/sysconfig/snmpd' + + + packages: + main: + name: net-snmp + + files: + init: + path: '/etc/sysconfig/snmpd' \ No newline at end of file diff --git a/data/snmp/osfamily/Solaris.yaml b/data/snmp/osfamily/Solaris.yaml index 7ae7ff58..ad4aa0b0 100644 --- a/data/snmp/osfamily/Solaris.yaml +++ b/data/snmp/osfamily/Solaris.yaml @@ -1,3 +1,8 @@ --- snmp::settings: package_name: 'net-snmp' + service_name: 'net-snmp' + config_file_path: '/etc/net-snmp/snmp/snmpd.conf' + config_file_mode: '0444' + config_file_group: 'bin' + config_dir_path: '/etc/net-snmp/snmp' diff --git a/data/snmp/osfamily/Suse.yaml b/data/snmp/osfamily/Suse.yaml deleted file mode 100644 index 233bdd0e..00000000 --- a/data/snmp/osfamily/Suse.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -snmp::settings: - package_name: 'net-snmp-utils' diff --git a/data/snmp/osfamily/Ubuntu.yaml b/data/snmp/osfamily/Ubuntu.yaml deleted file mode 100644 index 040a3ed9..00000000 --- a/data/snmp/osfamily/Ubuntu.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -snmp::settings: - config_file_path: '/etc/snmp/snmp.conf' - config_dir_path: '/etc/snmp/' diff --git a/data/snmp/osfamily/windows.yaml b/data/snmp/osfamily/windows.yaml new file mode 100644 index 00000000..7670fdad --- /dev/null +++ b/data/snmp/osfamily/windows.yaml @@ -0,0 +1,14 @@ +--- +snmp::settings: + + # If exe or msi package is available for direct download: + package_provider: 'windows' + package_source: 'https://github.com/snmp/snmp/releases/download/v$VERSION/snmp_$VERSION_$OS_$ARCH.msi' + + user_files: + config: + path: '%APPDATA%\snmp\snmp.conf' + + user_dirs: + config: + path: '%APPDATA%\snmp' \ No newline at end of file diff --git a/data/snmpd/default.yaml b/data/snmpd/default.yaml deleted file mode 100644 index 2db5d3af..00000000 --- a/data/snmpd/default.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -snmpd::settings: - package_name: 'snmpd' - service_name: 'snmpd' - config_file_path: '/etc/snmp/snmpd.conf' - config_dir_path: '/etc/snmp' - pid_file_path: '/var/run/snmpd.pid' - log_file_path: '/var/log/snmpd/snmpd.log' - log_dir_path: '/var/log/snmpd' - process_name: 'snmpd' - process_user: 'snmpd' - process_group: 'snmpd' - udp_port: '161' diff --git a/data/snmpd/hiera.yaml b/data/snmpd/hiera.yaml deleted file mode 100644 index 19fa9ae9..00000000 --- a/data/snmpd/hiera.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -:hierarchy: - - "%{title}/osfamily/%{osfamily}" - - "%{title}/default" - - "default/%{operatingsystem}" - - default diff --git a/data/snmpd/osfamily/Debian.yaml b/data/snmpd/osfamily/Debian.yaml deleted file mode 100644 index b8d448b7..00000000 --- a/data/snmpd/osfamily/Debian.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -snmpd::settings: - config_file_mode: '0600' - config_dir_path: '/etc/snmp' - process_user: 'snmp' - process_group: 'snmp' - init_file_path: '/etc/default/snmpd' diff --git a/data/snmpd/osfamily/RedHat.yaml b/data/snmpd/osfamily/RedHat.yaml deleted file mode 100644 index 91258695..00000000 --- a/data/snmpd/osfamily/RedHat.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -snmpd::settings: - package_name: 'net-snmp' - config_file_mode: '0600' - init_file_path: '/etc/sysconfig/snmpd.options' diff --git a/data/snmpd/osfamily/Solaris.yaml b/data/snmpd/osfamily/Solaris.yaml deleted file mode 100644 index c4dfe4b8..00000000 --- a/data/snmpd/osfamily/Solaris.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -snmpd::settings: - package_name: 'net-snmp' - service_name: 'net-snmp' - config_file_path: '/etc/net-snmp/snmp/snmpd.conf' - config_file_mode: '0444' - config_file_group: 'bin' - config_dir_path: '/etc/net-snmp/snmp' diff --git a/data/snmpd/osfamily/Suse.yaml b/data/snmpd/osfamily/Suse.yaml deleted file mode 100644 index 2e4c73f5..00000000 --- a/data/snmpd/osfamily/Suse.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -snmpd::settings: - package_name: 'net-snmp' diff --git a/metadata.json b/metadata.json index 8cf892ef..239bb77e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.6.0", + "version": "0.6.1", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", diff --git a/scripts/github_latest_version.py b/scripts/github_latest_version.py new file mode 100755 index 00000000..0eaee125 --- /dev/null +++ b/scripts/github_latest_version.py @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import requests +import sys + +# Get the repo name from the first argument +repo = sys.argv[1] + +# Get the data file from the second argument +file = sys.argv[2] + +# Get the latest release version from Github API +url = "https://github.com/" + repo + "/releases/latest" +r = requests.get(url) +version = r.url.split('/')[-1] + +# Open the file in append mode +with open(file, "a") as f: + # Append a new line character at the end of file + f.write("\n") + # Append the version name to the file + f.write(version) diff --git a/scripts/github_repos.txt b/scripts/github_repos.txt new file mode 100644 index 00000000..bd4c9156 --- /dev/null +++ b/scripts/github_repos.txt @@ -0,0 +1,34 @@ + +elastic/beats/tree/master/auditbeat' +hashicorp/boundary' +PowerShell/PowerShell.git' +prometheus/prometheus' +ceph/ceph' +Icinga/icinga2 +example42/hdm' +vdukhovni/postfix' +microsoft/PowerToys.git' +LibreOffice/core' +apache/activemq' +pypa/pip' +nats-io/nats-server' +puppetlabs/bolt' +tigeli/bind-utils' +hashicorp/vault.git +telegramdesktop/tdesktop.git' +obsproject/obs-studio.git' +apache/httpd' +ansible/ansible' +microsoft/vscode' +projectdiscovery/nuclei' +microsoft/SCXcore.git' +Sysinternals/SysinternalsEBPF.git' +telegramdesktop/tdesktop.git' +Sysinternals/SysmonForLinux' +Sysinternals/ProcDump-for-Linux' +microsoft/omi.git' +git/git' +hashicorp/vagrant.git +telegramdesktop/tdesktop.git' +smicallef/spiderfoot' +Azure/azure-cli From adca8f5c74a2c8dcadebcd73fe4570aa921a5012 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 9 Aug 2023 20:37:26 +0200 Subject: [PATCH 277/284] Version 0.7.0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 239bb77e..6ca28493 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.6.1", + "version": "0.7.0", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From 9bd5e67e789988b6749a3c812f8e61b67e903e84 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 9 Aug 2023 20:39:07 +0200 Subject: [PATCH 278/284] Yaml fix --- data/icinga2/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/icinga2/default.yaml b/data/icinga2/default.yaml index d1114757..b6f1ccb7 100755 --- a/data/icinga2/default.yaml +++ b/data/icinga2/default.yaml @@ -7,9 +7,9 @@ icinga2::settings: conf_dir_path: "/etc/icinga2/conf.d" features_dir_path: "/etc/icinga2/features-enabled" pid_file_path: "/var/run/icinga2/icinga2.pid" - log_file_path: &1 - - "/var/log/icinga2/icinga2.log" - - "/var/log/icinga2/error.log" + log_file_path: + - "/var/log/icinga2/icinga2.log" + - "/var/log/icinga2/error.log" log_dir_path: "/var/log/icinga2" process_name: icinga2 process_user: icinga From 5e53395ffa9c24b4e242465e08d55cc180f2f770 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 9 Aug 2023 20:54:21 +0200 Subject: [PATCH 279/284] Lints --- data/blender/default.yaml | 10 +++++----- data/golang/default.yaml | 2 +- data/mgmt/default.yaml | 2 +- data/nix/default.yaml | 4 +--- data/reference/default.yaml | 2 +- data/sample/default.yaml | 2 +- data/snmp/default.yaml | 2 +- data/surfex/default.yaml | 1 - 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/data/blender/default.yaml b/data/blender/default.yaml index e668bcc1..51e47a8f 100644 --- a/data/blender/default.yaml +++ b/data/blender/default.yaml @@ -21,7 +21,7 @@ blender::settings: params: {} providers: chocolatey: - name: + name: blender scoop: name: blender winget: @@ -34,7 +34,7 @@ blender::settings: dirs: home: - path: /usr/share/blender/qON/ + path: '/usr/share/blender/qON/' user_files: config: @@ -49,7 +49,7 @@ blender::settings: debug_commands: debug: 'blender debug' test_commands: - status: 'blender status' + status: 'blender status' version_command: 'blender version' help_command: 'blender help' run_commands: @@ -60,8 +60,8 @@ blender::settings: latest_version_major: '3.4' destination: /usr/share/blender base_url: 'https://mirrors.dotsrc.org/blender/release/Blender$MAJVERSION/' -# Official base url has a intermediate page. A specific mirrot is used instead. -# base_url: 'https://www.blender.org/download/release/Blender$MAJVERSION/blender-$VERSION-$OS-$ARCH' + # Official base url has a intermediate page. A specific mirrot is used instead. + # base_url: 'https://www.blender.org/download/release/Blender$MAJVERSION/blender-$VERSION-$OS-$ARCH' file_name: 'blender-$VERSION-$OS-x64.tar.xz' extracted_dir: 'blender-$VERSION-$OS-x64' file_format: xz diff --git a/data/golang/default.yaml b/data/golang/default.yaml index 2b7d9bbc..ed6792e9 100644 --- a/data/golang/default.yaml +++ b/data/golang/default.yaml @@ -36,7 +36,7 @@ golang::settings: debug_commands: debug: 'go debug' test_commands: - status: 'go status' + status: 'go status' version_command: 'go version' help_command: 'go help' run_commands: diff --git a/data/mgmt/default.yaml b/data/mgmt/default.yaml index 050f736c..7df6ec7a 100644 --- a/data/mgmt/default.yaml +++ b/data/mgmt/default.yaml @@ -70,7 +70,7 @@ mgmt::settings: debug_commands: debug: 'mgmt debug' test_commands: - status: 'mgmt status' + status: 'mgmt status' version_command: 'mgmt version' help_command: 'mgmt help' run_commands: diff --git a/data/nix/default.yaml b/data/nix/default.yaml index b491ba7f..f26f44da 100644 --- a/data/nix/default.yaml +++ b/data/nix/default.yaml @@ -3,12 +3,10 @@ nix::settings: tp_prerequisites: {} exec_prerequisites: install: -# command: 'sh <(curl -L https://nixos.org/nix/install) --daemon' -# command: 'curl -L https://nixos.org/nix/install -o /tmp/nix_install ; sh /tmp/nix_install --daemon | yes' command: 'wget -O /tmp/nix_install https://nixos.org/nix/install ; sh /tmp/nix_install --daemon --yes' creates: '/nix' provider: posix - environment: [ 'HOME=/root' ] + environment: ['HOME=/root'] urls: website: 'https://nixos.org' diff --git a/data/reference/default.yaml b/data/reference/default.yaml index 3927c3e1..a9af6a33 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -722,7 +722,7 @@ reference::settings: # A v4 setting used by the tp::install define to install the app when install_method=file - : + releases: # An hash of Puppet resources (file, exec, package, tp::install ... any Puppet resource type can be used) # to apply before installing the app with install_method=file . The values of each resource can be a string, # an array or an hash of resource titles with the relevant arguments diff --git a/data/sample/default.yaml b/data/sample/default.yaml index b295deda..0f3cfc7b 100644 --- a/data/sample/default.yaml +++ b/data/sample/default.yaml @@ -86,7 +86,7 @@ sample::settings: debug_commands: debug: 'sample debug' test_commands: - status: 'sample status' + status: 'sample status' version_command: 'sample version' help_command: 'sample help' run_commands: diff --git a/data/snmp/default.yaml b/data/snmp/default.yaml index 33d2da23..ee9f03ce 100644 --- a/data/snmp/default.yaml +++ b/data/snmp/default.yaml @@ -121,7 +121,7 @@ snmp::settings: debug_commands: debug: 'snmpd debug' test_commands: - status: 'snmpd status' + status: 'snmpd status' version_command: 'snmpd version' help_command: 'snmpd help' run_commands: diff --git a/data/surfex/default.yaml b/data/surfex/default.yaml index 183573e7..c125d612 100644 --- a/data/surfex/default.yaml +++ b/data/surfex/default.yaml @@ -38,7 +38,6 @@ surfex::settings: base_url: 'https://www.umr-cnrm.fr/surfex/data/OPEN-SURFEX' file_name: 'open_surfex_$VERSION.tar.gz' extracted_dir: 'OPEN_SURFEX_V9' -# extracted_dir: 'open_SURFEX_V$MAJVERSION' file_format: tar.gz setup: enable: true From 98d0b467201cf317e70cb0adc86ce7d22ba11ed7 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 9 Aug 2023 21:11:31 +0200 Subject: [PATCH 280/284] Lint --- data/nix/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/nix/default.yaml b/data/nix/default.yaml index f26f44da..44bd213d 100644 --- a/data/nix/default.yaml +++ b/data/nix/default.yaml @@ -65,7 +65,7 @@ nix::settings: debug_commands: debug: 'nix store verify' test_commands: - status: 'nix status' + status: 'nix status' version_command: 'nix --version' help_command: 'nix --help' From a876283eb289b2d44aca1a040f0c6a94ca9f99f9 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Wed, 9 Aug 2023 22:26:08 +0200 Subject: [PATCH 281/284] Fixed icinga2 data yntax --- data/icinga2/default.yaml | 4 +++- metadata.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/icinga2/default.yaml b/data/icinga2/default.yaml index b6f1ccb7..03c0a04f 100755 --- a/data/icinga2/default.yaml +++ b/data/icinga2/default.yaml @@ -26,7 +26,9 @@ icinga2::settings: config: path: "/etc/icinga2/icinga2.conf" log: - path: *1 + path: + - "/var/log/icinga2/icinga2.log" + - "/var/log/icinga2/error.log" user_files: config: path: "$HOME/.icinga2/icinga2.conf" diff --git a/metadata.json b/metadata.json index 6ca28493..98797904 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "example42-tinydata", - "version": "0.7.0", + "version": "0.7.1", "author": "Alessandro Franceschi", "summary": "Tiny Puppet Data", "license": "Apache-2.0", From d7f3217bff7877ff9a4bcaa4d25060ebefc3d327 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:47:10 +0000 Subject: [PATCH 282/284] Bump tj-actions/changed-files from 34 to 41 in /.github/workflows Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 34 to 41. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v34...v41) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7eb90f81..18033aeb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -43,7 +43,7 @@ jobs: run: git config --global --add safe.directory /__w/tinydata/tinydata - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v34 + uses: tj-actions/changed-files@v41 - name: Run tp tests run: scripts/github_tp_test.sh "${{ steps.changed-files.outputs.all_changed_files }}" shell: 'script -q -e -c "bash {0}"' From f6c970b8c54ff8f3143efd7e3e34deddc85810f2 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 16 Feb 2024 21:57:55 +0100 Subject: [PATCH 283/284] Updates --- data/blender/default.yaml | 2 +- data/mgmt/default.yaml | 15 +++++++------ data/nats-server/default.yaml | 7 +++--- data/nuclei/default.yaml | 7 +++--- data/prometheus/default.yaml | 26 +++++++++++++---------- data/prometheus/osfamily/Debian.yaml | 7 ++++++ data/redis/osfamily/test.yaml | 2 +- data/reference/default.yaml | 2 +- data/reference/hiera.yaml | 8 +++---- data/sysdig/upstream/osfamily/Debian.yaml | 11 ++++++---- data/sysdig/upstream/osfamily/RedHat.yaml | 9 +++++--- 11 files changed, 58 insertions(+), 38 deletions(-) diff --git a/data/blender/default.yaml b/data/blender/default.yaml index 51e47a8f..0af189c9 100644 --- a/data/blender/default.yaml +++ b/data/blender/default.yaml @@ -60,7 +60,7 @@ blender::settings: latest_version_major: '3.4' destination: /usr/share/blender base_url: 'https://mirrors.dotsrc.org/blender/release/Blender$MAJVERSION/' - # Official base url has a intermediate page. A specific mirrot is used instead. + # Official base url has a intermediate page. A specific mirror is used instead. # base_url: 'https://www.blender.org/download/release/Blender$MAJVERSION/blender-$VERSION-$OS-$ARCH' file_name: 'blender-$VERSION-$OS-x64.tar.xz' extracted_dir: 'blender-$VERSION-$OS-x64' diff --git a/data/mgmt/default.yaml b/data/mgmt/default.yaml index 7df6ec7a..d8e1f998 100644 --- a/data/mgmt/default.yaml +++ b/data/mgmt/default.yaml @@ -10,7 +10,7 @@ mgmt::settings: description: 'Mgmt is a real-time automation tool.' # Configured: -package -source +release -image - install_method: 'release' + install_method: 'source' packages: main: @@ -82,6 +82,8 @@ mgmt::settings: tp::install: - golang execs: + - name: 'build deps' + command: 'make deps' - name: build command: 'make' setup: @@ -94,17 +96,16 @@ mgmt::settings: resources: {} manage_service: false manage_user: false - release: - latest_version: '0.0.21-1' + latest_version: '0.0.24' prerequisites: {} latest_url: ~ - base_url: 'https://github.com/purpleidea/mgmt/releases' - file_name: 'mgmt-$VERSION.$OS-$ARCH.tar.gz' - extracted_dir: 'mgmt-$VERSION.$OS-$ARCH' + base_url: 'https://github.com/purpleidea/mgmt/archive/refs/tags' + file_name: '$VERSION.tar.gz' + extracted_dir: 'mgmt-$VERSION' file_format: tar.gz setup: - enable: true + enable: false files: mgmt: path: '/usr/local/bin/mgmt' diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index 14ddd710..915cb852 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -16,9 +16,10 @@ nats-server::settings: description: 'NATS is an open-source, high-performance, cloud native messaging system.' docker_image: 'nats' docker_args: '' - website: 'https://nats.io' - issues: 'https://github.com/nats-io/nats-server/issues' - git_source: 'https://github.com/nats-io/nats-server' + urls: + website: 'https://nats.io' + issues: 'https://github.com/nats-io/nats-server/issues' + source: 'https://github.com/nats-io/nats-server' files: config: diff --git a/data/nuclei/default.yaml b/data/nuclei/default.yaml index 76b600c2..33211ce0 100644 --- a/data/nuclei/default.yaml +++ b/data/nuclei/default.yaml @@ -14,9 +14,10 @@ nuclei::settings: description: 'Fast and customizable vulnerability scanner based on simple YAML based DSL.' docker_image: 'projectdiscovery/nuclei' docker_args: '' - website: 'https://nuclei.projectdiscovery.io/' - issues: 'https://github.com/projectdiscovery/nuclei/issues' - git_source: 'https://github.com/projectdiscovery/nuclei' + urls: + website: 'https://nuclei.projectdiscovery.io/' + issues: 'https://github.com/projectdiscovery/nuclei/issues' + source: 'https://github.com/projectdiscovery/nuclei' files: config: diff --git a/data/prometheus/default.yaml b/data/prometheus/default.yaml index 8e10b076..b6eb9cdb 100644 --- a/data/prometheus/default.yaml +++ b/data/prometheus/default.yaml @@ -16,23 +16,24 @@ prometheus::settings: config_file_format: yaml # validate_cmd: 'prometheus validate' pid_file_path: '' - init_file_path: '/etc/sysconfig/prometheus.conf' + init_file_path: '/etc/sysconfig/prometheus' config_dir_path: '/etc/prometheus' # tp 4 settings install_method: 'release' description: 'The Prometheus monitoring system and time series database' - website: 'https://prometheus.io/' - issues: 'https://github.com/prometheus/prometheus/issues' - git_source: 'https://github.com/prometheus/prometheus' + urls: + website: 'https://prometheus.io/' + issues: 'https://github.com/prometheus/prometheus/issues' + source: 'https://github.com/prometheus/prometheus' files: config: path: '/etc/prometheus/prometheus.yml' format: yaml init: - path: '/etc/sysconfig/prometheus.conf' + path: '/etc/sysconfig/prometheus' format: inifile systemd: path: '/etc/systemd/system/prometheus.service' @@ -43,7 +44,7 @@ prometheus::settings: path: '/etc/prometheus' rules: path: '/etc/prometheus/rules' - rules.d: + 'rules.d': path: '/etc/prometheus/rules.d' files_sd: path: /etc/prometheus/files_sd @@ -83,14 +84,14 @@ prometheus::settings: description: 'Instance to start' options: config_file: - default: 'prometheus.conf' + default: 'prometheus.yml' value: String description: 'Config file to use' restart: command: 'prometheus restart' release: - latest_version: '2.41.0' + latest_version: '2.49.1' prerequisites: {} base_url: 'https://github.com/prometheus/prometheus/releases/download/v$VERSION' file_name: 'prometheus-$VERSION.$OS-$ARCH.tar.gz' @@ -107,14 +108,17 @@ prometheus::settings: systemd_options: {} setup: - enable: false + enable: true + manage_user: true files: prometheus: path: '/usr/local/bin/prometheus' mode: '0755' + overwrite: true promtool: path: '/usr/local/bin/promtool' mode: '0755' + overwrite: true prometheus.yml: path: '/etc/prometheus/prometheus.yml' mode: '0644' @@ -130,8 +134,8 @@ prometheus::settings: owner: prometheus exec: prometheus_init_config: - command: 'touch /etc/sysconfig/prometheus.conf' - creates: '/etc/sysconfig/prometheus.conf' + command: 'touch /etc/sysconfig/prometheus' + creates: '/etc/sysconfig/prometheus' systemd_options: Service: ExecStart: '/usr/local/bin/prometheus --config.file /etc/prometheus/prometheus.yml' diff --git a/data/prometheus/osfamily/Debian.yaml b/data/prometheus/osfamily/Debian.yaml index 55988237..0a102727 100644 --- a/data/prometheus/osfamily/Debian.yaml +++ b/data/prometheus/osfamily/Debian.yaml @@ -6,3 +6,10 @@ prometheus::settings: files: init: path: '/etc/default/prometheus' + + setup: + resources: + exec: + prometheus_init_config: + command: 'touch /etc/default/prometheus' + creates: '/etc/default/prometheus' \ No newline at end of file diff --git a/data/redis/osfamily/test.yaml b/data/redis/osfamily/test.yaml index d46fd364..2cfdb54b 100644 --- a/data/redis/osfamily/test.yaml +++ b/data/redis/osfamily/test.yaml @@ -14,4 +14,4 @@ redis::settings: config_dir_path: '/etc/redis-test' config_dir_owner: 'test' config_dir_group: 'test' - config_dir_mode: '0755' + config_dir_mode: '0644' diff --git a/data/reference/default.yaml b/data/reference/default.yaml index a9af6a33..110d09b6 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -225,7 +225,7 @@ reference::settings: # The mode of the config directory # v3 format. v4 equivalent is dirs.config.mode - config_dir_mode: '0755' + config_dir_mode: '0644' # If to purge the config directory or not. This is the default value used by the tp::dir define. # v3 format. v4 equivalent is dirs.config.purge diff --git a/data/reference/hiera.yaml b/data/reference/hiera.yaml index 77ac7154..2dc35e3d 100644 --- a/data/reference/hiera.yaml +++ b/data/reference/hiera.yaml @@ -4,10 +4,10 @@ # This file is actually used by the tp_lookup function and has the following # limitation: # Variables interpolation is done ONLY for the following variables: -# - Fact $::operatingsystemmajrelease -# - Fact $::operatingsystemrelease -# - Fact $::operatingsystem -# - Fact $::osfamily +# - Fact $::os['release']['major'] +# - Fact $::os['release']['full'] +# - Fact $::os['name'] +# - Fact $::os['family'] # - Argument $repo of the tp::install define (defaults to 'upstream' is upstream_repo is true) # - $title of the tp::install (or other tp::*) define diff --git a/data/sysdig/upstream/osfamily/Debian.yaml b/data/sysdig/upstream/osfamily/Debian.yaml index fa553af8..1a25b393 100644 --- a/data/sysdig/upstream/osfamily/Debian.yaml +++ b/data/sysdig/upstream/osfamily/Debian.yaml @@ -1,6 +1,9 @@ --- sysdig::settings: - repo_url: 'http://download.draios.com/stable/deb' - key: 'D27A 72F3 2D86 7DF9 300A 2415 7449 0FD6 EC51 E8C4' - key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' - apt_release: 'stable-$(ARCH)/' +# repo_url: 'http://download.draios.com/stable/deb' +# key: 'D27A 72F3 2D86 7DF9 300A 2415 7449 0FD6 EC51 E8C4' +# key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' +# apt_release: 'stable-$(ARCH)/' + repo_file_url: 'https://download.sysdig.com/stable/deb/draios.list' + repo_file_name: 'draios.list' + diff --git a/data/sysdig/upstream/osfamily/RedHat.yaml b/data/sysdig/upstream/osfamily/RedHat.yaml index 85cccdc5..5a07b5a2 100644 --- a/data/sysdig/upstream/osfamily/RedHat.yaml +++ b/data/sysdig/upstream/osfamily/RedHat.yaml @@ -1,7 +1,10 @@ --- sysdig::settings: - repo_url: 'http://download.draios.com/stable/rpm/$basearch' - key: 'F1C3BD80' - key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' +# repo_url: 'http://download.draios.com/stable/rpm/$basearch' +# key: 'F1C3BD80' +# key_url: 'https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public' tp_prerequisites: - dkms + - epel + repo_file_url: 'https://download.sysdig.com/stable/rpm/draios.repo' + repo_file_name: 'draios.repo' From 87730d6fff842efe294fb8f4ee52611cb7d5689b Mon Sep 17 00:00:00 2001 From: CV Date: Mon, 26 Feb 2024 10:29:21 +0100 Subject: [PATCH 284/284] squid with debian 12 has now a conf.d dir squid in Debian Bookworm (12) has now a conf.d directory. --- data/squid/default.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/squid/default.yaml b/data/squid/default.yaml index 863afa4b..ec7f8815 100644 --- a/data/squid/default.yaml +++ b/data/squid/default.yaml @@ -4,6 +4,7 @@ squid::settings: service_name: 'squid' config_file_path: '/etc/squid/squid.conf' config_dir_path: '/etc/squid' + conf_dir_path: '/etc/squid/conf.d' pid_file_path: '/var/run/squid.pid' process_name: 'squid' process_user: 'squid'