From d2cb5d9c0f06f9466a2c2dc2e0097088ca5afd4a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 16 Feb 2024 21:57:55 +0100 Subject: [PATCH 01/17] 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 c5bca676969e3f3b1cf03471fe43b5f1471be332 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 23 Feb 2024 18:58:47 +0100 Subject: [PATCH 02/17] Fixed microsoft_repo hiera --- data/microsoft_repo/hiera.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/microsoft_repo/hiera.yaml b/data/microsoft_repo/hiera.yaml index 28dbb017..ad8c1d7c 100644 --- a/data/microsoft_repo/hiera.yaml +++ b/data/microsoft_repo/hiera.yaml @@ -3,6 +3,7 @@ - "%{title}/upstream/operatingsystem/%{operatingsystem}%{operatingsystemmajrelease}" - "%{title}/upstream/operatingsystem/%{operatingsystem}" - "%{title}/upstream/osfamily/%{operatingsystem}" + - "%{title}/upstream/osfamily/%{osfamily}%{operatingsystemmajrelease}" - "%{title}/upstream/osfamily/%{osfamily}" - "%{title}/upstream/default" - "%{title}/osfamily/%{osfamily}" From ec7912930d28ea6b2305baf45bc4e49f09252c76 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 23 Feb 2024 21:19:58 +0100 Subject: [PATCH 03/17] Updated convert script --- scripts/convert_v3_to_v4.rb | 176 ++++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 79 deletions(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 6d6c54fb..b42dd308 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -12,121 +12,139 @@ # 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 +output_file_path = ARGV[1] || "#{file_path}.v4" # Load the original yaml file original_config = YAML.load_file(file_path) +new_config = {} + # 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 +package_name = original_config[settings_key]['package_name'] if original_config.dig(settings_key, 'package_name') +new_config["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"][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"][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"][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"][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"][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"][service_name]["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 +# Service +service_name = original_config[settings_key]['service_name'] if original_config.dig(settings_key, 'service_name') +process_name = original_config[settings_key]['process_name'] if original_config.dig(settings_key, 'process_name') +process_extra_name = original_config[settings_key]['process_extra_name'] if original_config.dig(settings_key, 'process_extra_name') +process_user = original_config[settings_key]['process_user'] if original_config.dig(settings_key, 'process_user') +process_group = original_config[settings_key]['process_group'] if original_config.dig(settings_key, 'process_group') +nodaemon_args = original_config[settings_key]['nodaemon_args'] if original_config.dig(settings_key, 'nodaemon_args') + +new_config["services"] = { service_name => {} } if service_name or process_name or process_extra_name or process_user or process_group or nodaemon_args +new_config["services"][service_name]["process_name"] = process_name if process_name +new_config["services"][service_name]["process_extra_name"] = process_extra_name if process_extra_name +new_config["services"][service_name]["process_user"] = process_user if process_user +new_config["services"][service_name]["process_group"] = process_user if process_group +new_config["services"][service_name]["nodaemon_args"] = nodaemon_args if nodaemon_args + + +# Files +config_file_path = original_config[settings_key]['config_file_path'] if original_config.dig(settings_key, 'config_file_path') +config_file_format = original_config[settings_key]['config_file_format'] if original_config.dig(settings_key, 'config_file_format') +log_file_path = original_config[settings_key]['log_file_path'] if original_config.dig(settings_key, 'log_file_path') +init_file_path = original_config[settings_key]['init_file_path'] if original_config.dig(settings_key, 'init_file_path') + +new_config["files"] ||= {} if config_file_path or config_file_format or log_file_path or init_file_path + +new_config["files"] = {"config" => {"path" => config_file_path}} if config_file_path +new_config["user_files"] = {"config" => {"path" => config_file_path.gsub('/etc/','$HOME/.') }} if config_file_path + +new_config["files"]["config"] ||= {} if config_file_format +new_config["files"]["config"]["format"] = config_file_format if config_file_format + +new_config["files"]["log"] ||= {} if log_file_path +new_config["files"]["log"] = { "path" => log_file_path } if log_file_path + +new_config["files"]["init"] ||= {} if init_file_path +new_config["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 +config_dir_path = original_config[settings_key]['config_dir_path'] if original_config.dig(settings_key, 'config_dir_path') +new_config["dirs"] = {"config" => {"path" => config_dir_path}} if config_dir_path +new_config["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 +conf_dir_path = original_config[settings_key]['conf_dir_path'] if original_config.dig(settings_key, 'conf_dir_path') +new_config["dirs"] ||= {} if conf_dir_path +new_config["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 +log_dir_path = original_config[settings_key]['log_dir_path'] if original_config.dig(settings_key, 'log_dir_path') +new_config["dirs"] ||= {} if log_dir_path +new_config["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 +home_dir_path = original_config[settings_key]['home_dir_path'] if original_config.dig(settings_key, 'home_dir_path') +new_config["dirs"] ||= {} if home_dir_path +new_config["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 +data_dir_path = original_config[settings_key]['data_dir_path'] if original_config.dig(settings_key, 'data_dir_path') +new_config["dirs"] ||= {} if data_dir_path +new_config["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 +ssl_dir_path = original_config[settings_key]['ssl_dir_path'] if original_config.dig(settings_key, 'ssl_dir_path') +new_config["dirs"] ||= {} if ssl_dir_path +new_config["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 +tcp_port = original_config[settings_key]['tcp_port'] if original_config.dig(settings_key, 'tcp_port') +new_config["ports"] ||= {} if tcp_port +new_config["ports"]["main"] = {"port" => tcp_port , "protocol" => "tcp" } 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 +udp_port = original_config[settings_key]['udp_port'] if original_config.dig(settings_key, 'udp_port') +new_config["ports"] ||= {} if udp_port +new_config["ports"]["main_udp"] = {"port" => udp_port , "protocol" => "udp" } 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 +website_url = original_config[settings_key]['website_url'] if original_config.dig(settings_key, 'website_url') +new_config["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 +git_source = original_config[settings_key]['git_source'] if original_config.dig(settings_key, 'git_source') +new_config["urls"] ||= {} if git_source +new_config["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 +docker_image = original_config[settings_key]['docker_image'] if original_config.dig(settings_key, 'docker_image') +dockerfile_prerequisites = original_config[settings_key]['dockerfile_prerequisites'] if original_config.dig(settings_key, 'dockerfile_prerequisites') + +new_config["image"] ||= {} if docker_image or dockerfile_prerequisites +new_config["image"]["name"] = docker_image if docker_image +new_config["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 +upstream_repo = original_config[settings_key]['upstream_repo'] if original_config.dig(settings_key, 'upstream_repo') +new_config["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 +tp_prerequisites = original_config[settings_key]['tp_prerequisites'] if original_config.dig(settings_key, 'tp_prerequisites') +new_config["preinstall"] ||= {} if tp_prerequisites +new_config["preinstall"]['tp::install'] = tp_prerequisites if tp_prerequisites +exec_prerequisites = original_config[settings_key]['exec_prerequisites'] if original_config.dig(settings_key, 'exec_prerequisites') +new_config["preinstall"] ||= {} if exec_prerequisites +new_config["preinstall"]['exec'] = exec_prerequisites if exec_prerequisites +package_prerequisites = original_config[settings_key]['package_prerequisites'] if original_config.dig(settings_key, 'package_prerequisites') +new_config["preinstall"] ||= {} if package_prerequisites +new_config["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 +exec_postinstall = original_config[settings_key]['exec_postinstall'] if original_config.dig(settings_key, 'exec_postinstall') +new_config["postinstall"] = { 'exec' => exec_postinstall } if exec_postinstall +extra_postinstall = original_config[settings_key]['extra_postinstall'] if original_config.dig(settings_key, 'extra_postinstall') +new_config["postinstall"] = { 'extra' => extra_postinstall } if extra_postinstall # Convert the config to a hash -original_config = original_config.to_hash +original_output = original_config.to_hash +new_output = new_config.to_hash.to_yaml -# Convert the config to a yaml string -original_config = original_config.to_yaml +new_output.gsub!(/^---\n/, '') +new_output.gsub!(/^/, ' ') # Write the merged config to output file -File.open(output_file_path, 'w') { |file| file.write(original_config.to_yaml) } +File.open(output_file_path, 'w') { |file| file.write(original_output.to_yaml) } +File.open(output_file_path, 'a') { |file| file.write("\n# Version 4 format\n") } +File.open(output_file_path, 'a') { |file| file.write(new_output) } From 493497d37d2a806f99b2d5d0c74652072272b1f7 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 23 Feb 2024 21:28:22 +0100 Subject: [PATCH 04/17] Work on same file --- 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 b42dd308..adabed48 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -12,7 +12,7 @@ # 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}.v4" +output_file_path = ARGV[1] || "#{file_path}" # Load the original yaml file original_config = YAML.load_file(file_path) @@ -145,6 +145,6 @@ new_output.gsub!(/^/, ' ') # Write the merged config to output file -File.open(output_file_path, 'w') { |file| file.write(original_output.to_yaml) } +# File.open(output_file_path, 'w') { |file| file.write(original_output.to_yaml) } File.open(output_file_path, 'a') { |file| file.write("\n# Version 4 format\n") } File.open(output_file_path, 'a') { |file| file.write(new_output) } From 80270287afd1f573cac92c2f4fdc8a7d1283f004 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 23 Feb 2024 21:42:58 +0100 Subject: [PATCH 05/17] Do not add data if there's no new data --- scripts/convert_v3_to_v4.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index adabed48..63248eeb 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -146,5 +146,7 @@ # Write the merged config to output file # File.open(output_file_path, 'w') { |file| file.write(original_output.to_yaml) } -File.open(output_file_path, 'a') { |file| file.write("\n# Version 4 format\n") } -File.open(output_file_path, 'a') { |file| file.write(new_output) } +if new_config != {} + File.open(output_file_path, 'a') { |file| file.write("\n# Version 4 format\n") } + File.open(output_file_path, 'a') { |file| file.write(new_output) } +end From ec8b491d8c5c2150584f78c65a77bdf27477887b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 23 Feb 2024 21:44:25 +0100 Subject: [PATCH 06/17] Add string when no data to add --- scripts/convert_v3_to_v4.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 63248eeb..d26fb630 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -149,4 +149,6 @@ if new_config != {} File.open(output_file_path, 'a') { |file| file.write("\n# Version 4 format\n") } File.open(output_file_path, 'a') { |file| file.write(new_output) } +else + File.open(output_file_path, 'a') { |file| file.write("\n# No data to convert to Version 4 format\n") } end From 5ffb439928192ee43e2c74324634724fa39d753e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Feb 2024 15:31:40 +0100 Subject: [PATCH 07/17] Updated convert script --- scripts/convert_v3_to_v4.rb | 75 +++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 8 deletions(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index d26fb630..1c6d1c81 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -22,12 +22,13 @@ # 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 package_name = original_config[settings_key]['package_name'] if original_config.dig(settings_key, 'package_name') +package_provider = original_config[settings_key]['package_provider'] if original_config.dig(settings_key, 'package_provider') + +new_config["packages"] = { "main" => {} } if package_name or package_provider new_config["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 +new_config["packages"]["main"]["provider"] = package_provider if package_provider # Service service_name = original_config[settings_key]['service_name'] if original_config.dig(settings_key, 'service_name') @@ -65,7 +66,7 @@ new_config["files"]["init"] ||= {} if init_file_path new_config["files"]["init"] = { "path" => init_file_path } if init_file_path -# Get the config_dir_path from the original config +# Dirs config_dir_path = original_config[settings_key]['config_dir_path'] if original_config.dig(settings_key, 'config_dir_path') new_config["dirs"] = {"config" => {"path" => config_dir_path}} if config_dir_path new_config["user_dirs"] = {"config" => {"path" => config_dir_path.gsub('/etc/','$HOME/.') }} if config_dir_path @@ -90,7 +91,7 @@ new_config["dirs"] ||= {} if ssl_dir_path new_config["dirs"]["ssl"] = {"path" => ssl_dir_path} if ssl_dir_path -# Get the tcp port from the original config +# Ports tcp_port = original_config[settings_key]['tcp_port'] if original_config.dig(settings_key, 'tcp_port') new_config["ports"] ||= {} if tcp_port new_config["ports"]["main"] = {"port" => tcp_port , "protocol" => "tcp" } if tcp_port @@ -99,7 +100,7 @@ new_config["ports"] ||= {} if udp_port new_config["ports"]["main_udp"] = {"port" => udp_port , "protocol" => "udp" } if udp_port -# Get the website_url from the original config +# Urls website_url = original_config[settings_key]['website_url'] if original_config.dig(settings_key, 'website_url') new_config["urls"] = {"website" => website_url } if website_url # Get the git_source from the original config @@ -115,10 +116,68 @@ new_config["image"]["name"] = docker_image if docker_image new_config["image"]["dockerfile_prerequisites"] = dockerfile_prerequisites if dockerfile_prerequisites -# Convert upstream_repo to repo = upstream +# Repo upstream_repo = original_config[settings_key]['upstream_repo'] if original_config.dig(settings_key, 'upstream_repo') new_config["repo"] = 'upstream' if upstream_repo == true + +repo_url = original_config[settings_key]['repo_url'] if original_config.dig(settings_key, 'repo_url') +repo_package_name = original_config[settings_key]['repo_package_name'] if original_config.dig(settings_key, 'repo_package_name') +repo_package_url = original_config[settings_key]['repo_package_url'] if original_config.dig(settings_key, 'repo_package_url') +repo_package_provider = original_config[settings_key]['repo_package_provider'] if original_config.dig(settings_key, 'repo_package_provider') +repo_package_params = original_config[settings_key]['repo_package_params'] if original_config.dig(settings_key, 'repo_package_params') +repo_file_url = original_config[settings_key]['repo_file_url'] if original_config.dig(settings_key, 'repo_file_url') +repo_url = original_config[settings_key]['repo_url'] if original_config.dig(settings_key, 'repo_url') +repo_name = original_config[settings_key]['repo_name'] if original_config.dig(settings_key, 'repo_name') +repo_description = original_config[settings_key]['repo_description'] if original_config.dig(settings_key, 'repo_description') +repo_filename = original_config[settings_key]['repo_filename'] if original_config.dig(settings_key, 'repo_filename') +key = original_config[settings_key]['key'] if original_config.dig(settings_key, 'key') +key_url = original_config[settings_key]['key_url'] if original_config.dig(settings_key, 'key_url') +include_src = original_config[settings_key]['include_src'] if original_config.dig(settings_key, 'include_src') +yumrepo_params = original_config[settings_key]['yumrepo_params'] if original_config.dig(settings_key, 'yumrepo_params') + +apt_repos = original_config[settings_key]['apt_repos'] if original_config.dig(settings_key, 'apt_repos') +apt_key_server = original_config[settings_key]['apt_key_server'] if original_config.dig(settings_key, 'apt_key_server') +apt_key_fingerprint = original_config[settings_key]['apt_key_fingerprint'] if original_config.dig(settings_key, 'apt_key_fingerprint') +apt_release = original_config[settings_key]['apt_release'] if original_config.dig(settings_key, 'apt_release') +apt_pin = original_config[settings_key]['apt_pin'] if original_config.dig(settings_key, 'apt_pin') +yum_priority = original_config[settings_key]['yum_priority'] if original_config.dig(settings_key, 'yum_priority') +yum_mirrorlist = original_config[settings_key]['yum_mirrorlist'] if original_config.dig(settings_key, 'yum_mirrorlist') +zypper_repofile_url = original_config[settings_key]['zypper_repofile_url'] if original_config.dig(settings_key, 'zypper_repofile_url') +brew_tap = original_config[settings_key]['brew_tap'] if original_config.dig(settings_key, 'brew_tap') + +new_config["repo"] ||= { "upstream" => {}} if repo_url or repo_package_name or repo_package_url or repo_package_provider or repo_package_params or repo_file_url or repo_url or repo_name or repo_description or repo_filename or key or key_url or include_src or yumrepo_params or apt_repos or apt_key_server or apt_key_fingerprint or apt_release or apt_pin or yum_priority or yum_mirrorlist or zypper_repofile_url or brew_tap +new_config["repo"]["upstream"]["package_name"] = repo_package_name if repo_package_name +new_config["repo"]["upstream"]["package_url"] = repo_package_url if repo_package_url +new_config["repo"]["upstream"]["package_provider"] = repo_package_provider if repo_package_provider +new_config["repo"]["upstream"]["package_params"] = repo_package_params if repo_package_params +new_config["repo"]["upstream"]["repofile_url"] = repo_file_url if repo_file_url +new_config["repo"]["upstream"]["url"] = repo_url if repo_url +new_config["repo"]["upstream"]["name"] = repo_name if repo_name +new_config["repo"]["upstream"]["description"] = repo_description if repo_description +new_config["repo"]["upstream"]["repofile_name"] = repo_filename if repo_filename +new_config["repo"]["upstream"]["key"] = key if key +new_config["repo"]["upstream"]["key_url"] = key_url if key_url + +new_config["repo"]["upstream"]["yum"] ||= {} if yumrepo_params or yum_priority or yum_mirrorlist or repo_url or key +new_config["repo"]["upstream"]["yum"]["baseurl"] = repo_url if repo_url +new_config["repo"]["upstream"]["yum"]["gpgcheck"] = true if key +new_config["repo"]["upstream"]["yum"]["gpgkey"] = key if key +new_config["repo"]["upstream"]["yum"]["params"] = yumrepo_params if yumrepo_params +new_config["repo"]["upstream"]["yum"]["priority"] = yum_priority if yum_priority +new_config["repo"]["upstream"]["yum"]["mirrorlist"] = yum_mirrorlist if yum_mirrorlist + +new_config["repo"]["upstream"]["apt"] ||= {} if include_src or apt_key_server or apt_key_fingerprint or apt_release or apt_pin +new_config["repo"]["upstream"]["apt"]["include_src"] = include_src if include_src +new_config["repo"]["upstream"]["apt"]["key_server"] = apt_key_server if apt_key_server +new_config["repo"]["upstream"]["apt"]["key_fingerprint"] = apt_key_fingerprint if apt_key_fingerprint +new_config["repo"]["upstream"]["apt"]["release"] = apt_release if apt_release +new_config["repo"]["upstream"]["apt"]["pin"] = apt_pin if apt_pin + +new_config["repo"]["upstream"]["zypper_repofile_url"] = zypper_repofile_url if zypper_repofile_url +new_config["repo"]["upstream"]["brew_tap"] = brew_tap if brew_tap + + # Convert prerequisites tp_prerequisites = original_config[settings_key]['tp_prerequisites'] if original_config.dig(settings_key, 'tp_prerequisites') new_config["preinstall"] ||= {} if tp_prerequisites From 134995d397de50556dee18d0af731337c70fdb1c Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Feb 2024 17:16:40 +0100 Subject: [PATCH 08/17] Fixed settings --- data/ddclient/osfamily/RedHat.yaml | 3 ++- data/kedro/default.yaml | 2 +- data/keras/default.yaml | 2 +- data/metaflow/default.yaml | 2 +- data/mlrun/default.yaml | 2 +- data/openjdk-jdk/default.yaml | 2 +- data/pytorch/default.yaml | 2 +- data/rundeck/osfamily/Debian.yaml | 2 +- data/scikit-learn/default.yaml | 2 +- data/scikit-learn/osfamily/Debian.yaml | 2 +- data/scikit-learn/osfamily/RedHat.yaml | 2 +- data/tensorflow/default.yaml | 2 +- data/zenml/default.yaml | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/data/ddclient/osfamily/RedHat.yaml b/data/ddclient/osfamily/RedHat.yaml index 4d8fab6f..35fd64a5 100644 --- a/data/ddclient/osfamily/RedHat.yaml +++ b/data/ddclient/osfamily/RedHat.yaml @@ -1,3 +1,4 @@ --- -init_file_path: '/etc/sysconfig/ddclient' +ddclient::settings: + init_file_path: '/etc/sysconfig/ddclient' diff --git a/data/kedro/default.yaml b/data/kedro/default.yaml index cb305b04..668367f8 100644 --- a/data/kedro/default.yaml +++ b/data/kedro/default.yaml @@ -1,4 +1,4 @@ --- -kedro: +kedro::settings: package_name: kedro package_provider: 'pip' diff --git a/data/keras/default.yaml b/data/keras/default.yaml index e35d94de..90793e21 100644 --- a/data/keras/default.yaml +++ b/data/keras/default.yaml @@ -1,5 +1,5 @@ --- -keras: +keras::settings: package_name: keras package_provider: 'pip' diff --git a/data/metaflow/default.yaml b/data/metaflow/default.yaml index 25a909ae..f0bd0736 100644 --- a/data/metaflow/default.yaml +++ b/data/metaflow/default.yaml @@ -1,5 +1,5 @@ --- -metaflow: +metaflow ::settings: package_name: metaflow package_provider: 'pip' diff --git a/data/mlrun/default.yaml b/data/mlrun/default.yaml index 16e4bff1..e81bc396 100644 --- a/data/mlrun/default.yaml +++ b/data/mlrun/default.yaml @@ -1,5 +1,5 @@ --- -mlrun: +mlrun::settings: package_name: mlrun package_provider: 'pip' diff --git a/data/openjdk-jdk/default.yaml b/data/openjdk-jdk/default.yaml index 73a13816..cf92b3a0 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/pytorch/default.yaml b/data/pytorch/default.yaml index 883b285f..8528b2bd 100644 --- a/data/pytorch/default.yaml +++ b/data/pytorch/default.yaml @@ -1,5 +1,5 @@ --- -pytorch: +pytorch::settings: package_name: - 'torch' - 'torchvision' diff --git a/data/rundeck/osfamily/Debian.yaml b/data/rundeck/osfamily/Debian.yaml index bb76d39b..d1c4cd6f 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/scikit-learn/default.yaml b/data/scikit-learn/default.yaml index 90517c3d..779c5fe7 100644 --- a/data/scikit-learn/default.yaml +++ b/data/scikit-learn/default.yaml @@ -1,4 +1,4 @@ --- -scikit-learn: +scikit-learn::settings: package_name: 'scikit-learn' package_provider: 'pip' diff --git a/data/scikit-learn/osfamily/Debian.yaml b/data/scikit-learn/osfamily/Debian.yaml index c2fa007f..e6cafe1a 100644 --- a/data/scikit-learn/osfamily/Debian.yaml +++ b/data/scikit-learn/osfamily/Debian.yaml @@ -1,5 +1,5 @@ --- -scikit-learn: +scikit-learn::settings: package_name: - 'python3-sklearn' - 'python3-sklearn-lib' diff --git a/data/scikit-learn/osfamily/RedHat.yaml b/data/scikit-learn/osfamily/RedHat.yaml index 0bef5ae6..51a96080 100644 --- a/data/scikit-learn/osfamily/RedHat.yaml +++ b/data/scikit-learn/osfamily/RedHat.yaml @@ -1,4 +1,4 @@ --- -scikit-learn: +scikit-learn::settings: package_name: python3-scikit-learn package_provider: 'yum' diff --git a/data/tensorflow/default.yaml b/data/tensorflow/default.yaml index e2ca68f0..5123013f 100644 --- a/data/tensorflow/default.yaml +++ b/data/tensorflow/default.yaml @@ -1,5 +1,5 @@ --- -tensorflow: +tensorflow::settings: package_name: tensorflow package_provider: 'pip' diff --git a/data/zenml/default.yaml b/data/zenml/default.yaml index 80454417..0180d7fa 100644 --- a/data/zenml/default.yaml +++ b/data/zenml/default.yaml @@ -1,5 +1,5 @@ --- -zenml: +zenml::settings: package_name: zenml package_provider: 'pip' From c012773c2a0a7e8f4041bf9d9a13362b42854e86 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Feb 2024 17:23:12 +0100 Subject: [PATCH 09/17] Updated script --- data/reference/default.yaml | 2 ++ scripts/convert_v3_to_v4.rb | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/reference/default.yaml b/data/reference/default.yaml index 110d09b6..ca71e8ec 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -449,6 +449,8 @@ reference::settings: name: ~ winget: name: ~ + brew: + name: ~ # Examples of other packages client: name: reference-client diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 1c6d1c81..26246295 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -25,10 +25,13 @@ # Package package_name = original_config[settings_key]['package_name'] if original_config.dig(settings_key, 'package_name') package_provider = original_config[settings_key]['package_provider'] if original_config.dig(settings_key, 'package_provider') +brew_package_name = original_config[settings_key]['brew_package_name'] if original_config.dig(settings_key, 'brew_package_name') -new_config["packages"] = { "main" => {} } if package_name or package_provider +new_config["packages"] = { "main" => {} } if package_name or package_provider or brew_package_name new_config["packages"] = {"main" => {"name" => package_name}} if package_name new_config["packages"]["main"]["provider"] = package_provider if package_provider +new_config["packages"]["main"]["providers"] = { "brew" => { "name" => brew_package_name } } if brew_package_name + # Service service_name = original_config[settings_key]['service_name'] if original_config.dig(settings_key, 'service_name') From 574cec024de91fea6fafd3a73578be1f33446aa8 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Feb 2024 17:28:47 +0100 Subject: [PATCH 10/17] Updated script --- scripts/convert_v3_to_v4.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 26246295..4f6a38c3 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -26,12 +26,18 @@ package_name = original_config[settings_key]['package_name'] if original_config.dig(settings_key, 'package_name') package_provider = original_config[settings_key]['package_provider'] if original_config.dig(settings_key, 'package_provider') brew_package_name = original_config[settings_key]['brew_package_name'] if original_config.dig(settings_key, 'brew_package_name') +winget_package_name = original_config[settings_key]['winget_package_name'] if original_config.dig(settings_key, 'winget_package_name') +choco_package_name = original_config[settings_key]['choco_package_name'] if original_config.dig(settings_key, 'choco_package_name') -new_config["packages"] = { "main" => {} } if package_name or package_provider or brew_package_name +new_config["packages"] = { "main" => {} } if package_name or package_provider or brew_package_name or winget_package_name or choco_package_name new_config["packages"] = {"main" => {"name" => package_name}} if package_name new_config["packages"]["main"]["provider"] = package_provider if package_provider -new_config["packages"]["main"]["providers"] = { "brew" => { "name" => brew_package_name } } if brew_package_name - +new_config["packages"]["main"]["providers"]["brew"] ||= {} if brew_package_name +new_config["packages"]["main"]["providers"]["brew"] = { "name" => brew_package_name } if brew_package_name +new_config["packages"]["main"]["providers"]["winget"] ||= {} if winget_package_name +new_config["packages"]["main"]["providers"]["winget"] = { "name" => winget_package_name } if winget_package_name +new_config["packages"]["main"]["providers"]["choco"] ||= {} if choco_package_name +new_config["packages"]["main"]["providers"]["choco"] = { "name" => choco_package_name } if choco_package_name # Service service_name = original_config[settings_key]['service_name'] if original_config.dig(settings_key, 'service_name') From 7b152c3387ffc43abbd07641431b1b179aa8660a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Feb 2024 17:32:55 +0100 Subject: [PATCH 11/17] Updated script --- scripts/convert_v3_to_v4.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 4f6a38c3..b337a99e 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -169,7 +169,6 @@ new_config["repo"]["upstream"]["key_url"] = key_url if key_url new_config["repo"]["upstream"]["yum"] ||= {} if yumrepo_params or yum_priority or yum_mirrorlist or repo_url or key -new_config["repo"]["upstream"]["yum"]["baseurl"] = repo_url if repo_url new_config["repo"]["upstream"]["yum"]["gpgcheck"] = true if key new_config["repo"]["upstream"]["yum"]["gpgkey"] = key if key new_config["repo"]["upstream"]["yum"]["params"] = yumrepo_params if yumrepo_params From 740903979ca587fd2ff2ac9bac7cb4502b6deb77 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Feb 2024 17:35:34 +0100 Subject: [PATCH 12/17] Up --- scripts/convert_v3_to_v4.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index b337a99e..3bcecc24 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -31,7 +31,7 @@ new_config["packages"] = { "main" => {} } if package_name or package_provider or brew_package_name or winget_package_name or choco_package_name new_config["packages"] = {"main" => {"name" => package_name}} if package_name -new_config["packages"]["main"]["provider"] = package_provider if package_provider +new_config["packages"]["main"]["provider"] = package_provider if package_provider or brew_package_name or winget_package_name or choco_package_name new_config["packages"]["main"]["providers"]["brew"] ||= {} if brew_package_name new_config["packages"]["main"]["providers"]["brew"] = { "name" => brew_package_name } if brew_package_name new_config["packages"]["main"]["providers"]["winget"] ||= {} if winget_package_name From f46d21f6be55130aa8c63e67e8fa00fd5d8d300a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Feb 2024 17:51:39 +0100 Subject: [PATCH 13/17] Fixes --- data/jupyterlab/default.yaml | 4 +++- data/mlflow/default.yaml | 4 +++- data/notebook/default.yaml | 4 +++- scripts/convert_v3_to_v4.rb | 19 ++++++++++++++----- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/data/jupyterlab/default.yaml b/data/jupyterlab/default.yaml index 16469305..88547a6c 100644 --- a/data/jupyterlab/default.yaml +++ b/data/jupyterlab/default.yaml @@ -1,5 +1,7 @@ --- -jupyterlab: +jupyterlab::settings: package_name: jupyterlab package_provider: 'pip' + +# No data to convert to Version 4 format diff --git a/data/mlflow/default.yaml b/data/mlflow/default.yaml index 476e961d..a7e21523 100644 --- a/data/mlflow/default.yaml +++ b/data/mlflow/default.yaml @@ -1,5 +1,7 @@ --- -mlflow: +mlflow::settings: package_name: mlflow package_provider: 'pip' + +# No data to convert to Version 4 format diff --git a/data/notebook/default.yaml b/data/notebook/default.yaml index 5dbda45c..5da73fca 100644 --- a/data/notebook/default.yaml +++ b/data/notebook/default.yaml @@ -1,5 +1,7 @@ --- -notebook: +notebook::settings: package_name: notebook package_provider: 'pip' + +# No data to convert to Version 4 format diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 3bcecc24..251e3ecf 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -25,19 +25,24 @@ # Package package_name = original_config[settings_key]['package_name'] if original_config.dig(settings_key, 'package_name') package_provider = original_config[settings_key]['package_provider'] if original_config.dig(settings_key, 'package_provider') +package_source = original_config[settings_key]['package_source'] if original_config.dig(settings_key, 'package_source') brew_package_name = original_config[settings_key]['brew_package_name'] if original_config.dig(settings_key, 'brew_package_name') winget_package_name = original_config[settings_key]['winget_package_name'] if original_config.dig(settings_key, 'winget_package_name') choco_package_name = original_config[settings_key]['choco_package_name'] if original_config.dig(settings_key, 'choco_package_name') -new_config["packages"] = { "main" => {} } if package_name or package_provider or brew_package_name or winget_package_name or choco_package_name +new_config["packages"] = { "main" => {} } if package_name or package_provider or brew_package_name or winget_package_name or choco_package_name or snap_package_name or package_source new_config["packages"] = {"main" => {"name" => package_name}} if package_name -new_config["packages"]["main"]["provider"] = package_provider if package_provider or brew_package_name or winget_package_name or choco_package_name +new_config["packages"]["main"]["provider"] = package_provider if package_provider +new_config["packages"]["main"]["source"] = package_source if package_source +new_config["packages"]["main"]["providers"] ||= {} if brew_package_name or winget_package_name or choco_package_name or snap_package_name new_config["packages"]["main"]["providers"]["brew"] ||= {} if brew_package_name new_config["packages"]["main"]["providers"]["brew"] = { "name" => brew_package_name } if brew_package_name new_config["packages"]["main"]["providers"]["winget"] ||= {} if winget_package_name new_config["packages"]["main"]["providers"]["winget"] = { "name" => winget_package_name } if winget_package_name new_config["packages"]["main"]["providers"]["choco"] ||= {} if choco_package_name new_config["packages"]["main"]["providers"]["choco"] = { "name" => choco_package_name } if choco_package_name +new_config["packages"]["main"]["providers"]["snap"] ||= {} if snap_package_name +new_config["packages"]["main"]["providers"]["snap"] = { "name" => snap_package_name } if snap_package_name # Service service_name = original_config[settings_key]['service_name'] if original_config.dig(settings_key, 'service_name') @@ -60,8 +65,9 @@ config_file_format = original_config[settings_key]['config_file_format'] if original_config.dig(settings_key, 'config_file_format') log_file_path = original_config[settings_key]['log_file_path'] if original_config.dig(settings_key, 'log_file_path') init_file_path = original_config[settings_key]['init_file_path'] if original_config.dig(settings_key, 'init_file_path') +pid_file_path = original_config[settings_key]['pid_file_path'] if original_config.dig(settings_key, 'pid_file_path') -new_config["files"] ||= {} if config_file_path or config_file_format or log_file_path or init_file_path +new_config["files"] ||= {} if config_file_path or config_file_format or log_file_path or init_file_path or pid_file_path new_config["files"] = {"config" => {"path" => config_file_path}} if config_file_path new_config["user_files"] = {"config" => {"path" => config_file_path.gsub('/etc/','$HOME/.') }} if config_file_path @@ -75,6 +81,9 @@ new_config["files"]["init"] ||= {} if init_file_path new_config["files"]["init"] = { "path" => init_file_path } if init_file_path +new_config["files"]["pid"] ||= {} if pid_file_path +new_config["files"]["pid"] = { "path" => pid_file_path } if pid_file_path + # Dirs config_dir_path = original_config[settings_key]['config_dir_path'] if original_config.dig(settings_key, 'config_dir_path') new_config["dirs"] = {"config" => {"path" => config_dir_path}} if config_dir_path @@ -168,9 +177,9 @@ new_config["repo"]["upstream"]["key"] = key if key new_config["repo"]["upstream"]["key_url"] = key_url if key_url -new_config["repo"]["upstream"]["yum"] ||= {} if yumrepo_params or yum_priority or yum_mirrorlist or repo_url or key +new_config["repo"]["upstream"]["yum"] ||= {} if yumrepo_params or yum_priority or yum_mirrorlist new_config["repo"]["upstream"]["yum"]["gpgcheck"] = true if key -new_config["repo"]["upstream"]["yum"]["gpgkey"] = key if key +#new_config["repo"]["upstream"]["yum"]["gpgkey"] = key if key new_config["repo"]["upstream"]["yum"]["params"] = yumrepo_params if yumrepo_params new_config["repo"]["upstream"]["yum"]["priority"] = yum_priority if yum_priority new_config["repo"]["upstream"]["yum"]["mirrorlist"] = yum_mirrorlist if yum_mirrorlist From b0466fbcfdd61b33d9fb7a13cfefaf0046b4d910 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sat, 24 Feb 2024 17:58:56 +0100 Subject: [PATCH 14/17] Fixes --- scripts/convert_v3_to_v4.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 251e3ecf..1a9e7526 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -29,20 +29,21 @@ brew_package_name = original_config[settings_key]['brew_package_name'] if original_config.dig(settings_key, 'brew_package_name') winget_package_name = original_config[settings_key]['winget_package_name'] if original_config.dig(settings_key, 'winget_package_name') choco_package_name = original_config[settings_key]['choco_package_name'] if original_config.dig(settings_key, 'choco_package_name') +snap_package_name = original_config[settings_key]['snap_package_name'] if original_config.dig(settings_key, 'snap_package_name') new_config["packages"] = { "main" => {} } if package_name or package_provider or brew_package_name or winget_package_name or choco_package_name or snap_package_name or package_source -new_config["packages"] = {"main" => {"name" => package_name}} if package_name +new_config["packages"]["main"]["name"] = package_name if package_name new_config["packages"]["main"]["provider"] = package_provider if package_provider new_config["packages"]["main"]["source"] = package_source if package_source new_config["packages"]["main"]["providers"] ||= {} if brew_package_name or winget_package_name or choco_package_name or snap_package_name new_config["packages"]["main"]["providers"]["brew"] ||= {} if brew_package_name -new_config["packages"]["main"]["providers"]["brew"] = { "name" => brew_package_name } if brew_package_name +new_config["packages"]["main"]["providers"]["brew"]["name"] = brew_package_name if brew_package_name new_config["packages"]["main"]["providers"]["winget"] ||= {} if winget_package_name -new_config["packages"]["main"]["providers"]["winget"] = { "name" => winget_package_name } if winget_package_name +new_config["packages"]["main"]["providers"]["winget"]["name"] = winget_package_name if winget_package_name new_config["packages"]["main"]["providers"]["choco"] ||= {} if choco_package_name -new_config["packages"]["main"]["providers"]["choco"] = { "name" => choco_package_name } if choco_package_name +new_config["packages"]["main"]["providers"]["choco"]["name"] = choco_package_name if choco_package_name new_config["packages"]["main"]["providers"]["snap"] ||= {} if snap_package_name -new_config["packages"]["main"]["providers"]["snap"] = { "name" => snap_package_name } if snap_package_name +new_config["packages"]["main"]["providers"]["snap"]["name"] = snap_package_name if snap_package_name # Service service_name = original_config[settings_key]['service_name'] if original_config.dig(settings_key, 'service_name') @@ -177,7 +178,7 @@ new_config["repo"]["upstream"]["key"] = key if key new_config["repo"]["upstream"]["key_url"] = key_url if key_url -new_config["repo"]["upstream"]["yum"] ||= {} if yumrepo_params or yum_priority or yum_mirrorlist +new_config["repo"]["upstream"]["yum"] ||= {} if yumrepo_params or yum_priority or yum_mirrorlist or key new_config["repo"]["upstream"]["yum"]["gpgcheck"] = true if key #new_config["repo"]["upstream"]["yum"]["gpgkey"] = key if key new_config["repo"]["upstream"]["yum"]["params"] = yumrepo_params if yumrepo_params From 36e3c06b1f2d7c58f2c5390ec0588fcb9030ba99 Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 25 Feb 2024 08:40:49 +0100 Subject: [PATCH 15/17] Updated script --- scripts/convert_v3_to_v4.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/convert_v3_to_v4.rb b/scripts/convert_v3_to_v4.rb index 1a9e7526..89aec8fe 100755 --- a/scripts/convert_v3_to_v4.rb +++ b/scripts/convert_v3_to_v4.rb @@ -139,14 +139,12 @@ upstream_repo = original_config[settings_key]['upstream_repo'] if original_config.dig(settings_key, 'upstream_repo') new_config["repo"] = 'upstream' if upstream_repo == true - repo_url = original_config[settings_key]['repo_url'] if original_config.dig(settings_key, 'repo_url') repo_package_name = original_config[settings_key]['repo_package_name'] if original_config.dig(settings_key, 'repo_package_name') repo_package_url = original_config[settings_key]['repo_package_url'] if original_config.dig(settings_key, 'repo_package_url') repo_package_provider = original_config[settings_key]['repo_package_provider'] if original_config.dig(settings_key, 'repo_package_provider') repo_package_params = original_config[settings_key]['repo_package_params'] if original_config.dig(settings_key, 'repo_package_params') repo_file_url = original_config[settings_key]['repo_file_url'] if original_config.dig(settings_key, 'repo_file_url') -repo_url = original_config[settings_key]['repo_url'] if original_config.dig(settings_key, 'repo_url') repo_name = original_config[settings_key]['repo_name'] if original_config.dig(settings_key, 'repo_name') repo_description = original_config[settings_key]['repo_description'] if original_config.dig(settings_key, 'repo_description') repo_filename = original_config[settings_key]['repo_filename'] if original_config.dig(settings_key, 'repo_filename') @@ -154,7 +152,6 @@ key_url = original_config[settings_key]['key_url'] if original_config.dig(settings_key, 'key_url') include_src = original_config[settings_key]['include_src'] if original_config.dig(settings_key, 'include_src') yumrepo_params = original_config[settings_key]['yumrepo_params'] if original_config.dig(settings_key, 'yumrepo_params') - apt_repos = original_config[settings_key]['apt_repos'] if original_config.dig(settings_key, 'apt_repos') apt_key_server = original_config[settings_key]['apt_key_server'] if original_config.dig(settings_key, 'apt_key_server') apt_key_fingerprint = original_config[settings_key]['apt_key_fingerprint'] if original_config.dig(settings_key, 'apt_key_fingerprint') @@ -178,8 +175,8 @@ new_config["repo"]["upstream"]["key"] = key if key new_config["repo"]["upstream"]["key_url"] = key_url if key_url -new_config["repo"]["upstream"]["yum"] ||= {} if yumrepo_params or yum_priority or yum_mirrorlist or key -new_config["repo"]["upstream"]["yum"]["gpgcheck"] = true if key +new_config["repo"]["upstream"]["yum"] ||= {} if yumrepo_params or yum_priority or yum_mirrorlist or key_url +new_config["repo"]["upstream"]["yum"]["gpgcheck"] = true if key_url #new_config["repo"]["upstream"]["yum"]["gpgkey"] = key if key new_config["repo"]["upstream"]["yum"]["params"] = yumrepo_params if yumrepo_params new_config["repo"]["upstream"]["yum"]["priority"] = yum_priority if yum_priority From d14ec9ded830d79c9de8a1c158365f3adf21597e Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Sun, 25 Feb 2024 08:41:05 +0100 Subject: [PATCH 16/17] Mass tinydata v4 conversion --- data/activemq/default.yaml | 36 +++++++++++ data/activemq/osfamily/Debian.yaml | 5 ++ data/activemq/osfamily/RedHat.yaml | 7 +++ data/ansible/default.yaml | 23 +++++++ data/apache/default.yaml | 42 +++++++++++++ data/apache/osfamily/Debian.yaml | 36 +++++++++++ data/apache/osfamily/FreeBSD.yaml | 14 +++++ data/apache/osfamily/Linux.yaml | 36 +++++++++++ data/apache/osfamily/RedHat.yaml | 40 ++++++++++++ data/apache/osfamily/Suse.yaml | 34 ++++++++++ data/apm-server/default.yaml | 34 ++++++++++ data/apm-server/osfamily/Debian.yaml | 5 ++ data/apm-server/osfamily/RedHat.yaml | 5 ++ data/apm-server/osfamily/RedHat9.yaml | 12 ++++ data/apm-server/osfamily/windows.yaml | 8 +++ data/apm-server/upstream/default.yaml | 6 +- data/apparmor/default.yaml | 24 +++++++ data/apparmor/osfamily/Debian.yaml | 5 ++ data/apt/default.yaml | 24 ++++++- data/apt/osfamily/Darwin.yaml | 8 ++- data/apt/osfamily/RedHat.yaml | 8 ++- data/apt/osfamily/Suse.yaml | 8 ++- data/apt/osfamily/windows.yaml | 8 ++- data/auditbeat/default.yaml | 37 +++++++++++ data/auditbeat/osfamily/Debian.yaml | 5 ++ data/auditbeat/osfamily/RedHat.yaml | 5 ++ data/auditbeat/osfamily/RedHat9.yaml | 12 ++++ data/auditbeat/osfamily/windows.yaml | 8 +++ data/auditbeat/upstream/default.yaml | 6 +- data/autofs/default.yaml | 22 ++++++- data/autofs/osfamily/Debian.yaml | 5 ++ data/autofs/osfamily/RedHat.yaml | 5 ++ data/autoruns/default.yaml | 7 +++ data/autoruns/osfamily/windows.yaml | 10 +++ data/awscli/default.yaml | 23 +++++++ data/awscli/osfamily/RedHat.yaml | 8 +++ data/awscli/osfamily/RedHat8.yaml | 5 ++ data/azure-cli/default.yaml | 10 +++ data/azure-cli/upstream/default.yaml | 13 ++++ data/azure-cli/upstream/osfamily/Debian.yaml | 5 ++ data/azure-cli/upstream/osfamily/RedHat.yaml | 9 +++ data/azure-cli/upstream/osfamily/RedHat7.yaml | 8 ++- data/azure-cli/upstream/osfamily/RedHat8.yaml | 5 ++ data/azure-cli/upstream/osfamily/RedHat9.yaml | 5 ++ data/azure-cli/upstream/osfamily/Suse.yaml | 5 ++ data/azure-cli/upstream/osfamily/windows.yaml | 9 +++ data/bacula-client/default.yaml | 39 +++++++++++- .../operatingsystem/Ubuntu22.04.yaml | 8 ++- data/bacula-client/osfamily/Debian.yaml | 5 ++ data/bacula-client/osfamily/RedHat.yaml | 5 ++ data/bash/default.yaml | 22 +++++++ data/bind-utils/default.yaml | 7 +++ data/bind-utils/osfamily/Debian.yaml | 5 ++ data/bind/default.yaml | 39 ++++++++++++ data/bind/operatingsystem/Ubuntu.yaml | 12 ++++ data/bind/osfamily/Debian.yaml | 29 +++++++++ data/bind/osfamily/RedHat.yaml | 22 +++++++ data/bird/default.yaml | 31 ++++++++++ data/blender/default.yaml | 4 ++ data/blender/osfamily/Darwin.yaml | 8 +++ data/blender/osfamily/Debian.yaml | 2 + data/blender/osfamily/windows.yaml | 6 ++ data/bolt/default.yaml | 27 +++++++- data/bolt/osfamily/windows.yaml | 19 ++++++ data/bolt/osfamily/windows11.yaml | 5 ++ data/boundary/default.yaml | 33 ++++++++++ data/boundary/upstream/default.yaml | 6 +- data/bzip2/default.yaml | 8 +++ data/ceilometer/default.yaml | 33 +++++++++- data/ceilometer/osfamily/Debian.yaml | 8 +++ data/ceilometer/osfamily/RedHat.yaml | 8 +++ data/ceph/default.yaml | 36 ++++++++++- data/ceph/osfamily/Debian.yaml | 5 ++ data/ceph/osfamily/RedHat.yaml | 5 ++ data/cinder/default.yaml | 25 ++++++++ data/cinder/osfamily/Debian.yaml | 10 +++ data/cinder/osfamily/RedHat.yaml | 10 +++ data/clvm/default.yaml | 23 +++++++ data/clvm/osfamily/Debian.yaml | 10 +++ data/clvm/osfamily/RedHat.yaml | 5 ++ data/collectd/default.yaml | 27 ++++++++ data/collectd/osfamily/Debian.yaml | 5 ++ data/collectd/osfamily/RedHat.yaml | 18 ++++++ data/consul-enterprise/default.yaml | 31 ++++++++++ data/consul-enterprise/upstream/default.yaml | 6 +- data/consul/default.yaml | 31 ++++++++++ data/consul/upstream/default.yaml | 6 +- data/corosync/default.yaml | 26 ++++++++ data/corosync/osfamily/Debian.yaml | 5 ++ data/corosync/osfamily/RedHat.yaml | 5 ++ data/cron/default.yaml | 16 +++++ data/cron/osfamily/Fedora.yaml | 5 ++ .../default.yaml | 26 ++++++++ data/crowdsec/default.yaml | 34 +++++++++- data/crowdsec_repo/default.yaml | 3 + data/crowdsec_repo/upstream/default.yaml | 18 +++++- .../upstream/operatingsystem/Ubuntu.yaml | 5 ++ .../upstream/osfamily/Debian.yaml | 5 ++ .../upstream/osfamily/RedHat.yaml | 7 +++ .../upstream/osfamily/RedHat6.yaml | 5 ++ .../upstream/osfamily/RedHat7.yaml | 5 ++ .../upstream/osfamily/RedHat8.yaml | 5 ++ .../upstream/osfamily/RedHat9.yaml | 5 ++ .../crowdsec_repo/upstream/osfamily/Suse.yaml | 5 ++ .../upstream/osfamily/Suse13.yaml | 5 ++ .../upstream/osfamily/Suse14.yaml | 5 ++ .../upstream/osfamily/Suse15.yaml | 5 ++ data/ddclient/default.yaml | 30 +++++++++ data/ddclient/osfamily/Debian.yaml | 5 ++ data/ddclient/osfamily/RedHat.yaml | 5 ++ data/debootstrap/default.yaml | 5 ++ data/default.yaml | 2 + data/default/AlmaLinux.yaml | 5 ++ data/default/CentOS.yaml | 5 ++ data/default/CentOS6.yaml | 2 + data/default/Darwin.yaml | 5 ++ data/default/Debian.yaml | 9 ++- data/default/Debian10.yaml | 6 ++ data/default/Debian11.yaml | 6 ++ data/default/Debian5.yaml | 6 ++ data/default/Debian6.yaml | 6 ++ data/default/Debian7.yaml | 6 ++ data/default/Debian8.yaml | 6 ++ data/default/Debian9.yaml | 6 ++ data/default/Devuan4.yaml | 6 ++ data/default/FreeBSD.yaml | 2 + data/default/OpenBSD.yaml | 2 + data/default/OracleLinux.yaml | 6 +- data/default/RedHat.yaml | 6 +- data/default/Rocky.yaml | 6 +- data/default/Solaris.yaml | 2 + data/default/Ubuntu.yaml | 5 ++ data/default/Ubuntu12.04.yaml | 6 ++ data/default/Ubuntu14.04.yaml | 6 ++ data/default/Ubuntu14.10.yaml | 6 ++ data/default/Ubuntu15.04.yaml | 6 ++ data/default/Ubuntu15.10.yaml | 6 ++ data/default/Ubuntu16.04.yaml | 6 ++ data/default/Ubuntu16.10.yaml | 6 ++ data/default/Ubuntu17.04.yaml | 6 ++ data/default/Ubuntu17.10.yaml | 6 ++ data/default/Ubuntu18.04.yaml | 6 ++ data/default/Ubuntu18.10.yaml | 6 ++ data/default/Ubuntu19.04.yaml | 6 ++ data/default/Ubuntu19.10.yaml | 6 ++ data/default/Ubuntu20.04.yaml | 6 ++ data/default/Ubuntu20.10.yaml | 6 ++ data/default/Ubuntu21.04.yaml | 6 ++ data/default/Ubuntu21.10.yaml | 6 ++ data/default/Ubuntu22.04.yaml | 6 ++ data/default/windows.yaml | 5 ++ data/dhcpd/default.yaml | 28 +++++++++ data/dhcpd/osfamily/Debian.yaml | 25 ++++++++ data/dhcpd/osfamily/OpenBSD.yaml | 25 ++++++++ data/dhcpd/osfamily/RedHat.yaml | 19 ++++++ data/dhcpd/osfamily/Suse.yaml | 15 +++++ data/discord/default.yaml | 10 +++ data/discord/osfamily/Darwin.yaml | 7 +++ data/discord/osfamily/windows.yaml | 9 +++ data/dkms/default.yaml | 19 ++++++ data/dkms/osfamily/RedHat.yaml | 5 ++ data/dnsmasq/default.yaml | 34 ++++++++++ data/dnsmasq/osfamily/Debian.yaml | 5 ++ data/dnsmasq/osfamily/RedHat.yaml | 8 +++ data/docker/default.yaml | 30 +++++++++ data/docker/upstream/default.yaml | 5 ++ .../upstream/operatingsystem/Amazon2.yaml | 5 ++ .../upstream/operatingsystem/CentOS.yaml | 16 +++++ .../upstream/operatingsystem/CentOS6.yaml | 5 ++ .../upstream/operatingsystem/CentOS7.yaml | 5 ++ .../upstream/operatingsystem/Darwin.yaml | 7 +++ .../upstream/operatingsystem/Debian.yaml | 12 ++++ .../upstream/operatingsystem/Devuan4.yaml | 5 ++ .../upstream/operatingsystem/Fedora.yaml | 5 ++ .../upstream/operatingsystem/RedHat.yaml | 16 +++++ .../upstream/operatingsystem/SLES12.yaml | 5 ++ .../upstream/operatingsystem/SLES15.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu.yaml | 14 +++++ data/docker/upstream/osfamily/RedHat.yaml | 5 ++ data/docker/upstream/osfamily/windows.yaml | 6 +- data/dovecot/default.yaml | 34 ++++++++++ data/dovecot/osfamily/Debian.yaml | 9 +++ data/dovecot/osfamily/FreeBSD.yaml | 23 +++++++ data/dovecot/osfamily/RedHat.yaml | 10 +++ data/duply/default.yaml | 11 ++++ data/edge/default.yaml | 12 ++++ data/edge/osfamily/Darwin.yaml | 8 +++ data/edge/osfamily/windows.yaml | 11 +++- data/elastic-agent/default.yaml | 32 ++++++++++ data/elastic-agent/osfamily/Debian.yaml | 5 ++ data/elastic-agent/osfamily/RedHat.yaml | 5 ++ data/elastic-agent/osfamily/windows.yaml | 8 +++ data/elastic-agent/upstream/default.yaml | 6 +- data/elastic_repo/6.x/default.yaml | 6 ++ data/elastic_repo/6.x/osfamily/Debian.yaml | 7 +++ data/elastic_repo/6.x/osfamily/RedHat.yaml | 5 ++ data/elastic_repo/7.x/default.yaml | 6 ++ data/elastic_repo/7.x/osfamily/Debian.yaml | 7 +++ data/elastic_repo/7.x/osfamily/RedHat.yaml | 5 ++ data/elastic_repo/8.x/default.yaml | 6 ++ data/elastic_repo/8.x/osfamily/Debian.yaml | 7 +++ data/elastic_repo/8.x/osfamily/RedHat.yaml | 5 ++ data/elastic_repo/ds/default.yaml | 6 ++ data/elastic_repo/ds/osfamily/Debian.yaml | 7 +++ data/elastic_repo/ds/osfamily/RedHat.yaml | 5 ++ data/elastic_repo/upstream/default.yaml | 6 ++ .../upstream/osfamily/Debian.yaml | 7 +++ .../upstream/osfamily/RedHat.yaml | 5 ++ data/elasticsearch/default.yaml | 37 +++++++++++ data/elasticsearch/osfamily/Debian.yaml | 5 ++ data/elasticsearch/osfamily/RedHat.yaml | 5 ++ data/elasticsearch/osfamily/windows.yaml | 8 +++ data/elasticsearch/upstream/default.yaml | 6 +- data/elrepo/osfamily/RedHat.yaml | 5 ++ data/elrepo/osfamily/RedHat6.yaml | 5 ++ data/elrepo/osfamily/RedHat7.yaml | 5 ++ data/elrepo/osfamily/RedHat8.yaml | 5 ++ data/enterprise-search/default.yaml | 32 ++++++++++ data/enterprise-search/osfamily/Debian.yaml | 5 ++ data/enterprise-search/osfamily/RedHat.yaml | 5 ++ data/enterprise-search/osfamily/windows.yaml | 8 +++ data/enterprise-search/upstream/default.yaml | 6 +- data/epel/osfamily/RedHat.yaml | 5 ++ data/epel/osfamily/RedHat4.yaml | 5 ++ data/epel/osfamily/RedHat5.yaml | 5 ++ data/epel/osfamily/RedHat6.yaml | 5 ++ data/epel/osfamily/RedHat7.yaml | 5 ++ data/epel/osfamily/RedHat8.yaml | 5 ++ data/epel/osfamily/RedHat9.yaml | 5 ++ data/exim/default.yaml | 32 ++++++++++ data/exim/osfamily/Debian.yaml | 25 ++++++++ data/exim/osfamily/RedHat.yaml | 5 ++ data/fabric/default.yaml | 9 +++ data/fabric/osfamily/Debian.yaml | 5 ++ data/fabric/osfamily/RedHat.yaml | 6 ++ data/fail2ban/default.yaml | 30 +++++++++ data/fail2ban/osfamily/Debian.yaml | 9 +++ data/fail2ban/osfamily/RedHat.yaml | 5 ++ data/filebeat/default.yaml | 32 ++++++++++ data/filebeat/osfamily/Debian.yaml | 5 ++ data/filebeat/osfamily/RedHat.yaml | 5 ++ data/filebeat/osfamily/windows.yaml | 8 +++ data/filebeat/upstream/default.yaml | 6 +- data/firewalld/default.yaml | 26 ++++++++ data/firewalld/osfamily/Debian.yaml | 5 ++ data/firewalld/osfamily/RedHat.yaml | 5 ++ data/foreman/default.yaml | 39 ++++++++++++ data/foreman/operatingsystem/Debian8.yaml | 6 ++ data/foreman/operatingsystem/Ubuntu16.04.yaml | 6 ++ data/foreman/osfamily/Debian.yaml | 15 +++++ data/foreman/osfamily/RedHat.yaml | 8 +++ data/foreman/osfamily/RedHat7.yaml | 5 ++ data/freeradius/default.yaml | 34 ++++++++++ data/freeradius/osfamily/Debian.yaml | 29 +++++++++ data/freeradius/osfamily/RedHat.yaml | 5 ++ data/git/default.yaml | 10 +++ data/git/osfamily/Darwin.yaml | 5 ++ data/git/osfamily/Suse.yaml | 5 ++ data/git/osfamily/windows.yaml | 9 +++ data/gitlab-ce/default.yaml | 22 ++++++- data/gitlab-ce/osfamily/Debian.yaml | 8 +++ data/gitlab-ce/osfamily/RedHat.yaml | 8 +++ data/gitlab-cli/default.yaml | 10 +++ data/gitlab-ee/default.yaml | 22 ++++++- data/gitlab-ee/osfamily/Debian.yaml | 8 +++ data/gitlab-ee/osfamily/RedHat.yaml | 8 +++ data/gitlab-runner/default.yaml | 19 ++++++ data/gitlab-runner/osfamily/Debian.yaml | 8 +++ data/gitlab-runner/osfamily/RedHat.yaml | 8 +++ data/glance/default.yaml | 25 ++++++++ data/glance/osfamily/Debian.yaml | 8 +++ data/glance/osfamily/RedHat.yaml | 8 +++ data/go-server/default.yaml | 35 +++++++++++ data/go-server/osfamily/Debian.yaml | 10 +++ data/go-server/osfamily/RedHat.yaml | 8 +++ data/golang/default.yaml | 4 ++ data/golang/osfamily/Darwin.yaml | 3 +- data/golang/osfamily/Debian.yaml | 3 +- data/golang/osfamily/RedHat.yaml | 4 ++ data/golang/osfamily/windows.yaml | 7 ++- data/grafana/default.yaml | 35 +++++++++++ data/grafana/osfamily/Debian.yaml | 17 +++++ data/grafana/osfamily/RedHat.yaml | 16 +++++ data/graylog2/default.yaml | 31 ++++++++++ data/graylog2/osfamily/Debian.yaml | 5 ++ data/graylog2/osfamily/RedHat.yaml | 5 ++ data/haproxy/default.yaml | 36 +++++++++++ data/haproxy/osfamily/Debian.yaml | 5 ++ data/haproxy/osfamily/RedHat.yaml | 5 ++ data/hashicorp_repo/default.yaml | 3 + data/hashicorp_repo/upstream/default.yaml | 6 ++ .../upstream/operatingsystem/Debian10.yaml | 7 +++ .../upstream/operatingsystem/Debian11.yaml | 7 +++ .../upstream/operatingsystem/Debian9.yaml | 7 +++ .../upstream/osfamily/Amazon.yaml | 6 ++ .../upstream/osfamily/Debian.yaml | 9 +++ .../upstream/osfamily/Fedora.yaml | 6 ++ .../upstream/osfamily/RedHat.yaml | 6 ++ data/haveged/default.yaml | 5 ++ data/hdm/default.yaml | 25 ++++++++ data/heartbeat-elastic/default.yaml | 32 ++++++++++ data/heartbeat-elastic/osfamily/Debian.yaml | 5 ++ data/heartbeat-elastic/osfamily/RedHat.yaml | 5 ++ data/heartbeat-elastic/osfamily/windows.yaml | 8 +++ data/heartbeat-elastic/upstream/default.yaml | 6 +- data/heartbeat/default.yaml | 30 +++++++++ data/heartbeat/osfamily/Debian.yaml | 5 ++ data/heartbeat/osfamily/RedHat.yaml | 5 ++ data/homebrew/default.yaml | 16 +++++ data/homebrew/osfamily/Darwin.yaml | 14 +++++ data/hosts/default.yaml | 8 +++ data/htop/default.yaml | 5 ++ data/icinga/default.yaml | 32 ++++++++++ data/icinga/osfamily/Debian.yaml | 11 ++++ data/icinga/osfamily/RedHat.yaml | 5 ++ data/icinga2/default.yaml | 32 ++++++++++ data/icinga2/osfamily/Debian.yaml | 5 ++ data/icinga2/osfamily/RedHat.yaml | 11 ++++ data/icinga2/osfamily/RedHat5.yaml | 5 ++ data/icinga2/osfamily/RedHat6.yaml | 5 ++ data/icinga2/osfamily/RedHat7.yaml | 5 ++ data/icinga_repo/default.yaml | 6 +- data/icinga_repo/upstream/default.yaml | 8 ++- .../icinga_repo/upstream/osfamily/Debian.yaml | 7 +++ .../icinga_repo/upstream/osfamily/RedHat.yaml | 5 ++ data/icingaweb2/default.yaml | 23 +++++++ data/icingaweb2/osfamily/Debian.yaml | 5 ++ data/icingaweb2/osfamily/RedHat.yaml | 11 ++++ data/icingaweb2/osfamily/RedHat5.yaml | 5 ++ data/icingaweb2/osfamily/RedHat6.yaml | 5 ++ data/icingaweb2/osfamily/RedHat7.yaml | 5 ++ data/influxdb/default.yaml | 40 ++++++++++++ data/influxdb/operatingsystem/Debian7.yaml | 6 ++ data/influxdb/operatingsystem/Debian8.yaml | 6 ++ data/influxdb/operatingsystem/Debian9.yaml | 6 ++ data/influxdb/operatingsystem/Ubuntu.yaml | 5 ++ .../influxdb/operatingsystem/Ubuntu12.04.yaml | 6 ++ .../influxdb/operatingsystem/Ubuntu14.04.yaml | 6 ++ .../influxdb/operatingsystem/Ubuntu14.10.yaml | 6 ++ .../influxdb/operatingsystem/Ubuntu16.04.yaml | 6 ++ data/influxdb/osfamily/Debian.yaml | 10 +++ data/influxdb/osfamily/RedHat.yaml | 5 ++ data/influxdb/osfamily/RedHat6.yaml | 5 ++ data/influxdb/osfamily/RedHat7.yaml | 5 ++ data/iotop/default.yaml | 5 ++ data/iptraf/default.yaml | 5 ++ data/iptraf/operatingsystem/Debian-11.yaml | 5 ++ data/iptraf/osfamily/RedHat.yaml | 5 ++ data/ius/osfamily/RedHat.yaml | 5 ++ data/ius/osfamily/RedHat6.yaml | 5 ++ data/ius/osfamily/RedHat7.yaml | 5 ++ data/jboss/default.yaml | 34 ++++++++++ data/jboss/osfamily/Debian.yaml | 5 ++ data/jboss/osfamily/RedHat.yaml | 5 ++ data/jenkins/default.yaml | 30 +++++++++ data/jenkins/operatingsystem/Amazon.yaml | 5 ++ data/jenkins/osfamily/Debian.yaml | 14 +++++ data/jenkins/osfamily/RedHat.yaml | 9 +++ data/jenkins/osfamily/Suse.yaml | 5 ++ data/journalbeat/default.yaml | 32 ++++++++++ data/journalbeat/osfamily/Debian.yaml | 5 ++ data/journalbeat/osfamily/RedHat.yaml | 5 ++ data/journalbeat/osfamily/windows.yaml | 8 +++ data/journalbeat/upstream/default.yaml | 6 +- data/jupyterlab/default.yaml | 6 ++ data/kedro/default.yaml | 6 ++ data/keepalived/default.yaml | 26 ++++++++ data/keepalived/osfamily/Debian.yaml | 5 ++ data/keras/default.yaml | 6 ++ data/keystone/default.yaml | 25 ++++++++ data/keystone/osfamily/Debian.yaml | 10 +++ data/keystone/osfamily/RedHat.yaml | 12 ++++ data/kibana/default.yaml | 39 ++++++++++++ data/kibana/osfamily/Debian.yaml | 5 ++ data/kibana/osfamily/RedHat.yaml | 5 ++ data/kibana/upstream/default.yaml | 6 +- data/krateo/default.yaml | 5 ++ data/krateo/osfamily/Darwin.yaml | 5 ++ data/kubernetes/default.yaml | 26 ++++++++ data/kubernetes/operatingsystem/Debian6.yaml | 6 ++ data/kubernetes/operatingsystem/Debian7.yaml | 6 ++ data/kubernetes/operatingsystem/Debian8.yaml | 6 ++ data/kubernetes/operatingsystem/Debian9.yaml | 6 ++ .../operatingsystem/Ubuntu12.04.yaml | 6 ++ .../operatingsystem/Ubuntu14.04.yaml | 6 ++ .../operatingsystem/Ubuntu16.04.yaml | 6 ++ .../operatingsystem/Ubuntu16.10.yaml | 6 ++ .../operatingsystem/Ubuntu18.04.yaml | 6 ++ data/kubernetes/osfamily/Debian.yaml | 12 ++++ data/kubernetes/osfamily/RedHat.yaml | 13 ++++ data/kubernetes/osfamily/RedHat6.yaml | 5 ++ data/kubernetes/osfamily/RedHat7.yaml | 5 ++ data/kubernetes/osfamily/RedHat8.yaml | 5 ++ data/libreoffice/default.yaml | 11 ++++ data/libreoffice/osfamily/Darwin.yaml | 7 +++ data/libreoffice/osfamily/windows.yaml | 9 +++ data/libvirt/default.yaml | 32 ++++++++++ data/libvirt/osfamily/Debian.yaml | 10 +++ data/libvirt/osfamily/RedHat.yaml | 5 ++ data/lighttpd/default.yaml | 38 ++++++++++++ data/lighttpd/osfamily/Debian.yaml | 8 +++ data/logrotate/default.yaml | 19 ++++++ data/logstash/default.yaml | 36 +++++++++++ data/logstash/osfamily/Debian.yaml | 5 ++ data/logstash/osfamily/RedHat.yaml | 5 ++ data/logstash/upstream/default.yaml | 6 +- data/lsb-release/default.yaml | 5 ++ data/lsb-release/osfamily/Debian.yaml | 5 ++ data/lsb-release/osfamily/RedHat.yaml | 5 ++ data/lsb/default.yaml | 5 ++ data/lsb/osfamily/Debian.yaml | 5 ++ data/lsb/osfamily/RedHat.yaml | 5 ++ data/lsb/osfamily/Suse.yaml | 5 ++ data/lsof/default.yaml | 5 ++ data/mailx/default.yaml | 11 ++++ data/mailx/osfamily/Debian.yaml | 5 ++ data/make/default.yaml | 5 ++ data/mariadb/default.yaml | 34 ++++++++++ data/mariadb/osfamily/Debian.yaml | 8 +++ data/mariadb/osfamily/RedHat.yaml | 8 +++ data/mcollective/default.yaml | 31 ++++++++++ data/mcollective/osfamily/Debian.yaml | 11 ++++ data/mcollective/osfamily/RedHat.yaml | 12 ++++ data/mdadm/default.yaml | 24 +++++++ data/memcached/default.yaml | 27 ++++++++ data/memcached/osfamily/Debian.yaml | 5 ++ data/memcached/osfamily/RedHat.yaml | 10 +++ data/metaflow/default.yaml | 6 ++ data/metricbeat/default.yaml | 32 ++++++++++ data/metricbeat/osfamily/Debian.yaml | 5 ++ data/metricbeat/osfamily/RedHat.yaml | 5 ++ data/metricbeat/osfamily/windows.yaml | 8 +++ data/metricbeat/upstream/default.yaml | 6 +- data/mgmt/default.yaml | 4 ++ data/mgmt/osfamily/Darwin.yaml | 8 ++- data/mgmt/osfamily/Debian.yaml | 3 +- data/mgmt/osfamily/RedHat.yaml | 4 ++ data/mgmt/osfamily/windows.yaml | 7 ++- data/microsoft_repo/default.yaml | 3 + data/microsoft_repo/upstream/default.yaml | 7 ++- .../upstream/operatingsystem/CentOS6.yaml | 5 ++ .../upstream/operatingsystem/CentOS7.yaml | 5 ++ .../upstream/operatingsystem/CentOS8.yaml | 5 ++ .../upstream/operatingsystem/Debian10.yaml | 5 ++ .../upstream/operatingsystem/Debian11.yaml | 6 +- .../upstream/operatingsystem/Debian8.yaml | 5 ++ .../upstream/operatingsystem/Debian9.yaml | 5 ++ .../upstream/operatingsystem/Fedora26.yaml | 5 ++ .../upstream/operatingsystem/Fedora27.yaml | 5 ++ .../upstream/operatingsystem/Fedora28.yaml | 5 ++ .../upstream/operatingsystem/Fedora29.yaml | 5 ++ .../upstream/operatingsystem/Fedora30.yaml | 5 ++ .../upstream/operatingsystem/Fedora31.yaml | 5 ++ .../upstream/operatingsystem/Fedora32.yaml | 5 ++ .../upstream/operatingsystem/Fedora33.yaml | 5 ++ .../upstream/operatingsystem/Fedora34.yaml | 5 ++ .../upstream/operatingsystem/Fedora35.yaml | 5 ++ .../upstream/operatingsystem/Fedora36.yaml | 5 ++ .../upstream/operatingsystem/OpenSuse12.yaml | 5 ++ .../upstream/operatingsystem/OpenSuse15.yaml | 5 ++ .../operatingsystem/OpenSuse42.2.yaml | 5 ++ .../operatingsystem/OpenSuse42.3.yaml | 5 ++ .../upstream/operatingsystem/SLES11.yaml | 5 ++ .../upstream/operatingsystem/SLES12.yaml | 5 ++ .../upstream/operatingsystem/SLES15.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu14.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu15.10.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu16.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu16.10.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu17.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu17.10.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu18.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu18.10.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu19.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu19.10.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu20.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu20.10.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu21.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu21.10.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu22.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu22.10.yaml | 5 ++ .../upstream/osfamily/RedHat6.yaml | 5 ++ .../upstream/osfamily/RedHat7.yaml | 5 ++ .../upstream/osfamily/RedHat8.yaml | 5 ++ .../upstream/osfamily/RedHat9.yaml | 5 ++ data/mlflow/default.yaml | 6 ++ data/mlocate/default.yaml | 5 ++ data/mlrun/default.yaml | 6 ++ .../mongodb-mms-automation-agent/default.yaml | 28 +++++++++ .../osfamily/Debian.yaml | 5 ++ .../osfamily/RedHat.yaml | 5 ++ data/mongodb-mms-backup-agent/default.yaml | 28 +++++++++ .../osfamily/Debian.yaml | 5 ++ .../osfamily/RedHat.yaml | 5 ++ .../mongodb-mms-monitoring-agent/default.yaml | 28 +++++++++ .../osfamily/Debian.yaml | 5 ++ .../osfamily/RedHat.yaml | 5 ++ data/mongodb-mms/default.yaml | 28 +++++++++ data/mongodb-mms/osfamily/Debian.yaml | 5 ++ data/mongodb-mms/osfamily/RedHat.yaml | 5 ++ data/mongodb/default.yaml | 29 +++++++++ data/mongodb/osfamily/Debian.yaml | 7 +++ data/mongodb/osfamily/RedHat.yaml | 19 ++++++ data/mongodb/upstream/default.yaml | 30 +++++++++ .../upstream/operatingsystem/Darwin.yaml | 16 +++++ .../upstream/operatingsystem/Debian10.yaml | 7 ++- .../upstream/operatingsystem/Debian11.yaml | 7 ++- .../upstream/operatingsystem/Debian9.yaml | 6 ++ .../upstream/operatingsystem/SLES12.yaml | 7 ++- .../upstream/operatingsystem/SLES15.yaml | 7 ++- .../upstream/operatingsystem/Ubuntu.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu16.04.yaml | 7 ++- .../upstream/operatingsystem/Ubuntu18.04.yaml | 7 ++- .../upstream/operatingsystem/Ubuntu20.04.yaml | 7 ++- .../upstream/operatingsystem/windows.yaml | 5 ++ data/mongodb/upstream/osfamily/Debian.yaml | 5 ++ data/mongodb/upstream/osfamily/RedHat.yaml | 5 ++ data/monit/default.yaml | 28 +++++++++ data/monit/osfamily/Debian.yaml | 13 ++++ data/monit/osfamily/RedHat.yaml | 5 ++ data/motd/default.yaml | 8 +++ data/motd/lsbdistcodename/wheezy.yaml | 8 +++ data/motd/operatingsystem/Debian.yaml | 8 +++ data/motd/operatingsystem/Solaris.yaml | 2 + data/msmtp/default.yaml | 15 +++++ data/msmtp/osfamily/Debian.yaml | 5 ++ data/multipath/default.yaml | 24 +++++++ data/multipath/osfamily/Debian.yaml | 15 +++++ data/multipath/osfamily/RedHat.yaml | 15 +++++ data/multipath/osfamily/Suse.yaml | 8 ++- data/multitail/default.yaml | 5 ++ data/munin-node/default.yaml | 34 ++++++++++ data/munin-node/osfamily/Debian.yaml | 5 ++ data/munin-node/osfamily/OpenBSD.yaml | 5 ++ data/munin-node/osfamily/RedHat.yaml | 7 +++ data/munin/default.yaml | 23 +++++++ data/munin/osfamily/Debian.yaml | 2 + data/munin/osfamily/RedHat.yaml | 2 + data/mysql/default.yaml | 34 ++++++++++ data/mysql/osfamily/Debian.yaml | 5 ++ data/mysql/osfamily/FreeBSD.yaml | 13 ++++ data/mysql/osfamily/RedHat.yaml | 12 ++++ .../mysql/repo/mysql57-community-RedHat6.yaml | 6 ++ .../mysql/repo/mysql57-community-RedHat7.yaml | 6 ++ data/mysql/repo/mysql80-community-Debian.yaml | 9 +++ data/mysql/repo/mysql80-community-RedHat.yaml | 5 ++ .../mysql/repo/mysql80-community-RedHat6.yaml | 9 +++ .../mysql/repo/mysql80-community-RedHat7.yaml | 9 +++ data/nagios-plugins/default.yaml | 5 ++ data/nagios-plugins/osfamily/Debian.yaml | 5 ++ data/nagios-plugins/osfamily/RedHat.yaml | 8 +++ data/nagios-plugins/osfamily/RedHat8.yaml | 2 + data/nagios-plugins/osfamily/Solaris.yaml | 5 ++ data/nagios/default.yaml | 28 +++++++++ data/nagios/osfamily/Debian.yaml | 30 +++++++++ data/nagios/osfamily/RedHat.yaml | 5 ++ data/nano/default.yaml | 5 ++ data/nats-server/default.yaml | 26 ++++++++ data/nats-server/osfamily/Darwin.yaml | 8 ++- data/nats-server/osfamily/windows.yaml | 9 ++- data/newrelic/default.yaml | 28 +++++++++ data/newrelic/osfamily/Debian.yaml | 5 ++ data/newrelic/osfamily/RedHat.yaml | 5 ++ data/nfs-client/default.yaml | 4 ++ data/nfs-client/osfamily/Debian.yaml | 8 +++ data/nfs-client/osfamily/RedHat.yaml | 8 +++ data/nfs-client/osfamily/Suse.yaml | 8 +++ data/nfs-server/default.yaml | 12 ++++ data/nfs-server/osfamily/Debian.yaml | 7 +++ data/nfs-server/osfamily/RedHat.yaml | 7 +++ data/nfs-server/osfamily/RedHat6.yaml | 4 ++ data/nfs-server/osfamily/Suse.yaml | 7 +++ data/nfs/default.yaml | 19 ++++++ data/nfs/osfamily/Debian.yaml | 10 +++ data/nfs/osfamily/RedHat.yaml | 11 ++++ data/nginx/default.yaml | 41 ++++++++++++ data/nginx/osfamily/Debian.yaml | 9 +++ data/nix/default.yaml | 13 +++- data/nodejs/default.yaml | 5 ++ data/nodejs/upstream/default.yaml | 5 ++ data/nodejs/upstream/osfamily/Debian.yaml | 9 +++ data/nodejs/upstream/osfamily/RedHat.yaml | 12 ++++ data/nomad-enterprise/default.yaml | 31 ++++++++++ data/nomad-enterprise/upstream/default.yaml | 5 ++ data/nomad/default.yaml | 31 ++++++++++ data/nomad/upstream/default.yaml | 6 +- data/notebook/default.yaml | 6 ++ data/nova/default.yaml | 23 +++++++ data/nova/osfamily/Debian.yaml | 10 +++ data/nova/osfamily/RedHat.yaml | 10 +++ data/nrpe/default.yaml | 30 +++++++++ data/nrpe/osfamily/Debian.yaml | 21 +++++++ data/nrpe/osfamily/OpenBSD.yaml | 8 +++ data/nrpe/osfamily/RedHat.yaml | 7 +++ data/nrpe/osfamily/Solaris.yaml | 23 +++++++ data/ntp/default.yaml | 30 +++++++++ data/ntp/osfamily/Debian.yaml | 5 ++ data/ntp/osfamily/RedHat.yaml | 7 +++ data/ntp/osfamily/Suse.yaml | 2 + data/ntpdate/default.yaml | 5 ++ data/ntpdate/osfamily/RedHat8.yaml | 5 ++ data/nuclei/default.yaml | 22 +++++++ data/nuclei/osfamily/Darwin.yaml | 8 ++- data/nuclei/osfamily/windows.yaml | 2 + data/nux/osfamily/RedHat.yaml | 8 +++ data/nux/osfamily/RedHat6.yaml | 5 ++ data/nux/osfamily/RedHat7.yaml | 5 ++ data/obs-studio/default.yaml | 11 ++++ data/obs-studio/osfamily/Darwin.yaml | 7 +++ data/obs-studio/osfamily/windows.yaml | 9 +++ data/octocatalog-diff/default.yaml | 19 ++++++ data/octocatalog-diff/osfamily/Debian.yaml | 6 ++ data/oh-my-zsh/default.yaml | 12 ++++ data/oh-my-zsh/osfamily/Darwin.yaml | 6 ++ data/omi/default.yaml | 29 +++++++++ data/omi/osfamily/Darwin.yaml | 10 +++ data/omi/osfamily/windows.yaml | 10 +++ data/openjdk-jdk/default.yaml | 2 + data/openjdk-jdk/operatingsystem/Debian9.yaml | 5 ++ data/openjdk-jdk/operatingsystem/Ubuntu.yaml | 5 ++ .../operatingsystem/Ubuntu10.04.yaml | 5 ++ .../operatingsystem/Ubuntu10.10.yaml | 5 ++ .../operatingsystem/Ubuntu15.04.yaml | 5 ++ data/openjdk-jdk/osfamily/Debian.yaml | 5 ++ data/openjdk-jdk/osfamily/Debian15.10.yaml | 5 ++ data/openjdk-jdk/osfamily/Debian5.yaml | 5 ++ data/openjdk-jdk/osfamily/Debian6.yaml | 5 ++ data/openjdk-jdk/osfamily/OpenBSD.yaml | 5 ++ data/openjdk-jdk/osfamily/RedHat6.yaml | 5 ++ data/openjdk-jdk/osfamily/RedHat7.yaml | 5 ++ data/openjdk-jdk/osfamily/Suse.yaml | 5 ++ data/openjdk-jre/default.yaml | 2 + data/openjdk-jre/operatingsystem/Debian9.yaml | 5 ++ data/openjdk-jre/operatingsystem/Ubuntu.yaml | 5 ++ .../operatingsystem/Ubuntu10.04.yaml | 5 ++ .../operatingsystem/Ubuntu10.10.yaml | 5 ++ .../operatingsystem/Ubuntu15.04.yaml | 5 ++ .../operatingsystem/Ubuntu15.10.yaml | 5 ++ data/openjdk-jre/osfamily/Debian.yaml | 5 ++ data/openjdk-jre/osfamily/Debian5.yaml | 5 ++ data/openjdk-jre/osfamily/Debian6.yaml | 5 ++ data/openjdk-jre/osfamily/OpenBSD.yaml | 5 ++ data/openjdk-jre/osfamily/RedHat6.yaml | 5 ++ data/openjdk-jre/osfamily/RedHat7.yaml | 5 ++ data/openjdk-jre/osfamily/Suse.yaml | 5 ++ data/openntpd/default.yaml | 30 +++++++++ data/openntpd/osfamily/Debian.yaml | 5 ++ data/openntpd/osfamily/OpenBSD.yaml | 23 +++++++ data/openssh/default.yaml | 33 +++++++++- data/openssh/osfamily/Debian.yaml | 12 ++++ data/openssh/osfamily/OpenBSD.yaml | 12 ++++ data/openssh/osfamily/RedHat.yaml | 30 +++++++++ data/openssh/osfamily/Solaris.yaml | 10 +++ data/openssh/osfamily/Solaris/10.yaml | 10 +++ data/openssh/osfamily/Solaris/11.yaml | 5 ++ data/openssh/osfamily/Suse.yaml | 10 +++ data/openswan/default.yaml | 34 ++++++++++ data/openswan/osfamily/RedHat.yaml | 6 +- data/openvpn/default.yaml | 32 ++++++++++ data/openvpn/osfamily/Debian.yaml | 8 +++ data/openvpn/osfamily/RedHat.yaml | 5 ++ data/openvswitch/default.yaml | 25 ++++++++ data/openvswitch/osfamily/Debian.yaml | 5 ++ data/openvswitch/osfamily/RedHat.yaml | 5 ++ data/orientdb/default.yaml | 37 +++++++++++ data/orientdb/osfamily/Debian.yaml | 5 ++ data/orientdb/osfamily/RedHat.yaml | 5 ++ data/pacemaker/default.yaml | 18 ++++++ data/pacemaker/osfamily/Debian.yaml | 5 ++ data/pacemaker/osfamily/RedHat.yaml | 5 ++ data/packer/default.yaml | 9 +++ data/packer/upstream/default.yaml | 5 ++ data/packetbeat/default.yaml | 32 ++++++++++ data/packetbeat/osfamily/Debian.yaml | 5 ++ data/packetbeat/osfamily/RedHat.yaml | 5 ++ data/packetbeat/osfamily/windows.yaml | 8 +++ data/packetbeat/upstream/default.yaml | 6 +- data/pam/default.yaml | 19 ++++++ data/passenger-apache/default.yaml | 5 ++ data/passenger-apache/osfamily/Debian.yaml | 13 ++++ data/passenger-apache/osfamily/RedHat.yaml | 13 ++++ data/passenger-nginx/default.yaml | 5 ++ data/passenger-nginx/osfamily/Debian.yaml | 13 ++++ data/passenger-nginx/osfamily/RedHat.yaml | 15 +++++ data/passenger/default.yaml | 5 ++ data/passenger/osfamily/Debian.yaml | 10 +++ data/passenger/osfamily/RedHat.yaml | 5 ++ data/pe-client-tools/default.yaml | 9 ++- data/pgbouncer/default.yaml | 33 ++++++++++ data/pgbouncer/osfamily/Debian.yaml | 16 +++++ data/pgbouncer/osfamily/RedHat.yaml | 9 ++- data/pgbouncer/upstream/default.yaml | 8 +++ .../upstream/operatingsystem/Debian10.yaml | 7 +++ .../upstream/operatingsystem/Debian9.yaml | 7 +++ data/pgbouncer/upstream/osfamily/RedHat7.yaml | 7 +++ data/pgbouncer/upstream/osfamily/RedHat8.yaml | 7 +++ data/php-fpm/default.yaml | 28 +++++++++ data/php-fpm/osfamily/Debian.yaml | 5 ++ data/php-fpm/osfamily/RedHat.yaml | 5 ++ data/php/default.yaml | 19 ++++++ data/php/osfamily/Debian.yaml | 19 ++++++ data/php/osfamily/RedHat.yaml | 16 +++++ data/php/osfamily/Suse.yaml | 19 ++++++ data/postfix/default.yaml | 36 +++++++++++ data/postfix/operatingsystem/Ubuntu14.04.yaml | 2 + data/postfix/osfamily/Debian.yaml | 7 +++ data/postfix/osfamily/RedHat.yaml | 5 ++ data/postfix/osfamily/Suse.yaml | 2 + data/postgresql/default.yaml | 34 ++++++++++ data/postgresql/osfamily/Debian.yaml | 22 +++++++ data/postgresql/osfamily/RedHat.yaml | 5 ++ data/powershell/default.yaml | 16 +++++ data/powershell/osfamily/Darwin.yaml | 7 +++ data/powershell/osfamily/windows.yaml | 9 +++ data/powertoys/default.yaml | 5 ++ data/powertoys/osfamily/windows.yaml | 10 +++ data/procdump/default.yaml | 11 ++++ data/procdump/osfamily/Darwin.yaml | 7 +++ data/procdump/osfamily/windows.yaml | 7 +++ data/profile/default.yaml | 16 +++++ data/proftpd/default.yaml | 34 ++++++++++ data/proftpd/osfamily/Debian.yaml | 5 ++ data/proftpd/osfamily/RedHat.yaml | 5 ++ data/prometheus/default.yaml | 29 +++++++++ data/prometheus/operatingsystem/Devuan4.yaml | 6 +- data/prometheus/osfamily/Darwin.yaml | 8 ++- data/prometheus/osfamily/Debian.yaml | 6 +- data/prometheus/osfamily/RedHat.yaml | 4 ++ data/prometheus/osfamily/windows.yaml | 24 +++++++ data/prometheus/osfamily/windows11.yaml | 5 ++ data/psmisc/default.yaml | 5 ++ data/puppet-agent/default.yaml | 33 ++++++++++ data/puppet-agent/osfamily/Debian.yaml | 5 ++ data/puppet-agent/osfamily/RedHat.yaml | 7 +++ data/puppet-agent/upstream/default.yaml | 5 ++ .../puppet-agent/upstream/osfamily/Linux.yaml | 7 +++ .../upstream/osfamily/windows.yaml | 24 +++++++ data/puppet/default.yaml | 27 ++++++++ data/puppet/osfamily/Debian.yaml | 5 ++ data/puppet/osfamily/RedHat.yaml | 7 +++ data/puppet/upstream/default.yaml | 35 ++++++++++- data/puppet/upstream/osfamily/Linux.yaml | 10 +++ data/puppet/upstream/osfamily/windows.yaml | 29 +++++++++ data/puppet/upstream/osfamily/windows11.yaml | 5 ++ data/puppet_repo/default.yaml | 3 + data/puppet_repo/upstream/default.yaml | 5 ++ .../upstream/operatingsystem/Debian10.yaml | 5 ++ .../upstream/operatingsystem/Debian11.yaml | 5 ++ .../upstream/operatingsystem/Debian7.yaml | 5 ++ .../upstream/operatingsystem/Debian8.yaml | 5 ++ .../upstream/operatingsystem/Debian9.yaml | 5 ++ .../upstream/operatingsystem/Devuan4.yaml | 5 ++ .../upstream/operatingsystem/Fedora30.yaml | 5 ++ .../upstream/operatingsystem/Fedora31.yaml | 5 ++ .../upstream/operatingsystem/Fedora32.yaml | 5 ++ .../upstream/operatingsystem/Fedora34.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu14.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu16.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu18.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu20.04.yaml | 5 ++ .../upstream/operatingsystem/Ubuntu22.04.yaml | 5 ++ .../puppet_repo/upstream/osfamily/Darwin.yaml | 9 ++- .../upstream/osfamily/RedHat5.yaml | 5 ++ .../upstream/osfamily/RedHat6.yaml | 5 ++ .../upstream/osfamily/RedHat7.yaml | 5 ++ .../upstream/osfamily/RedHat8.yaml | 5 ++ .../upstream/osfamily/RedHat9.yaml | 5 ++ .../puppet_repo/upstream/osfamily/Suse11.yaml | 5 ++ .../puppet_repo/upstream/osfamily/Suse12.yaml | 5 ++ .../puppet_repo/upstream/osfamily/Suse15.yaml | 5 ++ data/puppetdb-termini/default.yaml | 21 ++++++- data/puppetdb/default.yaml | 41 +++++++++++- data/puppetdb/osfamily/Debian.yaml | 5 ++ data/puppetdb/osfamily/RedHat.yaml | 5 ++ data/puppetserver/default.yaml | 39 +++++++++++- data/puppetserver/osfamily/Debian.yaml | 5 ++ data/puppetserver/osfamily/RedHat.yaml | 7 +++ data/pwgen/default.yaml | 5 ++ data/pwgen/operatingsystem/OracleLinux.yaml | 5 ++ data/python-pip/default.yaml | 15 +++++ data/python-pip/osfamily/Debian.yaml | 5 ++ data/python-pip/osfamily/Debian20.04.yaml | 5 ++ data/python-pip/osfamily/Debian22.04.yaml | 5 ++ data/python-pip/osfamily/Fedora36.yaml | 6 +- data/python-pip/osfamily/RedHat7.yaml | 6 +- data/python-pip/osfamily/RedHat8.yaml | 5 ++ data/python-pip/osfamily/RedHat9.yaml | 6 +- data/python-pip/osfamily/Suse.yaml | 5 ++ data/python-pip/osfamily/windows.yaml | 6 +- data/pytorch/default.yaml | 9 +++ data/quagga/default.yaml | 30 +++++++++ data/quagga/osfamily/Debian.yaml | 5 ++ data/quagga/osfamily/RedHat.yaml | 5 ++ data/quantum/default.yaml | 25 ++++++++ data/quantum/osfamily/Debian.yaml | 10 +++ data/quantum/osfamily/RedHat.yaml | 10 +++ data/r10k/default.yaml | 15 +++++ data/rabbitmq/default.yaml | 32 ++++++++++ data/rabbitmq/osfamily/Debian.yaml | 10 +++ data/rabbitmq/osfamily/RedHat.yaml | 10 +++ data/rails/default.yaml | 5 ++ data/rails/osfamily/Debian.yaml | 6 ++ data/rails/osfamily/RedHat.yaml | 6 ++ data/redis/default.yaml | 30 +++++++++ data/redis/operatingsystem/testos-0.0.1.yaml | 19 ++++++ data/redis/operatingsystem/testos.yaml | 19 ++++++ data/redis/osfamily/Debian.yaml | 10 +++ data/redis/osfamily/RedHat.yaml | 8 +++ data/redis/osfamily/test.yaml | 21 +++++++ data/reference/default.yaml | 62 +++++++++++++++++++ data/reference/osfamily/Darwin.yaml | 10 +++ data/reference/osfamily/Debian.yaml | 5 ++ data/reference/osfamily/RedHat.yaml | 4 ++ data/reference/osfamily/windows.yaml | 9 +++ data/remi/osfamily/CentOS6.yaml | 5 ++ data/remi/osfamily/CentOS7.yaml | 5 ++ data/remi/osfamily/RedHat.yaml | 8 +++ data/remi/osfamily/RedHat6.yaml | 11 +++- data/remi/osfamily/RedHat7.yaml | 11 +++- data/remi/osfamily/RedHat8.yaml | 5 ++ data/rinse/default.yaml | 17 +++++ data/rinse/osfamily/Debian.yaml | 8 +++ data/rpmfusion-free/osfamily/CentOS8.yaml | 7 +++ data/rpmfusion-free/osfamily/RedHat.yaml | 8 +++ data/rpmfusion-free/osfamily/RedHat6.yaml | 5 ++ data/rpmfusion-free/osfamily/RedHat7.yaml | 5 ++ data/rpmfusion-free/osfamily/RedHat8.yaml | 12 ++++ data/rpmfusion-nonfree/osfamily/CentOS8.yaml | 8 ++- data/rpmfusion-nonfree/osfamily/RedHat.yaml | 8 +++ data/rpmfusion-nonfree/osfamily/RedHat6.yaml | 5 ++ data/rpmfusion-nonfree/osfamily/RedHat7.yaml | 5 ++ data/rpmfusion-nonfree/osfamily/RedHat8.yaml | 13 +++- data/rsync/default.yaml | 22 +++++++ data/rsync/osfamily/Debian.yaml | 5 ++ data/rsync/osfamily/FreeBSD.yaml | 16 +++++ data/rsync/osfamily/RedHat.yaml | 5 ++ data/rsyslog-relp/default.yaml | 5 ++ data/rsyslog/default.yaml | 36 +++++++++++ data/rsyslog/osfamily/Debian.yaml | 9 +++ data/ruby-dev/default.yaml | 5 ++ data/ruby-dev/osfamily/Debian.yaml | 5 ++ data/ruby-dev/osfamily/RedHat.yaml | 5 ++ data/ruby-dev/osfamily/Suse.yaml | 5 ++ data/ruby/default.yaml | 5 ++ data/ruby/osfamily/RedHat6.yaml | 5 ++ data/rundeck/default.yaml | 35 +++++++++++ data/rundeck/osfamily/Debian.yaml | 2 + data/rundeck/osfamily/RedHat.yaml | 6 ++ data/samba/default.yaml | 33 ++++++++++ data/samba/operatingsystem/Debian9.yaml | 4 ++ data/samba/osfamily/Debian.yaml | 9 +++ data/samba/osfamily/Suse.yaml | 7 +++ data/sample/default.yaml | 4 ++ data/sample/osfamily/Darwin.yaml | 8 ++- data/sample/osfamily/Debian.yaml | 3 +- data/sample/osfamily/RedHat.yaml | 4 ++ data/sample/osfamily/windows.yaml | 7 ++- data/scikit-learn/default.yaml | 6 ++ data/scikit-learn/osfamily/Debian.yaml | 9 +++ data/scikit-learn/osfamily/RedHat.yaml | 6 ++ data/scl/operatingsystem/CentOS.yaml | 5 ++ data/scl/operatingsystem/RedHat6.yaml | 7 +++ data/scl/operatingsystem/RedHat7.yaml | 7 +++ data/screen/default.yaml | 11 ++++ data/scx/default.yaml | 21 +++++++ data/scx/osfamily/windows.yaml | 10 +++ data/sendmail/default.yaml | 30 +++++++++ data/sendmail/osfamily/Debian.yaml | 10 +++ data/sendmail/osfamily/RedHat.yaml | 8 +++ data/sensu/default.yaml | 35 +++++++++++ data/serf/default.yaml | 10 ++- data/serf/upstream/default.yaml | 6 +- data/snmp/default.yaml | 34 ++++++++++ data/snmp/osfamily/Darwin.yaml | 8 ++- data/snmp/osfamily/Debian.yaml | 16 ++++- data/snmp/osfamily/OpenBSD.yaml | 19 ++++++ data/snmp/osfamily/RedHat.yaml | 9 ++- data/snmp/osfamily/Solaris.yaml | 19 ++++++ data/snmp/osfamily/windows.yaml | 7 ++- data/spiderfoot/default.yaml | 16 +++++ 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/Darwin.yaml | 7 +++ data/spiderfoot/osfamily/Debian.yaml | 7 ++- data/spiderfoot/osfamily/RedHat.yaml | 4 ++ data/spiderfoot/osfamily/windows.yaml | 9 ++- data/spiderfoot/osfamily/windows11.yaml | 5 ++ data/squid/default.yaml | 28 +++++++++ data/squid/osfamily/Debian9.yaml | 21 +++++++ data/ssmtp/default.yaml | 17 +++++ data/strace/default.yaml | 5 ++ data/subversion/default.yaml | 17 +++++ data/sudo/default.yaml | 14 +++++ data/supervisor/default.yaml | 24 +++++++ data/supervisor/osfamily/Debian.yaml | 10 +++ data/supervisor/osfamily/Linux.yaml | 18 ++++++ data/supervisor/osfamily/RedHat.yaml | 16 +++++ data/supervisor/osfamily/RedHat6.yaml | 16 +++++ data/surfex/default.yaml | 4 ++ data/sysdig/default.yaml | 6 ++ .../upstream/operatingsystem/Ubuntu14.04.yaml | 7 +++ data/sysdig/upstream/osfamily/Debian.yaml | 5 ++ data/sysdig/upstream/osfamily/RedHat.yaml | 9 +++ data/sysdig/upstream/osfamily/RedHat9.yaml | 12 ++++ data/sysdig/upstream/osfamily/Suse.yaml | 2 + data/sysfs/default.yaml | 21 +++++++ data/sysinternals/default.yaml | 11 ++++ data/sysinternals/osfamily/windows.yaml | 10 +++ data/sysklogd/default.yaml | 22 +++++++ data/sysklogd/osfamily/Debian.yaml | 7 +++ data/syslog-ng/default.yaml | 24 +++++++ data/syslog-ng/osfamily/Debian.yaml | 5 ++ data/syslog-ng/osfamily/RedHat.yaml | 5 ++ data/sysmon/default.yaml | 11 ++++ data/sysmon/osfamily/windows.yaml | 9 ++- data/sysstat/default.yaml | 23 +++++++ data/sysstat/osfamily/Debian.yaml | 5 ++ data/sysstat/osfamily/RedHat.yaml | 5 ++ data/tcpdump/default.yaml | 5 ++ data/telegram-desktop/default.yaml | 11 ++++ data/telegram-desktop/osfamily/Darwin.yaml | 7 +++ data/telegram-desktop/osfamily/windows.yaml | 9 +++ data/telnet/default.yaml | 5 ++ data/tensorflow/default.yaml | 6 ++ data/terraform/default.yaml | 6 ++ data/terraform/upstream/default.yaml | 6 +- data/test/default.yaml | 34 ++++++++++ data/test/osfamily/Debian.yaml | 5 ++ data/test/osfamily/RedHat.yaml | 5 ++ data/tftpd/default.yaml | 34 ++++++++++ data/tftpd/osfamily/Debian.yaml | 17 +++++ data/tinc/default.yaml | 34 ++++++++++ data/tinc/osfamily/Debian.yaml | 5 ++ data/tinc/osfamily/RedHat.yaml | 5 ++ data/tree/default.yaml | 5 ++ data/trickle/default.yaml | 5 ++ data/trickle/operatingsystem/OracleLinux.yaml | 5 ++ data/twitch-studio/default.yaml | 7 +++ data/twitch-studio/osfamily/Darwin.yaml | 7 +++ data/twitch-studio/osfamily/windows.yaml | 10 +++ data/twitch/default.yaml | 11 ++++ data/twitch/osfamily/Darwin.yaml | 9 ++- data/twitch/osfamily/windows.yaml | 9 +++ data/ulyaoth/osfamily/RedHat.yaml | 6 ++ data/unzip/default.yaml | 5 ++ data/unzip/osfamily/windows.yaml | 5 ++ data/vagrant/default.yaml | 14 +++++ data/vagrant/upstream/default.yaml | 6 +- data/varnish/default.yaml | 35 +++++++++++ data/varnish/osfamily/Debian.yaml | 5 ++ data/varnish/osfamily/RedHat.yaml | 5 ++ data/varnish/osfamily/Suse12.yaml | 16 +++++ data/vault-enterprise/default.yaml | 28 +++++++++ data/vault-enterprise/upstream/default.yaml | 6 +- data/vault/default.yaml | 30 +++++++++ data/vault/upstream/default.yaml | 5 ++ data/vim/default.yaml | 17 +++++ data/vim/operatingsystem/Fedora36.yaml | 11 ++++ data/vim/osfamily/RedHat.yaml | 8 +++ data/vim/osfamily/RedHat8.yaml | 11 ++++ data/vim/osfamily/RedHat9.yaml | 11 ++++ data/virtualbox/default.yaml | 13 ++++ data/virtualbox/operatingsystem/Debian7.yaml | 8 +++ .../operatingsystem/Ubuntu14.04.yaml | 8 +++ .../operatingsystem/Ubuntu14.10.yaml | 8 +++ .../operatingsystem/Ubuntu15.04.yaml | 8 +++ .../operatingsystem/Ubuntu15.10.yaml | 8 +++ .../operatingsystem/Ubuntu18.04.yaml | 8 +++ data/virtualbox/osfamily/Debian.yaml | 9 +++ data/virtualbox/osfamily/RedHat.yaml | 14 +++++ data/vscode/default.yaml | 16 +++++ data/vscode/osfamily/Darwin.yaml | 6 +- data/vscode/osfamily/Debian.yaml | 7 +++ data/vscode/osfamily/RedHat.yaml | 7 +++ data/vscode/osfamily/windows.yaml | 9 +++ data/vsftpd/default.yaml | 32 ++++++++++ data/vsftpd/osfamily/Debian.yaml | 20 ++++++ data/vsftpd/osfamily/RedHat.yaml | 10 +++ data/waypoint/default.yaml | 9 +++ data/waypoint/upstream/default.yaml | 6 +- data/wazuh-agent/default.yaml | 25 ++++++++ .../wazuh-agent/upstream/osfamily/Debian.yaml | 12 +++- .../wazuh-agent/upstream/osfamily/RedHat.yaml | 9 +++ data/wazuh-agent/upstream/osfamily/Suse.yaml | 2 + .../upstream/osfamily/Debian.yaml | 12 +++- .../upstream/osfamily/RedHat.yaml | 9 +++ data/wazuh-server/upstream/osfamily/Suse.yaml | 2 + data/webex-meetings/default.yaml | 11 ++++ data/webex-meetings/osfamily/Darwin.yaml | 8 +++ data/webex-meetings/osfamily/windows.yaml | 10 +++ data/webex/default.yaml | 10 +++ data/webex/osfamily/Darwin.yaml | 8 +++ data/webex/osfamily/windows.yaml | 10 +++ data/wpscan/default.yaml | 5 ++ data/xinetd/default.yaml | 26 ++++++++ data/xinetd/osfamily/Debian.yaml | 5 ++ data/yarn/default.yaml | 5 ++ data/yarn/osfamily/Debian.yaml | 11 ++++ data/yarn/osfamily/RedHat.yaml | 7 +++ data/yum-cron/default.yaml | 15 +++++ data/zabbix-agent/default.yaml | 32 ++++++++++ data/zabbix-agent/osfamily/Debian.yaml | 5 ++ data/zabbix-agent/osfamily/RedHat.yaml | 5 ++ data/zabbix-agent/osfamily/Suse.yaml | 8 +++ data/zeek/default.yaml | 25 ++++++++ data/zeek/upstream/default.yaml | 5 ++ .../zeek/upstream/operatingsystem/CentOS.yaml | 5 ++ .../upstream/operatingsystem/CentOS7.yaml | 5 ++ .../upstream/operatingsystem/CentOS8.yaml | 5 ++ .../zeek/upstream/operatingsystem/Darwin.yaml | 5 ++ .../zeek/upstream/operatingsystem/Debian.yaml | 12 ++++ .../upstream/operatingsystem/Debian10.yaml | 6 ++ .../upstream/operatingsystem/Fedora29.yaml | 5 ++ .../upstream/operatingsystem/Fedora30.yaml | 5 ++ .../upstream/operatingsystem/Fedora31.yaml | 5 ++ .../upstream/operatingsystem/Fedora32.yaml | 5 ++ .../upstream/operatingsystem/Raspbian10.yaml | 6 ++ .../zeek/upstream/operatingsystem/RedHat.yaml | 16 +++++ .../upstream/operatingsystem/RedHat7.yaml | 5 ++ .../upstream/operatingsystem/RedHat8.yaml | 5 ++ .../zeek/upstream/operatingsystem/Ubuntu.yaml | 14 +++++ .../upstream/operatingsystem/Ubuntu18.04.yaml | 6 ++ .../upstream/operatingsystem/Ubuntu18.10.yaml | 6 ++ .../upstream/operatingsystem/Ubuntu19.04.yaml | 6 ++ .../upstream/operatingsystem/Ubuntu19.10.yaml | 6 ++ .../upstream/operatingsystem/Ubuntu20.04.yaml | 7 ++- .../upstream/operatingsystem/Ubuntu22.04.yaml | 7 ++- data/zeek/upstream/osfamily/Debian.yaml | 2 + data/zenml/default.yaml | 6 ++ data/zoom/default.yaml | 10 +++ data/zoom/osfamily/Darwin.yaml | 8 +++ data/zoom/osfamily/windows.yaml | 10 +++ 1034 files changed, 10899 insertions(+), 102 deletions(-) diff --git a/data/activemq/default.yaml b/data/activemq/default.yaml index 261dc690..21d7aed0 100644 --- a/data/activemq/default.yaml +++ b/data/activemq/default.yaml @@ -19,3 +19,39 @@ activemq::settings: test_commands: status: 'activemq status' docker_image: 'apache/activemq' + +# Version 4 format + packages: + main: + name: activemq + services: + activemq: + process_name: java + process_extra_name: activemq + process_user: activemq + process_group: activemq + files: + config: + path: "/etc/activemq/activemq.xml" + log: + path: "/var/log/activemq" + pid: + path: "/var/run/activemq/activemq.pid" + user_files: + config: + path: "$HOME/.activemq/activemq.xml" + dirs: + config: + path: "/etc/activemq" + user_dirs: + config: + path: "$HOME/.activemq" + ports: + main: + port: '8161' + protocol: tcp + urls: + website: https://activemq.apache.org/ + source: https://github.com/apache/activemq + image: + name: apache/activemq diff --git a/data/activemq/osfamily/Debian.yaml b/data/activemq/osfamily/Debian.yaml index 1a0f8352..fef370d1 100644 --- a/data/activemq/osfamily/Debian.yaml +++ b/data/activemq/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- activemq::settings: init_file_path: '/etc/default/activemq' + +# Version 4 format + files: + init: + path: "/etc/default/activemq" diff --git a/data/activemq/osfamily/RedHat.yaml b/data/activemq/osfamily/RedHat.yaml index 033e3dc3..75509234 100644 --- a/data/activemq/osfamily/RedHat.yaml +++ b/data/activemq/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ activemq::settings: package_name: '' service_name: '' + +# Version 4 format + packages: + main: + name: '' + services: + '': {} diff --git a/data/ansible/default.yaml b/data/ansible/default.yaml index b95ef619..5f05d1f7 100644 --- a/data/ansible/default.yaml +++ b/data/ansible/default.yaml @@ -9,3 +9,26 @@ ansible::settings: website_url: 'https://www.ansible.com/' git_source: 'https://github.com/ansible/ansible' docker_image: 'quay.io/ansible/ansible-runner' + +# Version 4 format + packages: + main: + name: ansible + files: + config: + path: "/etc/ansible/ansible.cfg" + format: inifile_with_stanzas + user_files: + config: + path: "$HOME/.ansible/ansible.cfg" + dirs: + config: + path: "/etc/ansible" + user_dirs: + config: + path: "$HOME/.ansible" + urls: + website: https://www.ansible.com/ + source: https://github.com/ansible/ansible + image: + name: quay.io/ansible/ansible-runner diff --git a/data/apache/default.yaml b/data/apache/default.yaml index b8157291..1a46156d 100644 --- a/data/apache/default.yaml +++ b/data/apache/default.yaml @@ -25,3 +25,45 @@ apache::settings: website_url: 'https://httpd.apache.org/' git_source: 'https://github.com/apache/httpd' docker_image: 'httpd' + +# Version 4 format + packages: + main: + name: httpd + services: + httpd: + process_name: httpd + process_user: apache + process_group: apache + nodaemon_args: "-DFOREGROUND" + files: + config: + path: "/etc/httpd/conf/httpd.conf" + log: + path: + - "/var/log/httpd/access.log" + - "/var/log/httpd/error.log" + pid: + path: "/var/run/httpd.pid" + user_files: + config: + path: "$HOME/.httpd/conf/httpd.conf" + dirs: + config: + path: "/etc/httpd" + log: + path: "/var/log/httpd" + data: + path: "/var/www/html" + user_dirs: + config: + path: "$HOME/.httpd" + ports: + main: + port: '80' + protocol: tcp + urls: + website: https://httpd.apache.org/ + source: https://github.com/apache/httpd + image: + name: httpd diff --git a/data/apache/osfamily/Debian.yaml b/data/apache/osfamily/Debian.yaml index 12c670a2..f368f7b3 100644 --- a/data/apache/osfamily/Debian.yaml +++ b/data/apache/osfamily/Debian.yaml @@ -28,3 +28,39 @@ apache::settings: show_loaded_modules: 'apache2 -t -D DUMP_MODULES' test_commands: validate_config: 'source /etc/apache2/envvars ; apache2 -t' + +# Version 4 format + packages: + main: + name: apache2 + services: + apache2: + process_name: apache2 + process_user: www-data + process_group: www-data + files: + config: + path: "/etc/apache2/apache2.conf" + log: + path: + - "/var/log/apache2/access.log" + - "/var/log/apache2/error.log" + init: + path: "/etc/default/apache2" + pid: + path: "/var/run/apache2.pid" + user_files: + config: + path: "$HOME/.apache2/apache2.conf" + dirs: + config: + path: "/etc/apache2" + conf: + path: "/etc/apache2/conf.d" + log: + path: "/var/log/apache2" + data: + path: "/var/www" + user_dirs: + config: + path: "$HOME/.apache2" diff --git a/data/apache/osfamily/FreeBSD.yaml b/data/apache/osfamily/FreeBSD.yaml index 6995315d..880b3e02 100644 --- a/data/apache/osfamily/FreeBSD.yaml +++ b/data/apache/osfamily/FreeBSD.yaml @@ -2,3 +2,17 @@ apache::settings: config_file_path: '/usr/local/etc/apache20/httpd.conf' config_dir_path: '/usr/local/etc/apache20' + +# Version 4 format + files: + config: + path: "/usr/local/etc/apache20/httpd.conf" + user_files: + config: + path: "/usr/local$HOME/.apache20/httpd.conf" + dirs: + config: + path: "/usr/local/etc/apache20" + user_dirs: + config: + path: "/usr/local$HOME/.apache20" diff --git a/data/apache/osfamily/Linux.yaml b/data/apache/osfamily/Linux.yaml index 6c4aea24..bb3d3e7d 100644 --- a/data/apache/osfamily/Linux.yaml +++ b/data/apache/osfamily/Linux.yaml @@ -14,3 +14,39 @@ apache::settings: process_user: 'apache' process_group: 'apache' modules_dir_path: '/usr/lib/apache2' + +# Version 4 format + packages: + main: + name: apache2 + services: + apache2: + process_name: httpd + process_user: apache + process_group: apache + files: + config: + path: "/etc/apache2/httpd.conf" + log: + path: + - "/var/log/apache2/access.log" + - "/var/log/apache2/error.log" + init: + path: "/etc/conf.d/apache2" + pid: + path: "/var/run/apache2/httpd.pid" + user_files: + config: + path: "$HOME/.apache2/httpd.conf" + dirs: + config: + path: "/etc/apache2" + conf: + path: "/etc/apache2/conf.d" + log: + path: "/var/log/apache2" + data: + path: "/var/www" + user_dirs: + config: + path: "$HOME/.apache2" diff --git a/data/apache/osfamily/RedHat.yaml b/data/apache/osfamily/RedHat.yaml index 575fb84f..b49a7192 100644 --- a/data/apache/osfamily/RedHat.yaml +++ b/data/apache/osfamily/RedHat.yaml @@ -15,3 +15,43 @@ apache::settings: process_name: 'httpd' process_user: 'apache' process_group: 'apache' + +# Version 4 format + packages: + main: + name: httpd + services: + httpd: + process_name: httpd + process_user: apache + process_group: apache + files: + config: + path: "/etc/httpd/conf/httpd.conf" + log: + path: + - "/var/log/httpd/access_log" + - "/var/log/httpd/error_log" + init: + path: "/etc/sysconfig/httpd" + pid: + path: "/var/run/httpd.pid" + user_files: + config: + path: "$HOME/.httpd/conf/httpd.conf" + dirs: + config: + path: "/etc/httpd" + conf: + path: "/etc/httpd/conf.d" + log: + path: "/var/log/httpd" + data: + path: "/var/www/html" + user_dirs: + config: + path: "$HOME/.httpd" + ports: + main: + port: '80' + protocol: tcp diff --git a/data/apache/osfamily/Suse.yaml b/data/apache/osfamily/Suse.yaml index d04a6c67..3f44e345 100644 --- a/data/apache/osfamily/Suse.yaml +++ b/data/apache/osfamily/Suse.yaml @@ -21,3 +21,37 @@ apache::settings: test_commands: validate_config: 'httpd2-prefork -t' version_command: 'httpd2-prefork -v' + +# Version 4 format + packages: + main: + name: apache2 + services: + apache2: + process_name: httpd2-prefork + process_user: wwwrun + process_group: wwwrun + files: + config: + path: "/etc/apache2/httpd.conf" + log: + path: + - "/var/log/apache2/access.log" + - "/var/log/apache2/error.log" + init: + path: "/etc/default/apache2" + pid: + path: "/var/run/httpd2.pid" + user_files: + config: + path: "$HOME/.apache2/httpd.conf" + dirs: + config: + path: "/etc/apache2" + log: + path: "/var/log/apache2" + data: + path: "/var/www/htdocs" + user_dirs: + config: + path: "$HOME/.apache2" diff --git a/data/apm-server/default.yaml b/data/apm-server/default.yaml index 25c95893..c938f921 100644 --- a/data/apm-server/default.yaml +++ b/data/apm-server/default.yaml @@ -14,3 +14,37 @@ apm-server::settings: process_name: 'apm-server' version_command: 'apm-server version' docker_image: 'elastic/apm-server' + +# Version 4 format + packages: + main: + name: apm-server + services: + apm-server: + process_name: apm-server + files: + config: + path: "/etc/apm-server/apm-server.yml" + format: yaml + log: + path: "/var/log/apm-server/apm-server" + pid: + path: "/var/run/apm-server.pid" + user_files: + config: + path: "$HOME/.apm-server/apm-server.yml" + dirs: + config: + path: "/etc/apm-server" + log: + path: "/var/log/apm-server" + home: + path: "/usr/share/apm-server" + data: + path: "/var/lib/apm-server" + user_dirs: + config: + path: "$HOME/.apm-server" + image: + name: elastic/apm-server + repo: upstream diff --git a/data/apm-server/osfamily/Debian.yaml b/data/apm-server/osfamily/Debian.yaml index 477f8af2..4c72e17e 100644 --- a/data/apm-server/osfamily/Debian.yaml +++ b/data/apm-server/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- apm-server::settings: init_file_path: '/etc/default/apm-server' + +# Version 4 format + files: + init: + path: "/etc/default/apm-server" diff --git a/data/apm-server/osfamily/RedHat.yaml b/data/apm-server/osfamily/RedHat.yaml index d7e2c6aa..ded13d16 100644 --- a/data/apm-server/osfamily/RedHat.yaml +++ b/data/apm-server/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- apm-server::settings: init_file_path: '/etc/sysconfig/apm-server' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/apm-server" diff --git a/data/apm-server/osfamily/RedHat9.yaml b/data/apm-server/osfamily/RedHat9.yaml index d12b337f..bdfb50cc 100644 --- a/data/apm-server/osfamily/RedHat9.yaml +++ b/data/apm-server/osfamily/RedHat9.yaml @@ -9,3 +9,15 @@ apm-server::settings: disallow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT' onlyif: '/usr/bin/update-crypto-policies --show | grep SHA1' + +# Version 4 format + preinstall: + exec: + allow_sha1: + command: "/usr/bin/update-crypto-policies --set DEFAULT:SHA1" + unless: dnf info apm-server + postinstall: + exec: + disallow_sha1: + command: "/usr/bin/update-crypto-policies --set DEFAULT" + onlyif: "/usr/bin/update-crypto-policies --show | grep SHA1" diff --git a/data/apm-server/osfamily/windows.yaml b/data/apm-server/osfamily/windows.yaml index 015a39c4..cf7d0cb4 100644 --- a/data/apm-server/osfamily/windows.yaml +++ b/data/apm-server/osfamily/windows.yaml @@ -2,3 +2,11 @@ apm-server::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\apm-server\tools\apm-server.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\apm-server\tools\apm-server.yml + user_files: + config: + 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 index b23d4324..e9ce490e 100644 --- a/data/apm-server/upstream/default.yaml +++ b/data/apm-server/upstream/default.yaml @@ -1,4 +1,8 @@ --- apm-server::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/apparmor/default.yaml b/data/apparmor/default.yaml index ce9feaaf..5ab1b48c 100644 --- a/data/apparmor/default.yaml +++ b/data/apparmor/default.yaml @@ -12,3 +12,27 @@ apparmor::settings: debug_commands: show_denied: 'grep -i denied /var/log/kern.log /var/log/syslog' version_command: 'dpkg -l apparmor | grep apparmor' + +# Version 4 format + packages: + main: + name: '' + files: + config: + path: "/etc/apparmor/parser.conf" + user_files: + config: + path: "$HOME/.apparmor/parser.conf" + dirs: + config: + path: "/etc/apparmor/" + conf: + path: "/etc/apparmor.d/" + data: + path: "/var/cache/apparmor/" + user_dirs: + config: + path: "$HOME/.apparmor/" + urls: + website: https://apparmor.net/ + source: https://gitlab.com/apparmor/apparmor diff --git a/data/apparmor/osfamily/Debian.yaml b/data/apparmor/osfamily/Debian.yaml index 23d9c325..9239b24d 100644 --- a/data/apparmor/osfamily/Debian.yaml +++ b/data/apparmor/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- apparmor::settings: package_name: 'apparmor' + +# Version 4 format + packages: + main: + name: apparmor diff --git a/data/apt/default.yaml b/data/apt/default.yaml index c21f9b68..c6c55db2 100644 --- a/data/apt/default.yaml +++ b/data/apt/default.yaml @@ -7,4 +7,26 @@ apt::settings: 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 + data_dir_path: '/var/cache/apt' +# Version 4 format + packages: + main: + name: apt + files: + config: + path: "/etc/apt/apt.conf" + log: + path: "/var/log/apt" + user_files: + config: + path: "$HOME/.apt/apt.conf" + dirs: + config: + path: "/etc/apt" + conf: + path: "/etc/apt/apt.conf.d" + data: + path: "/var/cache/apt" + user_dirs: + config: + path: "$HOME/.apt" diff --git a/data/apt/osfamily/Darwin.yaml b/data/apt/osfamily/Darwin.yaml index b9b7c07a..22bfda4b 100644 --- a/data/apt/osfamily/Darwin.yaml +++ b/data/apt/osfamily/Darwin.yaml @@ -1,4 +1,10 @@ --- apt::settings: package_name: '' - service_name: '' \ No newline at end of file + service_name: '' +# Version 4 format + packages: + main: + name: '' + services: + '': {} diff --git a/data/apt/osfamily/RedHat.yaml b/data/apt/osfamily/RedHat.yaml index b9b7c07a..22bfda4b 100644 --- a/data/apt/osfamily/RedHat.yaml +++ b/data/apt/osfamily/RedHat.yaml @@ -1,4 +1,10 @@ --- apt::settings: package_name: '' - service_name: '' \ No newline at end of file + service_name: '' +# Version 4 format + packages: + main: + name: '' + services: + '': {} diff --git a/data/apt/osfamily/Suse.yaml b/data/apt/osfamily/Suse.yaml index b9b7c07a..22bfda4b 100644 --- a/data/apt/osfamily/Suse.yaml +++ b/data/apt/osfamily/Suse.yaml @@ -1,4 +1,10 @@ --- apt::settings: package_name: '' - service_name: '' \ No newline at end of file + service_name: '' +# Version 4 format + packages: + main: + name: '' + services: + '': {} diff --git a/data/apt/osfamily/windows.yaml b/data/apt/osfamily/windows.yaml index b9b7c07a..22bfda4b 100644 --- a/data/apt/osfamily/windows.yaml +++ b/data/apt/osfamily/windows.yaml @@ -1,4 +1,10 @@ --- apt::settings: package_name: '' - service_name: '' \ No newline at end of file + service_name: '' +# Version 4 format + packages: + main: + name: '' + services: + '': {} diff --git a/data/auditbeat/default.yaml b/data/auditbeat/default.yaml index baad675e..e035c7d2 100644 --- a/data/auditbeat/default.yaml +++ b/data/auditbeat/default.yaml @@ -19,3 +19,40 @@ auditbeat::settings: show_status: 'auditbeat show auditd_status' show_rules: 'auditbeat show auditd_rules' docker_image: 'elastic/autditbeat' + +# Version 4 format + packages: + main: + name: auditbeat + services: + auditbeat: + process_name: auditbeat + files: + config: + path: "/etc/auditbeat/auditbeat.yml" + format: yaml + log: + path: "/var/log/auditbeat/auditbeat" + pid: + path: "/var/run/auditbeat.pid" + user_files: + config: + path: "$HOME/.auditbeat/auditbeat.yml" + dirs: + config: + path: "/etc/auditbeat" + log: + path: "/var/log/auditbeat" + home: + path: "/usr/share/auditbeat" + data: + path: "/var/lib/auditbeat" + user_dirs: + config: + path: "$HOME/.auditbeat" + urls: + website: https://www.elastic.co/beats/auditbeat + source: https://github.com/elastic/beats/tree/master/auditbeat + image: + name: elastic/autditbeat + repo: upstream diff --git a/data/auditbeat/osfamily/Debian.yaml b/data/auditbeat/osfamily/Debian.yaml index 8d6d1f07..ff233d53 100644 --- a/data/auditbeat/osfamily/Debian.yaml +++ b/data/auditbeat/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- auditbeat::settings: init_file_path: '/etc/default/auditbeat' + +# Version 4 format + files: + init: + path: "/etc/default/auditbeat" diff --git a/data/auditbeat/osfamily/RedHat.yaml b/data/auditbeat/osfamily/RedHat.yaml index 23915d57..b2ac8554 100644 --- a/data/auditbeat/osfamily/RedHat.yaml +++ b/data/auditbeat/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- auditbeat::settings: init_file_path: '/etc/sysconfig/auditbeat' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/auditbeat" diff --git a/data/auditbeat/osfamily/RedHat9.yaml b/data/auditbeat/osfamily/RedHat9.yaml index 26191d31..b6df4ce7 100644 --- a/data/auditbeat/osfamily/RedHat9.yaml +++ b/data/auditbeat/osfamily/RedHat9.yaml @@ -9,3 +9,15 @@ auditbeat::settings: disallow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT' onlyif: '/usr/bin/update-crypto-policies --show | grep SHA1' + +# Version 4 format + preinstall: + exec: + allow_sha1: + command: "/usr/bin/update-crypto-policies --set DEFAULT:SHA1" + unless: dnf info auditbeat + postinstall: + exec: + disallow_sha1: + command: "/usr/bin/update-crypto-policies --set DEFAULT" + onlyif: "/usr/bin/update-crypto-policies --show | grep SHA1" diff --git a/data/auditbeat/osfamily/windows.yaml b/data/auditbeat/osfamily/windows.yaml index 008effaf..b904a966 100644 --- a/data/auditbeat/osfamily/windows.yaml +++ b/data/auditbeat/osfamily/windows.yaml @@ -2,3 +2,11 @@ auditbeat::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\auditbeat\tools\auditbeat.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\auditbeat\tools\auditbeat.yml + user_files: + config: + path: C:\ProgramData\chocolatey\lib\auditbeat\tools\auditbeat.yml diff --git a/data/auditbeat/upstream/default.yaml b/data/auditbeat/upstream/default.yaml index 3e26ec5e..83da8c5f 100644 --- a/data/auditbeat/upstream/default.yaml +++ b/data/auditbeat/upstream/default.yaml @@ -1,4 +1,8 @@ --- auditbeat::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/autofs/default.yaml b/data/autofs/default.yaml index ffdefc68..01b744f5 100644 --- a/data/autofs/default.yaml +++ b/data/autofs/default.yaml @@ -7,4 +7,24 @@ autofs::settings: 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 + git_source: 'https://kernel.googlesource.com/pub/scm/linux/storage/autofs/autofs/' +# Version 4 format + packages: + main: + name: autofs + services: + autofs: + process_user: root + process_group: root + files: + config: + path: "/etc/auto.master" + init: + path: "/etc/sysconfig/autofs" + pid: + path: "/var/run/autofs.pid" + user_files: + config: + path: "$HOME/.auto.master" + urls: + source: https://kernel.googlesource.com/pub/scm/linux/storage/autofs/autofs/ diff --git a/data/autofs/osfamily/Debian.yaml b/data/autofs/osfamily/Debian.yaml index ea94e53a..0c5a8368 100644 --- a/data/autofs/osfamily/Debian.yaml +++ b/data/autofs/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- autofs::settings: init_file_path: '/etc/default/autofs' + +# Version 4 format + files: + init: + path: "/etc/default/autofs" diff --git a/data/autofs/osfamily/RedHat.yaml b/data/autofs/osfamily/RedHat.yaml index 5f885ba6..abb48422 100644 --- a/data/autofs/osfamily/RedHat.yaml +++ b/data/autofs/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- autofs::settings: init_file_path: '/etc/sysconfig/autofs' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/autofs" diff --git a/data/autoruns/default.yaml b/data/autoruns/default.yaml index d67816b5..1f99eb3f 100644 --- a/data/autoruns/default.yaml +++ b/data/autoruns/default.yaml @@ -2,3 +2,10 @@ autoruns::settings: package_name: '' website_url: 'https://learn.microsoft.com/en-us/sysinternals/downloads/autoruns' + +# Version 4 format + packages: + main: + name: '' + urls: + website: https://learn.microsoft.com/en-us/sysinternals/downloads/autoruns diff --git a/data/autoruns/osfamily/windows.yaml b/data/autoruns/osfamily/windows.yaml index c3c74aa2..1c335efa 100644 --- a/data/autoruns/osfamily/windows.yaml +++ b/data/autoruns/osfamily/windows.yaml @@ -3,3 +3,13 @@ autoruns::settings: winget_package_name: 'Microsoft.Sysinternals.Autoruns' choco_package_name: 'autoruns' package_name: 'autoruns' + +# Version 4 format + packages: + main: + name: autoruns + providers: + winget: + name: Microsoft.Sysinternals.Autoruns + choco: + name: autoruns diff --git a/data/awscli/default.yaml b/data/awscli/default.yaml index cd02c351..6c0f2047 100644 --- a/data/awscli/default.yaml +++ b/data/awscli/default.yaml @@ -8,3 +8,26 @@ awscli::settings: - python-pip version_command: 'aws --version' docker_image: 'amazon/aws-cli' + +# Version 4 format + packages: + main: + name: awscli + provider: pip + files: + config: + path: "/root/.aws/config" + user_files: + config: + path: "/root/.aws/config" + dirs: + config: + path: "/etc/aws" + user_dirs: + config: + path: "$HOME/.aws" + image: + name: amazon/aws-cli + preinstall: + tp::install: + - python-pip diff --git a/data/awscli/osfamily/RedHat.yaml b/data/awscli/osfamily/RedHat.yaml index 534f6d95..3bb5e9c4 100644 --- a/data/awscli/osfamily/RedHat.yaml +++ b/data/awscli/osfamily/RedHat.yaml @@ -1,3 +1,11 @@ --- awscli::settings: config_file_path: '/etc/awsclirc' + +# Version 4 format + files: + config: + path: "/etc/awsclirc" + user_files: + config: + path: "$HOME/.awsclirc" diff --git a/data/awscli/osfamily/RedHat8.yaml b/data/awscli/osfamily/RedHat8.yaml index b3e6c0a2..a0883176 100644 --- a/data/awscli/osfamily/RedHat8.yaml +++ b/data/awscli/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- awscli::settings: package_provider: 'pip3' + +# Version 4 format + packages: + main: + provider: pip3 diff --git a/data/azure-cli/default.yaml b/data/azure-cli/default.yaml index 92233996..e52956b9 100644 --- a/data/azure-cli/default.yaml +++ b/data/azure-cli/default.yaml @@ -5,3 +5,13 @@ azure-cli::settings: docker_image: 'bitnami/azure-cli' tp_prerequisites: - microsoft_repo + +# Version 4 format + packages: + main: + name: azure-cli + image: + name: bitnami/azure-cli + preinstall: + tp::install: + - microsoft_repo diff --git a/data/azure-cli/upstream/default.yaml b/data/azure-cli/upstream/default.yaml index 7edb4b28..70c9afad 100644 --- a/data/azure-cli/upstream/default.yaml +++ b/data/azure-cli/upstream/default.yaml @@ -7,3 +7,16 @@ azure-cli::settings: repo_description: 'Azure CLI' git_source: https://github.com/Azure/azure-cli website_url: https://learn.microsoft.com/en-us/cli/azure/ + +# Version 4 format + urls: + website: https://learn.microsoft.com/en-us/cli/azure/ + source: https://github.com/Azure/azure-cli + repo: + upstream: + description: Azure CLI + repofile_name: azure-cli + key: 8439 38DF 228D 22F7 B374 2BC0 D94A A3F0 EFE2 1092 + key_url: https://packages.microsoft.com/keys/microsoft.asc + yum: + gpgcheck: true diff --git a/data/azure-cli/upstream/osfamily/Debian.yaml b/data/azure-cli/upstream/osfamily/Debian.yaml index 754b7157..e375e31c 100644 --- a/data/azure-cli/upstream/osfamily/Debian.yaml +++ b/data/azure-cli/upstream/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- azure-cli::settings: repo_url: 'https://packages.microsoft.com/repos/azure-cli/' + +# Version 4 format + repo: + upstream: + 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 index 112c6d2a..99e6639e 100644 --- a/data/azure-cli/upstream/osfamily/RedHat.yaml +++ b/data/azure-cli/upstream/osfamily/RedHat.yaml @@ -3,3 +3,12 @@ azure-cli::settings: key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' repo_package_name: packages-microsoft-prod repo_filename: microsoft-prod + +# Version 4 format + repo: + upstream: + package_name: packages-microsoft-prod + repofile_name: microsoft-prod + key: 0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145 + yum: + gpgcheck: true diff --git a/data/azure-cli/upstream/osfamily/RedHat7.yaml b/data/azure-cli/upstream/osfamily/RedHat7.yaml index 3d3b0ed0..a4e8e3b5 100644 --- a/data/azure-cli/upstream/osfamily/RedHat7.yaml +++ b/data/azure-cli/upstream/osfamily/RedHat7.yaml @@ -2,4 +2,10 @@ 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 + repo_description: 'Azure CLI' +# Version 4 format + repo: + upstream: + url: https://packages.microsoft.com/yumrepos/azure-cli + description: Azure CLI + repofile_name: azure-cli diff --git a/data/azure-cli/upstream/osfamily/RedHat8.yaml b/data/azure-cli/upstream/osfamily/RedHat8.yaml index cdab77fd..415059e2 100644 --- a/data/azure-cli/upstream/osfamily/RedHat8.yaml +++ b/data/azure-cli/upstream/osfamily/RedHat8.yaml @@ -2,3 +2,8 @@ azure-cli::settings: repo_package_url: 'https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm diff --git a/data/azure-cli/upstream/osfamily/RedHat9.yaml b/data/azure-cli/upstream/osfamily/RedHat9.yaml index 63d5ea65..44e85263 100644 --- a/data/azure-cli/upstream/osfamily/RedHat9.yaml +++ b/data/azure-cli/upstream/osfamily/RedHat9.yaml @@ -1,3 +1,8 @@ --- azure-cli::settings: repo_package_url: 'https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 59f565ee..1c85e4a0 100644 --- a/data/azure-cli/upstream/osfamily/Suse.yaml +++ b/data/azure-cli/upstream/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- azure-cli::settings: repo_url: 'https://packages.microsoft.com/yumrepos/azure-cli' + +# Version 4 format + repo: + upstream: + 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 index 86e320f4..d0e08f75 100644 --- a/data/azure-cli/upstream/osfamily/windows.yaml +++ b/data/azure-cli/upstream/osfamily/windows.yaml @@ -2,3 +2,12 @@ azure-cli::settings: winget_package_name: 'Microsoft.AzureCLI' choco_package_name: 'azure-cli' + +# Version 4 format + packages: + main: + providers: + winget: + name: Microsoft.AzureCLI + choco: + name: azure-cli diff --git a/data/bacula-client/default.yaml b/data/bacula-client/default.yaml index 3705c3c6..a73d2941 100644 --- a/data/bacula-client/default.yaml +++ b/data/bacula-client/default.yaml @@ -22,4 +22,41 @@ bacula-client::settings: 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 + version_command: 'bacula-fd -? 2>&1 | grep -i version' +# Version 4 format + packages: + main: + name: bacula-client + services: + bacula-fd: + process_name: bacula-fd + process_user: root + process_group: root + nodaemon_args: "-f" + files: + config: + path: "/etc/bacula/bacula-fd.conf" + log: + path: "/var/log/messages" + init: + path: "/etc/sysconfig/bacula-fd" + pid: + path: "/var/run/bacula/bacula-fd.9102.pid" + user_files: + config: + path: "$HOME/.bacula/bacula-fd.conf" + dirs: + config: + path: "/etc/bacula" + log: + path: "/var/log/bacula" + user_dirs: + config: + path: "$HOME/.bacula" + ports: + main: + port: '9102' + protocol: tcp + urls: + website: https://www.bacula.org/ + source: https://gitlab.bacula.org/bacula-community-edition/bacula-community diff --git a/data/bacula-client/operatingsystem/Ubuntu22.04.yaml b/data/bacula-client/operatingsystem/Ubuntu22.04.yaml index 6a13b336..a00b40a3 100644 --- a/data/bacula-client/operatingsystem/Ubuntu22.04.yaml +++ b/data/bacula-client/operatingsystem/Ubuntu22.04.yaml @@ -1,4 +1,10 @@ --- bacula-client::settings: package_name: '' - service_name: '' \ No newline at end of file + service_name: '' +# Version 4 format + packages: + main: + name: '' + services: + '': {} diff --git a/data/bacula-client/osfamily/Debian.yaml b/data/bacula-client/osfamily/Debian.yaml index cd47c3de..80af7041 100644 --- a/data/bacula-client/osfamily/Debian.yaml +++ b/data/bacula-client/osfamily/Debian.yaml @@ -2,3 +2,8 @@ bacula-client::settings: work_dir_path: '/var/lib/bacula' init_file_path: '/etc/default/bacula-fd' + +# Version 4 format + files: + init: + path: "/etc/default/bacula-fd" diff --git a/data/bacula-client/osfamily/RedHat.yaml b/data/bacula-client/osfamily/RedHat.yaml index 68049dab..53647016 100644 --- a/data/bacula-client/osfamily/RedHat.yaml +++ b/data/bacula-client/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ bacula-client::settings: work_dir_path: '/var/spool/bacula' init_file_path: '/etc/default/bacula-fd' + +# Version 4 format + files: + init: + path: "/etc/default/bacula-fd" diff --git a/data/bash/default.yaml b/data/bash/default.yaml index 3e0b05ae..7d3e6fca 100644 --- a/data/bash/default.yaml +++ b/data/bash/default.yaml @@ -7,3 +7,25 @@ bash::settings: config_dir_path: '/etc/profile.d' user_config_file_path: '$HOME/.bash_profile' docker_image: 'bash' + +# Version 4 format + packages: + main: + name: bash + files: + config: + path: "/etc/profile" + user_files: + config: + path: "$HOME/.profile" + dirs: + config: + path: "/etc/profile.d" + user_dirs: + config: + path: "$HOME/.profile.d" + urls: + website: https://www.gnu.org/software/bash/ + source: https://git.savannah.gnu.org/git/bash.git + image: + name: bash diff --git a/data/bind-utils/default.yaml b/data/bind-utils/default.yaml index ff20a8a8..b32092c7 100644 --- a/data/bind-utils/default.yaml +++ b/data/bind-utils/default.yaml @@ -2,3 +2,10 @@ bind-utils::settings: package_name: 'bind-utils' git_source: 'https://github.com/tigeli/bind-utils' + +# Version 4 format + packages: + main: + name: bind-utils + urls: + source: https://github.com/tigeli/bind-utils diff --git a/data/bind-utils/osfamily/Debian.yaml b/data/bind-utils/osfamily/Debian.yaml index deef48d1..176846dc 100644 --- a/data/bind-utils/osfamily/Debian.yaml +++ b/data/bind-utils/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- bind-utils::settings: package_name: 'dnsutils' + +# Version 4 format + packages: + main: + name: dnsutils diff --git a/data/bind/default.yaml b/data/bind/default.yaml index c6fae0a5..d99a618b 100644 --- a/data/bind/default.yaml +++ b/data/bind/default.yaml @@ -25,3 +25,42 @@ bind::settings: tcp-timeouts: 'rndc tcp-timeouts' stats: 'rndc stats ; cat /var/cache/bind/named.stats' dumpdb: 'rndc dumpdb ; cat /var/cache/bind/named_dump.db' + +# Version 4 format + packages: + main: + name: bind + services: + bind: + process_name: named + process_user: bind + process_group: bind + nodaemon_args: "-f" + files: + config: + path: "/etc/bind.conf" + log: + path: "/var/log/messages" + pid: + path: "/var/run/bind.pid" + user_files: + config: + path: "$HOME/.bind.conf" + dirs: + config: + path: "/etc/bind.d" + conf: + path: "/etc/bind.d" + data: + path: "/var/named" + user_dirs: + config: + path: "$HOME/.bind.d" + ports: + main_udp: + port: '53' + protocol: udp + urls: + source: https://gitlab.isc.org/isc-projects/bind9 + image: + name: internetsystemsconsortium/bind9 diff --git a/data/bind/operatingsystem/Ubuntu.yaml b/data/bind/operatingsystem/Ubuntu.yaml index afef3608..16a37dc0 100644 --- a/data/bind/operatingsystem/Ubuntu.yaml +++ b/data/bind/operatingsystem/Ubuntu.yaml @@ -6,3 +6,15 @@ bind::settings: process_name: 'named' process_user: 'bind' process_group: 'bind' + +# Version 4 format + services: + bind9: + process_name: named + process_user: bind + process_group: bind + files: + log: + path: "/var/log/syslog" + pid: + path: "/var/run/named/named.pid" diff --git a/data/bind/osfamily/Debian.yaml b/data/bind/osfamily/Debian.yaml index d8f221cb..a7b3408b 100644 --- a/data/bind/osfamily/Debian.yaml +++ b/data/bind/osfamily/Debian.yaml @@ -9,3 +9,32 @@ bind::settings: config_dir_path: '/etc/bind' conf_dir_path: '/etc/bind' data_dir_path: '/var/cache/named' + +# Version 4 format + packages: + main: + name: bind9 + services: + bind9: {} + files: + config: + path: "/etc/bind/named.conf" + log: + path: "/var/log/syslog" + init: + path: "/etc/default/bind9" + pid: + path: "/var/run/named/named.pid" + user_files: + config: + path: "$HOME/.bind/named.conf" + dirs: + config: + path: "/etc/bind" + conf: + path: "/etc/bind" + data: + path: "/var/cache/named" + user_dirs: + config: + path: "$HOME/.bind" diff --git a/data/bind/osfamily/RedHat.yaml b/data/bind/osfamily/RedHat.yaml index e44ce73c..a89d390f 100644 --- a/data/bind/osfamily/RedHat.yaml +++ b/data/bind/osfamily/RedHat.yaml @@ -12,3 +12,25 @@ bind::settings: tsig-list: 'rndc tsig-list' tcp-timeouts: 'rndc tcp-timeouts' stats: 'rndc stats ; cat /var/named/data/named_stats.txt' + +# Version 4 format + services: + named: + process_user: named + process_group: named + files: + config: + path: "/etc/named.conf" + init: + path: "/etc/sysconfig/named" + pid: + path: "/var/run/named/named.pid" + user_files: + config: + path: "$HOME/.named.conf" + dirs: + config: + path: "/etc/named" + user_dirs: + config: + path: "$HOME/.named" diff --git a/data/bird/default.yaml b/data/bird/default.yaml index 8f9d0c7a..e075bb81 100644 --- a/data/bird/default.yaml +++ b/data/bird/default.yaml @@ -19,3 +19,34 @@ bird::settings: - /var/log/bird6.log website_url: 'https://bird.network.cz/' git_source: 'https://gitlab.labs.nic.cz/labs/bird' + +# Version 4 format + packages: + main: + name: bird + services: + bird: + process_name: bird + process_user: bird + process_group: bird + files: + config: + path: "/etc/bird/bird.conf" + log: + path: + - "/var/log/bird.log" + - "/var/log/bird6.log" + user_files: + config: + path: "$HOME/.bird/bird.conf" + dirs: + config: + path: "/etc/bird" + home: + path: "/run/bird" + user_dirs: + config: + path: "$HOME/.bird" + urls: + website: https://bird.network.cz/ + source: https://gitlab.labs.nic.cz/labs/bird diff --git a/data/blender/default.yaml b/data/blender/default.yaml index 0af189c9..d9ec163b 100644 --- a/data/blender/default.yaml +++ b/data/blender/default.yaml @@ -70,3 +70,7 @@ blender::settings: enable: true links: '/usr/local/bin/blender': '/usr/share/blender/blender-$VERSION-$OS-x64/blender' + +# Version 4 format + preinstall: + tp::install: {} diff --git a/data/blender/osfamily/Darwin.yaml b/data/blender/osfamily/Darwin.yaml index 0d94cd8f..c4d6b9e6 100644 --- a/data/blender/osfamily/Darwin.yaml +++ b/data/blender/osfamily/Darwin.yaml @@ -6,3 +6,11 @@ blender::settings: packages: main: source: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender$MAJVERSION/blender-$VERSION-macos-$ARCH.dmg' + +# Version 4 format + packages: + main: + provider: appdmg + providers: + brew: + name: blender diff --git a/data/blender/osfamily/Debian.yaml b/data/blender/osfamily/Debian.yaml index 0436a448..7615146d 100644 --- a/data/blender/osfamily/Debian.yaml +++ b/data/blender/osfamily/Debian.yaml @@ -1,3 +1,5 @@ --- blender::settings: {} + +# No data to convert to Version 4 format diff --git a/data/blender/osfamily/windows.yaml b/data/blender/osfamily/windows.yaml index cb0137d9..810f2bf8 100644 --- a/data/blender/osfamily/windows.yaml +++ b/data/blender/osfamily/windows.yaml @@ -2,3 +2,9 @@ blender::settings: package_provider: 'windows' package_source: 'https://www.blender.org/download/release/Blender$MAJVERSION/blender-$VERSION-windows-x64.msi' + +# Version 4 format + packages: + main: + provider: windows + source: https://www.blender.org/download/release/Blender$MAJVERSION/blender-$VERSION-windows-x64.msi diff --git a/data/bolt/default.yaml b/data/bolt/default.yaml index 6d6e86d8..ce5fdde3 100644 --- a/data/bolt/default.yaml +++ b/data/bolt/default.yaml @@ -18,4 +18,29 @@ bolt::settings: 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 + docker_image: 'puppet/puppet-bolt' +# Version 4 format + packages: + main: + name: puppet-bolt + files: + config: + path: "/etc/puppetlabs/bolt/bolt-defaults.yaml" + format: yaml + user_files: + config: + path: "$HOME/.puppetlabs/bolt/bolt-defaults.yaml" + dirs: + config: + path: "/etc/puppetlabs/bolt" + user_dirs: + config: + path: "$HOME/.puppetlabs/bolt" + urls: + website: https://puppet.com/docs/bolt/ + source: https://github.com/puppetlabs/bolt + image: + name: puppet/puppet-bolt + preinstall: + tp::install: + puppet_repo: {} diff --git a/data/bolt/osfamily/windows.yaml b/data/bolt/osfamily/windows.yaml index 9e20abe0..edee80a9 100644 --- a/data/bolt/osfamily/windows.yaml +++ b/data/bolt/osfamily/windows.yaml @@ -3,3 +3,22 @@ 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' + +# Version 4 format + packages: + main: + providers: + winget: + name: Puppet.puppet-bolt + files: + config: + path: C:\ProgramData\PuppetLabs\bolt\etc\bolt-defaults.yaml + user_files: + config: + path: C:\ProgramData\PuppetLabs\bolt\etc\bolt-defaults.yaml + dirs: + config: + path: C:\ProgramData\PuppetLabs\bolt\etc\ + user_dirs: + config: + path: C:\ProgramData\PuppetLabs\bolt\etc\ diff --git a/data/bolt/osfamily/windows11.yaml b/data/bolt/osfamily/windows11.yaml index dfaf13dc..c910f0fc 100644 --- a/data/bolt/osfamily/windows11.yaml +++ b/data/bolt/osfamily/windows11.yaml @@ -1,3 +1,8 @@ --- bolt::settings: package_name: 'Puppet.puppet-bolt' + +# Version 4 format + packages: + main: + name: Puppet.puppet-bolt diff --git a/data/boundary/default.yaml b/data/boundary/default.yaml index 16c883b4..0d5d122f 100644 --- a/data/boundary/default.yaml +++ b/data/boundary/default.yaml @@ -29,3 +29,36 @@ boundary::settings: users: 'boundary users list' workers: 'boundary workers list' docker_image: 'hashicorp/boundary' + +# Version 4 format + packages: + main: + name: boundary + services: + ! '': + process_name: boundary + files: + config: + path: "/etc/boundary.d/boundary.hcl" + format: hcl + user_files: + config: + path: "$HOME/.boundary.d/boundary.hcl" + dirs: + config: + path: "/etc/boundary.d" + conf: + path: "/etc/boundary.d" + user_dirs: + config: + path: "$HOME/.boundary.d" + ports: + main: + port: 9200 + protocol: tcp + urls: + website: https://boundaryproject.io/ + source: https://github.com/hashicorp/boundary + image: + name: hashicorp/boundary + repo: upstream diff --git a/data/boundary/upstream/default.yaml b/data/boundary/upstream/default.yaml index 2ffac159..bd8de3bc 100644 --- a/data/boundary/upstream/default.yaml +++ b/data/boundary/upstream/default.yaml @@ -1,4 +1,8 @@ --- boundary::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/bzip2/default.yaml b/data/bzip2/default.yaml index 9b51d71c..d860bb81 100644 --- a/data/bzip2/default.yaml +++ b/data/bzip2/default.yaml @@ -3,3 +3,11 @@ bzip2::settings: package_name: 'bzip2' website_url: 'https://sourceware.org/bzip2/' git_source: 'https://gitlab.com/bzip2/bzip2/' + +# Version 4 format + packages: + main: + name: bzip2 + urls: + website: https://sourceware.org/bzip2/ + source: https://gitlab.com/bzip2/bzip2/ diff --git a/data/ceilometer/default.yaml b/data/ceilometer/default.yaml index 6241f800..00b08ec5 100644 --- a/data/ceilometer/default.yaml +++ b/data/ceilometer/default.yaml @@ -13,4 +13,35 @@ ceilometer::settings: 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 + config_file_format: 'inifile_with_stanzas' +# Version 4 format + packages: + main: + name: ceilometer + services: + ! '': + process_name: ceilometer + process_user: ceilometer + process_group: ceilometer + files: + config: + path: "/etc/ceilometer/ceilometer.conf" + format: inifile_with_stanzas + log: + path: "/var/log/ceilometer/ceilometer.log" + pid: + path: "/var/run/ceilometer.pid" + user_files: + config: + path: "$HOME/.ceilometer/ceilometer.conf" + dirs: + config: + path: "/etc/ceilometer" + log: + path: "/var/log/ceilometer" + user_dirs: + config: + path: "$HOME/.ceilometer" + urls: + website: http://docs.openstack.org/ceilometer/ + source: https://opendev.org/openstack/ceilometer diff --git a/data/ceilometer/osfamily/Debian.yaml b/data/ceilometer/osfamily/Debian.yaml index 2fd904e6..cd55e9bc 100644 --- a/data/ceilometer/osfamily/Debian.yaml +++ b/data/ceilometer/osfamily/Debian.yaml @@ -2,3 +2,11 @@ ceilometer::settings: package_name: ceilometer-common init_file_path: '/etc/default/ceilometer' + +# Version 4 format + packages: + main: + name: ceilometer-common + files: + init: + path: "/etc/default/ceilometer" diff --git a/data/ceilometer/osfamily/RedHat.yaml b/data/ceilometer/osfamily/RedHat.yaml index f3f8dbfc..0fc9bd08 100644 --- a/data/ceilometer/osfamily/RedHat.yaml +++ b/data/ceilometer/osfamily/RedHat.yaml @@ -2,3 +2,11 @@ ceilometer::settings: package_name: 'openstack-ceilometer-common' init_file_path: '/etc/sysconfig/ceilometer' + +# Version 4 format + packages: + main: + name: openstack-ceilometer-common + files: + init: + path: "/etc/sysconfig/ceilometer" diff --git a/data/ceph/default.yaml b/data/ceph/default.yaml index 7f417513..81ed1a94 100644 --- a/data/ceph/default.yaml +++ b/data/ceph/default.yaml @@ -13,4 +13,38 @@ ceph::settings: 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 + docker_image: 'ceph/cepth' +# Version 4 format + packages: + main: + name: ceph + services: + ceph: + process_name: ceph + process_user: ceph + process_group: ceph + files: + config: + path: "/etc/ceph/ceph.conf" + log: + path: "/var/log/ceph/ceph.log" + pid: + path: "/var/run/ceph.pid" + user_files: + config: + path: "$HOME/.ceph/ceph.conf" + dirs: + config: + path: "/etc/ceph" + conf: + path: "/etc/ceph/conf.d" + log: + path: "/var/log/ceph" + user_dirs: + config: + path: "$HOME/.ceph" + urls: + website: http://ceph.com + source: https://github.com/ceph/ceph + image: + name: ceph/cepth diff --git a/data/ceph/osfamily/Debian.yaml b/data/ceph/osfamily/Debian.yaml index 818861da..5cebafdb 100644 --- a/data/ceph/osfamily/Debian.yaml +++ b/data/ceph/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- ceph::settings: init_file_path: '/etc/default/ceph' + +# Version 4 format + files: + init: + path: "/etc/default/ceph" diff --git a/data/ceph/osfamily/RedHat.yaml b/data/ceph/osfamily/RedHat.yaml index 757ded80..275bcb55 100644 --- a/data/ceph/osfamily/RedHat.yaml +++ b/data/ceph/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- ceph::settings: init_file_path: '/etc/sysconfig/ceph' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/ceph" diff --git a/data/cinder/default.yaml b/data/cinder/default.yaml index db91ba6d..380812e1 100644 --- a/data/cinder/default.yaml +++ b/data/cinder/default.yaml @@ -8,3 +8,28 @@ cinder::settings: process_name: 'cinder' process_user: 'cinder' process_group: 'cinder' + +# Version 4 format + services: + ! '': + process_name: cinder + process_user: cinder + process_group: cinder + files: + config: + path: "/etc/cinder/cinder.conf" + log: + path: "/var/log/cinder/cinder.log" + pid: + path: "/var/run/cinder.pid" + user_files: + config: + path: "$HOME/.cinder/cinder.conf" + dirs: + config: + path: "/etc/cinder" + log: + path: "/var/log/cinder" + user_dirs: + config: + path: "$HOME/.cinder" diff --git a/data/cinder/osfamily/Debian.yaml b/data/cinder/osfamily/Debian.yaml index a81aa669..a7e6a0fd 100644 --- a/data/cinder/osfamily/Debian.yaml +++ b/data/cinder/osfamily/Debian.yaml @@ -4,3 +4,13 @@ cinder::settings: - 'python-cinder' - 'cinder-common' init_file_path: '/etc/default/cinder' + +# Version 4 format + packages: + main: + name: + - python-cinder + - cinder-common + files: + init: + path: "/etc/default/cinder" diff --git a/data/cinder/osfamily/RedHat.yaml b/data/cinder/osfamily/RedHat.yaml index 724db0e9..f1e05ebc 100644 --- a/data/cinder/osfamily/RedHat.yaml +++ b/data/cinder/osfamily/RedHat.yaml @@ -5,3 +5,13 @@ cinder::settings: - 'openstack-cinder' init_file_path: '/etc/sysconfig/cinder' + +# Version 4 format + packages: + main: + name: + - python-cinder + - openstack-cinder + files: + init: + path: "/etc/sysconfig/cinder" diff --git a/data/clvm/default.yaml b/data/clvm/default.yaml index ca0a357e..456ae32d 100644 --- a/data/clvm/default.yaml +++ b/data/clvm/default.yaml @@ -7,3 +7,26 @@ clvm::settings: pid_file_path: '/var/run/clvmd.pid' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: lvm2-cluster + services: + clvmd: + process_user: root + process_group: root + files: + config: + path: "/etc/lvm/lvm.conf" + pid: + path: "/var/run/clvmd.pid" + user_files: + config: + path: "$HOME/.lvm/lvm.conf" + dirs: + config: + path: "/etc/lvm" + user_dirs: + config: + path: "$HOME/.lvm" diff --git a/data/clvm/osfamily/Debian.yaml b/data/clvm/osfamily/Debian.yaml index 874bb456..0e147c25 100644 --- a/data/clvm/osfamily/Debian.yaml +++ b/data/clvm/osfamily/Debian.yaml @@ -3,3 +3,13 @@ clvm::settings: package_name: 'clvm' service_name: 'clvm' init_file_path: '/etc/default/clvmd' + +# Version 4 format + packages: + main: + name: clvm + services: + clvm: {} + files: + init: + path: "/etc/default/clvmd" diff --git a/data/clvm/osfamily/RedHat.yaml b/data/clvm/osfamily/RedHat.yaml index b0435542..21fc6c14 100644 --- a/data/clvm/osfamily/RedHat.yaml +++ b/data/clvm/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- clvm::settings: init_file_path: '/etc/sysconfig/clvmd' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/clvmd" diff --git a/data/collectd/default.yaml b/data/collectd/default.yaml index 087b7bde..426ca6d3 100644 --- a/data/collectd/default.yaml +++ b/data/collectd/default.yaml @@ -9,3 +9,30 @@ collectd::settings: log_file_path: '/var/log/collectd.log' process_user: 'collectd' process_group: 'collectd' + +# Version 4 format + packages: + main: + name: collectd + services: + collectd: + process_user: collectd + process_group: collectd + files: + config: + path: "/etc/collectd/collectd.conf" + log: + path: "/var/log/collectd.log" + pid: + path: "/var/run/collectd.pid" + user_files: + config: + path: "$HOME/.collectd/collectd.conf" + dirs: + config: + path: "/etc/collectd" + conf: + path: "/etc/collectd/collectd.d" + user_dirs: + config: + path: "$HOME/.collectd" diff --git a/data/collectd/osfamily/Debian.yaml b/data/collectd/osfamily/Debian.yaml index 965fa36d..536c1747 100644 --- a/data/collectd/osfamily/Debian.yaml +++ b/data/collectd/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- collectd::settings: init_file_path: '/etc/default/collectd' + +# Version 4 format + files: + init: + path: "/etc/default/collectd" diff --git a/data/collectd/osfamily/RedHat.yaml b/data/collectd/osfamily/RedHat.yaml index d52382a3..27a4725c 100644 --- a/data/collectd/osfamily/RedHat.yaml +++ b/data/collectd/osfamily/RedHat.yaml @@ -4,3 +4,21 @@ collectd::settings: config_file_path: '/etc/collectd.conf' config_dir_path: '/etc/collectd.d' conf_dir_path: '/etc/collectd.d' + +# Version 4 format + files: + config: + path: "/etc/collectd.conf" + init: + path: "/etc/sysconfig/collectd" + user_files: + config: + path: "$HOME/.collectd.conf" + dirs: + config: + path: "/etc/collectd.d" + conf: + path: "/etc/collectd.d" + user_dirs: + config: + path: "$HOME/.collectd.d" diff --git a/data/consul-enterprise/default.yaml b/data/consul-enterprise/default.yaml index 58b6022f..19171ec6 100644 --- a/data/consul-enterprise/default.yaml +++ b/data/consul-enterprise/default.yaml @@ -12,3 +12,34 @@ consul-enterprise::settings: - 8301 - 8500 - 8600 + +# Version 4 format + packages: + main: + name: consul-enterprise + services: + consul: + process_name: consul + files: + config: + path: "/etc/consul.d/consul.hcl" + format: hcl + user_files: + config: + path: "$HOME/.consul.d/consul.hcl" + dirs: + config: + path: "/etc/consul.d" + data: + path: "/opt/consul" + user_dirs: + config: + path: "$HOME/.consul.d" + ports: + main: + port: + - 8301 + - 8500 + - 8600 + protocol: tcp + repo: upstream diff --git a/data/consul-enterprise/upstream/default.yaml b/data/consul-enterprise/upstream/default.yaml index fb7ce456..8c39d670 100644 --- a/data/consul-enterprise/upstream/default.yaml +++ b/data/consul-enterprise/upstream/default.yaml @@ -1,4 +1,8 @@ --- consul-enterprise::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/consul/default.yaml b/data/consul/default.yaml index f0399864..b56dd3f1 100644 --- a/data/consul/default.yaml +++ b/data/consul/default.yaml @@ -12,3 +12,34 @@ consul::settings: - 8301 - 8500 - 8600 + +# Version 4 format + packages: + main: + name: consul + services: + consul: + process_name: consul + files: + config: + path: "/etc/consul.d/consul.hcl" + format: hcl + user_files: + config: + path: "$HOME/.consul.d/consul.hcl" + dirs: + config: + path: "/etc/consul.d" + data: + path: "/opt/consul" + user_dirs: + config: + path: "$HOME/.consul.d" + ports: + main: + port: + - 8301 + - 8500 + - 8600 + protocol: tcp + repo: upstream diff --git a/data/consul/upstream/default.yaml b/data/consul/upstream/default.yaml index 763ef168..b16220b3 100644 --- a/data/consul/upstream/default.yaml +++ b/data/consul/upstream/default.yaml @@ -1,4 +1,8 @@ --- consul::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/corosync/default.yaml b/data/corosync/default.yaml index 0e932270..94b47a66 100644 --- a/data/corosync/default.yaml +++ b/data/corosync/default.yaml @@ -9,3 +9,29 @@ corosync::settings: process_name: 'corosync' process_user: 'corosync' process_group: 'corosync' + +# Version 4 format + packages: + main: + name: corosync + services: + corosync: + process_name: corosync + process_user: corosync + process_group: corosync + files: + config: + path: "/etc/corosync/corosync.conf" + log: + path: "/var/log/corosync/corosync.log" + user_files: + config: + path: "$HOME/.corosync/corosync.conf" + dirs: + config: + path: "/etc/corosync" + log: + path: "/var/log/corosync" + user_dirs: + config: + path: "$HOME/.corosync" diff --git a/data/corosync/osfamily/Debian.yaml b/data/corosync/osfamily/Debian.yaml index 534aa621..0c4a70b0 100644 --- a/data/corosync/osfamily/Debian.yaml +++ b/data/corosync/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- corosync::settings: init_file_path: '/etc/default/corosync' + +# Version 4 format + files: + init: + path: "/etc/default/corosync" diff --git a/data/corosync/osfamily/RedHat.yaml b/data/corosync/osfamily/RedHat.yaml index ca8945bd..c22983c4 100644 --- a/data/corosync/osfamily/RedHat.yaml +++ b/data/corosync/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ corosync::settings: init_file_path: '/etc/sysconfig/corosync' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/corosync" diff --git a/data/cron/default.yaml b/data/cron/default.yaml index 8dfced64..fc21210a 100644 --- a/data/cron/default.yaml +++ b/data/cron/default.yaml @@ -3,3 +3,19 @@ cron::settings: config_file_path: '/etc/crontab' config_dir_path: '/etc/cron.d' conf_dir_path: '/etc/cron.d' + +# Version 4 format + files: + config: + path: "/etc/crontab" + user_files: + config: + path: "$HOME/.crontab" + dirs: + config: + path: "/etc/cron.d" + conf: + path: "/etc/cron.d" + user_dirs: + config: + path: "$HOME/.cron.d" diff --git a/data/cron/osfamily/Fedora.yaml b/data/cron/osfamily/Fedora.yaml index b631f022..fedb4d69 100644 --- a/data/cron/osfamily/Fedora.yaml +++ b/data/cron/osfamily/Fedora.yaml @@ -1,3 +1,8 @@ --- cron::settings: package_name: 'cronie' + +# Version 4 format + packages: + main: + name: cronie diff --git a/data/crowdsec-firewall-bouncer-iptables/default.yaml b/data/crowdsec-firewall-bouncer-iptables/default.yaml index 3ae55c23..7581a0be 100644 --- a/data/crowdsec-firewall-bouncer-iptables/default.yaml +++ b/data/crowdsec-firewall-bouncer-iptables/default.yaml @@ -10,3 +10,29 @@ crowdsec-firewall-bouncer-iptables::settings: process_group: 'root' tp_prerequisites: - crowdsec_repo + +# Version 4 format + packages: + main: + name: crowdsec-firewall-bouncer-iptables + services: + crowdsec-firewall-bouncer: + process_name: crowdsec-firewall-bouncer + process_user: root + process_group: root + files: + config: + path: "/etc/crowdsec/bouncers/crowdsec-firewall-bouncer.yaml" + user_files: + config: + path: "$HOME/.crowdsec/bouncers/crowdsec-firewall-bouncer.yaml" + dirs: + config: + path: "/etc/crowdsec/bouncers" + user_dirs: + config: + path: "$HOME/.crowdsec/bouncers" + repo: upstream + preinstall: + tp::install: + - crowdsec_repo diff --git a/data/crowdsec/default.yaml b/data/crowdsec/default.yaml index bded496a..48c57b55 100644 --- a/data/crowdsec/default.yaml +++ b/data/crowdsec/default.yaml @@ -25,4 +25,36 @@ crowdsec::settings: hub_upgrade: command: 'cscli hub update && cscli hub upgrade' tp_prerequisites: - - crowdsec_repo \ No newline at end of file + - crowdsec_repo +# Version 4 format + packages: + main: + name: crowdsec + services: + crowdsec: + process_name: crowdsec + process_user: root + process_group: root + files: + config: + path: "/etc/crowdsec/config.yaml" + format: yaml + log: + path: + - "/var/log/crowdsec.log" + - "/var/log/crowdsec_api.log" + user_files: + config: + path: "$HOME/.crowdsec/config.yaml" + dirs: + config: + path: "/etc/crowdsec" + data: + path: "/var/lib/crowdsec/data" + user_dirs: + config: + path: "$HOME/.crowdsec" + repo: upstream + preinstall: + tp::install: + - crowdsec_repo diff --git a/data/crowdsec_repo/default.yaml b/data/crowdsec_repo/default.yaml index 96b8b20e..5783bd71 100644 --- a/data/crowdsec_repo/default.yaml +++ b/data/crowdsec_repo/default.yaml @@ -1,3 +1,6 @@ --- crowdsec_repo::settings: upstream_repo: true + +# Version 4 format + repo: upstream diff --git a/data/crowdsec_repo/upstream/default.yaml b/data/crowdsec_repo/upstream/default.yaml index 61ef3b1e..03256b97 100644 --- a/data/crowdsec_repo/upstream/default.yaml +++ b/data/crowdsec_repo/upstream/default.yaml @@ -8,4 +8,20 @@ crowdsec_repo::settings: yumrepo_params: sslverify: 1 sslcacert: /etc/pki/tls/certs/ca-bundle.crt - metadata_expire: 300 \ No newline at end of file + metadata_expire: 300 +# Version 4 format + repo: + upstream: + description: Cloudsec repository + repofile_name: crowdsec_crowdsec + key: 6A89 E3C2 303A 901A 8899 71D3 376E D532 6E93 CD0C + 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 + yum: + gpgcheck: true + params: + sslverify: 1 + sslcacert: "/etc/pki/tls/certs/ca-bundle.crt" + metadata_expire: 300 diff --git a/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml b/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml index af3e2a2f..9a5d4a44 100644 --- a/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml +++ b/data/crowdsec_repo/upstream/operatingsystem/Ubuntu.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/ubuntu' + +# Version 4 format + repo: + upstream: + 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 5a312edc..1cd461e4 100644 --- a/data/crowdsec_repo/upstream/osfamily/Debian.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/debian' + +# Version 4 format + repo: + upstream: + 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 33f712ce..8ab98afe 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ crowdsec_repo::settings: key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' # package_prerequisites: pygpgme + +# Version 4 format + repo: + upstream: + key: 0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145 + yum: + gpgcheck: true diff --git a/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml b/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml index 3fa4064c..0d53f935 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/el/6/$basearch' + +# Version 4 format + repo: + upstream: + 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 6e0b0e4f..6d4d3831 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/el/7/$basearch' + +# Version 4 format + repo: + upstream: + 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 c24fa38e..8d18b16f 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/el/8/$basearch' + +# Version 4 format + repo: + upstream: + 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 0ebd4579..658e24f7 100644 --- a/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml +++ b/data/crowdsec_repo/upstream/osfamily/RedHat9.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/el/9/$basearch' + +# Version 4 format + repo: + upstream: + 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 562fb989..6298ed8b 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/14/$basearch' + +# Version 4 format + repo: + upstream: + 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 123354a4..cb0e1f91 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse13.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse13.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/13/$basearch' + +# Version 4 format + repo: + upstream: + 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 562fb989..6298ed8b 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse14.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse14.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/14/$basearch' + +# Version 4 format + repo: + upstream: + 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 8e351c27..81fc74a7 100644 --- a/data/crowdsec_repo/upstream/osfamily/Suse15.yaml +++ b/data/crowdsec_repo/upstream/osfamily/Suse15.yaml @@ -1,3 +1,8 @@ --- crowdsec_repo::settings: repo_url: 'https://packagecloud.io/crowdsec/crowdsec/opensuse/15/$basearch' + +# Version 4 format + repo: + upstream: + url: https://packagecloud.io/crowdsec/crowdsec/opensuse/15/$basearch diff --git a/data/ddclient/default.yaml b/data/ddclient/default.yaml index e07e3adc..3a241792 100644 --- a/data/ddclient/default.yaml +++ b/data/ddclient/default.yaml @@ -11,3 +11,33 @@ ddclient::settings: process_name: 'ddclient' process_user: 'ddclient' process_group: 'ddclient' + +# Version 4 format + packages: + main: + name: ddclient + services: + ddclient: + process_name: ddclient + process_user: ddclient + process_group: ddclient + files: + config: + path: "/etc/ddclient/ddclient.conf" + log: + path: "/var/log/ddclient/ddclient.log" + pid: + path: "/var/run/ddclient.pid" + user_files: + config: + path: "$HOME/.ddclient/ddclient.conf" + dirs: + config: + path: "/etc/ddclient" + conf: + path: "/etc/ddclient/conf.d" + log: + path: "/var/log/ddclient" + user_dirs: + config: + path: "$HOME/.ddclient" diff --git a/data/ddclient/osfamily/Debian.yaml b/data/ddclient/osfamily/Debian.yaml index 54cd63bc..76b1c768 100644 --- a/data/ddclient/osfamily/Debian.yaml +++ b/data/ddclient/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- ddclient::settings: init_file_path: '/etc/default/ddclient' + +# Version 4 format + files: + init: + path: "/etc/default/ddclient" diff --git a/data/ddclient/osfamily/RedHat.yaml b/data/ddclient/osfamily/RedHat.yaml index 35fd64a5..9594bf04 100644 --- a/data/ddclient/osfamily/RedHat.yaml +++ b/data/ddclient/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ ddclient::settings: init_file_path: '/etc/sysconfig/ddclient' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/ddclient" diff --git a/data/debootstrap/default.yaml b/data/debootstrap/default.yaml index d4c0765a..2ec5b6f4 100644 --- a/data/debootstrap/default.yaml +++ b/data/debootstrap/default.yaml @@ -1,3 +1,8 @@ --- debootstrap::settings: package_name: 'debootstrap' + +# Version 4 format + packages: + main: + name: debootstrap diff --git a/data/default.yaml b/data/default.yaml index ca1ab56d..7cbc8476 100644 --- a/data/default.yaml +++ b/data/default.yaml @@ -51,3 +51,5 @@ default::settings: conf: owner: 'root' group: 'root' + +# No data to convert to Version 4 format diff --git a/data/default/AlmaLinux.yaml b/data/default/AlmaLinux.yaml index c508fcc0..cf5884bd 100755 --- a/data/default/AlmaLinux.yaml +++ b/data/default/AlmaLinux.yaml @@ -6,3 +6,8 @@ default::settings: repos: default: package_provider: 'rpm' + +# Version 4 format + repo: + upstream: + package_provider: rpm diff --git a/data/default/CentOS.yaml b/data/default/CentOS.yaml index c508fcc0..cf5884bd 100755 --- a/data/default/CentOS.yaml +++ b/data/default/CentOS.yaml @@ -6,3 +6,8 @@ default::settings: repos: default: package_provider: 'rpm' + +# Version 4 format + repo: + upstream: + package_provider: rpm diff --git a/data/default/CentOS6.yaml b/data/default/CentOS6.yaml index b068eedf..35d4efcc 100644 --- a/data/default/CentOS6.yaml +++ b/data/default/CentOS6.yaml @@ -1,3 +1,5 @@ --- default::settings: init_system: 'sysvinit' + +# No data to convert to Version 4 format diff --git a/data/default/Darwin.yaml b/data/default/Darwin.yaml index a0f53ece..94c1add5 100644 --- a/data/default/Darwin.yaml +++ b/data/default/Darwin.yaml @@ -11,3 +11,8 @@ default::settings: repos: default: package_provider: 'homebrew' + +# Version 4 format + packages: + main: + provider: homebrew diff --git a/data/default/Debian.yaml b/data/default/Debian.yaml index cd9cdc24..00b06040 100755 --- a/data/default/Debian.yaml +++ b/data/default/Debian.yaml @@ -8,4 +8,11 @@ default::settings: 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 + dockerfile_prerequisites: 'RUN apt-get update && apt-get install -y --force-yes --no-install-recommends wget' +# Version 4 format + image: + dockerfile_prerequisites: RUN apt-get update && apt-get install -y --force-yes --no-install-recommends + wget + repo: + upstream: + package_provider: dpkg diff --git a/data/default/Debian10.yaml b/data/default/Debian10.yaml index 91e324ef..3a2e2ef4 100644 --- a/data/default/Debian10.yaml +++ b/data/default/Debian10.yaml @@ -7,3 +7,9 @@ default::settings: default: apt: release: 'buster' + +# Version 4 format + repo: + upstream: + apt: + release: buster diff --git a/data/default/Debian11.yaml b/data/default/Debian11.yaml index e694386d..9908866c 100644 --- a/data/default/Debian11.yaml +++ b/data/default/Debian11.yaml @@ -7,3 +7,9 @@ default::settings: default: apt: release: 'bullseye' + +# Version 4 format + repo: + upstream: + apt: + release: bullseye diff --git a/data/default/Debian5.yaml b/data/default/Debian5.yaml index 4fedacd9..ad99512c 100644 --- a/data/default/Debian5.yaml +++ b/data/default/Debian5.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'lenny' + +# Version 4 format + repo: + upstream: + apt: + release: lenny diff --git a/data/default/Debian6.yaml b/data/default/Debian6.yaml index 9d590c0e..da2a4c79 100644 --- a/data/default/Debian6.yaml +++ b/data/default/Debian6.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'squeeze' + +# Version 4 format + repo: + upstream: + apt: + release: squeeze diff --git a/data/default/Debian7.yaml b/data/default/Debian7.yaml index 4079ac47..b490a768 100644 --- a/data/default/Debian7.yaml +++ b/data/default/Debian7.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'wheezy' + +# Version 4 format + repo: + upstream: + apt: + release: wheezy diff --git a/data/default/Debian8.yaml b/data/default/Debian8.yaml index f2bd3b5b..848df296 100644 --- a/data/default/Debian8.yaml +++ b/data/default/Debian8.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'jessie' + +# Version 4 format + repo: + upstream: + apt: + release: jessie diff --git a/data/default/Debian9.yaml b/data/default/Debian9.yaml index 3ebd038d..e652b07a 100644 --- a/data/default/Debian9.yaml +++ b/data/default/Debian9.yaml @@ -7,3 +7,9 @@ default::settings: default: apt: release: 'stretch' + +# Version 4 format + repo: + upstream: + apt: + release: stretch diff --git a/data/default/Devuan4.yaml b/data/default/Devuan4.yaml index 5d4daed8..fb4e7f9f 100644 --- a/data/default/Devuan4.yaml +++ b/data/default/Devuan4.yaml @@ -8,3 +8,9 @@ default::settings: default: apt: release: 'chimaera' + +# Version 4 format + repo: + upstream: + apt: + release: chimaera diff --git a/data/default/FreeBSD.yaml b/data/default/FreeBSD.yaml index 7ba670c6..cfb63800 100644 --- a/data/default/FreeBSD.yaml +++ b/data/default/FreeBSD.yaml @@ -5,3 +5,5 @@ default::settings: files: config: group: 'wheel' + +# No data to convert to Version 4 format diff --git a/data/default/OpenBSD.yaml b/data/default/OpenBSD.yaml index 7ba670c6..cfb63800 100644 --- a/data/default/OpenBSD.yaml +++ b/data/default/OpenBSD.yaml @@ -5,3 +5,5 @@ default::settings: files: config: group: 'wheel' + +# No data to convert to Version 4 format diff --git a/data/default/OracleLinux.yaml b/data/default/OracleLinux.yaml index 9b829fd2..1ae3b858 100755 --- a/data/default/OracleLinux.yaml +++ b/data/default/OracleLinux.yaml @@ -6,4 +6,8 @@ default::settings: repos: default: - package_provider: 'rpm' \ No newline at end of file + package_provider: 'rpm' +# Version 4 format + repo: + upstream: + package_provider: rpm diff --git a/data/default/RedHat.yaml b/data/default/RedHat.yaml index 9b829fd2..1ae3b858 100755 --- a/data/default/RedHat.yaml +++ b/data/default/RedHat.yaml @@ -6,4 +6,8 @@ default::settings: repos: default: - package_provider: 'rpm' \ No newline at end of file + package_provider: 'rpm' +# Version 4 format + repo: + upstream: + package_provider: rpm diff --git a/data/default/Rocky.yaml b/data/default/Rocky.yaml index 9b829fd2..1ae3b858 100755 --- a/data/default/Rocky.yaml +++ b/data/default/Rocky.yaml @@ -6,4 +6,8 @@ default::settings: repos: default: - package_provider: 'rpm' \ No newline at end of file + package_provider: 'rpm' +# Version 4 format + repo: + upstream: + package_provider: rpm diff --git a/data/default/Solaris.yaml b/data/default/Solaris.yaml index 968e01f9..18c96b86 100644 --- a/data/default/Solaris.yaml +++ b/data/default/Solaris.yaml @@ -1,3 +1,5 @@ --- default:settings: config_file_group: 'bin' + +# No data to convert to Version 4 format diff --git a/data/default/Ubuntu.yaml b/data/default/Ubuntu.yaml index 0df39a71..5651ee32 100755 --- a/data/default/Ubuntu.yaml +++ b/data/default/Ubuntu.yaml @@ -6,3 +6,8 @@ default::settings: repos: default: package_provider: dpkg + +# Version 4 format + repo: + upstream: + package_provider: dpkg diff --git a/data/default/Ubuntu12.04.yaml b/data/default/Ubuntu12.04.yaml index f8acd7b9..d5d5e9e4 100644 --- a/data/default/Ubuntu12.04.yaml +++ b/data/default/Ubuntu12.04.yaml @@ -2,3 +2,9 @@ default::settings: apt_release: 'precise' init_system: 'upstart' + +# Version 4 format + repo: + upstream: + apt: + release: precise diff --git a/data/default/Ubuntu14.04.yaml b/data/default/Ubuntu14.04.yaml index fea8b952..56817361 100644 --- a/data/default/Ubuntu14.04.yaml +++ b/data/default/Ubuntu14.04.yaml @@ -2,3 +2,9 @@ default::settings: apt_release: 'trusty' init_system: 'upstart' + +# Version 4 format + repo: + upstream: + apt: + release: trusty diff --git a/data/default/Ubuntu14.10.yaml b/data/default/Ubuntu14.10.yaml index d790a02c..53f99cff 100644 --- a/data/default/Ubuntu14.10.yaml +++ b/data/default/Ubuntu14.10.yaml @@ -2,3 +2,9 @@ default::settings: apt_release: 'utopic' init_system: 'upstart' + +# Version 4 format + repo: + upstream: + apt: + release: utopic diff --git a/data/default/Ubuntu15.04.yaml b/data/default/Ubuntu15.04.yaml index 6ce2e816..ef0c7369 100644 --- a/data/default/Ubuntu15.04.yaml +++ b/data/default/Ubuntu15.04.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'vivid' + +# Version 4 format + repo: + upstream: + apt: + release: vivid diff --git a/data/default/Ubuntu15.10.yaml b/data/default/Ubuntu15.10.yaml index 3f46addb..1875e50e 100644 --- a/data/default/Ubuntu15.10.yaml +++ b/data/default/Ubuntu15.10.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'wily' + +# Version 4 format + repo: + upstream: + apt: + release: wily diff --git a/data/default/Ubuntu16.04.yaml b/data/default/Ubuntu16.04.yaml index c920aee7..a289a51d 100644 --- a/data/default/Ubuntu16.04.yaml +++ b/data/default/Ubuntu16.04.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'xenial' + +# Version 4 format + repo: + upstream: + apt: + release: xenial diff --git a/data/default/Ubuntu16.10.yaml b/data/default/Ubuntu16.10.yaml index 4e71c0d9..7d962b35 100644 --- a/data/default/Ubuntu16.10.yaml +++ b/data/default/Ubuntu16.10.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'yakkety' + +# Version 4 format + repo: + upstream: + apt: + release: yakkety diff --git a/data/default/Ubuntu17.04.yaml b/data/default/Ubuntu17.04.yaml index d751b5ee..8d3ec82b 100644 --- a/data/default/Ubuntu17.04.yaml +++ b/data/default/Ubuntu17.04.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'zesty' + +# Version 4 format + repo: + upstream: + apt: + release: zesty diff --git a/data/default/Ubuntu17.10.yaml b/data/default/Ubuntu17.10.yaml index c3887c2b..6c422b81 100644 --- a/data/default/Ubuntu17.10.yaml +++ b/data/default/Ubuntu17.10.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'artful' + +# Version 4 format + repo: + upstream: + apt: + release: artful diff --git a/data/default/Ubuntu18.04.yaml b/data/default/Ubuntu18.04.yaml index 4ae415f7..1ff8f105 100644 --- a/data/default/Ubuntu18.04.yaml +++ b/data/default/Ubuntu18.04.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'bionic' + +# Version 4 format + repo: + upstream: + apt: + release: bionic diff --git a/data/default/Ubuntu18.10.yaml b/data/default/Ubuntu18.10.yaml index 6c059d3b..bd963725 100644 --- a/data/default/Ubuntu18.10.yaml +++ b/data/default/Ubuntu18.10.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'cosmic' + +# Version 4 format + repo: + upstream: + apt: + release: cosmic diff --git a/data/default/Ubuntu19.04.yaml b/data/default/Ubuntu19.04.yaml index 873c9eaa..37c47fce 100644 --- a/data/default/Ubuntu19.04.yaml +++ b/data/default/Ubuntu19.04.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'disco' + +# Version 4 format + repo: + upstream: + apt: + release: disco diff --git a/data/default/Ubuntu19.10.yaml b/data/default/Ubuntu19.10.yaml index c202dd1c..e0a69666 100644 --- a/data/default/Ubuntu19.10.yaml +++ b/data/default/Ubuntu19.10.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'eoan' + +# Version 4 format + repo: + upstream: + apt: + release: eoan diff --git a/data/default/Ubuntu20.04.yaml b/data/default/Ubuntu20.04.yaml index c6d29546..2f475c10 100644 --- a/data/default/Ubuntu20.04.yaml +++ b/data/default/Ubuntu20.04.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'focal' + +# Version 4 format + repo: + upstream: + apt: + release: focal diff --git a/data/default/Ubuntu20.10.yaml b/data/default/Ubuntu20.10.yaml index cb874e24..f906b7fe 100644 --- a/data/default/Ubuntu20.10.yaml +++ b/data/default/Ubuntu20.10.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'groovy' + +# Version 4 format + repo: + upstream: + apt: + release: groovy diff --git a/data/default/Ubuntu21.04.yaml b/data/default/Ubuntu21.04.yaml index b01705ea..3bd2f61b 100644 --- a/data/default/Ubuntu21.04.yaml +++ b/data/default/Ubuntu21.04.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'hirsute' + +# Version 4 format + repo: + upstream: + apt: + release: hirsute diff --git a/data/default/Ubuntu21.10.yaml b/data/default/Ubuntu21.10.yaml index c4b2422f..d5aec53f 100644 --- a/data/default/Ubuntu21.10.yaml +++ b/data/default/Ubuntu21.10.yaml @@ -6,3 +6,9 @@ default::settings: default: apt: release: 'impish' + +# Version 4 format + repo: + upstream: + apt: + release: impish diff --git a/data/default/Ubuntu22.04.yaml b/data/default/Ubuntu22.04.yaml index e4c161a8..4de5270a 100644 --- a/data/default/Ubuntu22.04.yaml +++ b/data/default/Ubuntu22.04.yaml @@ -7,3 +7,9 @@ default::settings: default: apt: release: 'jammy' + +# Version 4 format + repo: + upstream: + apt: + release: jammy diff --git a/data/default/windows.yaml b/data/default/windows.yaml index 0b5375d6..525d79f3 100644 --- a/data/default/windows.yaml +++ b/data/default/windows.yaml @@ -5,3 +5,8 @@ default::settings: config_file_group: 'NT AUTHORITY\SYSTEM' config_dir_owner: 'BUILTIN\Administrators' config_dir_group: 'NT AUTHORITY\SYSTEM' + +# Version 4 format + packages: + main: + provider: chocolatey diff --git a/data/dhcpd/default.yaml b/data/dhcpd/default.yaml index 94bf5416..2d2f1f80 100644 --- a/data/dhcpd/default.yaml +++ b/data/dhcpd/default.yaml @@ -9,3 +9,31 @@ dhcpd::settings: process_user: 'dhcpd' process_group: 'dhcpd' udp_port: '67' + +# Version 4 format + packages: + main: + name: dhcpd + services: + dhcpd: + process_name: dhcpd + process_user: dhcpd + process_group: dhcpd + files: + config: + path: "/etc/dhcpd/dhcpd.conf" + pid: + path: "/var/run/dhcpd.pid" + user_files: + config: + path: "$HOME/.dhcpd/dhcpd.conf" + dirs: + config: + path: "/etc/dhcpd" + user_dirs: + config: + path: "$HOME/.dhcpd" + ports: + main_udp: + port: '67' + protocol: udp diff --git a/data/dhcpd/osfamily/Debian.yaml b/data/dhcpd/osfamily/Debian.yaml index 9a8dd0b9..396c4507 100644 --- a/data/dhcpd/osfamily/Debian.yaml +++ b/data/dhcpd/osfamily/Debian.yaml @@ -8,3 +8,28 @@ dhcpd::settings: data_dir_path: '/var/lib/dhcp' init_file_path: '/etc/default/isc-dhcp-server' + +# Version 4 format + packages: + main: + name: isc-dhcp-server + services: + isc-dhcp-server: {} + files: + config: + path: "/etc/dhcp/dhcpd.conf" + init: + path: "/etc/default/isc-dhcp-server" + pid: + path: "/var/run/dhcp-server/dhcpd.pid" + user_files: + config: + path: "$HOME/.dhcp/dhcpd.conf" + dirs: + config: + path: "/etc/dhcp" + data: + path: "/var/lib/dhcp" + user_dirs: + config: + path: "$HOME/.dhcp" diff --git a/data/dhcpd/osfamily/OpenBSD.yaml b/data/dhcpd/osfamily/OpenBSD.yaml index f3abcd18..95626e85 100644 --- a/data/dhcpd/osfamily/OpenBSD.yaml +++ b/data/dhcpd/osfamily/OpenBSD.yaml @@ -7,3 +7,28 @@ dhcpd::settings: data_dir_path: '' process_user: '_dhcp' process_group: '_dhcp' + +# Version 4 format + packages: + main: + name: '' + services: + ! '': + process_user: _dhcp + process_group: _dhcp + files: + config: + path: "/etc/dhcpd.conf" + pid: + path: '' + user_files: + config: + path: "$HOME/.dhcpd.conf" + dirs: + config: + path: '' + data: + path: '' + user_dirs: + config: + path: '' diff --git a/data/dhcpd/osfamily/RedHat.yaml b/data/dhcpd/osfamily/RedHat.yaml index 46b03bba..34cbb383 100644 --- a/data/dhcpd/osfamily/RedHat.yaml +++ b/data/dhcpd/osfamily/RedHat.yaml @@ -4,3 +4,22 @@ dhcpd::settings: config_file_path: '/etc/dhcp/dhcpd.conf' config_dir_path: '/etc/dhcp' init_file_path: '/etc/sysconfig/dhcpd' + +# Version 4 format + packages: + main: + name: dhcp + files: + config: + path: "/etc/dhcp/dhcpd.conf" + init: + path: "/etc/sysconfig/dhcpd" + user_files: + config: + path: "$HOME/.dhcp/dhcpd.conf" + dirs: + config: + path: "/etc/dhcp" + user_dirs: + config: + path: "$HOME/.dhcp" diff --git a/data/dhcpd/osfamily/Suse.yaml b/data/dhcpd/osfamily/Suse.yaml index 03cedd4e..c6f54a17 100644 --- a/data/dhcpd/osfamily/Suse.yaml +++ b/data/dhcpd/osfamily/Suse.yaml @@ -4,3 +4,18 @@ dhcpd::settings: config_dir_path: '/etc/dhcpd.d' conf_dir_path: '/etc/dhcpd.d' data_dir_path: '/var/lib/dhcp' + +# Version 4 format + packages: + main: + name: dhcp-server + dirs: + config: + path: "/etc/dhcpd.d" + conf: + path: "/etc/dhcpd.d" + data: + path: "/var/lib/dhcp" + user_dirs: + config: + path: "$HOME/.dhcpd.d" diff --git a/data/discord/default.yaml b/data/discord/default.yaml index 694e3208..1f72eded 100644 --- a/data/discord/default.yaml +++ b/data/discord/default.yaml @@ -3,3 +3,13 @@ discord::settings: package_name: discord snap_package_name: 'discord' website_url: 'https://discord.com/' + +# Version 4 format + packages: + main: + name: discord + providers: + snap: + name: discord + urls: + website: https://discord.com/ diff --git a/data/discord/osfamily/Darwin.yaml b/data/discord/osfamily/Darwin.yaml index b257d069..27785c57 100644 --- a/data/discord/osfamily/Darwin.yaml +++ b/data/discord/osfamily/Darwin.yaml @@ -1,3 +1,10 @@ --- discord::settings: brew_package_name: 'discord' + +# Version 4 format + packages: + main: + providers: + brew: + name: discord diff --git a/data/discord/osfamily/windows.yaml b/data/discord/osfamily/windows.yaml index 16c25c97..7d6d260b 100644 --- a/data/discord/osfamily/windows.yaml +++ b/data/discord/osfamily/windows.yaml @@ -2,3 +2,12 @@ discord::settings: winget_package_name: 'Discord.Discord' choco_package_name: 'discord' + +# Version 4 format + packages: + main: + providers: + winget: + name: Discord.Discord + choco: + name: discord diff --git a/data/dkms/default.yaml b/data/dkms/default.yaml index 415b8fb4..8dce5ac4 100644 --- a/data/dkms/default.yaml +++ b/data/dkms/default.yaml @@ -4,3 +4,22 @@ dkms::settings: service_name: 'dkms' config_file_path: '/etc/dkms/framework.conf' config_dir_path: '/etc/dkms' + +# Version 4 format + packages: + main: + name: dkms + services: + dkms: {} + files: + config: + path: "/etc/dkms/framework.conf" + user_files: + config: + path: "$HOME/.dkms/framework.conf" + dirs: + config: + path: "/etc/dkms" + user_dirs: + config: + path: "$HOME/.dkms" diff --git a/data/dkms/osfamily/RedHat.yaml b/data/dkms/osfamily/RedHat.yaml index 67d62ef8..ab98a8d4 100644 --- a/data/dkms/osfamily/RedHat.yaml +++ b/data/dkms/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ dkms::settings: tp_prerequisites: - epel + +# Version 4 format + preinstall: + tp::install: + - epel diff --git a/data/dnsmasq/default.yaml b/data/dnsmasq/default.yaml index 09270dff..4ab4b69f 100644 --- a/data/dnsmasq/default.yaml +++ b/data/dnsmasq/default.yaml @@ -12,3 +12,37 @@ dnsmasq::settings: process_user: 'dnsmasq' process_group: 'dnsmasq' tcp_port: '53' + +# Version 4 format + packages: + main: + name: dnsmasq + services: + dnsmasq: + process_name: dnsmasq + process_user: dnsmasq + process_group: dnsmasq + files: + config: + path: "/etc/dnsmasq.conf" + log: + path: "/var/log/dnsmasq/dnsmasq.log" + pid: + path: "/var/run/dnsmasq.pid" + user_files: + config: + path: "$HOME/.dnsmasq.conf" + dirs: + config: + path: "/etc/dnsmasq.d" + conf: + path: "/etc/dnsmasq.d" + log: + path: "/var/log/dnsmasq" + user_dirs: + config: + path: "$HOME/.dnsmasq.d" + ports: + main: + port: '53' + protocol: tcp diff --git a/data/dnsmasq/osfamily/Debian.yaml b/data/dnsmasq/osfamily/Debian.yaml index 7dbd0433..9bc81433 100644 --- a/data/dnsmasq/osfamily/Debian.yaml +++ b/data/dnsmasq/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- dnsmasq::settings: init_file_path: '/etc/default/dnsmasq' + +# Version 4 format + files: + init: + path: "/etc/default/dnsmasq" diff --git a/data/dnsmasq/osfamily/RedHat.yaml b/data/dnsmasq/osfamily/RedHat.yaml index 2c9c5a08..a6ac9858 100644 --- a/data/dnsmasq/osfamily/RedHat.yaml +++ b/data/dnsmasq/osfamily/RedHat.yaml @@ -2,3 +2,11 @@ dnsmasq::settings: process_user: 'nobody' init_file_path: '/etc/sysconfig/dnsmasq' + +# Version 4 format + services: + ! '': + process_user: nobody + files: + init: + path: "/etc/sysconfig/dnsmasq" diff --git a/data/docker/default.yaml b/data/docker/default.yaml index 61b1d5bb..901cf3ce 100644 --- a/data/docker/default.yaml +++ b/data/docker/default.yaml @@ -11,3 +11,33 @@ docker::settings: config_file_path: '/etc/docker/daemon.json' config_dir_path: '/etc/docker' config_file_format: 'json' + +# Version 4 format + packages: + main: + name: docker + services: + docker: + process_name: docker + process_user: docker + process_group: docker + files: + config: + path: "/etc/docker/daemon.json" + format: json + pid: + path: "/var/run/docker.pid" + user_files: + config: + path: "$HOME/.docker/daemon.json" + dirs: + config: + path: "/etc/docker" + user_dirs: + config: + path: "$HOME/.docker" + ports: + main: + port: '2375' + protocol: tcp + repo: upstream diff --git a/data/docker/upstream/default.yaml b/data/docker/upstream/default.yaml index eeae2a18..db651450 100644 --- a/data/docker/upstream/default.yaml +++ b/data/docker/upstream/default.yaml @@ -2,3 +2,8 @@ docker::settings: package_name: 'docker-ce' compose_version: '1.24.0' + +# Version 4 format + packages: + main: + name: docker-ce diff --git a/data/docker/upstream/operatingsystem/Amazon2.yaml b/data/docker/upstream/operatingsystem/Amazon2.yaml index 3450eefc..723eac74 100644 --- a/data/docker/upstream/operatingsystem/Amazon2.yaml +++ b/data/docker/upstream/operatingsystem/Amazon2.yaml @@ -2,3 +2,8 @@ docker::settings: repo_file_url: ~ package_name: docker + +# Version 4 format + packages: + main: + name: docker diff --git a/data/docker/upstream/operatingsystem/CentOS.yaml b/data/docker/upstream/operatingsystem/CentOS.yaml index 41c9bdd2..a1dbd2ff 100644 --- a/data/docker/upstream/operatingsystem/CentOS.yaml +++ b/data/docker/upstream/operatingsystem/CentOS.yaml @@ -4,3 +4,19 @@ docker::settings: 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' + +# Version 4 format + files: + config: + path: "/etc/sysconfig/docker" + init: + path: "/etc/sysconfig/docker" + user_files: + config: + path: "$HOME/.sysconfig/docker" + repo: + upstream: + key: 060A 61C5 1B55 8A7F 742B 77AA C52F EB6B 621E 9F35 + key_url: https://download.docker.com/linux/centos/gpg + yum: + gpgcheck: true diff --git a/data/docker/upstream/operatingsystem/CentOS6.yaml b/data/docker/upstream/operatingsystem/CentOS6.yaml index bff7a9da..f4c00c80 100644 --- a/data/docker/upstream/operatingsystem/CentOS6.yaml +++ b/data/docker/upstream/operatingsystem/CentOS6.yaml @@ -1,3 +1,8 @@ --- docker::settings: repo_url: 'https://yum.dockerproject.org/repo/main/centos/6/$basearch/stable' + +# Version 4 format + repo: + upstream: + url: https://yum.dockerproject.org/repo/main/centos/6/$basearch/stable diff --git a/data/docker/upstream/operatingsystem/CentOS7.yaml b/data/docker/upstream/operatingsystem/CentOS7.yaml index dcf220ba..ea1d96c4 100644 --- a/data/docker/upstream/operatingsystem/CentOS7.yaml +++ b/data/docker/upstream/operatingsystem/CentOS7.yaml @@ -1,3 +1,8 @@ --- docker::settings: repo_url: 'https://download.docker.com/linux/centos/7/$basearch/stable' + +# Version 4 format + repo: + upstream: + url: https://download.docker.com/linux/centos/7/$basearch/stable diff --git a/data/docker/upstream/operatingsystem/Darwin.yaml b/data/docker/upstream/operatingsystem/Darwin.yaml index d64b3afd..2ecb3abf 100644 --- a/data/docker/upstream/operatingsystem/Darwin.yaml +++ b/data/docker/upstream/operatingsystem/Darwin.yaml @@ -3,3 +3,10 @@ docker::settings: package_name: docker service_name: com.docker.vmnetd + +# Version 4 format + packages: + main: + name: docker + services: + com.docker.vmnetd: {} diff --git a/data/docker/upstream/operatingsystem/Debian.yaml b/data/docker/upstream/operatingsystem/Debian.yaml index 904f9097..5c801e95 100644 --- a/data/docker/upstream/operatingsystem/Debian.yaml +++ b/data/docker/upstream/operatingsystem/Debian.yaml @@ -5,3 +5,15 @@ docker::settings: key: '0EBFCD88' key_url: 'https://download.docker.com/linux/debian/gpg' apt_repos: 'stable' + +# Version 4 format + files: + init: + path: "/etc/default/docker" + repo: + upstream: + url: https://download.docker.com/linux/debian + key: 0EBFCD88 + key_url: https://download.docker.com/linux/debian/gpg + yum: + gpgcheck: true diff --git a/data/docker/upstream/operatingsystem/Devuan4.yaml b/data/docker/upstream/operatingsystem/Devuan4.yaml index f1445213..a1593cef 100644 --- a/data/docker/upstream/operatingsystem/Devuan4.yaml +++ b/data/docker/upstream/operatingsystem/Devuan4.yaml @@ -2,3 +2,8 @@ docker::settings: repo_url: ~ package_name: 'docker' + +# Version 4 format + packages: + main: + name: docker diff --git a/data/docker/upstream/operatingsystem/Fedora.yaml b/data/docker/upstream/operatingsystem/Fedora.yaml index b55a0d1b..ddb891a4 100644 --- a/data/docker/upstream/operatingsystem/Fedora.yaml +++ b/data/docker/upstream/operatingsystem/Fedora.yaml @@ -1,3 +1,8 @@ --- docker::settings: repo_url: 'https://download.docker.com/linux/fedora/docker-ce.repo' + +# Version 4 format + repo: + upstream: + url: https://download.docker.com/linux/fedora/docker-ce.repo diff --git a/data/docker/upstream/operatingsystem/RedHat.yaml b/data/docker/upstream/operatingsystem/RedHat.yaml index 7a847bc2..1a7bed29 100644 --- a/data/docker/upstream/operatingsystem/RedHat.yaml +++ b/data/docker/upstream/operatingsystem/RedHat.yaml @@ -4,3 +4,19 @@ docker::settings: config_file_path: '/etc/sysconfig/docker' key: '2C52609D' key_url: 'http://yum.dockerproject.org/gpg' + +# Version 4 format + files: + config: + path: "/etc/sysconfig/docker" + init: + path: "/etc/sysconfig/docker" + user_files: + config: + path: "$HOME/.sysconfig/docker" + repo: + upstream: + key: 2C52609D + key_url: http://yum.dockerproject.org/gpg + yum: + gpgcheck: true diff --git a/data/docker/upstream/operatingsystem/SLES12.yaml b/data/docker/upstream/operatingsystem/SLES12.yaml index 7edcf5eb..ba162051 100644 --- a/data/docker/upstream/operatingsystem/SLES12.yaml +++ b/data/docker/upstream/operatingsystem/SLES12.yaml @@ -1,3 +1,8 @@ --- docker::settings: repo_file_url: "https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP3/security:SELinux.repo" + +# Version 4 format + repo: + upstream: + repofile_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 index 7edcf5eb..ba162051 100644 --- a/data/docker/upstream/operatingsystem/SLES15.yaml +++ b/data/docker/upstream/operatingsystem/SLES15.yaml @@ -1,3 +1,8 @@ --- docker::settings: repo_file_url: "https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP3/security:SELinux.repo" + +# Version 4 format + repo: + upstream: + repofile_url: https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP3/security:SELinux.repo diff --git a/data/docker/upstream/operatingsystem/Ubuntu.yaml b/data/docker/upstream/operatingsystem/Ubuntu.yaml index a77deeba..80a0747d 100644 --- a/data/docker/upstream/operatingsystem/Ubuntu.yaml +++ b/data/docker/upstream/operatingsystem/Ubuntu.yaml @@ -6,3 +6,17 @@ docker::settings: key_url: 'https://download.docker.com/linux/ubuntu/gpg' apt_repos: 'stable' apt_key_server: 'http://p80.pool.sks-keyservers.net' + +# Version 4 format + files: + init: + path: "/etc/default/docker" + repo: + upstream: + url: https://download.docker.com/linux/ubuntu + key: 9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88 + key_url: https://download.docker.com/linux/ubuntu/gpg + yum: + gpgcheck: true + apt: + key_server: http://p80.pool.sks-keyservers.net diff --git a/data/docker/upstream/osfamily/RedHat.yaml b/data/docker/upstream/osfamily/RedHat.yaml index f1f11c0e..f4d44056 100644 --- a/data/docker/upstream/osfamily/RedHat.yaml +++ b/data/docker/upstream/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- docker::settings: repo_file_url: 'https://download.docker.com/linux/centos/docker-ce.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index 4ea34537..f079757c 100644 --- a/data/docker/upstream/osfamily/windows.yaml +++ b/data/docker/upstream/osfamily/windows.yaml @@ -1,3 +1,7 @@ --- docker::settings: - package_name: 'docker-engine' \ No newline at end of file + package_name: 'docker-engine' +# Version 4 format + packages: + main: + name: docker-engine diff --git a/data/dovecot/default.yaml b/data/dovecot/default.yaml index ba27cd26..2050dfb7 100644 --- a/data/dovecot/default.yaml +++ b/data/dovecot/default.yaml @@ -12,3 +12,37 @@ dovecot::settings: process_user: 'dovecot' process_group: 'dovecot' tcp_port: '143' + +# Version 4 format + packages: + main: + name: dovecot + services: + dovecot: + process_name: dovecot + process_user: dovecot + process_group: dovecot + files: + config: + path: "/etc/dovecot/dovecot.conf" + log: + path: "/var/log/dovecot/dovecot.log" + pid: + path: "/var/run/dovecot.pid" + user_files: + config: + path: "$HOME/.dovecot/dovecot.conf" + dirs: + config: + path: "/etc/dovecot" + conf: + path: "/etc/dovecot/conf.d" + log: + path: "/var/log/dovecot" + user_dirs: + config: + path: "$HOME/.dovecot" + ports: + main: + port: '143' + protocol: tcp diff --git a/data/dovecot/osfamily/Debian.yaml b/data/dovecot/osfamily/Debian.yaml index a2e2ed62..7655b68b 100644 --- a/data/dovecot/osfamily/Debian.yaml +++ b/data/dovecot/osfamily/Debian.yaml @@ -4,3 +4,12 @@ dovecot::settings: - 'dovecot-imapd' init_file_path: '/etc/default/dovecot' run_file_path: '/var/run/dovecot/master.pid' + +# Version 4 format + packages: + main: + name: + - dovecot-imapd + files: + init: + path: "/etc/default/dovecot" diff --git a/data/dovecot/osfamily/FreeBSD.yaml b/data/dovecot/osfamily/FreeBSD.yaml index 8ccb0969..a1d709ef 100644 --- a/data/dovecot/osfamily/FreeBSD.yaml +++ b/data/dovecot/osfamily/FreeBSD.yaml @@ -7,3 +7,26 @@ dovecot::settings: config_dir_path: '/usr/local/etc/dovecot' conf_dir_path: '' pid_file_path: '/var/run/dovecot.pid' + +# Version 4 format + packages: + main: + name: + - dovecot2 + - dovecot-pigeonhole + files: + config: + path: "/usr/local/etc/dovecot/dovecot.conf" + pid: + path: "/var/run/dovecot.pid" + user_files: + config: + path: "/usr/local$HOME/.dovecot/dovecot.conf" + dirs: + config: + path: "/usr/local/etc/dovecot" + conf: + path: '' + user_dirs: + config: + path: "/usr/local$HOME/.dovecot" diff --git a/data/dovecot/osfamily/RedHat.yaml b/data/dovecot/osfamily/RedHat.yaml index d10a1703..faa308bd 100644 --- a/data/dovecot/osfamily/RedHat.yaml +++ b/data/dovecot/osfamily/RedHat.yaml @@ -2,3 +2,13 @@ dovecot::settings: config_file_path: '/etc/dovecot.conf' init_file_path: '/etc/sysconfig/dovecot' + +# Version 4 format + files: + config: + path: "/etc/dovecot.conf" + init: + path: "/etc/sysconfig/dovecot" + user_files: + config: + path: "$HOME/.dovecot.conf" diff --git a/data/duply/default.yaml b/data/duply/default.yaml index f5fb3363..bc147213 100644 --- a/data/duply/default.yaml +++ b/data/duply/default.yaml @@ -3,3 +3,14 @@ duply::settings: package_name: 'duply' config_dir_path: '/etc/duply' config_dir_mode: '0600' + +# Version 4 format + packages: + main: + name: duply + dirs: + config: + path: "/etc/duply" + user_dirs: + config: + path: "$HOME/.duply" diff --git a/data/edge/default.yaml b/data/edge/default.yaml index 5044df9e..9452b526 100644 --- a/data/edge/default.yaml +++ b/data/edge/default.yaml @@ -5,3 +5,15 @@ edge::settings: website_url: 'https://learn.microsoft.com/edge/' tp_prerequisites: - 'microsoft_repo' + +# Version 4 format + packages: + main: + name: microsoft-edge-stable + urls: + website: https://learn.microsoft.com/edge/ + image: + name: microsoft/edge + preinstall: + tp::install: + - microsoft_repo diff --git a/data/edge/osfamily/Darwin.yaml b/data/edge/osfamily/Darwin.yaml index 896ae8ba..1656e280 100644 --- a/data/edge/osfamily/Darwin.yaml +++ b/data/edge/osfamily/Darwin.yaml @@ -2,3 +2,11 @@ edge::settings: brew_package_name: 'microsoft-edge' package_name: 'microsoft-edge' + +# Version 4 format + packages: + main: + name: microsoft-edge + providers: + brew: + name: microsoft-edge diff --git a/data/edge/osfamily/windows.yaml b/data/edge/osfamily/windows.yaml index a1c293ea..cc05f9db 100644 --- a/data/edge/osfamily/windows.yaml +++ b/data/edge/osfamily/windows.yaml @@ -2,4 +2,13 @@ edge::settings: winget_package_name: 'Microsoft.Edge' choco_package_name: 'edge' - package_name: 'edge' \ No newline at end of file + package_name: 'edge' +# Version 4 format + packages: + main: + name: edge + providers: + winget: + name: Microsoft.Edge + choco: + name: edge diff --git a/data/elastic-agent/default.yaml b/data/elastic-agent/default.yaml index d0f09e9d..5832aead 100644 --- a/data/elastic-agent/default.yaml +++ b/data/elastic-agent/default.yaml @@ -13,3 +13,35 @@ elastic-agent::settings: data_dir_path: '/var/lib/elastic-agent' process_name: 'elastic-agent' + +# Version 4 format + packages: + main: + name: elastic-agent + services: + elastic-agent: + process_name: elastic-agent + files: + config: + path: "/etc/elastic-agent/elastic-agent.yml" + format: yaml + log: + path: "/var/log/elastic-agent/elastic-agent" + pid: + path: "/var/run/elastic-agent.pid" + user_files: + config: + path: "$HOME/.elastic-agent/elastic-agent.yml" + dirs: + config: + path: "/etc/elastic-agent" + log: + path: "/var/log/elastic-agent" + home: + path: "/usr/share/elastic-agent" + data: + path: "/var/lib/elastic-agent" + user_dirs: + config: + path: "$HOME/.elastic-agent" + repo: upstream diff --git a/data/elastic-agent/osfamily/Debian.yaml b/data/elastic-agent/osfamily/Debian.yaml index aa8d4477..18ed42d4 100644 --- a/data/elastic-agent/osfamily/Debian.yaml +++ b/data/elastic-agent/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- elastic-agent::settings: init_file_path: '/etc/default/elastic-agent' + +# Version 4 format + files: + init: + path: "/etc/default/elastic-agent" diff --git a/data/elastic-agent/osfamily/RedHat.yaml b/data/elastic-agent/osfamily/RedHat.yaml index 7cc697a2..b9e4a1cb 100644 --- a/data/elastic-agent/osfamily/RedHat.yaml +++ b/data/elastic-agent/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- elastic-agent::settings: init_file_path: '/etc/sysconfig/elastic-agent' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/elastic-agent" diff --git a/data/elastic-agent/osfamily/windows.yaml b/data/elastic-agent/osfamily/windows.yaml index 2107d47c..4d7751c9 100644 --- a/data/elastic-agent/osfamily/windows.yaml +++ b/data/elastic-agent/osfamily/windows.yaml @@ -2,3 +2,11 @@ elastic-agent::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\elastic-agent\tools\elastic-agent.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\elastic-agent\tools\elastic-agent.yml + user_files: + config: + 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 index 55b765c6..b785e092 100644 --- a/data/elastic-agent/upstream/default.yaml +++ b/data/elastic-agent/upstream/default.yaml @@ -1,4 +1,8 @@ --- elastic-agent::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/elastic_repo/6.x/default.yaml b/data/elastic_repo/6.x/default.yaml index a189e83f..622e8f98 100644 --- a/data/elastic_repo/6.x/default.yaml +++ b/data/elastic_repo/6.x/default.yaml @@ -2,3 +2,9 @@ elastic_repo::settings: repo_filename: elastic-6.x repo_description: 'Elastic repository for 6.x packages' + +# Version 4 format + repo: + upstream: + description: Elastic repository for 6.x packages + repofile_name: elastic-6.x diff --git a/data/elastic_repo/6.x/osfamily/Debian.yaml b/data/elastic_repo/6.x/osfamily/Debian.yaml index cedd4457..5daf975e 100644 --- a/data/elastic_repo/6.x/osfamily/Debian.yaml +++ b/data/elastic_repo/6.x/osfamily/Debian.yaml @@ -3,3 +3,10 @@ elastic_repo::settings: repo_url: 'http://artifacts.elastic.co/packages/6.x/apt' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + repo: + upstream: + url: http://artifacts.elastic.co/packages/6.x/apt + apt: + release: stable diff --git a/data/elastic_repo/6.x/osfamily/RedHat.yaml b/data/elastic_repo/6.x/osfamily/RedHat.yaml index e2be4791..772b31b2 100644 --- a/data/elastic_repo/6.x/osfamily/RedHat.yaml +++ b/data/elastic_repo/6.x/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ elastic_repo::settings: repo_url: 'http://artifacts.elastic.co/packages/6.x/yum' + +# Version 4 format + repo: + upstream: + 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 index 9cc7c368..08d431cd 100644 --- a/data/elastic_repo/7.x/default.yaml +++ b/data/elastic_repo/7.x/default.yaml @@ -2,3 +2,9 @@ elastic_repo::settings: repo_filename: elastic-7.x repo_description: 'Elastic repository for 7.x packages' + +# Version 4 format + repo: + upstream: + description: Elastic repository for 7.x packages + repofile_name: elastic-7.x diff --git a/data/elastic_repo/7.x/osfamily/Debian.yaml b/data/elastic_repo/7.x/osfamily/Debian.yaml index 9cdca979..06c75967 100644 --- a/data/elastic_repo/7.x/osfamily/Debian.yaml +++ b/data/elastic_repo/7.x/osfamily/Debian.yaml @@ -3,3 +3,10 @@ elastic_repo::settings: repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + repo: + upstream: + url: http://artifacts.elastic.co/packages/7.x/apt + apt: + release: stable diff --git a/data/elastic_repo/7.x/osfamily/RedHat.yaml b/data/elastic_repo/7.x/osfamily/RedHat.yaml index 9ad7a7e3..6255fbe3 100644 --- a/data/elastic_repo/7.x/osfamily/RedHat.yaml +++ b/data/elastic_repo/7.x/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ elastic_repo::settings: repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + +# Version 4 format + repo: + upstream: + url: http://artifacts.elastic.co/packages/7.x/yum diff --git a/data/elastic_repo/8.x/default.yaml b/data/elastic_repo/8.x/default.yaml index 6697685f..83168084 100644 --- a/data/elastic_repo/8.x/default.yaml +++ b/data/elastic_repo/8.x/default.yaml @@ -2,3 +2,9 @@ elastic_repo::settings: repo_filename: elastic-8.x repo_description: 'Elastic repository for 8.x packages' + +# Version 4 format + repo: + upstream: + description: Elastic repository for 8.x packages + repofile_name: elastic-8.x diff --git a/data/elastic_repo/8.x/osfamily/Debian.yaml b/data/elastic_repo/8.x/osfamily/Debian.yaml index 39f3d01e..465bb642 100644 --- a/data/elastic_repo/8.x/osfamily/Debian.yaml +++ b/data/elastic_repo/8.x/osfamily/Debian.yaml @@ -3,3 +3,10 @@ elastic_repo::settings: repo_url: 'https://artifacts.elastic.co/packages/8.x/apt' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + repo: + upstream: + url: https://artifacts.elastic.co/packages/8.x/apt + apt: + release: stable diff --git a/data/elastic_repo/8.x/osfamily/RedHat.yaml b/data/elastic_repo/8.x/osfamily/RedHat.yaml index 2ede54e6..ccd60d41 100644 --- a/data/elastic_repo/8.x/osfamily/RedHat.yaml +++ b/data/elastic_repo/8.x/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ elastic_repo::settings: repo_url: 'https://artifacts.elastic.co/packages/8.x/yum' + +# Version 4 format + repo: + upstream: + url: https://artifacts.elastic.co/packages/8.x/yum diff --git a/data/elastic_repo/ds/default.yaml b/data/elastic_repo/ds/default.yaml index 9cc7c368..08d431cd 100644 --- a/data/elastic_repo/ds/default.yaml +++ b/data/elastic_repo/ds/default.yaml @@ -2,3 +2,9 @@ elastic_repo::settings: repo_filename: elastic-7.x repo_description: 'Elastic repository for 7.x packages' + +# Version 4 format + repo: + upstream: + description: Elastic repository for 7.x packages + repofile_name: elastic-7.x diff --git a/data/elastic_repo/ds/osfamily/Debian.yaml b/data/elastic_repo/ds/osfamily/Debian.yaml index 9cdca979..06c75967 100644 --- a/data/elastic_repo/ds/osfamily/Debian.yaml +++ b/data/elastic_repo/ds/osfamily/Debian.yaml @@ -3,3 +3,10 @@ elastic_repo::settings: repo_url: 'http://artifacts.elastic.co/packages/7.x/apt' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + repo: + upstream: + url: http://artifacts.elastic.co/packages/7.x/apt + apt: + release: stable diff --git a/data/elastic_repo/ds/osfamily/RedHat.yaml b/data/elastic_repo/ds/osfamily/RedHat.yaml index 9ad7a7e3..6255fbe3 100644 --- a/data/elastic_repo/ds/osfamily/RedHat.yaml +++ b/data/elastic_repo/ds/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ elastic_repo::settings: repo_url: 'http://artifacts.elastic.co/packages/7.x/yum' + +# Version 4 format + repo: + upstream: + url: http://artifacts.elastic.co/packages/7.x/yum diff --git a/data/elastic_repo/upstream/default.yaml b/data/elastic_repo/upstream/default.yaml index 6697685f..83168084 100644 --- a/data/elastic_repo/upstream/default.yaml +++ b/data/elastic_repo/upstream/default.yaml @@ -2,3 +2,9 @@ elastic_repo::settings: repo_filename: elastic-8.x repo_description: 'Elastic repository for 8.x packages' + +# Version 4 format + repo: + upstream: + description: Elastic repository for 8.x packages + repofile_name: elastic-8.x diff --git a/data/elastic_repo/upstream/osfamily/Debian.yaml b/data/elastic_repo/upstream/osfamily/Debian.yaml index 39f3d01e..465bb642 100644 --- a/data/elastic_repo/upstream/osfamily/Debian.yaml +++ b/data/elastic_repo/upstream/osfamily/Debian.yaml @@ -3,3 +3,10 @@ elastic_repo::settings: repo_url: 'https://artifacts.elastic.co/packages/8.x/apt' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + repo: + upstream: + url: https://artifacts.elastic.co/packages/8.x/apt + apt: + release: stable diff --git a/data/elastic_repo/upstream/osfamily/RedHat.yaml b/data/elastic_repo/upstream/osfamily/RedHat.yaml index 2ede54e6..ccd60d41 100644 --- a/data/elastic_repo/upstream/osfamily/RedHat.yaml +++ b/data/elastic_repo/upstream/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ elastic_repo::settings: repo_url: 'https://artifacts.elastic.co/packages/8.x/yum' + +# Version 4 format + repo: + upstream: + url: https://artifacts.elastic.co/packages/8.x/yum diff --git a/data/elasticsearch/default.yaml b/data/elasticsearch/default.yaml index 5d5c0555..7c1f79cf 100644 --- a/data/elasticsearch/default.yaml +++ b/data/elasticsearch/default.yaml @@ -16,3 +16,40 @@ elasticsearch::settings: process_group: 'elasticsearch' tcp_port: '9200' + +# Version 4 format + packages: + main: + name: elasticsearch + services: + elasticsearch: + process_name: java + process_extra_name: elasticsearch + process_user: elasticsearch + process_group: elasticsearch + files: + config: + path: "/etc/elasticsearch/elasticsearch.yml" + format: yaml + log: + path: "/var/log/elasticsearch/elasticsearch.log" + pid: + path: "/var/run/elasticsearch.pid" + user_files: + config: + path: "$HOME/.elasticsearch/elasticsearch.yml" + dirs: + config: + path: "/etc/elasticsearch" + log: + path: "/var/log/elasticsearch" + data: + path: "/var/lib/elasticsearch" + user_dirs: + config: + path: "$HOME/.elasticsearch" + ports: + main: + port: '9200' + protocol: tcp + repo: upstream diff --git a/data/elasticsearch/osfamily/Debian.yaml b/data/elasticsearch/osfamily/Debian.yaml index 42cc54bb..e60a4529 100644 --- a/data/elasticsearch/osfamily/Debian.yaml +++ b/data/elasticsearch/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- elasticsearch::settings: init_file_path: '/etc/default/elasticsearch' + +# Version 4 format + files: + init: + path: "/etc/default/elasticsearch" diff --git a/data/elasticsearch/osfamily/RedHat.yaml b/data/elasticsearch/osfamily/RedHat.yaml index eaf2fd11..d74d4cfd 100644 --- a/data/elasticsearch/osfamily/RedHat.yaml +++ b/data/elasticsearch/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- elasticsearch::settings: init_file_path: '/etc/sysconfig/elasticsearch' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/elasticsearch" diff --git a/data/elasticsearch/osfamily/windows.yaml b/data/elasticsearch/osfamily/windows.yaml index 5fc9e3fd..117e24b4 100644 --- a/data/elasticsearch/osfamily/windows.yaml +++ b/data/elasticsearch/osfamily/windows.yaml @@ -2,3 +2,11 @@ elasticsearch::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\elasticsearch\tools\filebeat.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\elasticsearch\tools\filebeat.yml + user_files: + config: + path: C:\ProgramData\chocolatey\lib\elasticsearch\tools\filebeat.yml diff --git a/data/elasticsearch/upstream/default.yaml b/data/elasticsearch/upstream/default.yaml index dce800e8..c419dd98 100644 --- a/data/elasticsearch/upstream/default.yaml +++ b/data/elasticsearch/upstream/default.yaml @@ -1,4 +1,8 @@ --- elasticsearch::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/elrepo/osfamily/RedHat.yaml b/data/elrepo/osfamily/RedHat.yaml index 100fdf37..97c32dfc 100644 --- a/data/elrepo/osfamily/RedHat.yaml +++ b/data/elrepo/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- elrepo::settings: repo_package_name: 'elrepo-release' + +# Version 4 format + repo: + upstream: + package_name: elrepo-release diff --git a/data/elrepo/osfamily/RedHat6.yaml b/data/elrepo/osfamily/RedHat6.yaml index b8ee08a9..6f54db8d 100644 --- a/data/elrepo/osfamily/RedHat6.yaml +++ b/data/elrepo/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- elrepo::settings: repo_package_url: 'https://www.elrepo.org/elrepo-release-6.el6.elrepo.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index 142ed240..6b3715f3 100644 --- a/data/elrepo/osfamily/RedHat7.yaml +++ b/data/elrepo/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- elrepo::settings: repo_package_url: 'https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index 21342954..6e29ae50 100644 --- a/data/elrepo/osfamily/RedHat8.yaml +++ b/data/elrepo/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- elrepo::settings: repo_package_url: 'https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm diff --git a/data/enterprise-search/default.yaml b/data/enterprise-search/default.yaml index 3ef0f763..77ecd6d6 100644 --- a/data/enterprise-search/default.yaml +++ b/data/enterprise-search/default.yaml @@ -13,3 +13,35 @@ enterprise-search::settings: data_dir_path: '/var/lib/enterprise-search' process_name: 'enterprise-search' + +# Version 4 format + packages: + main: + name: enterprise-search + services: + enterprise-search: + process_name: enterprise-search + files: + config: + path: "/etc/enterprise-search/enterprise-search.yml" + format: yaml + log: + path: "/var/log/enterprise-search/enterprise-search" + pid: + path: "/var/run/enterprise-search.pid" + user_files: + config: + path: "$HOME/.enterprise-search/enterprise-search.yml" + dirs: + config: + path: "/etc/enterprise-search" + log: + path: "/var/log/enterprise-search" + home: + path: "/usr/share/enterprise-search" + data: + path: "/var/lib/enterprise-search" + user_dirs: + config: + path: "$HOME/.enterprise-search" + repo: upstream diff --git a/data/enterprise-search/osfamily/Debian.yaml b/data/enterprise-search/osfamily/Debian.yaml index a1b14a35..3fa637f5 100644 --- a/data/enterprise-search/osfamily/Debian.yaml +++ b/data/enterprise-search/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- enterprise-search::settings: init_file_path: '/etc/default/enterprise-search' + +# Version 4 format + files: + init: + path: "/etc/default/enterprise-search" diff --git a/data/enterprise-search/osfamily/RedHat.yaml b/data/enterprise-search/osfamily/RedHat.yaml index 94e58770..e9275214 100644 --- a/data/enterprise-search/osfamily/RedHat.yaml +++ b/data/enterprise-search/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- enterprise-search::settings: init_file_path: '/etc/sysconfig/enterprise-search' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/enterprise-search" diff --git a/data/enterprise-search/osfamily/windows.yaml b/data/enterprise-search/osfamily/windows.yaml index 2bc00b88..c0c6bf21 100644 --- a/data/enterprise-search/osfamily/windows.yaml +++ b/data/enterprise-search/osfamily/windows.yaml @@ -2,3 +2,11 @@ enterprise-search::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\enterprise-search\tools\enterprise-search.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\enterprise-search\tools\enterprise-search.yml + user_files: + config: + 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 index 9cd09eb5..b8aa431f 100644 --- a/data/enterprise-search/upstream/default.yaml +++ b/data/enterprise-search/upstream/default.yaml @@ -1,4 +1,8 @@ --- enterprise-search::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/epel/osfamily/RedHat.yaml b/data/epel/osfamily/RedHat.yaml index 1b4ca2fb..15cc390c 100644 --- a/data/epel/osfamily/RedHat.yaml +++ b/data/epel/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ epel::settings: repo_package_name: 'epel-release' + +# Version 4 format + repo: + upstream: + package_name: epel-release diff --git a/data/epel/osfamily/RedHat4.yaml b/data/epel/osfamily/RedHat4.yaml index a9d69a32..b5541a37 100644 --- a/data/epel/osfamily/RedHat4.yaml +++ b/data/epel/osfamily/RedHat4.yaml @@ -1,3 +1,8 @@ --- epel::settings: repo_package_url: 'http://dl.fedoraproject.org/pub/archive/epel/4/i386/epel-release-4-10.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 1fc5e1af..0b985030 100644 --- a/data/epel/osfamily/RedHat5.yaml +++ b/data/epel/osfamily/RedHat5.yaml @@ -1,3 +1,8 @@ --- epel::settings: repo_package_url: 'https://dl.fedoraproject.org/pub/archive/epel/5/x86_64/epel-release-5-4.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 cc578572..f0cc381d 100644 --- a/data/epel/osfamily/RedHat6.yaml +++ b/data/epel/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- epel::settings: repo_package_url: 'https://dl.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://dl.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm diff --git a/data/epel/osfamily/RedHat7.yaml b/data/epel/osfamily/RedHat7.yaml index 1e3f0fb5..95704979 100644 --- a/data/epel/osfamily/RedHat7.yaml +++ b/data/epel/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- epel::settings: repo_package_url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index 5701f517..1f74e835 100644 --- a/data/epel/osfamily/RedHat8.yaml +++ b/data/epel/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- epel::settings: repo_package_url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm diff --git a/data/epel/osfamily/RedHat9.yaml b/data/epel/osfamily/RedHat9.yaml index c6d91979..fd244543 100644 --- a/data/epel/osfamily/RedHat9.yaml +++ b/data/epel/osfamily/RedHat9.yaml @@ -1,3 +1,8 @@ --- epel::settings: repo_package_url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm diff --git a/data/exim/default.yaml b/data/exim/default.yaml index 14b25149..55bb2c25 100644 --- a/data/exim/default.yaml +++ b/data/exim/default.yaml @@ -11,3 +11,35 @@ exim::settings: process_user: 'exim' process_group: 'exim' tcp_port: '25' + +# Version 4 format + packages: + main: + name: exim + services: + exim: + process_name: exim + process_user: exim + process_group: exim + files: + config: + path: "/etc/exim/exim.conf" + log: + path: "/var/log/exim/exim.log" + pid: + path: "/var/run/exim.pid" + user_files: + config: + path: "$HOME/.exim/exim.conf" + dirs: + config: + path: "/etc/exim" + log: + path: "/var/log/exim" + user_dirs: + config: + path: "$HOME/.exim" + ports: + main: + port: '25' + protocol: tcp diff --git a/data/exim/osfamily/Debian.yaml b/data/exim/osfamily/Debian.yaml index 44c4d62e..971dc60e 100644 --- a/data/exim/osfamily/Debian.yaml +++ b/data/exim/osfamily/Debian.yaml @@ -8,3 +8,28 @@ exim::settings: process_name: 'exim4' process_user: 'Debian-exim' init_file_path: '/etc/default/exim' + +# Version 4 format + packages: + main: + name: exim4 + services: + exim4: + process_name: exim4 + process_user: Debian-exim + files: + config: + path: "/etc/exim4/update-exim4.conf.conf" + init: + path: "/etc/default/exim" + pid: + path: "/var/run/exim4/exim.pid" + user_files: + config: + path: "$HOME/.exim4/update-exim4.conf.conf" + dirs: + config: + path: "/etc/exim4" + user_dirs: + config: + path: "$HOME/.exim4" diff --git a/data/exim/osfamily/RedHat.yaml b/data/exim/osfamily/RedHat.yaml index b4782f9c..95db0d66 100644 --- a/data/exim/osfamily/RedHat.yaml +++ b/data/exim/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- exim::settings: init_file_path: '/etc/sysconfig/exim' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/exim" diff --git a/data/fabric/default.yaml b/data/fabric/default.yaml index 9a8f2ed8..2af4d1ff 100644 --- a/data/fabric/default.yaml +++ b/data/fabric/default.yaml @@ -4,3 +4,12 @@ fabric::settings: package_provider: 'pip' tp_prerequisites: - python-pip + +# Version 4 format + packages: + main: + name: fabric + provider: pip + preinstall: + tp::install: + - python-pip diff --git a/data/fabric/osfamily/Debian.yaml b/data/fabric/osfamily/Debian.yaml index 2105ea76..6827394c 100644 --- a/data/fabric/osfamily/Debian.yaml +++ b/data/fabric/osfamily/Debian.yaml @@ -2,3 +2,8 @@ fabric::settings: package_prerequisites: - python-dev + +# Version 4 format + preinstall: + package: + - python-dev diff --git a/data/fabric/osfamily/RedHat.yaml b/data/fabric/osfamily/RedHat.yaml index a50a1723..e7ae4287 100644 --- a/data/fabric/osfamily/RedHat.yaml +++ b/data/fabric/osfamily/RedHat.yaml @@ -3,3 +3,9 @@ fabric::settings: package_prerequisites: - python-devel - openssl-devel + +# Version 4 format + preinstall: + package: + - python-devel + - openssl-devel diff --git a/data/fail2ban/default.yaml b/data/fail2ban/default.yaml index d73a447c..00e98a80 100644 --- a/data/fail2ban/default.yaml +++ b/data/fail2ban/default.yaml @@ -15,3 +15,33 @@ fail2ban::settings: process_name: 'fail2ban-server' process_user: 'fail2ban' process_group: 'fail2ban' + +# Version 4 format + packages: + main: + name: fail2ban + services: + fail2ban: + process_name: fail2ban-server + process_user: fail2ban + process_group: fail2ban + files: + config: + path: "/etc/fail2ban/fail2ban.local" + log: + path: "/var/log/fail2ban/fail2ban.log" + init: + path: "/etc/sysconfig/fail2ban" + pid: + path: "/var/run/fail2ban.pid" + user_files: + config: + path: "$HOME/.fail2ban/fail2ban.local" + dirs: + config: + path: "/etc/fail2ban" + log: + path: "/var/log/fail2ban" + user_dirs: + config: + path: "$HOME/.fail2ban" diff --git a/data/fail2ban/osfamily/Debian.yaml b/data/fail2ban/osfamily/Debian.yaml index 7cd07172..d9bfdbde 100644 --- a/data/fail2ban/osfamily/Debian.yaml +++ b/data/fail2ban/osfamily/Debian.yaml @@ -3,3 +3,12 @@ fail2ban::settings: init_file_path: '/etc/default/fail2ban' pid_file_path: '/var/run/fail2ban/fail2ban.pid' log_file_path: '/var/log/fail2ban.log' + +# Version 4 format + files: + log: + path: "/var/log/fail2ban.log" + init: + path: "/etc/default/fail2ban" + pid: + path: "/var/run/fail2ban/fail2ban.pid" diff --git a/data/fail2ban/osfamily/RedHat.yaml b/data/fail2ban/osfamily/RedHat.yaml index c6062fc8..8ab3c7a1 100644 --- a/data/fail2ban/osfamily/RedHat.yaml +++ b/data/fail2ban/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ fail2ban::settings: tp_prerequisites: - epel + +# Version 4 format + preinstall: + tp::install: + - epel diff --git a/data/filebeat/default.yaml b/data/filebeat/default.yaml index e847b66f..fdbb2bfe 100644 --- a/data/filebeat/default.yaml +++ b/data/filebeat/default.yaml @@ -12,3 +12,35 @@ filebeat::settings: home_dir_path: '/usr/share/filebeat' data_dir_path: '/var/lib/filebeat' process_name: 'filebeat' + +# Version 4 format + packages: + main: + name: filebeat + services: + filebeat: + process_name: filebeat + files: + config: + path: "/etc/filebeat/filebeat.yml" + format: yaml + log: + path: "/var/log/filebeat/filebeat" + pid: + path: "/var/run/filebeat.pid" + user_files: + config: + path: "$HOME/.filebeat/filebeat.yml" + dirs: + config: + path: "/etc/filebeat" + log: + path: "/var/log/filebeat" + home: + path: "/usr/share/filebeat" + data: + path: "/var/lib/filebeat" + user_dirs: + config: + path: "$HOME/.filebeat" + repo: upstream diff --git a/data/filebeat/osfamily/Debian.yaml b/data/filebeat/osfamily/Debian.yaml index 1169abfa..40afebb5 100644 --- a/data/filebeat/osfamily/Debian.yaml +++ b/data/filebeat/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- filebeat::settings: init_file_path: '/etc/default/filebeat' + +# Version 4 format + files: + init: + path: "/etc/default/filebeat" diff --git a/data/filebeat/osfamily/RedHat.yaml b/data/filebeat/osfamily/RedHat.yaml index f2f0f034..7cbfc074 100644 --- a/data/filebeat/osfamily/RedHat.yaml +++ b/data/filebeat/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- filebeat::settings: init_file_path: '/etc/sysconfig/filebeat' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/filebeat" diff --git a/data/filebeat/osfamily/windows.yaml b/data/filebeat/osfamily/windows.yaml index bce4bea0..1e7c4433 100644 --- a/data/filebeat/osfamily/windows.yaml +++ b/data/filebeat/osfamily/windows.yaml @@ -2,3 +2,11 @@ filebeat::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\filebeat\tools\filebeat.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\filebeat\tools\filebeat.yml + user_files: + config: + path: C:\ProgramData\chocolatey\lib\filebeat\tools\filebeat.yml diff --git a/data/filebeat/upstream/default.yaml b/data/filebeat/upstream/default.yaml index 6d0c835f..ede4a362 100644 --- a/data/filebeat/upstream/default.yaml +++ b/data/filebeat/upstream/default.yaml @@ -1,4 +1,8 @@ --- filebeat::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/firewalld/default.yaml b/data/firewalld/default.yaml index c14af43b..cb6f843b 100644 --- a/data/firewalld/default.yaml +++ b/data/firewalld/default.yaml @@ -10,3 +10,29 @@ firewalld::settings: process_args: 'firewalld' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: firewalld + services: + firewalld: + process_name: python + process_user: root + process_group: root + files: + config: + path: "/etc/firewalld/firewalld.conf" + log: + path: "/var/log/firewalld" + pid: + path: "/var/run/firewalld" + user_files: + config: + path: "$HOME/.firewalld/firewalld.conf" + dirs: + config: + path: "/etc/firewalld" + user_dirs: + config: + path: "$HOME/.firewalld" diff --git a/data/firewalld/osfamily/Debian.yaml b/data/firewalld/osfamily/Debian.yaml index c746cfa1..d720f8d1 100644 --- a/data/firewalld/osfamily/Debian.yaml +++ b/data/firewalld/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- firewalld::settings: init_file_path: '/etc/default/firewalld' + +# Version 4 format + files: + init: + path: "/etc/default/firewalld" diff --git a/data/firewalld/osfamily/RedHat.yaml b/data/firewalld/osfamily/RedHat.yaml index d873f84b..4ea35508 100644 --- a/data/firewalld/osfamily/RedHat.yaml +++ b/data/firewalld/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- firewalld::settings: init_file_path: '/etc/sysconfig/firewalld' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/firewalld" diff --git a/data/foreman/default.yaml b/data/foreman/default.yaml index b08ec310..16cb1787 100644 --- a/data/foreman/default.yaml +++ b/data/foreman/default.yaml @@ -19,3 +19,42 @@ foreman::settings: command: 'foreman-installer -l warning' creates: '/etc/foreman/settings.yaml' logoutput: true + +# Version 4 format + packages: + main: + name: foreman-installer + services: + foreman: + process_user: foreman + process_group: foreman + files: + config: + path: "/etc/foreman/config.yml" + log: + path: + - "/var/log/foreman/production.log" + - "/var/log/foreman/error.log" + pid: + path: "/var/run/foreman/foreman.pid" + user_files: + config: + path: "$HOME/.foreman/config.yml" + dirs: + config: + path: "/etc/foreman" + log: + path: "/var/log/foreman" + user_dirs: + config: + path: "$HOME/.foreman" + preinstall: + tp::install: + - puppet-agent + - puppetserver + postinstall: + exec: + 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 af96ed64..3db975d5 100644 --- a/data/foreman/operatingsystem/Debian8.yaml +++ b/data/foreman/operatingsystem/Debian8.yaml @@ -1,3 +1,9 @@ --- foreman::settings: apt_release: 'jessie' + +# Version 4 format + repo: + upstream: + apt: + release: jessie diff --git a/data/foreman/operatingsystem/Ubuntu16.04.yaml b/data/foreman/operatingsystem/Ubuntu16.04.yaml index fe84d869..e6f6d480 100644 --- a/data/foreman/operatingsystem/Ubuntu16.04.yaml +++ b/data/foreman/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,9 @@ --- foreman::settings: apt_release: 'xenial' + +# Version 4 format + repo: + upstream: + apt: + release: xenial diff --git a/data/foreman/osfamily/Debian.yaml b/data/foreman/osfamily/Debian.yaml index 15304625..2b972ed6 100644 --- a/data/foreman/osfamily/Debian.yaml +++ b/data/foreman/osfamily/Debian.yaml @@ -7,3 +7,18 @@ foreman::settings: apt_repos: '1.14' package_prerequisites: - ca-certificates + +# Version 4 format + files: + init: + path: "/etc/default/foreman" + repo: + upstream: + url: http://deb.theforeman.org/ + key: 563278F6 + key_url: https://deb.theforeman.org/pubkey.gpg + yum: + gpgcheck: true + preinstall: + package: + - ca-certificates diff --git a/data/foreman/osfamily/RedHat.yaml b/data/foreman/osfamily/RedHat.yaml index bf18cfc0..e8efffac 100644 --- a/data/foreman/osfamily/RedHat.yaml +++ b/data/foreman/osfamily/RedHat.yaml @@ -2,3 +2,11 @@ foreman::settings: init_file_path: '/etc/sysconfig/foreman' repo_package_name: 'foreman-release' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/foreman" + repo: + upstream: + package_name: foreman-release diff --git a/data/foreman/osfamily/RedHat7.yaml b/data/foreman/osfamily/RedHat7.yaml index 6ca8000e..0d0c2480 100644 --- a/data/foreman/osfamily/RedHat7.yaml +++ b/data/foreman/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- foreman::settings: repo_package_url: 'https://yum.theforeman.org/releases/1.14/el7/x86_64/foreman-release.rpm' + +# Version 4 format + repo: + upstream: + 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 a37ae86e..f523aab1 100644 --- a/data/freeradius/default.yaml +++ b/data/freeradius/default.yaml @@ -13,3 +13,37 @@ freeradius::settings: process_name: 'radiusd' process_user: 'radiusd' process_group: 'radiusd' + +# Version 4 format + packages: + main: + name: freeradius + services: + radiusd: + process_name: radiusd + process_user: radiusd + process_group: radiusd + files: + config: + path: "/etc/raddb/radiusd.conf" + log: + path: "/var/log/radius/radius.log" + pid: + path: "/var/run/radiusd/radiusd.pid" + user_files: + config: + path: "$HOME/.raddb/radiusd.conf" + dirs: + config: + path: "/etc/raddb" + log: + path: "/var/log/radius" + data: + path: "/var/lib/radiusd" + user_dirs: + config: + path: "$HOME/.raddb" + ports: + main: + port: '1812' + protocol: tcp diff --git a/data/freeradius/osfamily/Debian.yaml b/data/freeradius/osfamily/Debian.yaml index 7b594ec4..fc4923a2 100644 --- a/data/freeradius/osfamily/Debian.yaml +++ b/data/freeradius/osfamily/Debian.yaml @@ -13,3 +13,32 @@ freeradius::settings: data_dir_path: '/var/lib/freeradius' log_file_path: '/var/log/freeradius/radius.log' log_dir_path: '/var/log/freeradius' + +# Version 4 format + services: + freeradius: + process_name: freeradius + process_user: freerad + process_group: freerad + files: + config: + path: "/etc/freeradius/radiusd.conf" + log: + path: "/var/log/freeradius/radius.log" + init: + path: "/etc/default/freeradius" + pid: + path: "/var/run/freeradius/freeradius.pid" + user_files: + config: + path: "$HOME/.freeradius/radiusd.conf" + dirs: + config: + path: "/etc/freeradius" + log: + path: "/var/log/freeradius" + data: + path: "/var/lib/freeradius" + user_dirs: + config: + path: "$HOME/.freeradius" diff --git a/data/freeradius/osfamily/RedHat.yaml b/data/freeradius/osfamily/RedHat.yaml index 8bfb2c11..6421df00 100644 --- a/data/freeradius/osfamily/RedHat.yaml +++ b/data/freeradius/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- freeradius::settings: init_file_path: "/etc/sysconfig/radiusd" + +# Version 4 format + files: + init: + path: "/etc/sysconfig/radiusd" diff --git a/data/git/default.yaml b/data/git/default.yaml index 30bfcc4f..80f4c398 100644 --- a/data/git/default.yaml +++ b/data/git/default.yaml @@ -6,3 +6,13 @@ git::settings: docker_image: 'bitnami/git' user_config_dir: '$HOME/.git' user_config_path: '$HOME/.gitconfig' + +# Version 4 format + packages: + main: + name: git + urls: + website: https://git-scm.com/ + source: https://github.com/git/git + image: + name: bitnami/git diff --git a/data/git/osfamily/Darwin.yaml b/data/git/osfamily/Darwin.yaml index f434f7ac..7de96d08 100644 --- a/data/git/osfamily/Darwin.yaml +++ b/data/git/osfamily/Darwin.yaml @@ -1,3 +1,8 @@ --- git::settings: package_name: 'git' + +# Version 4 format + packages: + main: + name: git diff --git a/data/git/osfamily/Suse.yaml b/data/git/osfamily/Suse.yaml index 8f5ce9a1..3d7d4fd9 100644 --- a/data/git/osfamily/Suse.yaml +++ b/data/git/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- git::settings: package_name: 'git-core' + +# Version 4 format + packages: + main: + name: git-core diff --git a/data/git/osfamily/windows.yaml b/data/git/osfamily/windows.yaml index b9335d01..46136646 100644 --- a/data/git/osfamily/windows.yaml +++ b/data/git/osfamily/windows.yaml @@ -4,3 +4,12 @@ git::settings: choco_package_name: 'git' user_config_dir: '%HOMEPATH%/.git' user_config_path: '%HOMEPATH%/.gitconfig' + +# Version 4 format + packages: + main: + providers: + winget: + name: Git.Git + choco: + name: git diff --git a/data/gitlab-ce/default.yaml b/data/gitlab-ce/default.yaml index 76de6bf2..a2b50b7d 100644 --- a/data/gitlab-ce/default.yaml +++ b/data/gitlab-ce/default.yaml @@ -20,4 +20,24 @@ gitlab-ce::settings: registry-garbage-collect: command: 'gitlab-ctl registry-garbage-collect' test_commands: - status: 'gitlab-ctl status' \ No newline at end of file + status: 'gitlab-ctl status' +# Version 4 format + packages: + main: + name: gitlab-ce + services: + gitlab-runsvdir: {} + files: + config: + path: "/etc/gitlab/gitlab.rb" + user_files: + config: + path: "$HOME/.gitlab/gitlab.rb" + dirs: + config: + path: "/etc/gitlab" + ssl: + path: "/etc/gitlab/ssl" + user_dirs: + config: + path: "$HOME/.gitlab" diff --git a/data/gitlab-ce/osfamily/Debian.yaml b/data/gitlab-ce/osfamily/Debian.yaml index a56ad509..8bf6fea2 100644 --- a/data/gitlab-ce/osfamily/Debian.yaml +++ b/data/gitlab-ce/osfamily/Debian.yaml @@ -4,3 +4,11 @@ gitlab-ce::settings: 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' + +# Version 4 format + preinstall: + exec: + 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 e93045a5..1b10ffce 100644 --- a/data/gitlab-ce/osfamily/RedHat.yaml +++ b/data/gitlab-ce/osfamily/RedHat.yaml @@ -4,3 +4,11 @@ gitlab-ce::settings: 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' + +# Version 4 format + preinstall: + exec: + 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-cli/default.yaml b/data/gitlab-cli/default.yaml index dec0f710..821928e4 100644 --- a/data/gitlab-cli/default.yaml +++ b/data/gitlab-cli/default.yaml @@ -5,3 +5,13 @@ gitlab-cli::settings: tp_prerequisites: - ruby - ruby-dev + +# Version 4 format + packages: + main: + name: gitlab + provider: puppet_gem + preinstall: + tp::install: + - ruby + - ruby-dev diff --git a/data/gitlab-ee/default.yaml b/data/gitlab-ee/default.yaml index 5d62ee32..b5b822fb 100644 --- a/data/gitlab-ee/default.yaml +++ b/data/gitlab-ee/default.yaml @@ -20,4 +20,24 @@ gitlab-ee::settings: registry-garbage-collect: command: 'gitlab-ctl registry-garbage-collect' test_commands: - status: 'gitlab-ctl status' \ No newline at end of file + status: 'gitlab-ctl status' +# Version 4 format + packages: + main: + name: gitlab-ee + services: + gitlab-runsvdir: {} + files: + config: + path: "/etc/gitlab/gitlab.rb" + user_files: + config: + path: "$HOME/.gitlab/gitlab.rb" + dirs: + config: + path: "/etc/gitlab" + ssl: + path: "/etc/gitlab/ssl" + user_dirs: + config: + path: "$HOME/.gitlab" diff --git a/data/gitlab-ee/osfamily/Debian.yaml b/data/gitlab-ee/osfamily/Debian.yaml index e8ae685e..b319d264 100644 --- a/data/gitlab-ee/osfamily/Debian.yaml +++ b/data/gitlab-ee/osfamily/Debian.yaml @@ -5,3 +5,11 @@ gitlab-ee::settings: 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' + +# Version 4 format + preinstall: + exec: + 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 index 2784993a..52b61305 100644 --- a/data/gitlab-ee/osfamily/RedHat.yaml +++ b/data/gitlab-ee/osfamily/RedHat.yaml @@ -4,3 +4,11 @@ gitlab-ee::settings: 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' + +# Version 4 format + preinstall: + exec: + 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/gitlab-runner/default.yaml b/data/gitlab-runner/default.yaml index f75529dd..7ef0ea21 100644 --- a/data/gitlab-runner/default.yaml +++ b/data/gitlab-runner/default.yaml @@ -4,3 +4,22 @@ gitlab-runner::settings: service_name: 'gitlab-runner' config_file_path: '/etc/gitlab-runner/config.toml' config_dir_path: '/etc/gitlab-runner' + +# Version 4 format + packages: + main: + name: gitlab-runner + services: + gitlab-runner: {} + files: + config: + path: "/etc/gitlab-runner/config.toml" + user_files: + config: + path: "$HOME/.gitlab-runner/config.toml" + dirs: + config: + path: "/etc/gitlab-runner" + user_dirs: + config: + path: "$HOME/.gitlab-runner" diff --git a/data/gitlab-runner/osfamily/Debian.yaml b/data/gitlab-runner/osfamily/Debian.yaml index 32f2e644..7eaf75f9 100644 --- a/data/gitlab-runner/osfamily/Debian.yaml +++ b/data/gitlab-runner/osfamily/Debian.yaml @@ -4,3 +4,11 @@ gitlab-runner::settings: 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' + +# Version 4 format + preinstall: + exec: + 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 48ecce44..af46cd6f 100644 --- a/data/gitlab-runner/osfamily/RedHat.yaml +++ b/data/gitlab-runner/osfamily/RedHat.yaml @@ -4,3 +4,11 @@ gitlab-runner::settings: 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' + +# Version 4 format + preinstall: + exec: + 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 3d93d057..b847cb28 100644 --- a/data/glance/default.yaml +++ b/data/glance/default.yaml @@ -8,3 +8,28 @@ glance::settings: process_name: 'glance' process_user: 'glance' process_group: 'glance' + +# Version 4 format + services: + ! '': + process_name: glance + process_user: glance + process_group: glance + files: + config: + path: "/etc/glance/glance.conf" + log: + path: "/var/log/glance/glance.log" + pid: + path: "/var/run/glance.pid" + user_files: + config: + path: "$HOME/.glance/glance.conf" + dirs: + config: + path: "/etc/glance" + log: + path: "/var/log/glance" + user_dirs: + config: + path: "$HOME/.glance" diff --git a/data/glance/osfamily/Debian.yaml b/data/glance/osfamily/Debian.yaml index 7b0e0c25..ced6ccff 100644 --- a/data/glance/osfamily/Debian.yaml +++ b/data/glance/osfamily/Debian.yaml @@ -2,3 +2,11 @@ glance::settings: package_name: 'glance' init_file_path: '/etc/default/glance' + +# Version 4 format + packages: + main: + name: glance + files: + init: + path: "/etc/default/glance" diff --git a/data/glance/osfamily/RedHat.yaml b/data/glance/osfamily/RedHat.yaml index f9f83558..e0509ae2 100644 --- a/data/glance/osfamily/RedHat.yaml +++ b/data/glance/osfamily/RedHat.yaml @@ -3,3 +3,11 @@ glance::settings: package_name: 'openstack-glance' init_file_path: '/etc/sysconfig/glance' + +# Version 4 format + packages: + main: + name: openstack-glance + files: + init: + path: "/etc/sysconfig/glance" diff --git a/data/go-server/default.yaml b/data/go-server/default.yaml index 5fa87bbc..73caf6bc 100644 --- a/data/go-server/default.yaml +++ b/data/go-server/default.yaml @@ -15,3 +15,38 @@ go-server::settings: tcp_port: - '8153' - '8154' + +# Version 4 format + packages: + main: + name: go-server + services: + go-server: + process_name: java + process_extra_name: go-server + process_user: go + process_group: go + files: + config: + path: "/etc/go/log4j.properties" + log: + path: "/var/log/go-server/go-server.log" + pid: + path: "/var/run/go-server.pid" + user_files: + config: + path: "$HOME/.go/log4j.properties" + dirs: + config: + path: "/etc/go" + log: + path: "/var/log/go-server" + user_dirs: + config: + path: "$HOME/.go" + ports: + main: + port: + - '8153' + - '8154' + protocol: tcp diff --git a/data/go-server/osfamily/Debian.yaml b/data/go-server/osfamily/Debian.yaml index 30b597da..4b5bfff0 100644 --- a/data/go-server/osfamily/Debian.yaml +++ b/data/go-server/osfamily/Debian.yaml @@ -4,3 +4,13 @@ go-server::settings: repo_url: 'http://dl.bintray.com/gocd/gocd-deb' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + files: + init: + path: "/etc/default/go-server" + repo: + upstream: + url: http://dl.bintray.com/gocd/gocd-deb + apt: + release: stable diff --git a/data/go-server/osfamily/RedHat.yaml b/data/go-server/osfamily/RedHat.yaml index b2e6f7c1..9041eee7 100644 --- a/data/go-server/osfamily/RedHat.yaml +++ b/data/go-server/osfamily/RedHat.yaml @@ -2,3 +2,11 @@ go-server::settings: init_file_path: '/etc/sysconfig/go-server' repo_url: 'http://dl.bintray.com/gocd/gocd-rpm' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/go-server" + repo: + upstream: + url: http://dl.bintray.com/gocd/gocd-rpm diff --git a/data/golang/default.yaml b/data/golang/default.yaml index ed6792e9..8af4ecdd 100644 --- a/data/golang/default.yaml +++ b/data/golang/default.yaml @@ -85,3 +85,7 @@ golang::settings: resources: {} manage_service: false manage_user: false + +# Version 4 format + preinstall: + tp::install: {} diff --git a/data/golang/osfamily/Darwin.yaml b/data/golang/osfamily/Darwin.yaml index 7e96c2ca..07cc6c0f 100644 --- a/data/golang/osfamily/Darwin.yaml +++ b/data/golang/osfamily/Darwin.yaml @@ -2,4 +2,5 @@ golang::settings: release: - https://go.dev/dl/go1.20.darwin-arm64.pkg \ No newline at end of file + https://go.dev/dl/go1.20.darwin-arm64.pkg +# No data to convert to Version 4 format diff --git a/data/golang/osfamily/Debian.yaml b/data/golang/osfamily/Debian.yaml index 620a6a05..14f5c88d 100644 --- a/data/golang/osfamily/Debian.yaml +++ b/data/golang/osfamily/Debian.yaml @@ -3,4 +3,5 @@ golang::settings: files: init: - path: '/etc/default/golang' \ No newline at end of file + path: '/etc/default/golang' +# No data to convert to Version 4 format diff --git a/data/golang/osfamily/RedHat.yaml b/data/golang/osfamily/RedHat.yaml index 5292c963..45acb5a0 100644 --- a/data/golang/osfamily/RedHat.yaml +++ b/data/golang/osfamily/RedHat.yaml @@ -1,3 +1,7 @@ --- golang::settings: dockerfile_prerequisites: 'RUN yum install -y wget which' + +# Version 4 format + image: + dockerfile_prerequisites: RUN yum install -y wget which diff --git a/data/golang/osfamily/windows.yaml b/data/golang/osfamily/windows.yaml index 39ceff9c..f6b0a4c0 100644 --- a/data/golang/osfamily/windows.yaml +++ b/data/golang/osfamily/windows.yaml @@ -11,4 +11,9 @@ golang::settings: user_dirs: config: - path: '%APPDATA%\golang' \ No newline at end of file + path: '%APPDATA%\golang' +# Version 4 format + packages: + main: + provider: windows + source: https://go.dev/dl/go$VERSION.$OS-$ARCH.msi diff --git a/data/grafana/default.yaml b/data/grafana/default.yaml index 95404a4d..9b15fcb9 100644 --- a/data/grafana/default.yaml +++ b/data/grafana/default.yaml @@ -17,3 +17,38 @@ grafana::settings: process_user: 'grafana' process_group: 'grafana' tcp_port: '3000' + +# Version 4 format + packages: + main: + name: grafana + services: + grafana-server: + process_name: grafana-server + process_user: grafana + process_group: grafana + files: + config: + path: "/etc/grafana/grafana.ini" + log: + path: "/var/log/grafana/grafana.log" + pid: + path: "/var/run/grafana/grafana-server.pid" + user_files: + config: + path: "$HOME/.grafana/grafana.ini" + dirs: + config: + path: "/etc/grafana" + log: + path: "/var/log/grafana" + user_dirs: + config: + path: "$HOME/.grafana" + ports: + main: + port: '3000' + protocol: tcp + repo: + upstream: + key_url: https://packages.grafana.com/gpg.key diff --git a/data/grafana/osfamily/Debian.yaml b/data/grafana/osfamily/Debian.yaml index 79b6b9f2..b83bfb98 100644 --- a/data/grafana/osfamily/Debian.yaml +++ b/data/grafana/osfamily/Debian.yaml @@ -8,3 +8,20 @@ grafana::settings: package_prerequisites: - 'libfontconfig1' - 'adduser' + +# Version 4 format + files: + init: + path: "/etc/default/grafana-server" + repo: + upstream: + url: https://packages.grafana.com/oss/deb + key: D59097AB + yum: + gpgcheck: true + apt: + release: stable + preinstall: + package: + - libfontconfig1 + - adduser diff --git a/data/grafana/osfamily/RedHat.yaml b/data/grafana/osfamily/RedHat.yaml index 1d97e599..c00d5111 100644 --- a/data/grafana/osfamily/RedHat.yaml +++ b/data/grafana/osfamily/RedHat.yaml @@ -7,3 +7,19 @@ grafana::settings: - 'initscripts' - 'fontconfig' - 'urw-fonts' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/grafana-server" + repo: + upstream: + url: https://packages.grafana.com/oss/rpm + key: D59097AB + yum: + gpgcheck: true + preinstall: + package: + - initscripts + - fontconfig + - urw-fonts diff --git a/data/graylog2/default.yaml b/data/graylog2/default.yaml index 770269e5..e39df55d 100644 --- a/data/graylog2/default.yaml +++ b/data/graylog2/default.yaml @@ -11,3 +11,34 @@ graylog2::settings: process_user: 'graylog2' process_group: 'graylog2' udp_port: '514' + +# Version 4 format + packages: + main: + name: graylog2-server + services: + graylog2-server: + process_name: java + process_extra_name: graylog2 + process_user: graylog2 + process_group: graylog2 + files: + config: + path: "/etc/graylog2.conf" + pid: + path: "/var/run/graylog2.pid" + user_files: + config: + path: "$HOME/.graylog2.conf" + dirs: + config: + path: "/etc/graylog2" + conf: + path: "/etc/graylog2/conf.d" + user_dirs: + config: + path: "$HOME/.graylog2" + ports: + main_udp: + port: '514' + protocol: udp diff --git a/data/graylog2/osfamily/Debian.yaml b/data/graylog2/osfamily/Debian.yaml index 9beb1063..226f11a0 100644 --- a/data/graylog2/osfamily/Debian.yaml +++ b/data/graylog2/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- graylog2::settings: init_file_path: '/etc/default/graylog2' + +# Version 4 format + files: + init: + path: "/etc/default/graylog2" diff --git a/data/graylog2/osfamily/RedHat.yaml b/data/graylog2/osfamily/RedHat.yaml index 877496da..69e3a2e9 100644 --- a/data/graylog2/osfamily/RedHat.yaml +++ b/data/graylog2/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- graylog2::settings: init_file_path: '/etc/sysconfig/graylog2' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/graylog2" diff --git a/data/haproxy/default.yaml b/data/haproxy/default.yaml index 43c7ee99..edaf1303 100644 --- a/data/haproxy/default.yaml +++ b/data/haproxy/default.yaml @@ -14,3 +14,39 @@ haproxy::settings: tcp_port: - '80' - '443' + +# Version 4 format + packages: + main: + name: haproxy + services: + haproxy: + process_name: haproxy + process_user: haproxy + process_group: haproxy + files: + config: + path: "/etc/haproxy/haproxy.cfg" + log: + path: "/var/log/haproxy/haproxy.log" + pid: + path: "/var/run/haproxy.pid" + user_files: + config: + path: "$HOME/.haproxy/haproxy.cfg" + dirs: + config: + path: "/etc/haproxy" + conf: + path: "/etc/haproxy/conf.d" + log: + path: "/var/log/haproxy" + user_dirs: + config: + path: "$HOME/.haproxy" + ports: + main: + port: + - '80' + - '443' + protocol: tcp diff --git a/data/haproxy/osfamily/Debian.yaml b/data/haproxy/osfamily/Debian.yaml index 0df52a13..c44b260e 100644 --- a/data/haproxy/osfamily/Debian.yaml +++ b/data/haproxy/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- haproxy::settings: init_file_path: '/etc/default/haproxy' + +# Version 4 format + files: + init: + path: "/etc/default/haproxy" diff --git a/data/haproxy/osfamily/RedHat.yaml b/data/haproxy/osfamily/RedHat.yaml index bebf7959..e5e15232 100644 --- a/data/haproxy/osfamily/RedHat.yaml +++ b/data/haproxy/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- haproxy::settings: init_file_path: '/etc/sysconfig/haproxy' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/haproxy" diff --git a/data/hashicorp_repo/default.yaml b/data/hashicorp_repo/default.yaml index b15056d8..2e54b378 100644 --- a/data/hashicorp_repo/default.yaml +++ b/data/hashicorp_repo/default.yaml @@ -1,3 +1,6 @@ --- hashicorp_repo::settings: upstream_repo: true + +# Version 4 format + repo: upstream diff --git a/data/hashicorp_repo/upstream/default.yaml b/data/hashicorp_repo/upstream/default.yaml index 98244d54..b89854fc 100644 --- a/data/hashicorp_repo/upstream/default.yaml +++ b/data/hashicorp_repo/upstream/default.yaml @@ -2,3 +2,9 @@ hashicorp_repo::settings: repo_filename: hashicorp repo_description: 'Hashicorp Stable - $basearch' + +# Version 4 format + repo: + upstream: + description: Hashicorp Stable - $basearch + repofile_name: hashicorp diff --git a/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml b/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml index 42327f31..10b87545 100644 --- a/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml +++ b/data/hashicorp_repo/upstream/operatingsystem/Debian10.yaml @@ -2,3 +2,10 @@ hashicorp_repo::settings: repo_url: 'https://apt.releases.hashicorp.com' apt_release: 'buster main' + +# Version 4 format + repo: + upstream: + url: https://apt.releases.hashicorp.com + apt: + release: buster main diff --git a/data/hashicorp_repo/upstream/operatingsystem/Debian11.yaml b/data/hashicorp_repo/upstream/operatingsystem/Debian11.yaml index 42327f31..10b87545 100644 --- a/data/hashicorp_repo/upstream/operatingsystem/Debian11.yaml +++ b/data/hashicorp_repo/upstream/operatingsystem/Debian11.yaml @@ -2,3 +2,10 @@ hashicorp_repo::settings: repo_url: 'https://apt.releases.hashicorp.com' apt_release: 'buster main' + +# Version 4 format + repo: + upstream: + 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 6843d500..107a88b0 100644 --- a/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml +++ b/data/hashicorp_repo/upstream/operatingsystem/Debian9.yaml @@ -2,3 +2,10 @@ hashicorp_repo::settings: repo_url: 'https://apt.releases.hashicorp.com' apt_release: 'stretch main' + +# Version 4 format + repo: + upstream: + url: https://apt.releases.hashicorp.com + apt: + release: stretch main diff --git a/data/hashicorp_repo/upstream/osfamily/Amazon.yaml b/data/hashicorp_repo/upstream/osfamily/Amazon.yaml index 85613e3d..005b9498 100644 --- a/data/hashicorp_repo/upstream/osfamily/Amazon.yaml +++ b/data/hashicorp_repo/upstream/osfamily/Amazon.yaml @@ -3,3 +3,9 @@ hashicorp_repo::settings: repo_url: 'https://rpm.releases.hashicorp.com/AmazonLinux/$releasever/$basearch/stable' key_url: 'https://rpm.releases.hashicorp.com/gpg' + +# Version 4 format + repo: + upstream: + 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 index 66e6eb44..0fd97357 100644 --- a/data/hashicorp_repo/upstream/osfamily/Debian.yaml +++ b/data/hashicorp_repo/upstream/osfamily/Debian.yaml @@ -4,3 +4,12 @@ hashicorp_repo::settings: apt_repos: 'main' key_url: 'https://apt.releases.hashicorp.com/gpg' key: 'E8A0 32E0 94D8 EB4E A189 D270 DA41 8C88 A321 9F7B' + +# Version 4 format + repo: + upstream: + url: https://apt.releases.hashicorp.com + key: E8A0 32E0 94D8 EB4E A189 D270 DA41 8C88 A321 9F7B + key_url: https://apt.releases.hashicorp.com/gpg + yum: + gpgcheck: true diff --git a/data/hashicorp_repo/upstream/osfamily/Fedora.yaml b/data/hashicorp_repo/upstream/osfamily/Fedora.yaml index 8da57ec9..00b993f4 100644 --- a/data/hashicorp_repo/upstream/osfamily/Fedora.yaml +++ b/data/hashicorp_repo/upstream/osfamily/Fedora.yaml @@ -3,3 +3,9 @@ hashicorp_repo::settings: repo_url: https://rpm.releases.hashicorp.com/fedora/$releasever/$basearch/stable key_url: 'https://rpm.releases.hashicorp.com/gpg' + +# Version 4 format + repo: + upstream: + 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 index f7e878d0..4e08e9ff 100644 --- a/data/hashicorp_repo/upstream/osfamily/RedHat.yaml +++ b/data/hashicorp_repo/upstream/osfamily/RedHat.yaml @@ -2,3 +2,9 @@ hashicorp_repo::settings: repo_url: 'https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable' key_url: 'https://rpm.releases.hashicorp.com/gpg' + +# Version 4 format + repo: + upstream: + url: https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable + key_url: https://rpm.releases.hashicorp.com/gpg diff --git a/data/haveged/default.yaml b/data/haveged/default.yaml index 3dbcf95a..e288d271 100644 --- a/data/haveged/default.yaml +++ b/data/haveged/default.yaml @@ -1,3 +1,8 @@ --- haveged::settings: package_name: 'haveged' + +# Version 4 format + packages: + main: + name: haveged diff --git a/data/hdm/default.yaml b/data/hdm/default.yaml index 55b14589..e749e240 100644 --- a/data/hdm/default.yaml +++ b/data/hdm/default.yaml @@ -6,3 +6,28 @@ hdm::settings: tcp_port: '8042' log_file_path: ['/opt/hdm/log/production.log'] log_dir_path: '/opt/hdm/log' + +# Version 4 format + files: + config: + path: "/etc/hdm/hdm.conf" + log: + path: + - "/opt/hdm/log/production.log" + user_files: + config: + path: "$HOME/.hdm/hdm.conf" + dirs: + config: + path: "/etc/hdm" + log: + path: "/opt/hdm/log" + user_dirs: + config: + path: "$HOME/.hdm" + ports: + main: + port: '8042' + protocol: tcp + urls: + source: https://github.com/example42/hdm diff --git a/data/heartbeat-elastic/default.yaml b/data/heartbeat-elastic/default.yaml index b3354e0d..bce92563 100644 --- a/data/heartbeat-elastic/default.yaml +++ b/data/heartbeat-elastic/default.yaml @@ -13,3 +13,35 @@ heartbeat-elastic::settings: data_dir_path: '/var/lib/heartbeat' process_name: 'heartbeat' + +# Version 4 format + packages: + main: + name: heartbeat-elastic + services: + heartbeat-elastic: + process_name: heartbeat + files: + config: + path: "/etc/heartbeat/heartbeat.yml" + format: yaml + log: + path: "/var/log/heartbeat/heartbeat" + pid: + path: "/var/run/heartbeat.pid" + user_files: + config: + path: "$HOME/.heartbeat/heartbeat.yml" + dirs: + config: + path: "/etc/heartbeat" + log: + path: "/var/log/heartbeat" + home: + path: "/usr/share/heartbeat" + data: + path: "/var/lib/heartbeat" + user_dirs: + config: + path: "$HOME/.heartbeat" + repo: upstream diff --git a/data/heartbeat-elastic/osfamily/Debian.yaml b/data/heartbeat-elastic/osfamily/Debian.yaml index fd8cd355..932a633a 100644 --- a/data/heartbeat-elastic/osfamily/Debian.yaml +++ b/data/heartbeat-elastic/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- heartbeat-elastic::settings: init_file_path: '/etc/default/heartbeat-elastic' + +# Version 4 format + files: + init: + path: "/etc/default/heartbeat-elastic" diff --git a/data/heartbeat-elastic/osfamily/RedHat.yaml b/data/heartbeat-elastic/osfamily/RedHat.yaml index 60700155..ae9fcfda 100644 --- a/data/heartbeat-elastic/osfamily/RedHat.yaml +++ b/data/heartbeat-elastic/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- heartbeat-elastic::settings: init_file_path: '/etc/sysconfig/heartbeat-elastic' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/heartbeat-elastic" diff --git a/data/heartbeat-elastic/osfamily/windows.yaml b/data/heartbeat-elastic/osfamily/windows.yaml index ad0fb925..6bbe1821 100644 --- a/data/heartbeat-elastic/osfamily/windows.yaml +++ b/data/heartbeat-elastic/osfamily/windows.yaml @@ -2,3 +2,11 @@ heartbeat-elastic::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\heartbeat-elastic\tools\heartbeat-elastic.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\heartbeat-elastic\tools\heartbeat-elastic.yml + user_files: + config: + 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 index 0409d210..c034afaa 100644 --- a/data/heartbeat-elastic/upstream/default.yaml +++ b/data/heartbeat-elastic/upstream/default.yaml @@ -1,4 +1,8 @@ --- heartbeat-elastic::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/heartbeat/default.yaml b/data/heartbeat/default.yaml index fd283ef6..3e0f4a5a 100644 --- a/data/heartbeat/default.yaml +++ b/data/heartbeat/default.yaml @@ -12,3 +12,33 @@ heartbeat::settings: process_name: 'heartbeat' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: heartbeat + services: + heartbeat: + process_name: heartbeat + process_user: root + process_group: root + files: + config: + path: "/etc/ha.d/ha.cf" + log: + path: + - "/var/log/ha-log" + - "/var/log/ha-debug" + pid: + path: "/var/run/heartbeat/heartbeat.pid" + user_files: + config: + path: "$HOME/.ha.d/ha.cf" + dirs: + config: + path: "/etc/ha.d" + data: + path: "/var/lib/heartbeat" + user_dirs: + config: + path: "$HOME/.ha.d" diff --git a/data/heartbeat/osfamily/Debian.yaml b/data/heartbeat/osfamily/Debian.yaml index ab92d21c..0d7c7f58 100644 --- a/data/heartbeat/osfamily/Debian.yaml +++ b/data/heartbeat/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- heartbeat::settings: init_file_path: '/etc/default/heartbeat' + +# Version 4 format + files: + init: + path: "/etc/default/heartbeat" diff --git a/data/heartbeat/osfamily/RedHat.yaml b/data/heartbeat/osfamily/RedHat.yaml index 99e231e8..520c0c46 100644 --- a/data/heartbeat/osfamily/RedHat.yaml +++ b/data/heartbeat/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- heartbeat::settings: init_file_path: '/etc/sysconfig/heartbeat' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/heartbeat" diff --git a/data/homebrew/default.yaml b/data/homebrew/default.yaml index 676c30b5..4d85e575 100644 --- a/data/homebrew/default.yaml +++ b/data/homebrew/default.yaml @@ -15,3 +15,19 @@ homebrew::settings: doctor: '/home/linuxbrew/.linuxbrew/bin/brew doctor' info_commands: config: '/home/linuxbrew/.linuxbrew/bin/brew config' + +# Version 4 format + preinstall: + exec: + homebrew-install: + command: NONINTERACTIVE=1 ; curl https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh + | bash + creates: "/home/linuxbrew/.linuxbrew/bin/brew" + package: + - curl + postinstall: + exec: + 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 diff --git a/data/homebrew/osfamily/Darwin.yaml b/data/homebrew/osfamily/Darwin.yaml index 979afe57..25bca0a8 100644 --- a/data/homebrew/osfamily/Darwin.yaml +++ b/data/homebrew/osfamily/Darwin.yaml @@ -13,3 +13,17 @@ homebrew::settings: doctor: '/opt/homebrew/bin/brew doctor' info_commands: config: '/opt/homebrew/bin/brew config' + +# Version 4 format + preinstall: + exec: + homebrew-install: + command: NONINTERACTIVE=1 ; curl https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh + | bash + creates: "/opt/homebrew/bin/brew" + postinstall: + exec: + homebrew-add-user-env: + command: echo "eval $(/opt/homebrew/bin/brew shellenv)" >> ~/.zprofile + provider: shell + unless: grep '/opt/homebrew/bin/brew shellenv' ~/.zprofile diff --git a/data/hosts/default.yaml b/data/hosts/default.yaml index b1d2cec6..e0df9f1b 100644 --- a/data/hosts/default.yaml +++ b/data/hosts/default.yaml @@ -1,3 +1,11 @@ --- hosts::settings: config_file_path: '/etc/hosts' + +# Version 4 format + files: + config: + path: "/etc/hosts" + user_files: + config: + path: "$HOME/.hosts" diff --git a/data/htop/default.yaml b/data/htop/default.yaml index 4f06aba4..a741a4f9 100644 --- a/data/htop/default.yaml +++ b/data/htop/default.yaml @@ -1,3 +1,8 @@ --- htop::settings: package_name: 'htop' + +# Version 4 format + packages: + main: + name: htop diff --git a/data/icinga/default.yaml b/data/icinga/default.yaml index ad92fa79..af82545a 100644 --- a/data/icinga/default.yaml +++ b/data/icinga/default.yaml @@ -12,3 +12,35 @@ icinga::settings: process_name: 'icinga' process_user: 'icinga' process_group: 'icinga' + +# Version 4 format + packages: + main: + name: icinga + services: + icinga: + process_name: icinga + process_user: icinga + process_group: icinga + files: + config: + path: "/etc/icinga/icinga.conf" + log: + path: "/var/log/icinga/icinga.log" + pid: + path: "/var/run/icinga.pid" + user_files: + config: + path: "$HOME/.icinga/icinga.conf" + dirs: + config: + path: "/etc/icinga" + conf: + path: "/etc/icinga/conf.d" + log: + path: "/var/log/icinga" + data: + path: "/var/lib/icinga" + user_dirs: + config: + path: "$HOME/.icinga" diff --git a/data/icinga/osfamily/Debian.yaml b/data/icinga/osfamily/Debian.yaml index cac8a6e7..2aeeb4bc 100644 --- a/data/icinga/osfamily/Debian.yaml +++ b/data/icinga/osfamily/Debian.yaml @@ -4,3 +4,14 @@ icinga::settings: process_user: 'nagios' process_group: 'nagios' pid_file_path: '/var/run/icinga/icinga.pid' + +# Version 4 format + services: + ! '': + process_user: nagios + process_group: nagios + files: + init: + path: "/etc/default/icinga" + pid: + path: "/var/run/icinga/icinga.pid" diff --git a/data/icinga/osfamily/RedHat.yaml b/data/icinga/osfamily/RedHat.yaml index da96793b..d40b16df 100644 --- a/data/icinga/osfamily/RedHat.yaml +++ b/data/icinga/osfamily/RedHat.yaml @@ -5,3 +5,8 @@ icinga::settings: config_file_group: 'icinga' config_file_mode: '664' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/icinga" diff --git a/data/icinga2/default.yaml b/data/icinga2/default.yaml index 03c0a04f..acf4e3f0 100755 --- a/data/icinga2/default.yaml +++ b/data/icinga2/default.yaml @@ -42,3 +42,35 @@ icinga2::settings: user_dirs: config: path: "$HOME/.icinga2" + +# Version 4 format + packages: + main: + name: icinga2 + services: + icinga2: + process_name: icinga2 + process_user: icinga + process_group: icinga + files: + config: + path: "/etc/icinga2/icinga2.conf" + log: + path: + - "/var/log/icinga2/icinga2.log" + - "/var/log/icinga2/error.log" + pid: + path: "/var/run/icinga2/icinga2.pid" + 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/icinga2/osfamily/Debian.yaml b/data/icinga2/osfamily/Debian.yaml index d44f2516..73a162d3 100644 --- a/data/icinga2/osfamily/Debian.yaml +++ b/data/icinga2/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- icinga2::settings: init_file_path: '/etc/default/icinga2' + +# Version 4 format + files: + init: + path: "/etc/default/icinga2" diff --git a/data/icinga2/osfamily/RedHat.yaml b/data/icinga2/osfamily/RedHat.yaml index 76b4bdaf..6092f235 100644 --- a/data/icinga2/osfamily/RedHat.yaml +++ b/data/icinga2/osfamily/RedHat.yaml @@ -6,3 +6,14 @@ icinga2::settings: repo_package_name: 'icinga-rpm-release' tp_prerequisites: - epel + +# Version 4 format + files: + init: + path: "/etc/sysconfig/icinga2" + repo: + upstream: + package_name: icinga-rpm-release + preinstall: + tp::install: + - epel diff --git a/data/icinga2/osfamily/RedHat5.yaml b/data/icinga2/osfamily/RedHat5.yaml index f1115f61..2824c768 100644 --- a/data/icinga2/osfamily/RedHat5.yaml +++ b/data/icinga2/osfamily/RedHat5.yaml @@ -1,3 +1,8 @@ --- icinga2::settings: repo_package_url: 'https://packages.icinga.com/epel/5/release/noarch/icinga-rpm-release-5-1.el5.centos.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 c0a0607d..d333e2ef 100644 --- a/data/icinga2/osfamily/RedHat6.yaml +++ b/data/icinga2/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- icinga2::settings: repo_package_url: 'https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.centos.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 b4db8c43..de590c5f 100644 --- a/data/icinga2/osfamily/RedHat7.yaml +++ b/data/icinga2/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- icinga2::settings: repo_package_url: 'https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm diff --git a/data/icinga_repo/default.yaml b/data/icinga_repo/default.yaml index 2c331962..5ed0a260 100644 --- a/data/icinga_repo/default.yaml +++ b/data/icinga_repo/default.yaml @@ -1,4 +1,8 @@ --- icinga_repo::settings: upstream_repo: true - git_source: https://github.com/Icinga/icinga2 \ No newline at end of file + git_source: https://github.com/Icinga/icinga2 +# Version 4 format + urls: + source: https://github.com/Icinga/icinga2 + repo: upstream diff --git a/data/icinga_repo/upstream/default.yaml b/data/icinga_repo/upstream/default.yaml index 5f80a5a0..ba540949 100644 --- a/data/icinga_repo/upstream/default.yaml +++ b/data/icinga_repo/upstream/default.yaml @@ -2,4 +2,10 @@ icinga_repo::settings: repo_filename: icinga repo_description: 'Icinga repository' - key_url: https://packages.icinga.com/icinga.key \ No newline at end of file + key_url: https://packages.icinga.com/icinga.key +# Version 4 format + repo: + upstream: + description: Icinga repository + repofile_name: icinga + key_url: https://packages.icinga.com/icinga.key diff --git a/data/icinga_repo/upstream/osfamily/Debian.yaml b/data/icinga_repo/upstream/osfamily/Debian.yaml index 998cd3a9..92e9f293 100644 --- a/data/icinga_repo/upstream/osfamily/Debian.yaml +++ b/data/icinga_repo/upstream/osfamily/Debian.yaml @@ -3,3 +3,10 @@ icinga_repo::settings: repo_url: 'https://packages.icinga.com/debian' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + repo: + upstream: + url: https://packages.icinga.com/debian + apt: + release: stable diff --git a/data/icinga_repo/upstream/osfamily/RedHat.yaml b/data/icinga_repo/upstream/osfamily/RedHat.yaml index e5729aca..0b8c9afe 100644 --- a/data/icinga_repo/upstream/osfamily/RedHat.yaml +++ b/data/icinga_repo/upstream/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ icinga_repo::settings: repo_file_url: 'https://packages.icinga.com/centos/ICINGA-release.repo' + +# Version 4 format + repo: + upstream: + repofile_url: https://packages.icinga.com/centos/ICINGA-release.repo diff --git a/data/icingaweb2/default.yaml b/data/icingaweb2/default.yaml index 6f6ed89d..bbb4c64c 100644 --- a/data/icingaweb2/default.yaml +++ b/data/icingaweb2/default.yaml @@ -8,3 +8,26 @@ icingaweb2::settings: log_file_path: '/var/log/icingaweb2/icingaweb2.log' log_dir_path: '/var/log/icingaweb2' config_dir_mode: '0775' + +# Version 4 format + packages: + main: + name: icingaweb2 + files: + config: + path: "/etc/icingaweb2/icingaweb2.conf" + log: + path: "/var/log/icingaweb2/icingaweb2.log" + user_files: + config: + path: "$HOME/.icingaweb2/icingaweb2.conf" + dirs: + config: + path: "/etc/icingaweb2" + conf: + path: "/etc/icingaweb2/conf.d" + log: + path: "/var/log/icingaweb2" + user_dirs: + config: + path: "$HOME/.icingaweb2" diff --git a/data/icingaweb2/osfamily/Debian.yaml b/data/icingaweb2/osfamily/Debian.yaml index 5b4b8591..17b5f170 100644 --- a/data/icingaweb2/osfamily/Debian.yaml +++ b/data/icingaweb2/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- icingaweb2::settings: init_file_path: '/etc/default/icingaweb2' + +# Version 4 format + files: + init: + path: "/etc/default/icingaweb2" diff --git a/data/icingaweb2/osfamily/RedHat.yaml b/data/icingaweb2/osfamily/RedHat.yaml index 96dca9ef..c8ba5c34 100644 --- a/data/icingaweb2/osfamily/RedHat.yaml +++ b/data/icingaweb2/osfamily/RedHat.yaml @@ -6,3 +6,14 @@ icingaweb2::settings: repo_package_name: 'icinga-rpm-release' tp_prerequisites: - scl + +# Version 4 format + files: + init: + path: "/etc/sysconfig/icingaweb2" + repo: + upstream: + package_name: icinga-rpm-release + preinstall: + tp::install: + - scl diff --git a/data/icingaweb2/osfamily/RedHat5.yaml b/data/icingaweb2/osfamily/RedHat5.yaml index 03e55cec..6f3b0be0 100644 --- a/data/icingaweb2/osfamily/RedHat5.yaml +++ b/data/icingaweb2/osfamily/RedHat5.yaml @@ -1,3 +1,8 @@ --- icingaweb2::settings: repo_package_url: 'https://packages.icinga.com/epel/5/release/noarch/icinga-rpm-release-5-1.el5.centos.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 2499fc8f..1bd07cb9 100644 --- a/data/icingaweb2/osfamily/RedHat6.yaml +++ b/data/icingaweb2/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- icingaweb2::settings: repo_package_url: 'https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.centos.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 0d8d70f1..fd4d8000 100644 --- a/data/icingaweb2/osfamily/RedHat7.yaml +++ b/data/icingaweb2/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- icingaweb2::settings: repo_package_url: 'https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 34bc525f..4f7e53ce 100644 --- a/data/influxdb/default.yaml +++ b/data/influxdb/default.yaml @@ -15,3 +15,43 @@ influxdb::settings: - 8086 key: '87F70D56' key_url: 'https://repos.influxdata.com/influxdb.key' + +# Version 4 format + packages: + main: + name: influxdb + services: + influxdb: + process_name: influxd + process_user: influxdb + process_group: influxdb + files: + config: + path: "/etc/influxdb/influxdb.conf" + log: + path: "/var/log/influxdb/influxdb.log" + pid: + path: "/var/run/influxdb.pid" + user_files: + config: + path: "$HOME/.influxdb/influxdb.conf" + dirs: + config: + path: "/etc/influxdb" + log: + path: "/var/log/influxdb" + user_dirs: + config: + path: "$HOME/.influxdb" + ports: + main: + port: + - 8088 + - 8086 + protocol: tcp + repo: + upstream: + key: 87F70D56 + key_url: https://repos.influxdata.com/influxdb.key + yum: + gpgcheck: true diff --git a/data/influxdb/operatingsystem/Debian7.yaml b/data/influxdb/operatingsystem/Debian7.yaml index 900f32f5..3862ac10 100644 --- a/data/influxdb/operatingsystem/Debian7.yaml +++ b/data/influxdb/operatingsystem/Debian7.yaml @@ -1,3 +1,9 @@ --- influxdb::settings: apt_release: 'wheezy' + +# Version 4 format + repo: + upstream: + apt: + release: wheezy diff --git a/data/influxdb/operatingsystem/Debian8.yaml b/data/influxdb/operatingsystem/Debian8.yaml index 459cc4e7..1ccbd8a8 100644 --- a/data/influxdb/operatingsystem/Debian8.yaml +++ b/data/influxdb/operatingsystem/Debian8.yaml @@ -1,3 +1,9 @@ --- influxdb::settings: apt_release: 'jessie' + +# Version 4 format + repo: + upstream: + apt: + release: jessie diff --git a/data/influxdb/operatingsystem/Debian9.yaml b/data/influxdb/operatingsystem/Debian9.yaml index d0b46435..d9884db5 100644 --- a/data/influxdb/operatingsystem/Debian9.yaml +++ b/data/influxdb/operatingsystem/Debian9.yaml @@ -1,3 +1,9 @@ --- influxdb::settings: apt_release: 'stretch' + +# Version 4 format + repo: + upstream: + apt: + release: stretch diff --git a/data/influxdb/operatingsystem/Ubuntu.yaml b/data/influxdb/operatingsystem/Ubuntu.yaml index ab0ea043..aa4af3cf 100644 --- a/data/influxdb/operatingsystem/Ubuntu.yaml +++ b/data/influxdb/operatingsystem/Ubuntu.yaml @@ -1,3 +1,8 @@ --- influxdb::settings: repo_url: 'https://repos.influxdata.com/ubuntu' + +# Version 4 format + repo: + upstream: + url: https://repos.influxdata.com/ubuntu diff --git a/data/influxdb/operatingsystem/Ubuntu12.04.yaml b/data/influxdb/operatingsystem/Ubuntu12.04.yaml index 03fe4571..d1380151 100644 --- a/data/influxdb/operatingsystem/Ubuntu12.04.yaml +++ b/data/influxdb/operatingsystem/Ubuntu12.04.yaml @@ -1,3 +1,9 @@ --- influxdb::settings: apt_release: 'precise' + +# Version 4 format + repo: + upstream: + apt: + release: precise diff --git a/data/influxdb/operatingsystem/Ubuntu14.04.yaml b/data/influxdb/operatingsystem/Ubuntu14.04.yaml index 41e08bbe..af8ce83c 100644 --- a/data/influxdb/operatingsystem/Ubuntu14.04.yaml +++ b/data/influxdb/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,9 @@ --- influxdb::settings: apt_release: 'trusty' + +# Version 4 format + repo: + upstream: + apt: + release: trusty diff --git a/data/influxdb/operatingsystem/Ubuntu14.10.yaml b/data/influxdb/operatingsystem/Ubuntu14.10.yaml index 55a62530..192c531a 100644 --- a/data/influxdb/operatingsystem/Ubuntu14.10.yaml +++ b/data/influxdb/operatingsystem/Ubuntu14.10.yaml @@ -1,3 +1,9 @@ --- influxdb::settings: apt_release: 'ubuntu-utopic' + +# Version 4 format + repo: + upstream: + apt: + release: ubuntu-utopic diff --git a/data/influxdb/operatingsystem/Ubuntu16.04.yaml b/data/influxdb/operatingsystem/Ubuntu16.04.yaml index ebf3f382..2e5d7420 100644 --- a/data/influxdb/operatingsystem/Ubuntu16.04.yaml +++ b/data/influxdb/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,9 @@ --- influxdb::settings: apt_release: 'xenial' + +# Version 4 format + repo: + upstream: + apt: + release: xenial diff --git a/data/influxdb/osfamily/Debian.yaml b/data/influxdb/osfamily/Debian.yaml index c0c109e3..37eae3e8 100644 --- a/data/influxdb/osfamily/Debian.yaml +++ b/data/influxdb/osfamily/Debian.yaml @@ -4,3 +4,13 @@ influxdb::settings: repo_url: 'https://repos.influxdata.com/debian/pool/stable/i/influxdb/' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + files: + init: + path: "/etc/default/influxdb" + repo: + upstream: + url: https://repos.influxdata.com/debian/pool/stable/i/influxdb/ + apt: + release: stable diff --git a/data/influxdb/osfamily/RedHat.yaml b/data/influxdb/osfamily/RedHat.yaml index 65376311..7f3c58bf 100644 --- a/data/influxdb/osfamily/RedHat.yaml +++ b/data/influxdb/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- influxdb::settings: init_file_path: '/etc/sysconfig/influxdb' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/influxdb" diff --git a/data/influxdb/osfamily/RedHat6.yaml b/data/influxdb/osfamily/RedHat6.yaml index df53e74e..764ca856 100644 --- a/data/influxdb/osfamily/RedHat6.yaml +++ b/data/influxdb/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- influxdb::settings: repo_url: 'https://repos.influxdata.com/rhel/6/x86_64/stable/' + +# Version 4 format + repo: + upstream: + 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 a1bb7526..bcdfd47c 100644 --- a/data/influxdb/osfamily/RedHat7.yaml +++ b/data/influxdb/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- influxdb::settings: repo_url: 'https://repos.influxdata.com/rhel/7/x86_64/stable/' + +# Version 4 format + repo: + upstream: + url: https://repos.influxdata.com/rhel/7/x86_64/stable/ diff --git a/data/iotop/default.yaml b/data/iotop/default.yaml index 97bc1310..cc38e507 100644 --- a/data/iotop/default.yaml +++ b/data/iotop/default.yaml @@ -1,3 +1,8 @@ --- iotop::settings: package_name: 'iotop' + +# Version 4 format + packages: + main: + name: iotop diff --git a/data/iptraf/default.yaml b/data/iptraf/default.yaml index fa3dc89c..6157ecb3 100644 --- a/data/iptraf/default.yaml +++ b/data/iptraf/default.yaml @@ -1,3 +1,8 @@ --- iptraf::settings: package_name: 'iptraf' + +# Version 4 format + packages: + main: + name: iptraf diff --git a/data/iptraf/operatingsystem/Debian-11.yaml b/data/iptraf/operatingsystem/Debian-11.yaml index 54500244..4e4f41ac 100644 --- a/data/iptraf/operatingsystem/Debian-11.yaml +++ b/data/iptraf/operatingsystem/Debian-11.yaml @@ -1,3 +1,8 @@ --- iptraf::settings: package_name: 'iptraf-ng' + +# Version 4 format + packages: + main: + name: iptraf-ng diff --git a/data/iptraf/osfamily/RedHat.yaml b/data/iptraf/osfamily/RedHat.yaml index 54500244..4e4f41ac 100644 --- a/data/iptraf/osfamily/RedHat.yaml +++ b/data/iptraf/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- iptraf::settings: package_name: 'iptraf-ng' + +# Version 4 format + packages: + main: + name: iptraf-ng diff --git a/data/ius/osfamily/RedHat.yaml b/data/ius/osfamily/RedHat.yaml index 1866eac3..f94cc385 100644 --- a/data/ius/osfamily/RedHat.yaml +++ b/data/ius/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ ius::settings: repo_package_name: 'ius-release' + +# Version 4 format + repo: + upstream: + package_name: ius-release diff --git a/data/ius/osfamily/RedHat6.yaml b/data/ius/osfamily/RedHat6.yaml index 603bfffc..e6a2d8c8 100644 --- a/data/ius/osfamily/RedHat6.yaml +++ b/data/ius/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- ius::settings: repo_package_url: 'https://repo.ius.io/ius-release-el6.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://repo.ius.io/ius-release-el6.rpm diff --git a/data/ius/osfamily/RedHat7.yaml b/data/ius/osfamily/RedHat7.yaml index a82c740d..0dc608ca 100644 --- a/data/ius/osfamily/RedHat7.yaml +++ b/data/ius/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- ius::settings: repo_package_url: 'https://repo.ius.io/ius-release-el7.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://repo.ius.io/ius-release-el7.rpm diff --git a/data/jboss/default.yaml b/data/jboss/default.yaml index 3cc050ae..b01d300b 100644 --- a/data/jboss/default.yaml +++ b/data/jboss/default.yaml @@ -12,3 +12,37 @@ jboss::settings: process_user: 'jboss' process_group: 'jboss' tcp_port: '8080' + +# Version 4 format + packages: + main: + name: jboss + services: + jboss: + process_name: jboss + process_user: jboss + process_group: jboss + files: + config: + path: "/etc/jboss/jboss.conf" + log: + path: "/var/log/jboss/jboss.log" + pid: + path: "/var/run/jboss.pid" + user_files: + config: + path: "$HOME/.jboss/jboss.conf" + dirs: + config: + path: "/etc/jboss" + conf: + path: "/etc/jboss/conf.d" + log: + path: "/var/log/jboss" + user_dirs: + config: + path: "$HOME/.jboss" + ports: + main: + port: '8080' + protocol: tcp diff --git a/data/jboss/osfamily/Debian.yaml b/data/jboss/osfamily/Debian.yaml index 73db5efd..c31532e8 100644 --- a/data/jboss/osfamily/Debian.yaml +++ b/data/jboss/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- jboss::settings: init_file_path: '/etc/default/jboss' + +# Version 4 format + files: + init: + path: "/etc/default/jboss" diff --git a/data/jboss/osfamily/RedHat.yaml b/data/jboss/osfamily/RedHat.yaml index ef469141..8425af02 100644 --- a/data/jboss/osfamily/RedHat.yaml +++ b/data/jboss/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- jboss::settings: init_file_path: '/etc/sysconfig/jboss' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/jboss" diff --git a/data/jenkins/default.yaml b/data/jenkins/default.yaml index cba19371..715f4fbb 100644 --- a/data/jenkins/default.yaml +++ b/data/jenkins/default.yaml @@ -12,3 +12,33 @@ jenkins::settings: process_user: 'jenkins' process_group: 'jenkins' tcp_port: '8080' + +# Version 4 format + packages: + main: + name: jenkins + services: + jenkins: + process_name: java + process_extra_name: jenkins + process_user: jenkins + process_group: jenkins + files: + log: + path: "/var/log/jenkins/jenkins.log" + pid: + path: "/var/run/jenkins.pid" + dirs: + config: + path: "/etc/jenkins" + conf: + path: "/etc/jenkins/conf.d" + log: + path: "/var/log/jenkins" + user_dirs: + config: + path: "$HOME/.jenkins" + ports: + main: + port: '8080' + protocol: tcp diff --git a/data/jenkins/operatingsystem/Amazon.yaml b/data/jenkins/operatingsystem/Amazon.yaml index 99f68334..ab3193a4 100644 --- a/data/jenkins/operatingsystem/Amazon.yaml +++ b/data/jenkins/operatingsystem/Amazon.yaml @@ -1,3 +1,8 @@ --- jenkins::settings: init_file_path: '/etc/sysconfig/jenkins' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/jenkins" diff --git a/data/jenkins/osfamily/Debian.yaml b/data/jenkins/osfamily/Debian.yaml index 9ca0adc8..7a2be845 100644 --- a/data/jenkins/osfamily/Debian.yaml +++ b/data/jenkins/osfamily/Debian.yaml @@ -6,3 +6,17 @@ jenkins::settings: key: 'D50582E6' key_url: 'https://pkg.jenkins.io/debian-stable/jenkins.io.key' apt_repos: 'binary/' + +# Version 4 format + files: + init: + path: "/etc/default/jenkins" + pid: + path: "/var/run/jenkins/jenkins.pid" + repo: + upstream: + url: https://pkg.jenkins.io/debian-stable + key: D50582E6 + key_url: https://pkg.jenkins.io/debian-stable/jenkins.io.key + yum: + gpgcheck: true diff --git a/data/jenkins/osfamily/RedHat.yaml b/data/jenkins/osfamily/RedHat.yaml index 8d52dc7e..94ec4110 100644 --- a/data/jenkins/osfamily/RedHat.yaml +++ b/data/jenkins/osfamily/RedHat.yaml @@ -4,3 +4,12 @@ jenkins::settings: repo_url: 'http://pkg.jenkins.io/redhat-stable' # key: 'D88E42B4' key_url: 'https://pkg.jenkins.io/redhat-stable/jenkins.io.key' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/jenkins" + repo: + upstream: + url: http://pkg.jenkins.io/redhat-stable + key_url: https://pkg.jenkins.io/redhat-stable/jenkins.io.key diff --git a/data/jenkins/osfamily/Suse.yaml b/data/jenkins/osfamily/Suse.yaml index 99f68334..ab3193a4 100644 --- a/data/jenkins/osfamily/Suse.yaml +++ b/data/jenkins/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- jenkins::settings: init_file_path: '/etc/sysconfig/jenkins' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/jenkins" diff --git a/data/journalbeat/default.yaml b/data/journalbeat/default.yaml index f1d8d303..7927120a 100644 --- a/data/journalbeat/default.yaml +++ b/data/journalbeat/default.yaml @@ -13,3 +13,35 @@ journalbeat::settings: data_dir_path: '/var/lib/journalbeat' process_name: 'journalbeat' + +# Version 4 format + packages: + main: + name: journalbeat + services: + journalbeat: + process_name: journalbeat + files: + config: + path: "/etc/journalbeat/journalbeat.yml" + format: yaml + log: + path: "/var/log/journalbeat/journalbeat" + pid: + path: "/var/run/journalbeat.pid" + user_files: + config: + path: "$HOME/.journalbeat/journalbeat.yml" + dirs: + config: + path: "/etc/journalbeat" + log: + path: "/var/log/journalbeat" + home: + path: "/usr/share/journalbeat" + data: + path: "/var/lib/journalbeat" + user_dirs: + config: + path: "$HOME/.journalbeat" + repo: upstream diff --git a/data/journalbeat/osfamily/Debian.yaml b/data/journalbeat/osfamily/Debian.yaml index 788da1bd..f5b24ba3 100644 --- a/data/journalbeat/osfamily/Debian.yaml +++ b/data/journalbeat/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- journalbeat::settings: init_file_path: '/etc/default/journalbeat' + +# Version 4 format + files: + init: + path: "/etc/default/journalbeat" diff --git a/data/journalbeat/osfamily/RedHat.yaml b/data/journalbeat/osfamily/RedHat.yaml index 3cfa2e5d..7c1d76f2 100644 --- a/data/journalbeat/osfamily/RedHat.yaml +++ b/data/journalbeat/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- journalbeat::settings: init_file_path: '/etc/sysconfig/journalbeat' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/journalbeat" diff --git a/data/journalbeat/osfamily/windows.yaml b/data/journalbeat/osfamily/windows.yaml index 7011a18d..39e75142 100644 --- a/data/journalbeat/osfamily/windows.yaml +++ b/data/journalbeat/osfamily/windows.yaml @@ -2,3 +2,11 @@ journalbeat::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\journalbeat\tools\journalbeat.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\journalbeat\tools\journalbeat.yml + user_files: + config: + path: C:\ProgramData\chocolatey\lib\journalbeat\tools\journalbeat.yml diff --git a/data/journalbeat/upstream/default.yaml b/data/journalbeat/upstream/default.yaml index b6fe2561..b723b3b3 100644 --- a/data/journalbeat/upstream/default.yaml +++ b/data/journalbeat/upstream/default.yaml @@ -1,4 +1,8 @@ --- journalbeat::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/jupyterlab/default.yaml b/data/jupyterlab/default.yaml index 88547a6c..d066730f 100644 --- a/data/jupyterlab/default.yaml +++ b/data/jupyterlab/default.yaml @@ -5,3 +5,9 @@ jupyterlab::settings: # No data to convert to Version 4 format + +# Version 4 format + packages: + main: + name: jupyterlab + provider: pip diff --git a/data/kedro/default.yaml b/data/kedro/default.yaml index 668367f8..adfa5134 100644 --- a/data/kedro/default.yaml +++ b/data/kedro/default.yaml @@ -2,3 +2,9 @@ kedro::settings: package_name: kedro package_provider: 'pip' + +# Version 4 format + packages: + main: + name: kedro + provider: pip diff --git a/data/keepalived/default.yaml b/data/keepalived/default.yaml index c4e3c1b0..2da91636 100644 --- a/data/keepalived/default.yaml +++ b/data/keepalived/default.yaml @@ -9,3 +9,29 @@ keepalived::settings: process_name: 'keepalived' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: keepalived + services: + keepalived: + process_name: keepalived + process_user: root + process_group: root + files: + config: + path: "/etc/keepalived/keepalived.conf" + log: + path: "/var/log/messages" + init: + path: "/etc/sysconfig/keepalived" + user_files: + config: + path: "$HOME/.keepalived/keepalived.conf" + dirs: + config: + path: "/etc/keepalived" + user_dirs: + config: + path: "$HOME/.keepalived" diff --git a/data/keepalived/osfamily/Debian.yaml b/data/keepalived/osfamily/Debian.yaml index 2a679666..abf3bdaf 100644 --- a/data/keepalived/osfamily/Debian.yaml +++ b/data/keepalived/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- keepalived::settings: init_file_path: '/etc/default/keepalived' + +# Version 4 format + files: + init: + path: "/etc/default/keepalived" diff --git a/data/keras/default.yaml b/data/keras/default.yaml index 90793e21..0fff5f42 100644 --- a/data/keras/default.yaml +++ b/data/keras/default.yaml @@ -3,3 +3,9 @@ keras::settings: package_name: keras package_provider: 'pip' + +# Version 4 format + packages: + main: + name: keras + provider: pip diff --git a/data/keystone/default.yaml b/data/keystone/default.yaml index 125536aa..3eae7a27 100644 --- a/data/keystone/default.yaml +++ b/data/keystone/default.yaml @@ -9,3 +9,28 @@ keystone::settings: process_name: 'keystone' process_user: 'keystone' process_group: 'keystone' + +# Version 4 format + services: + keystone: + process_name: keystone + process_user: keystone + process_group: keystone + files: + config: + path: "/etc/keystone/keystone.conf" + log: + path: "/var/log/keystone/keystone.log" + pid: + path: "/var/run/keystone.pid" + user_files: + config: + path: "$HOME/.keystone/keystone.conf" + dirs: + config: + path: "/etc/keystone" + log: + path: "/var/log/keystone" + user_dirs: + config: + path: "$HOME/.keystone" diff --git a/data/keystone/osfamily/Debian.yaml b/data/keystone/osfamily/Debian.yaml index 197885ee..3885eb48 100644 --- a/data/keystone/osfamily/Debian.yaml +++ b/data/keystone/osfamily/Debian.yaml @@ -4,3 +4,13 @@ keystone::settings: - 'python-keystone' - 'keystone' init_file_path: '/etc/default/keystone' + +# Version 4 format + packages: + main: + name: + - python-keystone + - keystone + files: + init: + path: "/etc/default/keystone" diff --git a/data/keystone/osfamily/RedHat.yaml b/data/keystone/osfamily/RedHat.yaml index 622aa5a3..32e63fab 100644 --- a/data/keystone/osfamily/RedHat.yaml +++ b/data/keystone/osfamily/RedHat.yaml @@ -5,3 +5,15 @@ keystone::settings: - 'openstack-keystone' service_name: 'openstack-keystone' init_file_path: '/etc/sysconfig/keystone' + +# Version 4 format + packages: + main: + name: + - python-keystone + - openstack-keystone + services: + openstack-keystone: {} + files: + init: + path: "/etc/sysconfig/keystone" diff --git a/data/kibana/default.yaml b/data/kibana/default.yaml index eabbd253..a55ad02b 100644 --- a/data/kibana/default.yaml +++ b/data/kibana/default.yaml @@ -17,3 +17,42 @@ kibana::settings: process_group: 'root' tcp_port: '5601' + +# Version 4 format + packages: + main: + name: kibana + services: + kibana: + process_name: node + process_extra_name: kibana + process_user: kibana + process_group: kibana + files: + config: + path: "/etc/kibana/kibana.yml" + format: yaml + log: + path: "/var/log/kibana/kibana.stderr" + user_files: + config: + path: "$HOME/.kibana/kibana.yml" + dirs: + config: + path: "/etc/kibana" + conf: + path: "/etc/kibana/config" + log: + path: "/var/log/kibana" + home: + path: "/usr/share/kibana" + data: + path: "/var/lib/kibana" + user_dirs: + config: + path: "$HOME/.kibana" + ports: + main: + port: '5601' + protocol: tcp + repo: upstream diff --git a/data/kibana/osfamily/Debian.yaml b/data/kibana/osfamily/Debian.yaml index ead0831e..673b9cff 100644 --- a/data/kibana/osfamily/Debian.yaml +++ b/data/kibana/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- kibana::settings: init_file_path: '/etc/default/kibana' + +# Version 4 format + files: + init: + path: "/etc/default/kibana" diff --git a/data/kibana/osfamily/RedHat.yaml b/data/kibana/osfamily/RedHat.yaml index 91896b74..520e340e 100644 --- a/data/kibana/osfamily/RedHat.yaml +++ b/data/kibana/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- kibana::settings: init_file_path: '/etc/sysconfig/kibana' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/kibana" diff --git a/data/kibana/upstream/default.yaml b/data/kibana/upstream/default.yaml index 2959cc99..2de235aa 100644 --- a/data/kibana/upstream/default.yaml +++ b/data/kibana/upstream/default.yaml @@ -1,4 +1,8 @@ --- kibana::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/krateo/default.yaml b/data/krateo/default.yaml index 37e2e917..5052269a 100644 --- a/data/krateo/default.yaml +++ b/data/krateo/default.yaml @@ -1,3 +1,8 @@ --- krateo::settings: package_name: krateo + +# Version 4 format + packages: + main: + name: krateo diff --git a/data/krateo/osfamily/Darwin.yaml b/data/krateo/osfamily/Darwin.yaml index 4cc523a4..96e9e080 100644 --- a/data/krateo/osfamily/Darwin.yaml +++ b/data/krateo/osfamily/Darwin.yaml @@ -1,3 +1,8 @@ --- krateo::settings: brew_tap: 'krateoplatformops/krateo' + +# Version 4 format + repo: + upstream: + brew_tap: krateoplatformops/krateo diff --git a/data/kubernetes/default.yaml b/data/kubernetes/default.yaml index 3302687b..d2ebd2a2 100644 --- a/data/kubernetes/default.yaml +++ b/data/kubernetes/default.yaml @@ -8,3 +8,29 @@ kubernetes::settings: config_file_path: '/etc/kubernetes/kubelet.conf' config_dir_path: '/etc/kubernetes' tcp_port: '10250' + +# Version 4 format + packages: + main: + name: + - kubeadm + - kubectl + - kubelet + services: + kubelet: {} + files: + config: + path: "/etc/kubernetes/kubelet.conf" + user_files: + config: + path: "$HOME/.kubernetes/kubelet.conf" + dirs: + config: + path: "/etc/kubernetes" + user_dirs: + config: + path: "$HOME/.kubernetes" + ports: + main: + port: '10250' + protocol: tcp diff --git a/data/kubernetes/operatingsystem/Debian6.yaml b/data/kubernetes/operatingsystem/Debian6.yaml index 9cebfcb9..6fd9ba9f 100644 --- a/data/kubernetes/operatingsystem/Debian6.yaml +++ b/data/kubernetes/operatingsystem/Debian6.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-squeeze' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-squeeze diff --git a/data/kubernetes/operatingsystem/Debian7.yaml b/data/kubernetes/operatingsystem/Debian7.yaml index 63fe17f2..eba1be50 100644 --- a/data/kubernetes/operatingsystem/Debian7.yaml +++ b/data/kubernetes/operatingsystem/Debian7.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-wheezy' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-wheezy diff --git a/data/kubernetes/operatingsystem/Debian8.yaml b/data/kubernetes/operatingsystem/Debian8.yaml index 04771efb..0d19915f 100644 --- a/data/kubernetes/operatingsystem/Debian8.yaml +++ b/data/kubernetes/operatingsystem/Debian8.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-jessie' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-jessie diff --git a/data/kubernetes/operatingsystem/Debian9.yaml b/data/kubernetes/operatingsystem/Debian9.yaml index ec00426b..edb3288a 100644 --- a/data/kubernetes/operatingsystem/Debian9.yaml +++ b/data/kubernetes/operatingsystem/Debian9.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-stretch' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-stretch diff --git a/data/kubernetes/operatingsystem/Ubuntu12.04.yaml b/data/kubernetes/operatingsystem/Ubuntu12.04.yaml index b60e3763..e80488b5 100644 --- a/data/kubernetes/operatingsystem/Ubuntu12.04.yaml +++ b/data/kubernetes/operatingsystem/Ubuntu12.04.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-precise' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-precise diff --git a/data/kubernetes/operatingsystem/Ubuntu14.04.yaml b/data/kubernetes/operatingsystem/Ubuntu14.04.yaml index daa7ccdd..89c3e1d7 100644 --- a/data/kubernetes/operatingsystem/Ubuntu14.04.yaml +++ b/data/kubernetes/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-trusty' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-trusty diff --git a/data/kubernetes/operatingsystem/Ubuntu16.04.yaml b/data/kubernetes/operatingsystem/Ubuntu16.04.yaml index c8a630f9..1767eddf 100644 --- a/data/kubernetes/operatingsystem/Ubuntu16.04.yaml +++ b/data/kubernetes/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-xenial' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-xenial diff --git a/data/kubernetes/operatingsystem/Ubuntu16.10.yaml b/data/kubernetes/operatingsystem/Ubuntu16.10.yaml index e92f4ed4..fad15caa 100644 --- a/data/kubernetes/operatingsystem/Ubuntu16.10.yaml +++ b/data/kubernetes/operatingsystem/Ubuntu16.10.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-yakkety' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-yakkety diff --git a/data/kubernetes/operatingsystem/Ubuntu18.04.yaml b/data/kubernetes/operatingsystem/Ubuntu18.04.yaml index 7e8585bf..1cc6360a 100644 --- a/data/kubernetes/operatingsystem/Ubuntu18.04.yaml +++ b/data/kubernetes/operatingsystem/Ubuntu18.04.yaml @@ -1,3 +1,9 @@ --- kubernetes::settings: apt_release: 'kubernetes-bionic' + +# Version 4 format + repo: + upstream: + apt: + release: kubernetes-bionic diff --git a/data/kubernetes/osfamily/Debian.yaml b/data/kubernetes/osfamily/Debian.yaml index c0ea4ea4..cbf5549d 100644 --- a/data/kubernetes/osfamily/Debian.yaml +++ b/data/kubernetes/osfamily/Debian.yaml @@ -5,3 +5,15 @@ kubernetes::settings: 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' + +# Version 4 format + files: + init: + path: "/etc/default/kubelet" + repo: + upstream: + 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 + yum: + gpgcheck: true diff --git a/data/kubernetes/osfamily/RedHat.yaml b/data/kubernetes/osfamily/RedHat.yaml index 0deedee4..16356623 100644 --- a/data/kubernetes/osfamily/RedHat.yaml +++ b/data/kubernetes/osfamily/RedHat.yaml @@ -5,3 +5,16 @@ kubernetes::settings: 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' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/kubelet" + repo: + upstream: + description: Kubernetes + repofile_name: kubernetes + 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 + yum: + gpgcheck: true diff --git a/data/kubernetes/osfamily/RedHat6.yaml b/data/kubernetes/osfamily/RedHat6.yaml index 62ff4afd..ce954e1e 100644 --- a/data/kubernetes/osfamily/RedHat6.yaml +++ b/data/kubernetes/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- kubernetes::settings: repo_url: 'https://packages.cloud.google.com/yum/repos/kubernetes-el6-$basearch' + +# Version 4 format + repo: + upstream: + 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 index b2b8eaa4..da8fbc16 100644 --- a/data/kubernetes/osfamily/RedHat7.yaml +++ b/data/kubernetes/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- kubernetes::settings: repo_url: 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch' + +# Version 4 format + repo: + upstream: + 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 index a83bf199..9d3b79d5 100644 --- a/data/kubernetes/osfamily/RedHat8.yaml +++ b/data/kubernetes/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- kubernetes::settings: repo_url: 'https://packages.cloud.google.com/yum/repos/kubernetes-el8-$basearch' + +# Version 4 format + repo: + upstream: + url: https://packages.cloud.google.com/yum/repos/kubernetes-el8-$basearch diff --git a/data/libreoffice/default.yaml b/data/libreoffice/default.yaml index 9f3a2a8f..ece8f3e6 100644 --- a/data/libreoffice/default.yaml +++ b/data/libreoffice/default.yaml @@ -4,3 +4,14 @@ libreoffice::settings: snap_package_name: 'libreoffice' website_url: 'https://www.libreoffice.org/' git_source: 'https://github.com/LibreOffice/core' + +# Version 4 format + packages: + main: + name: libreoffice + providers: + snap: + name: libreoffice + urls: + website: https://www.libreoffice.org/ + source: https://github.com/LibreOffice/core diff --git a/data/libreoffice/osfamily/Darwin.yaml b/data/libreoffice/osfamily/Darwin.yaml index f2b69c8e..5a31f757 100644 --- a/data/libreoffice/osfamily/Darwin.yaml +++ b/data/libreoffice/osfamily/Darwin.yaml @@ -1,3 +1,10 @@ --- libreoffice::settings: brew_package_name: 'libreoffice' + +# Version 4 format + packages: + main: + providers: + brew: + name: libreoffice diff --git a/data/libreoffice/osfamily/windows.yaml b/data/libreoffice/osfamily/windows.yaml index 67c92694..37155e6f 100644 --- a/data/libreoffice/osfamily/windows.yaml +++ b/data/libreoffice/osfamily/windows.yaml @@ -2,3 +2,12 @@ libreoffice::settings: winget_package_name: 'TheDocumentFoundation.LibreOffice' choco_package_name: 'libreoffice' + +# Version 4 format + packages: + main: + providers: + winget: + name: TheDocumentFoundation.LibreOffice + choco: + name: libreoffice diff --git a/data/libvirt/default.yaml b/data/libvirt/default.yaml index 5603159d..c680099b 100644 --- a/data/libvirt/default.yaml +++ b/data/libvirt/default.yaml @@ -12,3 +12,35 @@ libvirt::settings: process_name: 'libvirtd' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: libvirt + services: + libvirtd: + process_name: libvirtd + process_user: root + process_group: root + files: + config: + path: "/etc/libvirt/libvirtd.conf" + log: + path: "/var/log/libvirt/libvirtd.log" + pid: + path: "/var/run/libvirt/network/default.pid" + user_files: + config: + path: "$HOME/.libvirt/libvirtd.conf" + dirs: + config: + path: "/etc/libvirt" + conf: + path: "/etc/libvirt/conf.d" + log: + path: "/var/log/libvirt" + data: + path: "/var/lib/libvirt" + user_dirs: + config: + path: "$HOME/.libvirt" diff --git a/data/libvirt/osfamily/Debian.yaml b/data/libvirt/osfamily/Debian.yaml index 805b0765..8add0cc1 100644 --- a/data/libvirt/osfamily/Debian.yaml +++ b/data/libvirt/osfamily/Debian.yaml @@ -3,3 +3,13 @@ libvirt::settings: package_name: 'libvirt-bin' service_name: 'libvirt-bin' init_file_path: '/etc/default/libvirt-bin' + +# Version 4 format + packages: + main: + name: libvirt-bin + services: + libvirt-bin: {} + files: + init: + path: "/etc/default/libvirt-bin" diff --git a/data/libvirt/osfamily/RedHat.yaml b/data/libvirt/osfamily/RedHat.yaml index 5f000f09..81d7db38 100644 --- a/data/libvirt/osfamily/RedHat.yaml +++ b/data/libvirt/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- libvirt::settings: init_file_path: '/etc/sysconfig/libvirtd' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/libvirtd" diff --git a/data/lighttpd/default.yaml b/data/lighttpd/default.yaml index 243f1ae6..15828e68 100644 --- a/data/lighttpd/default.yaml +++ b/data/lighttpd/default.yaml @@ -14,3 +14,41 @@ lighttpd::settings: process_name: 'lighttpd' process_user: 'lighttpd' process_group: 'lighttpd' + +# Version 4 format + packages: + main: + name: lighttpd + services: + lighttpd: + process_name: lighttpd + process_user: lighttpd + process_group: lighttpd + files: + config: + path: "/etc/lighttpd/lighttpd.conf" + log: + path: "/var/log/lighttpd/lighttpd.log" + init: + path: "/etc/sysconfig/lighttpd" + pid: + path: "/var/run/lighttpd.pid" + user_files: + config: + path: "$HOME/.lighttpd/lighttpd.conf" + dirs: + config: + path: "/etc/lighttpd" + conf: + path: "/etc/lighttpd/conf.d" + log: + path: "/var/log/lighttpd" + data: + path: "/var/www" + user_dirs: + config: + path: "$HOME/.lighttpd" + ports: + main: + port: '80' + protocol: tcp diff --git a/data/lighttpd/osfamily/Debian.yaml b/data/lighttpd/osfamily/Debian.yaml index b6fdd735..61e7fca8 100644 --- a/data/lighttpd/osfamily/Debian.yaml +++ b/data/lighttpd/osfamily/Debian.yaml @@ -2,3 +2,11 @@ lighttpd::settings: init_file_path: '/etc/default/lighttpd' conf_dir_path: '/etc/lighttpd/conf-enabled' + +# Version 4 format + files: + init: + path: "/etc/default/lighttpd" + dirs: + conf: + path: "/etc/lighttpd/conf-enabled" diff --git a/data/logrotate/default.yaml b/data/logrotate/default.yaml index 635cd6c5..6f52565a 100644 --- a/data/logrotate/default.yaml +++ b/data/logrotate/default.yaml @@ -4,3 +4,22 @@ logrotate::settings: config_file_path: '/etc/logrotate.conf' config_dir_path: '/etc/logrotate.d' conf_dir_path: '/etc/logrotate.d' + +# Version 4 format + packages: + main: + name: logrotate + files: + config: + path: "/etc/logrotate.conf" + user_files: + config: + path: "$HOME/.logrotate.conf" + dirs: + config: + path: "/etc/logrotate.d" + conf: + path: "/etc/logrotate.d" + user_dirs: + config: + path: "$HOME/.logrotate.d" diff --git a/data/logstash/default.yaml b/data/logstash/default.yaml index 3f26a569..70e5ab01 100644 --- a/data/logstash/default.yaml +++ b/data/logstash/default.yaml @@ -14,3 +14,39 @@ logstash::settings: process_user: 'logstash' process_group: 'logstash' tcp_port: '9292' + +# Version 4 format + packages: + main: + name: logstash + services: + logstash: + process_name: java + process_extra_name: logstash + process_user: logstash + process_group: logstash + files: + config: + path: "/etc/logstash/conf.d/logstash.conf" + log: + path: "/var/log/logstash/logstash.log" + pid: + path: "/var/run/logstash.pid" + user_files: + config: + path: "$HOME/.logstash/conf.d/logstash.conf" + dirs: + config: + path: "/etc/logstash" + conf: + path: "/etc/logstash/conf.d" + log: + path: "/var/log/logstash" + user_dirs: + config: + path: "$HOME/.logstash" + ports: + main: + port: '9292' + protocol: tcp + repo: upstream diff --git a/data/logstash/osfamily/Debian.yaml b/data/logstash/osfamily/Debian.yaml index 9dedb5bd..b8a5737e 100644 --- a/data/logstash/osfamily/Debian.yaml +++ b/data/logstash/osfamily/Debian.yaml @@ -2,3 +2,8 @@ logstash::settings: init_file_path: '/etc/default/logstash' + +# Version 4 format + files: + init: + path: "/etc/default/logstash" diff --git a/data/logstash/osfamily/RedHat.yaml b/data/logstash/osfamily/RedHat.yaml index 91def226..c1c80bb5 100644 --- a/data/logstash/osfamily/RedHat.yaml +++ b/data/logstash/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- logstash::settings: init_file_path: '/etc/sysconfig/logstash' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/logstash" diff --git a/data/logstash/upstream/default.yaml b/data/logstash/upstream/default.yaml index 1f091efe..92b6b6e1 100644 --- a/data/logstash/upstream/default.yaml +++ b/data/logstash/upstream/default.yaml @@ -1,4 +1,8 @@ --- logstash::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/lsb-release/default.yaml b/data/lsb-release/default.yaml index 9c00c3f3..9db2dce1 100644 --- a/data/lsb-release/default.yaml +++ b/data/lsb-release/default.yaml @@ -1,3 +1,8 @@ --- lsb-release::settings: package_name: 'lsb-release' + +# Version 4 format + packages: + main: + name: lsb-release diff --git a/data/lsb-release/osfamily/Debian.yaml b/data/lsb-release/osfamily/Debian.yaml index 9c00c3f3..9db2dce1 100644 --- a/data/lsb-release/osfamily/Debian.yaml +++ b/data/lsb-release/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- lsb-release::settings: package_name: 'lsb-release' + +# Version 4 format + packages: + main: + name: lsb-release diff --git a/data/lsb-release/osfamily/RedHat.yaml b/data/lsb-release/osfamily/RedHat.yaml index 5846266e..557fdd8c 100644 --- a/data/lsb-release/osfamily/RedHat.yaml +++ b/data/lsb-release/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- lsb-release::settings: package_name: 'redhat-lsb' + +# Version 4 format + packages: + main: + name: redhat-lsb diff --git a/data/lsb/default.yaml b/data/lsb/default.yaml index b5fa46a2..fc673967 100644 --- a/data/lsb/default.yaml +++ b/data/lsb/default.yaml @@ -1,3 +1,8 @@ --- lsb::settings: package_name: 'lsb' + +# Version 4 format + packages: + main: + name: lsb diff --git a/data/lsb/osfamily/Debian.yaml b/data/lsb/osfamily/Debian.yaml index ea2c8be9..74958773 100644 --- a/data/lsb/osfamily/Debian.yaml +++ b/data/lsb/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- lsb::settings: package_name: 'lsb-base' + +# Version 4 format + packages: + main: + name: lsb-base diff --git a/data/lsb/osfamily/RedHat.yaml b/data/lsb/osfamily/RedHat.yaml index 1461aad9..bbc4f436 100644 --- a/data/lsb/osfamily/RedHat.yaml +++ b/data/lsb/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- lsb::settings: package_name: 'redhat-lsb-core' + +# Version 4 format + packages: + main: + name: redhat-lsb-core diff --git a/data/lsb/osfamily/Suse.yaml b/data/lsb/osfamily/Suse.yaml index 6693fa42..bfbbdb21 100644 --- a/data/lsb/osfamily/Suse.yaml +++ b/data/lsb/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- lsb::settings: package_name: 'lsb-release' + +# Version 4 format + packages: + main: + name: lsb-release diff --git a/data/lsof/default.yaml b/data/lsof/default.yaml index 978a35d1..b0514a0e 100644 --- a/data/lsof/default.yaml +++ b/data/lsof/default.yaml @@ -1,3 +1,8 @@ --- lsof::settings: package_name: 'lsof' + +# Version 4 format + packages: + main: + name: lsof diff --git a/data/mailx/default.yaml b/data/mailx/default.yaml index ef92c9c8..d74320cc 100644 --- a/data/mailx/default.yaml +++ b/data/mailx/default.yaml @@ -2,3 +2,14 @@ mailx::settings: package_name: 'mailx' config_file_path: '/etc/mail.rc' + +# Version 4 format + packages: + main: + name: mailx + files: + config: + path: "/etc/mail.rc" + user_files: + config: + path: "$HOME/.mail.rc" diff --git a/data/mailx/osfamily/Debian.yaml b/data/mailx/osfamily/Debian.yaml index e7879426..132f9d7b 100644 --- a/data/mailx/osfamily/Debian.yaml +++ b/data/mailx/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- mailx::settings: package_name: 'bsd-mailx' + +# Version 4 format + packages: + main: + name: bsd-mailx diff --git a/data/make/default.yaml b/data/make/default.yaml index 37a403e5..8f1a84ae 100644 --- a/data/make/default.yaml +++ b/data/make/default.yaml @@ -1,3 +1,8 @@ --- make::settings: package_name: 'make' + +# Version 4 format + packages: + main: + name: make diff --git a/data/mariadb/default.yaml b/data/mariadb/default.yaml index 6c4fb463..7b73613c 100644 --- a/data/mariadb/default.yaml +++ b/data/mariadb/default.yaml @@ -13,3 +13,37 @@ mariadb::settings: process_user: 'mysql' process_group: 'mysql' tcp_port: '3306' + +# Version 4 format + packages: + main: + name: mariadb + services: + mariadb: + process_name: mysqld + process_user: mysql + process_group: mysql + files: + config: + path: "/etc/my.cnf" + log: + path: "/var/log/mariadb/mariadb.log" + pid: + path: "/var/run/mariadb.pid" + user_files: + config: + path: "$HOME/.my.cnf" + dirs: + config: + path: "/etc/my.cnf.d" + log: + path: "/var/log/mariadb" + data: + path: "/var/lib/mysql" + user_dirs: + config: + path: "$HOME/.my.cnf.d" + ports: + main: + port: '3306' + protocol: tcp diff --git a/data/mariadb/osfamily/Debian.yaml b/data/mariadb/osfamily/Debian.yaml index e42efcc1..e25330ae 100644 --- a/data/mariadb/osfamily/Debian.yaml +++ b/data/mariadb/osfamily/Debian.yaml @@ -2,3 +2,11 @@ mariadb::settings: package_name: 'mariadb-server' init_file_path: '/etc/default/mysql' + +# Version 4 format + packages: + main: + name: mariadb-server + files: + init: + path: "/etc/default/mysql" diff --git a/data/mariadb/osfamily/RedHat.yaml b/data/mariadb/osfamily/RedHat.yaml index cf39e9ac..720f4f0b 100644 --- a/data/mariadb/osfamily/RedHat.yaml +++ b/data/mariadb/osfamily/RedHat.yaml @@ -2,3 +2,11 @@ mariadb::settings: package_name: 'mariadb-server' init_file_path: '/etc/sysconfig/mariadb' + +# Version 4 format + packages: + main: + name: mariadb-server + files: + init: + path: "/etc/sysconfig/mariadb" diff --git a/data/mcollective/default.yaml b/data/mcollective/default.yaml index 9beb842c..60c06a73 100644 --- a/data/mcollective/default.yaml +++ b/data/mcollective/default.yaml @@ -10,3 +10,34 @@ mcollective::settings: process_user: 'mcollective' process_group: 'mcollective' tcp_port: '61613' + +# Version 4 format + packages: + main: + name: mcollective + services: + mcollective: + process_user: mcollective + process_group: mcollective + files: + config: + path: "/etc/mcollective/server.cfg" + log: + path: "/var/log/mcollective.log" + pid: + path: "/var/run/mcollective.pid" + user_files: + config: + path: "$HOME/.mcollective/server.cfg" + dirs: + config: + path: "/etc/mcollective" + log: + path: "/var/log/mcollective" + user_dirs: + config: + path: "$HOME/.mcollective" + ports: + main: + port: '61613' + protocol: tcp diff --git a/data/mcollective/osfamily/Debian.yaml b/data/mcollective/osfamily/Debian.yaml index 72553135..1134b5d4 100644 --- a/data/mcollective/osfamily/Debian.yaml +++ b/data/mcollective/osfamily/Debian.yaml @@ -3,3 +3,14 @@ mcollective::settings: process_name: 'mcollectived' init_file_path: '/etc/default/mcollective' data_dir_path: '/usr/share/mcollective' + +# Version 4 format + services: + ! '': + process_name: mcollectived + files: + init: + path: "/etc/default/mcollective" + dirs: + data: + path: "/usr/share/mcollective" diff --git a/data/mcollective/osfamily/RedHat.yaml b/data/mcollective/osfamily/RedHat.yaml index 018d0cc2..f4706f9b 100644 --- a/data/mcollective/osfamily/RedHat.yaml +++ b/data/mcollective/osfamily/RedHat.yaml @@ -4,3 +4,15 @@ mcollective::settings: process_extra_name: 'mcollectived' data_dir_path: '/usr/libexec/mcollective' init_file_path: '/etc/sysconfig/mcollective' + +# Version 4 format + services: + ! '': + process_name: ruby + process_extra_name: mcollectived + files: + init: + path: "/etc/sysconfig/mcollective" + dirs: + data: + path: "/usr/libexec/mcollective" diff --git a/data/mdadm/default.yaml b/data/mdadm/default.yaml index 514a127f..f0f6ee88 100644 --- a/data/mdadm/default.yaml +++ b/data/mdadm/default.yaml @@ -8,3 +8,27 @@ mdadm::settings: process_name: 'mdadm' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: mdadm + services: + mdadm: + process_name: mdadm + process_user: root + process_group: root + files: + config: + path: "/etc/mdadm/mdadm.conf" + pid: + path: "/run/mdadm/monitor.pid" + user_files: + config: + path: "$HOME/.mdadm/mdadm.conf" + dirs: + config: + path: "/etc/mdadm" + user_dirs: + config: + path: "$HOME/.mdadm" diff --git a/data/memcached/default.yaml b/data/memcached/default.yaml index 673c1385..fbfb0cb6 100644 --- a/data/memcached/default.yaml +++ b/data/memcached/default.yaml @@ -10,3 +10,30 @@ memcached::settings: process_user: 'memcached' process_group: 'memcached' tcp_port: '11211' + +# Version 4 format + packages: + main: + name: memcached + services: + memcached: + process_name: memcached + process_user: memcached + process_group: memcached + files: + config: + path: "/etc/memcached.conf" + log: + path: "/var/log/memcached/memcached.log" + pid: + path: "/var/run/memcached.pid" + user_files: + config: + path: "$HOME/.memcached.conf" + dirs: + log: + path: "/var/log/memcached" + ports: + main: + port: '11211' + protocol: tcp diff --git a/data/memcached/osfamily/Debian.yaml b/data/memcached/osfamily/Debian.yaml index 76fa64a3..a06dd753 100644 --- a/data/memcached/osfamily/Debian.yaml +++ b/data/memcached/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- memcached::settings: init_file_path: '/etc/default/memcached' + +# Version 4 format + files: + init: + path: "/etc/default/memcached" diff --git a/data/memcached/osfamily/RedHat.yaml b/data/memcached/osfamily/RedHat.yaml index 45a78427..42603340 100644 --- a/data/memcached/osfamily/RedHat.yaml +++ b/data/memcached/osfamily/RedHat.yaml @@ -2,3 +2,13 @@ memcached::settings: config_file_path: '/etc/sysconfig/memcached' init_file_path: '/etc/sysconfig/memcached' + +# Version 4 format + files: + config: + path: "/etc/sysconfig/memcached" + init: + path: "/etc/sysconfig/memcached" + user_files: + config: + path: "$HOME/.sysconfig/memcached" diff --git a/data/metaflow/default.yaml b/data/metaflow/default.yaml index f0bd0736..35939e3b 100644 --- a/data/metaflow/default.yaml +++ b/data/metaflow/default.yaml @@ -3,3 +3,9 @@ metaflow ::settings: package_name: metaflow package_provider: 'pip' + +# Version 4 format + packages: + main: + name: metaflow + provider: pip diff --git a/data/metricbeat/default.yaml b/data/metricbeat/default.yaml index 10e3d098..a127ec8b 100644 --- a/data/metricbeat/default.yaml +++ b/data/metricbeat/default.yaml @@ -13,3 +13,35 @@ metricbeat::settings: data_dir_path: '/var/lib/metricbeat' process_name: 'metricbeat' + +# Version 4 format + packages: + main: + name: metricbeat + services: + metricbeat: + process_name: metricbeat + files: + config: + path: "/etc/metricbeat/metricbeat.yml" + format: yaml + log: + path: "/var/log/metricbeat/metricbeat" + pid: + path: "/var/run/metricbeat.pid" + user_files: + config: + path: "$HOME/.metricbeat/metricbeat.yml" + dirs: + config: + path: "/etc/metricbeat" + log: + path: "/var/log/metricbeat" + home: + path: "/usr/share/metricbeat" + data: + path: "/var/lib/metricbeat" + user_dirs: + config: + path: "$HOME/.metricbeat" + repo: upstream diff --git a/data/metricbeat/osfamily/Debian.yaml b/data/metricbeat/osfamily/Debian.yaml index f4a394a0..9994234a 100644 --- a/data/metricbeat/osfamily/Debian.yaml +++ b/data/metricbeat/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- metricbeat::settings: init_file_path: '/etc/default/metricbeat' + +# Version 4 format + files: + init: + path: "/etc/default/metricbeat" diff --git a/data/metricbeat/osfamily/RedHat.yaml b/data/metricbeat/osfamily/RedHat.yaml index 9c6d07c4..945a76ee 100644 --- a/data/metricbeat/osfamily/RedHat.yaml +++ b/data/metricbeat/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- metricbeat::settings: init_file_path: '/etc/sysconfig/metricbeat' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/metricbeat" diff --git a/data/metricbeat/osfamily/windows.yaml b/data/metricbeat/osfamily/windows.yaml index 56c56b72..2de3f141 100644 --- a/data/metricbeat/osfamily/windows.yaml +++ b/data/metricbeat/osfamily/windows.yaml @@ -2,3 +2,11 @@ metricbeat::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\metricbeat\tools\metricbeat.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\metricbeat\tools\metricbeat.yml + user_files: + config: + path: C:\ProgramData\chocolatey\lib\metricbeat\tools\metricbeat.yml diff --git a/data/metricbeat/upstream/default.yaml b/data/metricbeat/upstream/default.yaml index d185ecf5..87e9b10d 100644 --- a/data/metricbeat/upstream/default.yaml +++ b/data/metricbeat/upstream/default.yaml @@ -1,4 +1,8 @@ --- metricbeat::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/mgmt/default.yaml b/data/mgmt/default.yaml index d8e1f998..422e7d83 100644 --- a/data/mgmt/default.yaml +++ b/data/mgmt/default.yaml @@ -117,3 +117,7 @@ mgmt::settings: resources: {} manage_service: false manage_user: false + +# Version 4 format + preinstall: + tp::install: {} diff --git a/data/mgmt/osfamily/Darwin.yaml b/data/mgmt/osfamily/Darwin.yaml index 041afadc..396d2237 100644 --- a/data/mgmt/osfamily/Darwin.yaml +++ b/data/mgmt/osfamily/Darwin.yaml @@ -8,4 +8,10 @@ mgmt::settings: user_dirs: config: - path: '$HOME/Library/Application\ Support/mgmt/mgmt.conf' \ No newline at end of file + path: '$HOME/Library/Application\ Support/mgmt/mgmt.conf' +# Version 4 format + packages: + main: + providers: + brew: + name: mgmt diff --git a/data/mgmt/osfamily/Debian.yaml b/data/mgmt/osfamily/Debian.yaml index 6542483e..a098260a 100644 --- a/data/mgmt/osfamily/Debian.yaml +++ b/data/mgmt/osfamily/Debian.yaml @@ -3,4 +3,5 @@ mgmt::settings: files: init: - path: '/etc/default/mgmt' \ No newline at end of file + path: '/etc/default/mgmt' +# No data to convert to Version 4 format diff --git a/data/mgmt/osfamily/RedHat.yaml b/data/mgmt/osfamily/RedHat.yaml index 38eac048..97bdb1e4 100644 --- a/data/mgmt/osfamily/RedHat.yaml +++ b/data/mgmt/osfamily/RedHat.yaml @@ -1,3 +1,7 @@ --- mgmt::settings: dockerfile_prerequisites: 'RUN yum install -y wget which' + +# Version 4 format + image: + dockerfile_prerequisites: RUN yum install -y wget which diff --git a/data/mgmt/osfamily/windows.yaml b/data/mgmt/osfamily/windows.yaml index 63713036..5128cee1 100644 --- a/data/mgmt/osfamily/windows.yaml +++ b/data/mgmt/osfamily/windows.yaml @@ -11,4 +11,9 @@ mgmt::settings: user_dirs: config: - path: '%APPDATA%\mgmt' \ No newline at end of file + path: '%APPDATA%\mgmt' +# Version 4 format + packages: + main: + provider: windows + source: https://github.com/mgmt/mgmt/releases/download/v$VERSION/mgmt_$VERSION_$OS_$ARCH.msi diff --git a/data/microsoft_repo/default.yaml b/data/microsoft_repo/default.yaml index d19f2c00..d85258fc 100644 --- a/data/microsoft_repo/default.yaml +++ b/data/microsoft_repo/default.yaml @@ -1,3 +1,6 @@ --- microsoft_repo::settings: upstream_repo: true + +# Version 4 format + repo: upstream diff --git a/data/microsoft_repo/upstream/default.yaml b/data/microsoft_repo/upstream/default.yaml index 791c8afe..99a7a16c 100644 --- a/data/microsoft_repo/upstream/default.yaml +++ b/data/microsoft_repo/upstream/default.yaml @@ -1,4 +1,9 @@ --- microsoft_repo::settings: repo_filename: microsoft-prod - repo_package_name: packages-microsoft-prod \ No newline at end of file + repo_package_name: packages-microsoft-prod +# Version 4 format + repo: + upstream: + package_name: packages-microsoft-prod + repofile_name: microsoft-prod diff --git a/data/microsoft_repo/upstream/operatingsystem/CentOS6.yaml b/data/microsoft_repo/upstream/operatingsystem/CentOS6.yaml index 5311eb98..b8d7a3a3 100644 --- a/data/microsoft_repo/upstream/operatingsystem/CentOS6.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/CentOS6.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/centos/6/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 89b06b06..b7cc0c0a 100644 --- a/data/microsoft_repo/upstream/operatingsystem/CentOS7.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/CentOS7.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 67b2f2da..16c2e71f 100644 --- a/data/microsoft_repo/upstream/operatingsystem/CentOS8.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/CentOS8.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/centos/8/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 4becbc57..2b01b62a 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Debian10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Debian10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 080e070a..8bc945c0 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Debian11.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Debian11.yaml @@ -1,3 +1,7 @@ --- microsoft_repo::settings: - repo_package_url: 'https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb' \ No newline at end of file + repo_package_url: 'https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb' +# Version 4 format + repo: + upstream: + package_url: https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb diff --git a/data/microsoft_repo/upstream/operatingsystem/Debian8.yaml b/data/microsoft_repo/upstream/operatingsystem/Debian8.yaml index e126b962..b69ca05c 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Debian8.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Debian8.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/debian/8/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 56e2b58a..d3141fbb 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Debian9.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Debian9.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/debian/9/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index a3ef514b..1f542a60 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora26.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora26.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/26/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 09007be2..e8006d15 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora27.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora27.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/27/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 355e192a..079ba914 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora28.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora28.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/28/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index f3a44143..64f1a269 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora29.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora29.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/29/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index a700b5fe..1f5a1c16 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora30.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora30.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/30/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index ce409ba2..4134cdd1 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora31.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora31.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/31/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 00d3df81..2d033a70 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora32.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora32.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/32/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 2d941d27..5ec99eec 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora33.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora33.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/33/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 8b7ac855..5611ea7a 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora34.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora34.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/34/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index cc56536b..0c32ddde 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora35.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora35.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/35/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 490832e9..f1ef9c4c 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Fedora36.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Fedora36.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/fedora/36/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index ccab09ce..3dede261 100644 --- a/data/microsoft_repo/upstream/operatingsystem/OpenSuse12.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/OpenSuse12.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_file_url: 'https://packages.microsoft.com/config/opensuse/12/prod.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index 37996777..5b58b664 100644 --- a/data/microsoft_repo/upstream/operatingsystem/OpenSuse15.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/OpenSuse15.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/opensuse/15/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index ec733f5a..54a441df 100644 --- a/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.2.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.2.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/opensuse/42.2/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index a0920878..acbf8f73 100644 --- a/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.3.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/OpenSuse42.3.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/opensuse/42.3/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 6cf3bb96..e9cbfef9 100644 --- a/data/microsoft_repo/upstream/operatingsystem/SLES11.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/SLES11.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/sles/11/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index de50d35a..fe5abf95 100644 --- a/data/microsoft_repo/upstream/operatingsystem/SLES12.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/SLES12.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/sles/12/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 5eed67a8..1932d3e3 100644 --- a/data/microsoft_repo/upstream/operatingsystem/SLES15.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/SLES15.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/sles/15/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index a4dfd1ae..cbdf28ff 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu14.04.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index ed4ec169..0cef8d6b 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu15.10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu15.10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/15.10/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 19b1b961..b698cd69 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.04.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 6768b402..56672e82 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu16.10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/16.10/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index c5a2ad40..7dc5e5b9 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.04.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.04.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/17.04/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 0d011293..a84562ac 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu17.10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/17.10/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 475860b3..86a89c64 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.04.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.04.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 86aa742e..45278e2f 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu18.10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/18.10/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 3897626a..fb8ce6ad 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.04.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.04.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/19.04/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 4244b79f..b345ea77 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu19.10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/19.10/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 3fb1cb71..d3a92635 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.04.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.04.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 90fd1471..8d0244fc 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu20.10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/20.10/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 1280759b..ba8f221d 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.04.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.04.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/21.04/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 0844a19d..2996d470 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu21.10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/21.10/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index cb311442..12f7c400 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.04.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.04.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index d9749322..eaac1e79 100644 --- a/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.10.yaml +++ b/data/microsoft_repo/upstream/operatingsystem/Ubuntu22.10.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/ubuntu/22.10/multiarch/packages-microsoft-prod.deb' + +# Version 4 format + repo: + upstream: + 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 index 5aa1470f..aceb3461 100644 --- a/data/microsoft_repo/upstream/osfamily/RedHat6.yaml +++ b/data/microsoft_repo/upstream/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/rhel/6/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index a5837284..99ce5eae 100644 --- a/data/microsoft_repo/upstream/osfamily/RedHat7.yaml +++ b/data/microsoft_repo/upstream/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/rhel/7.4/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 28ae2cd0..55f73c0f 100644 --- a/data/microsoft_repo/upstream/osfamily/RedHat8.yaml +++ b/data/microsoft_repo/upstream/osfamily/RedHat8.yaml @@ -2,3 +2,8 @@ microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + 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 index 05b77851..a52b7f37 100644 --- a/data/microsoft_repo/upstream/osfamily/RedHat9.yaml +++ b/data/microsoft_repo/upstream/osfamily/RedHat9.yaml @@ -1,3 +1,8 @@ --- microsoft_repo::settings: repo_package_url: 'https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm diff --git a/data/mlflow/default.yaml b/data/mlflow/default.yaml index a7e21523..f0fb49e0 100644 --- a/data/mlflow/default.yaml +++ b/data/mlflow/default.yaml @@ -5,3 +5,9 @@ mlflow::settings: # No data to convert to Version 4 format + +# Version 4 format + packages: + main: + name: mlflow + provider: pip diff --git a/data/mlocate/default.yaml b/data/mlocate/default.yaml index 00199f8e..085d84cf 100644 --- a/data/mlocate/default.yaml +++ b/data/mlocate/default.yaml @@ -1,3 +1,8 @@ --- mlocate::settings: package_name: 'mlocate' + +# Version 4 format + packages: + main: + name: mlocate diff --git a/data/mlrun/default.yaml b/data/mlrun/default.yaml index e81bc396..4ac341a7 100644 --- a/data/mlrun/default.yaml +++ b/data/mlrun/default.yaml @@ -3,3 +3,9 @@ mlrun::settings: package_name: mlrun package_provider: 'pip' + +# Version 4 format + packages: + main: + name: mlrun + provider: pip diff --git a/data/mongodb-mms-automation-agent/default.yaml b/data/mongodb-mms-automation-agent/default.yaml index c13e9e54..c4417864 100644 --- a/data/mongodb-mms-automation-agent/default.yaml +++ b/data/mongodb-mms-automation-agent/default.yaml @@ -10,3 +10,31 @@ mongodb-mms-automation-agent::settings: process_name: 'mongodb-mms-automation-agent' process_user: 'mongodb-mms-agent' process_group: 'mongodb-mms-agent' + +# Version 4 format + packages: + main: + name: mongodb-mms-automation-agent + services: + mongodb-mms-automation-agent: + process_name: mongodb-mms-automation-agent + process_user: mongodb-mms-agent + process_group: mongodb-mms-agent + files: + config: + path: "/etc/mongodb-mms/automation-agent.config" + log: + path: "/var/log/mongodb-mms/automation-agent.log" + pid: + path: "/var/run/mongodb-mms-automation-agent.pid" + user_files: + config: + path: "$HOME/.mongodb-mms/automation-agent.config" + dirs: + config: + path: "/etc/mongodb-mms" + log: + path: "/var/log/mongodb-mms" + user_dirs: + config: + path: "$HOME/.mongodb-mms" diff --git a/data/mongodb-mms-automation-agent/osfamily/Debian.yaml b/data/mongodb-mms-automation-agent/osfamily/Debian.yaml index 286a9c6e..4407c2ac 100644 --- a/data/mongodb-mms-automation-agent/osfamily/Debian.yaml +++ b/data/mongodb-mms-automation-agent/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- mongodb-mms-automation-agent::settings: init_file_path: '/etc/init/mongodb-mms-automation-agent.conf' + +# Version 4 format + files: + init: + 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 306c2f02..9d0fc39a 100644 --- a/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml +++ b/data/mongodb-mms-automation-agent/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- mongodb-mms-automation-agent::settings: init_file_path: '/etc/sysconfig/mongodb-mms-automation-agent' + +# Version 4 format + files: + init: + 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 7510ce42..afb068cd 100644 --- a/data/mongodb-mms-backup-agent/default.yaml +++ b/data/mongodb-mms-backup-agent/default.yaml @@ -10,3 +10,31 @@ mongodb-mms-backup-agent::settings: process_name: 'mongodb-mms-backup-agent' process_user: 'mongodb-mms-agent' process_group: 'mongodb-mms-agent' + +# Version 4 format + packages: + main: + name: mongodb-mms-backup-agent + services: + mongodb-mms-backup-agent: + process_name: mongodb-mms-backup-agent + process_user: mongodb-mms-agent + process_group: mongodb-mms-agent + files: + config: + path: "/etc/mongodb-mms/backup-agent.config" + log: + path: "/var/log/mongodb-mms/backup-agent.log" + pid: + path: "/var/run/mongodb-mms-backup-agent.pid" + user_files: + config: + path: "$HOME/.mongodb-mms/backup-agent.config" + dirs: + config: + path: "/etc/mongodb-mms" + log: + path: "/var/log/mongodb-mms" + user_dirs: + config: + path: "$HOME/.mongodb-mms" diff --git a/data/mongodb-mms-backup-agent/osfamily/Debian.yaml b/data/mongodb-mms-backup-agent/osfamily/Debian.yaml index 631a9a71..4845415d 100644 --- a/data/mongodb-mms-backup-agent/osfamily/Debian.yaml +++ b/data/mongodb-mms-backup-agent/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- mongodb-mms-backup-agent::settings: init_file_path: '/etc/init/mongodb-mms-backup-agent.conf' + +# Version 4 format + files: + init: + 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 d5fc978d..51bfd16f 100644 --- a/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml +++ b/data/mongodb-mms-backup-agent/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- mongodb-mms-backup-agent::settings: init_file_path: '/etc/sysconfig/mongodb-mms-backup-agent' + +# Version 4 format + files: + init: + 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 1edbb199..dbb15fbb 100644 --- a/data/mongodb-mms-monitoring-agent/default.yaml +++ b/data/mongodb-mms-monitoring-agent/default.yaml @@ -10,3 +10,31 @@ mongodb-mms-monitoring-agent::settings: process_name: 'mongodb-mms-monitoring-agent' process_user: 'mongodb-mms-agent' process_group: 'mongodb-mms-agent' + +# Version 4 format + packages: + main: + name: mongodb-mms-monitoring-agent + services: + mongodb-mms-monitoring-agent: + process_name: mongodb-mms-monitoring-agent + process_user: mongodb-mms-agent + process_group: mongodb-mms-agent + files: + config: + path: "/etc/mongodb-mms/monitoring-agent.config" + log: + path: "/var/log/mongodb-mms/monitoring-agent.log" + pid: + path: "/var/run/mongodb-mms-monitoring-agent.pid" + user_files: + config: + path: "$HOME/.mongodb-mms/monitoring-agent.config" + dirs: + config: + path: "/etc/mongodb-mms" + log: + path: "/var/log/mongodb-mms" + user_dirs: + config: + path: "$HOME/.mongodb-mms" diff --git a/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml b/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml index 4856737d..9e228fe0 100644 --- a/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml +++ b/data/mongodb-mms-monitoring-agent/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- mongodb-mms-monitoring-agent::settings: init_file_path: '/etc/init/mongodb-mms-monitoring-agent.conf' + +# Version 4 format + files: + init: + 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 bdc1de0f..17139aa7 100644 --- a/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml +++ b/data/mongodb-mms-monitoring-agent/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- mongodb-mms-monitoring-agent::settings: init_file_path: '/etc/sysconfig/mongodb-mms-monitoring-agent' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/mongodb-mms-monitoring-agent" diff --git a/data/mongodb-mms/default.yaml b/data/mongodb-mms/default.yaml index 58b5ba10..b4500031 100644 --- a/data/mongodb-mms/default.yaml +++ b/data/mongodb-mms/default.yaml @@ -10,3 +10,31 @@ mongodb-mms::settings: process_name: 'mongodb-mms' process_user: 'mongodb-mms-agent' process_group: 'mongodb-mms-agent' + +# Version 4 format + packages: + main: + name: mongodb-mms + services: + mongodb-mms: + process_name: mongodb-mms + process_user: mongodb-mms-agent + process_group: mongodb-mms-agent + files: + config: + path: "/opt/mongodb/mms/conf/mms.conf" + log: + path: "/opt/mongodb/mms/logs/daemon.log" + pid: + path: "/opt/mongodb/mms/tmp/mms-0.pid" + user_files: + config: + path: "/opt/mongodb/mms/conf/mms.conf" + dirs: + config: + path: "/opt/mongodb/mms/conf" + log: + path: "/opt/mongodb/mms/logs" + user_dirs: + config: + path: "/opt/mongodb/mms/conf" diff --git a/data/mongodb-mms/osfamily/Debian.yaml b/data/mongodb-mms/osfamily/Debian.yaml index 4eee375c..5d7f544d 100644 --- a/data/mongodb-mms/osfamily/Debian.yaml +++ b/data/mongodb-mms/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- mongodb-mms::settings: init_file_path: '/etc/init/mongodb-mms.conf' + +# Version 4 format + files: + init: + path: "/etc/init/mongodb-mms.conf" diff --git a/data/mongodb-mms/osfamily/RedHat.yaml b/data/mongodb-mms/osfamily/RedHat.yaml index ffa94310..f61651e2 100644 --- a/data/mongodb-mms/osfamily/RedHat.yaml +++ b/data/mongodb-mms/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- mongodb-mms::settings: init_file_path: '/etc/sysconfig/mongodb-mms' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/mongodb-mms" diff --git a/data/mongodb/default.yaml b/data/mongodb/default.yaml index fed2289b..c883dea1 100644 --- a/data/mongodb/default.yaml +++ b/data/mongodb/default.yaml @@ -11,3 +11,32 @@ mongodb::settings: process_user: 'mongodb' process_group: 'mongodb' tcp_port: '27017' + +# Version 4 format + packages: + main: + name: mongodb-server + services: + mongodb: + process_name: mongod + process_user: mongodb + process_group: mongodb + files: + config: + path: "/etc/mongodb.conf" + log: + path: "/var/log/mongodb/mongodb.log" + pid: + path: "/var/run/mongodb.pid" + user_files: + config: + path: "$HOME/.mongodb.conf" + dirs: + log: + path: "/var/log/mongodb" + data: + path: "/var/lib/mongodb" + ports: + main: + port: '27017' + protocol: tcp diff --git a/data/mongodb/osfamily/Debian.yaml b/data/mongodb/osfamily/Debian.yaml index 8521ea2d..2b277ab9 100644 --- a/data/mongodb/osfamily/Debian.yaml +++ b/data/mongodb/osfamily/Debian.yaml @@ -2,3 +2,10 @@ mongodb::settings: pid_file_path: '/var/run/mongodb/mongodb.pid' init_file_path: '/etc/default/mongodb' + +# Version 4 format + files: + init: + path: "/etc/default/mongodb" + pid: + path: "/var/run/mongodb/mongodb.pid" diff --git a/data/mongodb/osfamily/RedHat.yaml b/data/mongodb/osfamily/RedHat.yaml index 03944b74..eebae225 100644 --- a/data/mongodb/osfamily/RedHat.yaml +++ b/data/mongodb/osfamily/RedHat.yaml @@ -6,3 +6,22 @@ mongodb::settings: pid_file_path: '/var/run/mongodb/mongod.pid' log_file_path: '/var/log/mongodb/mongod.log' data_dir_path: '/var/lib/mongodb' + +# Version 4 format + services: + mongod: {} + files: + config: + path: "/etc/mongod.conf" + log: + path: "/var/log/mongodb/mongod.log" + init: + path: "/etc/sysconfig/mongod" + pid: + path: "/var/run/mongodb/mongod.pid" + user_files: + config: + path: "$HOME/.mongod.conf" + dirs: + data: + path: "/var/lib/mongodb" diff --git a/data/mongodb/upstream/default.yaml b/data/mongodb/upstream/default.yaml index 977e3363..f4daa9ee 100644 --- a/data/mongodb/upstream/default.yaml +++ b/data/mongodb/upstream/default.yaml @@ -12,3 +12,33 @@ mongodb::settings: repo_filename: mongodb-org-4.4 repo_description: 'MongoDB Repository' data_dir_path: '/var/lib/mongodb' + +# Version 4 format + packages: + main: + name: mongodb-org + services: + mongod: + process_user: mongodb + process_group: mongodb + files: + config: + path: "/etc/mongod.conf" + log: + path: "/var/log/mongodb/mongod.log" + pid: + path: "/var/run/mongodb.pid" + user_files: + config: + path: "$HOME/.mongod.conf" + dirs: + data: + path: "/var/lib/mongodb" + repo: + upstream: + description: MongoDB Repository + repofile_name: mongodb-org-4.4 + key: 2069 1EEC 3521 6C63 CAF6 6CE1 6564 08E3 90CF B1F5 + key_url: https://www.mongodb.org/static/pgp/server-4.4.asc + yum: + gpgcheck: true diff --git a/data/mongodb/upstream/operatingsystem/Darwin.yaml b/data/mongodb/upstream/operatingsystem/Darwin.yaml index 9a3367dc..33bad838 100644 --- a/data/mongodb/upstream/operatingsystem/Darwin.yaml +++ b/data/mongodb/upstream/operatingsystem/Darwin.yaml @@ -4,3 +4,19 @@ mongodb::settings: service_name: 'mongodb-community@4.4' brew_tap: 'mongodb/brew' config_file_path: '/usr/local/etc/mongod.conf' + +# Version 4 format + packages: + main: + name: mongodb-community@4.4 + services: + mongodb-community@4.4: {} + files: + config: + path: "/usr/local/etc/mongod.conf" + user_files: + config: + path: "/usr/local$HOME/.mongod.conf" + repo: + upstream: + brew_tap: mongodb/brew diff --git a/data/mongodb/upstream/operatingsystem/Debian10.yaml b/data/mongodb/upstream/operatingsystem/Debian10.yaml index 3d2916d5..4754ed8e 100644 --- a/data/mongodb/upstream/operatingsystem/Debian10.yaml +++ b/data/mongodb/upstream/operatingsystem/Debian10.yaml @@ -1,3 +1,8 @@ --- default::settings: - apt_release: 'buster/mongodb-org/4.4' \ No newline at end of file + apt_release: 'buster/mongodb-org/4.4' +# Version 4 format + repo: + upstream: + apt: + release: buster/mongodb-org/4.4 diff --git a/data/mongodb/upstream/operatingsystem/Debian11.yaml b/data/mongodb/upstream/operatingsystem/Debian11.yaml index 3d2916d5..4754ed8e 100644 --- a/data/mongodb/upstream/operatingsystem/Debian11.yaml +++ b/data/mongodb/upstream/operatingsystem/Debian11.yaml @@ -1,3 +1,8 @@ --- default::settings: - apt_release: 'buster/mongodb-org/4.4' \ No newline at end of file + apt_release: 'buster/mongodb-org/4.4' +# Version 4 format + repo: + upstream: + apt: + release: buster/mongodb-org/4.4 diff --git a/data/mongodb/upstream/operatingsystem/Debian9.yaml b/data/mongodb/upstream/operatingsystem/Debian9.yaml index 62bc0cbd..13cb6f1c 100644 --- a/data/mongodb/upstream/operatingsystem/Debian9.yaml +++ b/data/mongodb/upstream/operatingsystem/Debian9.yaml @@ -1,3 +1,9 @@ --- default::settings: apt_release: 'stretch/mongodb-org/4.4' + +# Version 4 format + repo: + upstream: + apt: + release: stretch/mongodb-org/4.4 diff --git a/data/mongodb/upstream/operatingsystem/SLES12.yaml b/data/mongodb/upstream/operatingsystem/SLES12.yaml index 86ed3b26..6c4f1eca 100644 --- a/data/mongodb/upstream/operatingsystem/SLES12.yaml +++ b/data/mongodb/upstream/operatingsystem/SLES12.yaml @@ -1,4 +1,9 @@ --- 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 + repo_name: 'mongodb' +# Version 4 format + repo: + upstream: + name: mongodb + zypper_repofile_url: https://repo.mongodb.org/zypper/suse/12/mongodb-org/4.4/x86_64/ diff --git a/data/mongodb/upstream/operatingsystem/SLES15.yaml b/data/mongodb/upstream/operatingsystem/SLES15.yaml index ea0837fd..ac417077 100644 --- a/data/mongodb/upstream/operatingsystem/SLES15.yaml +++ b/data/mongodb/upstream/operatingsystem/SLES15.yaml @@ -1,4 +1,9 @@ --- 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 + repo_name: 'mongodb' +# Version 4 format + repo: + upstream: + name: mongodb + zypper_repofile_url: https://repo.mongodb.org/zypper/suse/15/mongodb-org/4.4/x86_64/ diff --git a/data/mongodb/upstream/operatingsystem/Ubuntu.yaml b/data/mongodb/upstream/operatingsystem/Ubuntu.yaml index 42156de0..1fb0673b 100644 --- a/data/mongodb/upstream/operatingsystem/Ubuntu.yaml +++ b/data/mongodb/upstream/operatingsystem/Ubuntu.yaml @@ -2,3 +2,8 @@ mongodb::settings: repo_url: 'http://repo.mongodb.org/apt/ubuntu' apt_repos: 'multiverse' + +# Version 4 format + repo: + upstream: + url: http://repo.mongodb.org/apt/ubuntu diff --git a/data/mongodb/upstream/operatingsystem/Ubuntu16.04.yaml b/data/mongodb/upstream/operatingsystem/Ubuntu16.04.yaml index 1cc7df29..e4555cc6 100644 --- a/data/mongodb/upstream/operatingsystem/Ubuntu16.04.yaml +++ b/data/mongodb/upstream/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,8 @@ --- mongodb::settings: - apt_release: 'xenial/mongodb-org/4.4' \ No newline at end of file + apt_release: 'xenial/mongodb-org/4.4' +# Version 4 format + repo: + upstream: + apt: + release: xenial/mongodb-org/4.4 diff --git a/data/mongodb/upstream/operatingsystem/Ubuntu18.04.yaml b/data/mongodb/upstream/operatingsystem/Ubuntu18.04.yaml index 3b051351..e6381382 100644 --- a/data/mongodb/upstream/operatingsystem/Ubuntu18.04.yaml +++ b/data/mongodb/upstream/operatingsystem/Ubuntu18.04.yaml @@ -1,3 +1,8 @@ --- mongodb::settings: - apt_release: 'bionic/mongodb-org/4.4' \ No newline at end of file + apt_release: 'bionic/mongodb-org/4.4' +# Version 4 format + repo: + upstream: + apt: + release: bionic/mongodb-org/4.4 diff --git a/data/mongodb/upstream/operatingsystem/Ubuntu20.04.yaml b/data/mongodb/upstream/operatingsystem/Ubuntu20.04.yaml index ebb985d4..b886d911 100644 --- a/data/mongodb/upstream/operatingsystem/Ubuntu20.04.yaml +++ b/data/mongodb/upstream/operatingsystem/Ubuntu20.04.yaml @@ -1,3 +1,8 @@ --- mongodb::settings: - apt_release: 'focal/mongodb-org/4.4' \ No newline at end of file + apt_release: 'focal/mongodb-org/4.4' +# Version 4 format + repo: + upstream: + apt: + release: focal/mongodb-org/4.4 diff --git a/data/mongodb/upstream/operatingsystem/windows.yaml b/data/mongodb/upstream/operatingsystem/windows.yaml index 983f7580..8c6c8934 100644 --- a/data/mongodb/upstream/operatingsystem/windows.yaml +++ b/data/mongodb/upstream/operatingsystem/windows.yaml @@ -1,3 +1,8 @@ --- mongodb::settings: package_name: 'mongodb' + +# Version 4 format + packages: + main: + name: mongodb diff --git a/data/mongodb/upstream/osfamily/Debian.yaml b/data/mongodb/upstream/osfamily/Debian.yaml index 8ee06846..f7620cd3 100644 --- a/data/mongodb/upstream/osfamily/Debian.yaml +++ b/data/mongodb/upstream/osfamily/Debian.yaml @@ -2,3 +2,8 @@ mongodb::settings: repo_url: 'http://repo.mongodb.org/apt/debian' apt_repos: 'main' + +# Version 4 format + repo: + upstream: + url: http://repo.mongodb.org/apt/debian diff --git a/data/mongodb/upstream/osfamily/RedHat.yaml b/data/mongodb/upstream/osfamily/RedHat.yaml index 82c7a157..db46d2d9 100644 --- a/data/mongodb/upstream/osfamily/RedHat.yaml +++ b/data/mongodb/upstream/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- mongodb::settings: repo_url: 'https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.4/x86_64/' + +# Version 4 format + repo: + upstream: + url: https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.4/x86_64/ diff --git a/data/monit/default.yaml b/data/monit/default.yaml index 94afef16..9a1d805b 100644 --- a/data/monit/default.yaml +++ b/data/monit/default.yaml @@ -11,3 +11,31 @@ monit::settings: process_name: 'monit' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: monit + services: + monit: + process_name: monit + process_user: root + process_group: root + files: + config: + path: "/etc/monit.conf" + log: + path: "/var/log/monit.log" + pid: + path: "/var/run/monit.pid" + user_files: + config: + path: "$HOME/.monit.conf" + dirs: + config: + path: "/etc/monit" + conf: + path: "/etc/monit.d" + user_dirs: + config: + path: "$HOME/.monit" diff --git a/data/monit/osfamily/Debian.yaml b/data/monit/osfamily/Debian.yaml index 8ba77c84..d0c74233 100644 --- a/data/monit/osfamily/Debian.yaml +++ b/data/monit/osfamily/Debian.yaml @@ -3,3 +3,16 @@ monit::settings: config_file_path: '/etc/monit/monitrc' conf_dir_path: '/etc/monit/conf.d' init_file_path: '/etc/default/monit' + +# Version 4 format + files: + config: + path: "/etc/monit/monitrc" + init: + path: "/etc/default/monit" + user_files: + config: + path: "$HOME/.monit/monitrc" + dirs: + conf: + path: "/etc/monit/conf.d" diff --git a/data/monit/osfamily/RedHat.yaml b/data/monit/osfamily/RedHat.yaml index 2b9be5d5..fb647648 100644 --- a/data/monit/osfamily/RedHat.yaml +++ b/data/monit/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- monit::settings: init_file_path: '/etc/sysconfig/monit' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/monit" diff --git a/data/motd/default.yaml b/data/motd/default.yaml index 1ecdf5b1..d142fe8c 100644 --- a/data/motd/default.yaml +++ b/data/motd/default.yaml @@ -1,3 +1,11 @@ --- motd::settings: config_file_path: '/etc/motd' + +# Version 4 format + files: + config: + path: "/etc/motd" + user_files: + config: + path: "$HOME/.motd" diff --git a/data/motd/lsbdistcodename/wheezy.yaml b/data/motd/lsbdistcodename/wheezy.yaml index 1ecdf5b1..d142fe8c 100644 --- a/data/motd/lsbdistcodename/wheezy.yaml +++ b/data/motd/lsbdistcodename/wheezy.yaml @@ -1,3 +1,11 @@ --- motd::settings: config_file_path: '/etc/motd' + +# Version 4 format + files: + config: + path: "/etc/motd" + user_files: + config: + path: "$HOME/.motd" diff --git a/data/motd/operatingsystem/Debian.yaml b/data/motd/operatingsystem/Debian.yaml index 1ea08202..4cdfa93c 100644 --- a/data/motd/operatingsystem/Debian.yaml +++ b/data/motd/operatingsystem/Debian.yaml @@ -1,3 +1,11 @@ --- motd::settings: config_file_path: '/etc/motd.last' + +# Version 4 format + files: + config: + path: "/etc/motd.last" + user_files: + config: + path: "$HOME/.motd.last" diff --git a/data/motd/operatingsystem/Solaris.yaml b/data/motd/operatingsystem/Solaris.yaml index 9b3a7469..58973eeb 100644 --- a/data/motd/operatingsystem/Solaris.yaml +++ b/data/motd/operatingsystem/Solaris.yaml @@ -1,3 +1,5 @@ --- motd::settings: config_file_group: 'sys' + +# No data to convert to Version 4 format diff --git a/data/msmtp/default.yaml b/data/msmtp/default.yaml index cc7740e7..8c1e47cf 100644 --- a/data/msmtp/default.yaml +++ b/data/msmtp/default.yaml @@ -4,3 +4,18 @@ msmtp::settings: config_file_path: '/etc/msmtprc' process_user: 'msmtp' process_group: 'msmtp' + +# Version 4 format + packages: + main: + name: msmtp + services: + ! '': + process_user: msmtp + process_group: msmtp + files: + config: + path: "/etc/msmtprc" + user_files: + config: + path: "$HOME/.msmtprc" diff --git a/data/msmtp/osfamily/Debian.yaml b/data/msmtp/osfamily/Debian.yaml index d17af271..9e3f0534 100644 --- a/data/msmtp/osfamily/Debian.yaml +++ b/data/msmtp/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- msmtp::settings: package_name: 'msmtp-mta' + +# Version 4 format + packages: + main: + name: msmtp-mta diff --git a/data/multipath/default.yaml b/data/multipath/default.yaml index 0b50a084..ead21b9d 100644 --- a/data/multipath/default.yaml +++ b/data/multipath/default.yaml @@ -8,3 +8,27 @@ multipath::settings: process_name: 'multipathd' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: multipath + services: + multipathd: + process_name: multipathd + process_user: root + process_group: root + files: + config: + path: "/etc/multipath/multipath.conf" + pid: + path: "/var/run/multipathd.pid" + user_files: + config: + path: "$HOME/.multipath/multipath.conf" + dirs: + config: + path: "/etc/multipath" + user_dirs: + config: + path: "$HOME/.multipath" diff --git a/data/multipath/osfamily/Debian.yaml b/data/multipath/osfamily/Debian.yaml index 44b3e965..bd49f772 100644 --- a/data/multipath/osfamily/Debian.yaml +++ b/data/multipath/osfamily/Debian.yaml @@ -4,3 +4,18 @@ multipath::settings: service_name: 'multipath-tools' config_file_path: '/etc/multipath.conf' init_file_path: '/etc/default/multipath-tools' + +# Version 4 format + packages: + main: + name: multipath-tools + services: + multipath-tools: {} + files: + config: + path: "/etc/multipath.conf" + init: + path: "/etc/default/multipath-tools" + user_files: + config: + path: "$HOME/.multipath.conf" diff --git a/data/multipath/osfamily/RedHat.yaml b/data/multipath/osfamily/RedHat.yaml index c95f374a..0382ada3 100644 --- a/data/multipath/osfamily/RedHat.yaml +++ b/data/multipath/osfamily/RedHat.yaml @@ -4,3 +4,18 @@ multipath::settings: service_name: 'multipathd' init_file_path: '/etc/sysconfig/multipath' config_file_path: '/etc/multipath.conf' + +# Version 4 format + packages: + main: + name: device-mapper-multipath + services: + multipathd: {} + files: + config: + path: "/etc/multipath.conf" + init: + path: "/etc/sysconfig/multipath" + user_files: + config: + path: "$HOME/.multipath.conf" diff --git a/data/multipath/osfamily/Suse.yaml b/data/multipath/osfamily/Suse.yaml index be2026c9..bb0ad969 100644 --- a/data/multipath/osfamily/Suse.yaml +++ b/data/multipath/osfamily/Suse.yaml @@ -1,4 +1,10 @@ --- multipath::settings: package_name: 'multipath-tools' - service_name: 'multipath-tools' \ No newline at end of file + service_name: 'multipath-tools' +# Version 4 format + packages: + main: + name: multipath-tools + services: + multipath-tools: {} diff --git a/data/multitail/default.yaml b/data/multitail/default.yaml index 02d09fb0..467ed334 100644 --- a/data/multitail/default.yaml +++ b/data/multitail/default.yaml @@ -1,3 +1,8 @@ --- multitail::settings: package_name: 'multitail' + +# Version 4 format + packages: + main: + name: multitail diff --git a/data/munin-node/default.yaml b/data/munin-node/default.yaml index 7252286f..b3e42a0b 100644 --- a/data/munin-node/default.yaml +++ b/data/munin-node/default.yaml @@ -14,3 +14,37 @@ munin-node::settings: process_user: 'munin' process_group: 'munin' tcp_port: '4949' + +# Version 4 format + packages: + main: + name: munin-node + services: + munin-node: + process_name: munin-node + process_user: munin + process_group: munin + files: + config: + path: "/etc/munin/munin-node.conf" + log: + path: "/var/log/munin/munin.log" + pid: + path: "/var/run/munin/munin-node.pid" + user_files: + config: + path: "$HOME/.munin/munin-node.conf" + dirs: + config: + path: "/etc/munin" + conf: + path: "/etc/munin/munin-conf.d" + log: + path: "/var/log/munin" + user_dirs: + config: + path: "$HOME/.munin" + ports: + main: + port: '4949' + protocol: tcp diff --git a/data/munin-node/osfamily/Debian.yaml b/data/munin-node/osfamily/Debian.yaml index 1550b638..976d8b49 100644 --- a/data/munin-node/osfamily/Debian.yaml +++ b/data/munin-node/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- munin-node::settings: init_file_path: '/etc/default/munin' + +# Version 4 format + files: + init: + path: "/etc/default/munin" diff --git a/data/munin-node/osfamily/OpenBSD.yaml b/data/munin-node/osfamily/OpenBSD.yaml index ae82b8c8..9360806a 100644 --- a/data/munin-node/osfamily/OpenBSD.yaml +++ b/data/munin-node/osfamily/OpenBSD.yaml @@ -1,3 +1,8 @@ --- munin-node::settings: log_file_path: '/var/log/munin/munin-node.log' + +# Version 4 format + files: + log: + path: "/var/log/munin/munin-node.log" diff --git a/data/munin-node/osfamily/RedHat.yaml b/data/munin-node/osfamily/RedHat.yaml index 2517d463..07682531 100644 --- a/data/munin-node/osfamily/RedHat.yaml +++ b/data/munin-node/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ munin-node::settings: log_file_path: '/var/log/munin-node/munin-node.log' init_file_path: '/etc/sysconfig/munin' + +# Version 4 format + files: + log: + path: "/var/log/munin-node/munin-node.log" + init: + path: "/etc/sysconfig/munin" diff --git a/data/munin/default.yaml b/data/munin/default.yaml index 933eb87d..017868fe 100644 --- a/data/munin/default.yaml +++ b/data/munin/default.yaml @@ -6,3 +6,26 @@ munin::settings: conf_dir_path: '/etc/munin/munin.d' log_file_path: '/var/log/munin/munin.log' log_dir_path: '/var/log/munin' + +# Version 4 format + packages: + main: + name: munin + files: + config: + path: "/etc/munin/munin.conf" + log: + path: "/var/log/munin/munin.log" + user_files: + config: + path: "$HOME/.munin/munin.conf" + dirs: + config: + path: "/etc/munin" + conf: + path: "/etc/munin/munin.d" + log: + path: "/var/log/munin" + user_dirs: + config: + path: "$HOME/.munin" diff --git a/data/munin/osfamily/Debian.yaml b/data/munin/osfamily/Debian.yaml index 96537fd9..a0adf276 100644 --- a/data/munin/osfamily/Debian.yaml +++ b/data/munin/osfamily/Debian.yaml @@ -1,3 +1,5 @@ --- munin::settings: www_dir_path: '/var/cache/munin/www' + +# No data to convert to Version 4 format diff --git a/data/munin/osfamily/RedHat.yaml b/data/munin/osfamily/RedHat.yaml index 997cce49..0049488f 100644 --- a/data/munin/osfamily/RedHat.yaml +++ b/data/munin/osfamily/RedHat.yaml @@ -1,3 +1,5 @@ --- munin::settings: www_dir_path: '/var/www/html/munin' + +# No data to convert to Version 4 format diff --git a/data/mysql/default.yaml b/data/mysql/default.yaml index 2f90cb4a..bde2ca57 100644 --- a/data/mysql/default.yaml +++ b/data/mysql/default.yaml @@ -12,3 +12,37 @@ mysql::settings: process_user: 'mysql' process_group: 'mysql' tcp_port: '3306' + +# Version 4 format + packages: + main: + name: mysql-server + services: + mysql: + process_name: mysqld + process_user: mysql + process_group: mysql + files: + config: + path: "/etc/mysql/my.cnf" + log: + path: "/var/log/mysql.log" + pid: + path: "/var/run/mysqld/mysqld.pid" + user_files: + config: + path: "$HOME/.mysql/my.cnf" + dirs: + config: + path: "/etc/mysql" + log: + path: "/var/log/mysql" + data: + path: "/var/lib/mysql" + user_dirs: + config: + path: "$HOME/.mysql" + ports: + main: + port: '3306' + protocol: tcp diff --git a/data/mysql/osfamily/Debian.yaml b/data/mysql/osfamily/Debian.yaml index e9bfa309..8fe7c3f1 100644 --- a/data/mysql/osfamily/Debian.yaml +++ b/data/mysql/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- mysql::settings: init_file_path: '/etc/default/mysql' + +# Version 4 format + files: + init: + path: "/etc/default/mysql" diff --git a/data/mysql/osfamily/FreeBSD.yaml b/data/mysql/osfamily/FreeBSD.yaml index da32ca8e..b63e79b3 100644 --- a/data/mysql/osfamily/FreeBSD.yaml +++ b/data/mysql/osfamily/FreeBSD.yaml @@ -4,3 +4,16 @@ mysql::settings: service_name: 'mysql-server' config_file_path: '/etc/my.cnf' + +# Version 4 format + packages: + main: + name: databases/mysql56-server + services: + mysql-server: {} + files: + config: + path: "/etc/my.cnf" + user_files: + config: + path: "$HOME/.my.cnf" diff --git a/data/mysql/osfamily/RedHat.yaml b/data/mysql/osfamily/RedHat.yaml index 704c4455..461b320e 100644 --- a/data/mysql/osfamily/RedHat.yaml +++ b/data/mysql/osfamily/RedHat.yaml @@ -3,3 +3,15 @@ mysql::settings: service_name: 'mysqld' config_file_path: '/etc/my.cnf' init_file_path: '/etc/sysconfig/mysqld' + +# Version 4 format + services: + mysqld: {} + files: + config: + path: "/etc/my.cnf" + init: + path: "/etc/sysconfig/mysqld" + user_files: + config: + path: "$HOME/.my.cnf" diff --git a/data/mysql/repo/mysql57-community-RedHat6.yaml b/data/mysql/repo/mysql57-community-RedHat6.yaml index dd1ff298..3a203334 100644 --- a/data/mysql/repo/mysql57-community-RedHat6.yaml +++ b/data/mysql/repo/mysql57-community-RedHat6.yaml @@ -2,3 +2,9 @@ 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' + +# Version 4 format + repo: + upstream: + package_name: mysql57-community-release-el6-1 + package_url: https://dev.mysql.com/get/mysql57-community-release-el6-1.noarch.rpm diff --git a/data/mysql/repo/mysql57-community-RedHat7.yaml b/data/mysql/repo/mysql57-community-RedHat7.yaml index 0ee3e43d..6f4ffa30 100644 --- a/data/mysql/repo/mysql57-community-RedHat7.yaml +++ b/data/mysql/repo/mysql57-community-RedHat7.yaml @@ -2,3 +2,9 @@ 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' + +# Version 4 format + repo: + upstream: + package_name: mysql57-community-release-el7-1 + package_url: https://dev.mysql.com/get/mysql57-community-release-el7-1.noarch.rpm diff --git a/data/mysql/repo/mysql80-community-Debian.yaml b/data/mysql/repo/mysql80-community-Debian.yaml index ca5050fc..7eb296cc 100644 --- a/data/mysql/repo/mysql80-community-Debian.yaml +++ b/data/mysql/repo/mysql80-community-Debian.yaml @@ -3,3 +3,12 @@ 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' + +# Version 4 format + packages: + main: + name: mysql-community-server + repo: + upstream: + package_name: mysqlapt-config_0.8 + package_url: https://dev.mysql.com/get/mysql-apt-config_0.8.10-1_all.deb diff --git a/data/mysql/repo/mysql80-community-RedHat.yaml b/data/mysql/repo/mysql80-community-RedHat.yaml index fa66e6ea..947273e9 100644 --- a/data/mysql/repo/mysql80-community-RedHat.yaml +++ b/data/mysql/repo/mysql80-community-RedHat.yaml @@ -1,3 +1,8 @@ --- mysql::settings: package_name: 'mysql-community-server' + +# Version 4 format + packages: + main: + name: mysql-community-server diff --git a/data/mysql/repo/mysql80-community-RedHat6.yaml b/data/mysql/repo/mysql80-community-RedHat6.yaml index b4499e16..f604ac59 100644 --- a/data/mysql/repo/mysql80-community-RedHat6.yaml +++ b/data/mysql/repo/mysql80-community-RedHat6.yaml @@ -3,3 +3,12 @@ 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' + +# Version 4 format + packages: + main: + name: mysql-community-server + repo: + upstream: + package_name: mysql80-community-release-el6-1 + package_url: https://dev.mysql.com/get/mysql80-community-release-el6-1.noarch.rpm diff --git a/data/mysql/repo/mysql80-community-RedHat7.yaml b/data/mysql/repo/mysql80-community-RedHat7.yaml index 23dc13e5..898e18c5 100644 --- a/data/mysql/repo/mysql80-community-RedHat7.yaml +++ b/data/mysql/repo/mysql80-community-RedHat7.yaml @@ -3,3 +3,12 @@ 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' + +# Version 4 format + packages: + main: + name: mysql-community-server + repo: + upstream: + package_name: mysql80-community-release-el7-1 + package_url: https://dev.mysql.com/get/mysql80-community-release-el7-1.noarch.rpm diff --git a/data/nagios-plugins/default.yaml b/data/nagios-plugins/default.yaml index 241fca28..8f2e4868 100644 --- a/data/nagios-plugins/default.yaml +++ b/data/nagios-plugins/default.yaml @@ -1,3 +1,8 @@ --- nagios-plugins::settings: package_name: 'nagios-plugins' + +# Version 4 format + packages: + main: + name: nagios-plugins diff --git a/data/nagios-plugins/osfamily/Debian.yaml b/data/nagios-plugins/osfamily/Debian.yaml index 0055b53a..8d283fc4 100644 --- a/data/nagios-plugins/osfamily/Debian.yaml +++ b/data/nagios-plugins/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- nagios-plugins::settings: package_name: 'monitoring-plugins' + +# Version 4 format + packages: + main: + name: monitoring-plugins diff --git a/data/nagios-plugins/osfamily/RedHat.yaml b/data/nagios-plugins/osfamily/RedHat.yaml index 1ac1482c..eaf0e308 100644 --- a/data/nagios-plugins/osfamily/RedHat.yaml +++ b/data/nagios-plugins/osfamily/RedHat.yaml @@ -3,3 +3,11 @@ nagios-plugins::settings: package_name: 'nagios-plugins-all' tp_prerequisites: - epel + +# Version 4 format + packages: + main: + name: nagios-plugins-all + preinstall: + tp::install: + - epel diff --git a/data/nagios-plugins/osfamily/RedHat8.yaml b/data/nagios-plugins/osfamily/RedHat8.yaml index af100556..03701309 100644 --- a/data/nagios-plugins/osfamily/RedHat8.yaml +++ b/data/nagios-plugins/osfamily/RedHat8.yaml @@ -4,3 +4,5 @@ nagios-plugins::settings_broken: enable_powertools: command: 'dnf config-manager --set-enabled PowerTools' unless: "grep 'enabled=1' /etc/yum.repos.d/CentOS-PowerTools.repo 2>&1>/dev/null" + +# No data to convert to Version 4 format diff --git a/data/nagios-plugins/osfamily/Solaris.yaml b/data/nagios-plugins/osfamily/Solaris.yaml index 64dfe463..99eb8c6f 100644 --- a/data/nagios-plugins/osfamily/Solaris.yaml +++ b/data/nagios-plugins/osfamily/Solaris.yaml @@ -1,3 +1,8 @@ --- nagios-plugins::settings: package_name: 'nagios_plugins' + +# Version 4 format + packages: + main: + name: nagios_plugins diff --git a/data/nagios/default.yaml b/data/nagios/default.yaml index 01718491..1340495b 100644 --- a/data/nagios/default.yaml +++ b/data/nagios/default.yaml @@ -10,3 +10,31 @@ nagios::settings: process_name: 'nagios' process_user: 'nagios' process_group: 'nagios' + +# Version 4 format + packages: + main: + name: nagios + services: + nagios: + process_name: nagios + process_user: nagios + process_group: nagios + files: + config: + path: "/etc/nagios/nagios.cfg" + log: + path: "/var/log/nagios/nagios.log" + pid: + path: "/var/run/nagios.pid" + user_files: + config: + path: "$HOME/.nagios/nagios.cfg" + dirs: + config: + path: "/etc/nagios" + log: + path: "/var/log/nagios" + user_dirs: + config: + path: "$HOME/.nagios" diff --git a/data/nagios/osfamily/Debian.yaml b/data/nagios/osfamily/Debian.yaml index d8847557..e4700016 100644 --- a/data/nagios/osfamily/Debian.yaml +++ b/data/nagios/osfamily/Debian.yaml @@ -11,3 +11,33 @@ nagios::settings: process_user: 'nagios' process_group: 'nagios' init_file_path: '/etc/default/nagios3' + +# Version 4 format + packages: + main: + name: nagios3 + services: + nagios3: + process_name: nagios3 + process_user: nagios + process_group: nagios + files: + config: + path: "/etc/nagios3/nagios.cfg" + log: + path: "/var/log/nagios3/nagios.log" + init: + path: "/etc/default/nagios3" + pid: + path: "/var/run/nagios3/nagios3.pid" + user_files: + config: + path: "$HOME/.nagios3/nagios.cfg" + dirs: + config: + path: "/etc/nagios3" + log: + path: "/var/log/nagios3" + user_dirs: + config: + path: "$HOME/.nagios3" diff --git a/data/nagios/osfamily/RedHat.yaml b/data/nagios/osfamily/RedHat.yaml index 6ece78b3..5e17fa1e 100644 --- a/data/nagios/osfamily/RedHat.yaml +++ b/data/nagios/osfamily/RedHat.yaml @@ -4,3 +4,8 @@ nagios::settings: config_file_owner: 'nagios' config_file_group: 'nagios' init_file_path: '/etc/sysconfig/nagios' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/nagios" diff --git a/data/nano/default.yaml b/data/nano/default.yaml index 43e949bc..c5e17d8d 100644 --- a/data/nano/default.yaml +++ b/data/nano/default.yaml @@ -1,3 +1,8 @@ --- nano::settings: package_name: 'nano' + +# Version 4 format + packages: + main: + name: nano diff --git a/data/nats-server/default.yaml b/data/nats-server/default.yaml index 915cb852..67bd3998 100644 --- a/data/nats-server/default.yaml +++ b/data/nats-server/default.yaml @@ -78,3 +78,29 @@ nats-server::settings: EnvironmentFile: ~ manage_service: true manage_user: false + +# Version 4 format + packages: + main: + name: nats-server + services: + nats-server: + process_name: nats-server + process_user: root + process_group: root + files: + config: + path: "/etc/nats/nats-server.conf" + user_files: + config: + path: "$HOME/.nats/nats-server.conf" + dirs: + config: + path: "/etc/nats" + user_dirs: + config: + path: "$HOME/.nats" + image: + name: nats + preinstall: + tp::install: {} diff --git a/data/nats-server/osfamily/Darwin.yaml b/data/nats-server/osfamily/Darwin.yaml index 5c97cfa2..8c2e7836 100644 --- a/data/nats-server/osfamily/Darwin.yaml +++ b/data/nats-server/osfamily/Darwin.yaml @@ -1,4 +1,10 @@ --- nats-server::settings: brew_package_name: 'nats-server' - install_method: package \ No newline at end of file + install_method: package +# Version 4 format + packages: + main: + providers: + brew: + name: nats-server diff --git a/data/nats-server/osfamily/windows.yaml b/data/nats-server/osfamily/windows.yaml index 85986e78..ecf4e30c 100644 --- a/data/nats-server/osfamily/windows.yaml +++ b/data/nats-server/osfamily/windows.yaml @@ -2,4 +2,11 @@ nats-server::settings: choco_package_name: 'nats-server' package_name: 'nats-server' - install_method: package \ No newline at end of file + install_method: package +# Version 4 format + packages: + main: + name: nats-server + providers: + choco: + name: nats-server diff --git a/data/newrelic/default.yaml b/data/newrelic/default.yaml index bd26659b..46bc5d05 100644 --- a/data/newrelic/default.yaml +++ b/data/newrelic/default.yaml @@ -10,3 +10,31 @@ newrelic::settings: process_name: 'nrsysmond' process_user: 'newrelic' process_group: 'newrelic' + +# Version 4 format + packages: + main: + name: newrelic-sysmond + services: + newrelic-sysmond: + process_name: nrsysmond + process_user: newrelic + process_group: newrelic + files: + config: + path: "/etc/newrelic/nrsysmond.cfg" + log: + path: "/var/log/newrelic/nrsysmond.log" + pid: + path: "/var/run/nrsysmond.pid" + user_files: + config: + path: "$HOME/.newrelic/nrsysmond.cfg" + dirs: + config: + path: "/etc/newrelic" + log: + path: "/var/log/newrelic" + user_dirs: + config: + path: "$HOME/.newrelic" diff --git a/data/newrelic/osfamily/Debian.yaml b/data/newrelic/osfamily/Debian.yaml index 6474e6f7..be4aa2fe 100644 --- a/data/newrelic/osfamily/Debian.yaml +++ b/data/newrelic/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- newrelic::settings: init_file_path: '/etc/default/newrelic-nrsysmond' + +# Version 4 format + files: + init: + path: "/etc/default/newrelic-nrsysmond" diff --git a/data/newrelic/osfamily/RedHat.yaml b/data/newrelic/osfamily/RedHat.yaml index 30cf0b53..bde12f0b 100644 --- a/data/newrelic/osfamily/RedHat.yaml +++ b/data/newrelic/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- newrelic::settings: init_file_path: '/etc/sysconfig/newrelic-sysmond' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/newrelic-sysmond" diff --git a/data/nfs-client/default.yaml b/data/nfs-client/default.yaml index cd690cb8..502109ae 100644 --- a/data/nfs-client/default.yaml +++ b/data/nfs-client/default.yaml @@ -1,3 +1,7 @@ --- nfs-client::settings: service_name: 'rpcbind' + +# Version 4 format + services: + rpcbind: {} diff --git a/data/nfs-client/osfamily/Debian.yaml b/data/nfs-client/osfamily/Debian.yaml index b6da9d4a..bac1c22d 100644 --- a/data/nfs-client/osfamily/Debian.yaml +++ b/data/nfs-client/osfamily/Debian.yaml @@ -2,3 +2,11 @@ nfs-client::settings: package_name: 'nfs-common' init_file_path: '/etc/default/nfs-common' + +# Version 4 format + packages: + main: + name: nfs-common + files: + init: + path: "/etc/default/nfs-common" diff --git a/data/nfs-client/osfamily/RedHat.yaml b/data/nfs-client/osfamily/RedHat.yaml index 2619d144..be2ba82c 100644 --- a/data/nfs-client/osfamily/RedHat.yaml +++ b/data/nfs-client/osfamily/RedHat.yaml @@ -2,3 +2,11 @@ nfs-client::settings: package_name: 'nfs-utils' init_file_path: '/etc/sysconfig/nfs-common' + +# Version 4 format + packages: + main: + name: nfs-utils + files: + init: + path: "/etc/sysconfig/nfs-common" diff --git a/data/nfs-client/osfamily/Suse.yaml b/data/nfs-client/osfamily/Suse.yaml index 21372140..b1db64c4 100644 --- a/data/nfs-client/osfamily/Suse.yaml +++ b/data/nfs-client/osfamily/Suse.yaml @@ -2,3 +2,11 @@ nfs-client::settings: package_name: 'nfs-client' init_file_path: '/etc/sysconfig/nfs-client' + +# Version 4 format + packages: + main: + name: nfs-client + files: + init: + path: "/etc/sysconfig/nfs-client" diff --git a/data/nfs-server/default.yaml b/data/nfs-server/default.yaml index 0a36be0a..304230c3 100644 --- a/data/nfs-server/default.yaml +++ b/data/nfs-server/default.yaml @@ -2,3 +2,15 @@ nfs-server::settings: config_file_path: '/etc/exports' tcp_port: '2049' + +# Version 4 format + files: + config: + path: "/etc/exports" + user_files: + config: + path: "$HOME/.exports" + ports: + main: + port: '2049' + protocol: tcp diff --git a/data/nfs-server/osfamily/Debian.yaml b/data/nfs-server/osfamily/Debian.yaml index a4683ab8..3dbf7a62 100644 --- a/data/nfs-server/osfamily/Debian.yaml +++ b/data/nfs-server/osfamily/Debian.yaml @@ -2,3 +2,10 @@ nfs-server::settings: package_name: 'nfs-kernel-server' service_name: 'nfs-kernel-server' + +# Version 4 format + packages: + main: + name: nfs-kernel-server + services: + nfs-kernel-server: {} diff --git a/data/nfs-server/osfamily/RedHat.yaml b/data/nfs-server/osfamily/RedHat.yaml index b5744e8d..edf3ee3f 100644 --- a/data/nfs-server/osfamily/RedHat.yaml +++ b/data/nfs-server/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ nfs-server::settings: service_name: 'nfs-server' init_file_path: '/etc/sysconfig/nfs' + +# Version 4 format + services: + nfs-server: {} + files: + init: + path: "/etc/sysconfig/nfs" diff --git a/data/nfs-server/osfamily/RedHat6.yaml b/data/nfs-server/osfamily/RedHat6.yaml index 4a27ed3a..eb751d20 100644 --- a/data/nfs-server/osfamily/RedHat6.yaml +++ b/data/nfs-server/osfamily/RedHat6.yaml @@ -1,3 +1,7 @@ --- nfs-server::settings: service_name: 'nfs' + +# Version 4 format + services: + nfs: {} diff --git a/data/nfs-server/osfamily/Suse.yaml b/data/nfs-server/osfamily/Suse.yaml index a4683ab8..3dbf7a62 100644 --- a/data/nfs-server/osfamily/Suse.yaml +++ b/data/nfs-server/osfamily/Suse.yaml @@ -2,3 +2,10 @@ nfs-server::settings: package_name: 'nfs-kernel-server' service_name: 'nfs-kernel-server' + +# Version 4 format + packages: + main: + name: nfs-kernel-server + services: + nfs-kernel-server: {} diff --git a/data/nfs/default.yaml b/data/nfs/default.yaml index 1228bd18..3e8a92d4 100644 --- a/data/nfs/default.yaml +++ b/data/nfs/default.yaml @@ -7,3 +7,22 @@ nfs::settings: process_user: 'root' process_group: 'root' tcp_port: '2049' + +# Version 4 format + services: + nfs: + process_name: nfs + process_user: root + process_group: root + files: + config: + path: "/etc/exports" + pid: + path: "/var/run/nfs.pid" + user_files: + config: + path: "$HOME/.exports" + ports: + main: + port: '2049' + protocol: tcp diff --git a/data/nfs/osfamily/Debian.yaml b/data/nfs/osfamily/Debian.yaml index 208de89d..26960d78 100644 --- a/data/nfs/osfamily/Debian.yaml +++ b/data/nfs/osfamily/Debian.yaml @@ -3,3 +3,13 @@ nfs::settings: package_name: 'nfs-kernel-server' service_name: 'nfs-kernel-server' init_file_path: '/etc/default/nfs' + +# Version 4 format + packages: + main: + name: nfs-kernel-server + services: + nfs-kernel-server: {} + files: + init: + path: "/etc/default/nfs" diff --git a/data/nfs/osfamily/RedHat.yaml b/data/nfs/osfamily/RedHat.yaml index ff56ee22..0bf051ed 100644 --- a/data/nfs/osfamily/RedHat.yaml +++ b/data/nfs/osfamily/RedHat.yaml @@ -3,3 +3,14 @@ nfs::settings: package_name: 'nfs-utils' process_name: 'nfsd' init_file_path: '/etc/sysconfig/nfs' + +# Version 4 format + packages: + main: + name: nfs-utils + services: + ! '': + process_name: nfsd + files: + init: + path: "/etc/sysconfig/nfs" diff --git a/data/nginx/default.yaml b/data/nginx/default.yaml index 19a626e5..fc05a372 100644 --- a/data/nginx/default.yaml +++ b/data/nginx/default.yaml @@ -20,3 +20,44 @@ nginx::settings: validate_cmd: config: 'nginx -t -c %' version_command: 'nginx -v' + +# Version 4 format + packages: + main: + name: nginx + services: + nginx: + process_name: nginx + process_user: nginx + process_group: nginx + nodaemon_args: "-g 'daemon off;'" + files: + config: + path: "/etc/nginx/nginx.conf" + log: + path: + - "/var/log/nginx/access.log" + - "/var/log/nginx/error.log" + init: + path: "/etc/sysconfig/nginx" + pid: + path: "/var/run/nginx.pid" + user_files: + config: + path: "$HOME/.nginx/nginx.conf" + dirs: + config: + path: "/etc/nginx" + conf: + path: "/etc/nginx/conf.d" + log: + path: "/var/log/nginx" + data: + path: "/usr/share/nginx/html" + user_dirs: + config: + path: "$HOME/.nginx" + ports: + main: + port: '80' + protocol: tcp diff --git a/data/nginx/osfamily/Debian.yaml b/data/nginx/osfamily/Debian.yaml index 4413ce07..4fe89341 100644 --- a/data/nginx/osfamily/Debian.yaml +++ b/data/nginx/osfamily/Debian.yaml @@ -7,3 +7,12 @@ nginx::settings: mods-enabled_dir_path: '/etc/nginx/modules-enabled' sites-available_dir_path: '/etc/nginx/sites-available' sites-enabled_dir_path: '/etc/nginx/sites-enabled' + +# Version 4 format + services: + ! '': + process_user: www-data + process_group: www-data + files: + init: + path: "/etc/default/nginx" diff --git a/data/nix/default.yaml b/data/nix/default.yaml index 44bd213d..e9b85f25 100644 --- a/data/nix/default.yaml +++ b/data/nix/default.yaml @@ -88,4 +88,15 @@ nix::settings: install_nix: command: 'curl -L https://nixos.org/nix/install --daemon | bash' creates: '/nix' - provider: shell \ No newline at end of file + provider: shell +# Version 4 format + preinstall: + tp::install: {} + exec: + install: + command: wget -O /tmp/nix_install https://nixos.org/nix/install ; sh /tmp/nix_install + --daemon --yes + creates: "/nix" + provider: posix + environment: + - HOME=/root diff --git a/data/nodejs/default.yaml b/data/nodejs/default.yaml index 55594295..5aba3a8b 100644 --- a/data/nodejs/default.yaml +++ b/data/nodejs/default.yaml @@ -1,3 +1,8 @@ --- nodejs::settings: package_name: 'nodejs' + +# Version 4 format + packages: + main: + name: nodejs diff --git a/data/nodejs/upstream/default.yaml b/data/nodejs/upstream/default.yaml index 55594295..5aba3a8b 100644 --- a/data/nodejs/upstream/default.yaml +++ b/data/nodejs/upstream/default.yaml @@ -1,3 +1,8 @@ --- nodejs::settings: package_name: 'nodejs' + +# Version 4 format + packages: + main: + name: nodejs diff --git a/data/nodejs/upstream/osfamily/Debian.yaml b/data/nodejs/upstream/osfamily/Debian.yaml index 1009a859..5f2fb1cc 100644 --- a/data/nodejs/upstream/osfamily/Debian.yaml +++ b/data/nodejs/upstream/osfamily/Debian.yaml @@ -6,3 +6,12 @@ nodejs::settings: unless: 'dpkg -qa | grep nodesource-release' package_prerequisites: - build-essential + +# Version 4 format + preinstall: + exec: + repo_setup: + command: curl -L https://deb.nodesource.com/setup_lts.x | bash + unless: dpkg -qa | grep nodesource-release + package: + - build-essential diff --git a/data/nodejs/upstream/osfamily/RedHat.yaml b/data/nodejs/upstream/osfamily/RedHat.yaml index 3246460b..fdfdd5a8 100644 --- a/data/nodejs/upstream/osfamily/RedHat.yaml +++ b/data/nodejs/upstream/osfamily/RedHat.yaml @@ -9,3 +9,15 @@ nodejs::settings: - make tp_prerequisites: - epel + +# Version 4 format + preinstall: + tp::install: + - epel + exec: + repo_setup: + command: curl -L https://rpm.nodesource.com/setup_lts.x | bash + unless: rpm -qa | grep nodesource-release + package: + - gcc-c++ + - make diff --git a/data/nomad-enterprise/default.yaml b/data/nomad-enterprise/default.yaml index ba10b22c..0df29d72 100644 --- a/data/nomad-enterprise/default.yaml +++ b/data/nomad-enterprise/default.yaml @@ -12,3 +12,34 @@ nomad-enterprise::settings: - 4646 - 4647 - 4648 + +# Version 4 format + packages: + main: + name: nomad-enterprise + services: + nomad: + process_name: nomad + files: + config: + path: "/etc/nomad.d/nomad.hcl" + format: hcl + user_files: + config: + path: "$HOME/.nomad.d/nomad.hcl" + dirs: + config: + path: "/etc/nomad.d" + data: + path: "/opt/nomad" + user_dirs: + config: + path: "$HOME/.nomad.d" + ports: + main: + port: + - 4646 + - 4647 + - 4648 + protocol: tcp + repo: upstream diff --git a/data/nomad-enterprise/upstream/default.yaml b/data/nomad-enterprise/upstream/default.yaml index 49fdb76a..cbbfaf80 100644 --- a/data/nomad-enterprise/upstream/default.yaml +++ b/data/nomad-enterprise/upstream/default.yaml @@ -2,3 +2,8 @@ nomad-enterprise::settings: tp_prerequisites: hashicorp_repo: {} + +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/nomad/default.yaml b/data/nomad/default.yaml index e2a09225..e9331299 100644 --- a/data/nomad/default.yaml +++ b/data/nomad/default.yaml @@ -12,3 +12,34 @@ nomad::settings: - 4646 - 4647 - 4648 + +# Version 4 format + packages: + main: + name: nomad + services: + nomad: + process_name: nomad + files: + config: + path: "/etc/nomad.d/nomad.hcl" + format: hcl + user_files: + config: + path: "$HOME/.nomad.d/nomad.hcl" + dirs: + config: + path: "/etc/nomad.d" + data: + path: "/opt/nomad" + user_dirs: + config: + path: "$HOME/.nomad.d" + ports: + main: + port: + - 4646 + - 4647 + - 4648 + protocol: tcp + repo: upstream diff --git a/data/nomad/upstream/default.yaml b/data/nomad/upstream/default.yaml index d9032685..a7856a04 100644 --- a/data/nomad/upstream/default.yaml +++ b/data/nomad/upstream/default.yaml @@ -1,4 +1,8 @@ --- nomad::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/notebook/default.yaml b/data/notebook/default.yaml index 5da73fca..953aeec3 100644 --- a/data/notebook/default.yaml +++ b/data/notebook/default.yaml @@ -5,3 +5,9 @@ notebook::settings: # No data to convert to Version 4 format + +# Version 4 format + packages: + main: + name: notebook + provider: pip diff --git a/data/nova/default.yaml b/data/nova/default.yaml index cdca1352..f2ba6c65 100644 --- a/data/nova/default.yaml +++ b/data/nova/default.yaml @@ -7,3 +7,26 @@ nova::settings: process_name: 'nova' process_user: 'nova' process_group: 'nova' + +# Version 4 format + services: + ! '': + process_name: nova + process_user: nova + process_group: nova + files: + config: + path: "/etc/nova/nova.conf" + log: + path: "/var/log/nova/nova.log" + user_files: + config: + path: "$HOME/.nova/nova.conf" + dirs: + config: + path: "/etc/nova" + log: + path: "/var/log/nova" + user_dirs: + config: + path: "$HOME/.nova" diff --git a/data/nova/osfamily/Debian.yaml b/data/nova/osfamily/Debian.yaml index 6eacf387..8326da4d 100644 --- a/data/nova/osfamily/Debian.yaml +++ b/data/nova/osfamily/Debian.yaml @@ -4,3 +4,13 @@ nova::settings: - 'python-nova' - 'nova-common' init_file_path: '/etc/default/nova' + +# Version 4 format + packages: + main: + name: + - python-nova + - nova-common + files: + init: + path: "/etc/default/nova" diff --git a/data/nova/osfamily/RedHat.yaml b/data/nova/osfamily/RedHat.yaml index 2e57c575..ccb38cef 100644 --- a/data/nova/osfamily/RedHat.yaml +++ b/data/nova/osfamily/RedHat.yaml @@ -4,3 +4,13 @@ nova::settings: - 'python-nova' - 'openstack-nova-common' init_file_path: '/etc/sysconfig/nova' + +# Version 4 format + packages: + main: + name: + - python-nova + - openstack-nova-common + files: + init: + path: "/etc/sysconfig/nova" diff --git a/data/nrpe/default.yaml b/data/nrpe/default.yaml index 5a0ee888..3e0b66ef 100644 --- a/data/nrpe/default.yaml +++ b/data/nrpe/default.yaml @@ -10,3 +10,33 @@ nrpe::settings: process_user: 'nrpe' process_group: 'nrpe' tcp_port: '5666' + +# Version 4 format + packages: + main: + name: nrpe + services: + nrpe: + process_name: nrpe + process_user: nrpe + process_group: nrpe + files: + config: + path: "/etc/nagios/nrpe.cfg" + pid: + path: "/var/run/nrpe.pid" + user_files: + config: + path: "$HOME/.nagios/nrpe.cfg" + dirs: + config: + path: "/etc/nrpe.d" + conf: + path: "/etc/nrpe.d" + user_dirs: + config: + path: "$HOME/.nrpe.d" + ports: + main: + port: '5666' + protocol: tcp diff --git a/data/nrpe/osfamily/Debian.yaml b/data/nrpe/osfamily/Debian.yaml index ba612ece..64972036 100644 --- a/data/nrpe/osfamily/Debian.yaml +++ b/data/nrpe/osfamily/Debian.yaml @@ -7,3 +7,24 @@ nrpe::settings: process_user: 'nagios' pid_file_path: '/var/run/nagios/nrpe.pid' init_file_path: '/etc/default/nagios-nrpe-server' + +# Version 4 format + packages: + main: + name: nagios-nrpe-server + services: + nagios-nrpe-server: + process_user: nagios + files: + init: + path: "/etc/default/nagios-nrpe-server" + pid: + path: "/var/run/nagios/nrpe.pid" + dirs: + config: + path: "/etc/nagios/nrpe.d" + conf: + path: "/etc/nagios/nrpe.d" + user_dirs: + config: + path: "$HOME/.nagios/nrpe.d" diff --git a/data/nrpe/osfamily/OpenBSD.yaml b/data/nrpe/osfamily/OpenBSD.yaml index b61ed3d0..eef82e92 100644 --- a/data/nrpe/osfamily/OpenBSD.yaml +++ b/data/nrpe/osfamily/OpenBSD.yaml @@ -3,3 +3,11 @@ nrpe::settings: process_user: '_nrpe' pid_file_path: '/var/run/nrpe/nrpe.pid' service_name: 'nagios-nrpe-server' + +# Version 4 format + services: + nagios-nrpe-server: + process_user: _nrpe + files: + pid: + path: "/var/run/nrpe/nrpe.pid" diff --git a/data/nrpe/osfamily/RedHat.yaml b/data/nrpe/osfamily/RedHat.yaml index 11fdd90f..2b283227 100644 --- a/data/nrpe/osfamily/RedHat.yaml +++ b/data/nrpe/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ nrpe::settings: pid_file_path: '/var/run/nrpe/nrpe.pid' init_file_path: '/etc/sysconfig/nrpe' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/nrpe" + pid: + path: "/var/run/nrpe/nrpe.pid" diff --git a/data/nrpe/osfamily/Solaris.yaml b/data/nrpe/osfamily/Solaris.yaml index 92118dcb..4fcbd727 100644 --- a/data/nrpe/osfamily/Solaris.yaml +++ b/data/nrpe/osfamily/Solaris.yaml @@ -7,3 +7,26 @@ nrpe::settings: conf_dir_path: '/etc/opt/csw/nrpe.d' init_file_path: '/etc/opt/csw/nrpe-init' pid_file_path: '/var/run/nrpe.pid' + +# Version 4 format + services: + cswnrpe: + process_user: nagios + files: + config: + path: "/etc/opt/csw/nrpe.cfg" + init: + path: "/etc/opt/csw/nrpe-init" + pid: + path: "/var/run/nrpe.pid" + user_files: + config: + path: "$HOME/.opt/csw/nrpe.cfg" + dirs: + config: + path: "/etc/opt/csw/nrpe.d" + conf: + path: "/etc/opt/csw/nrpe.d" + user_dirs: + config: + path: "$HOME/.opt/csw/nrpe.d" diff --git a/data/ntp/default.yaml b/data/ntp/default.yaml index a49dc334..9389f586 100644 --- a/data/ntp/default.yaml +++ b/data/ntp/default.yaml @@ -10,3 +10,33 @@ ntp::settings: process_user: 'ntp' process_group: 'ntp' udp_port: '123' + +# Version 4 format + packages: + main: + name: ntp + services: + ntp: + process_name: ntpd + process_user: ntp + process_group: ntp + files: + config: + path: "/etc/ntp.conf" + pid: + path: "/var/run/ntpd.pid" + user_files: + config: + path: "$HOME/.ntp.conf" + dirs: + config: + path: "/etc/ntp" + conf: + path: "/etc/ntp/conf.d" + user_dirs: + config: + path: "$HOME/.ntp" + ports: + main_udp: + port: '123' + protocol: udp diff --git a/data/ntp/osfamily/Debian.yaml b/data/ntp/osfamily/Debian.yaml index a63a831e..5a68a5c1 100644 --- a/data/ntp/osfamily/Debian.yaml +++ b/data/ntp/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- ntp::settings: init_file_path: '/etc/default/ntp' + +# Version 4 format + files: + init: + path: "/etc/default/ntp" diff --git a/data/ntp/osfamily/RedHat.yaml b/data/ntp/osfamily/RedHat.yaml index ce8ecaa1..ca28da4a 100644 --- a/data/ntp/osfamily/RedHat.yaml +++ b/data/ntp/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ ntp::settings: service_name: 'ntpd' init_file_path: '/etc/sysconfig/ntpd' + +# Version 4 format + services: + ntpd: {} + files: + init: + path: "/etc/sysconfig/ntpd" diff --git a/data/ntp/osfamily/Suse.yaml b/data/ntp/osfamily/Suse.yaml index 90d58b4a..779cd728 100644 --- a/data/ntp/osfamily/Suse.yaml +++ b/data/ntp/osfamily/Suse.yaml @@ -2,3 +2,5 @@ ntp::settings: config_file_mode: '0640' config_file_group: 'ntp' + +# No data to convert to Version 4 format diff --git a/data/ntpdate/default.yaml b/data/ntpdate/default.yaml index ca66ecaa..42a11b30 100644 --- a/data/ntpdate/default.yaml +++ b/data/ntpdate/default.yaml @@ -1,3 +1,8 @@ --- ntpdate::settings: package_name: 'ntpdate' + +# Version 4 format + packages: + main: + name: ntpdate diff --git a/data/ntpdate/osfamily/RedHat8.yaml b/data/ntpdate/osfamily/RedHat8.yaml index de722d50..0c5cafbc 100644 --- a/data/ntpdate/osfamily/RedHat8.yaml +++ b/data/ntpdate/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- ntpdate::settings: package_name: '' + +# Version 4 format + packages: + main: + name: '' diff --git a/data/nuclei/default.yaml b/data/nuclei/default.yaml index 33211ce0..93628221 100644 --- a/data/nuclei/default.yaml +++ b/data/nuclei/default.yaml @@ -95,3 +95,25 @@ nuclei::settings: manage_service: false manage_user: false + +# Version 4 format + packages: + main: + name: nuclei + files: + config: + path: "$HOME/.config/nuclei/config.yaml" + format: yaml + user_files: + config: + path: "$HOME/.config/nuclei/config.yaml" + dirs: + config: + path: "$HOME/.config/nuclei" + user_dirs: + config: + path: "$HOME/.config/nuclei" + image: + name: projectdiscovery/nuclei + preinstall: + tp::install: {} diff --git a/data/nuclei/osfamily/Darwin.yaml b/data/nuclei/osfamily/Darwin.yaml index fcbd220b..8b367d9a 100644 --- a/data/nuclei/osfamily/Darwin.yaml +++ b/data/nuclei/osfamily/Darwin.yaml @@ -1,4 +1,10 @@ --- nuclei::settings: brew_package_name: 'nuclei' - install_method: 'package' \ No newline at end of file + install_method: 'package' +# Version 4 format + packages: + main: + providers: + brew: + name: nuclei diff --git a/data/nuclei/osfamily/windows.yaml b/data/nuclei/osfamily/windows.yaml index 57ff8111..7c3d90bc 100644 --- a/data/nuclei/osfamily/windows.yaml +++ b/data/nuclei/osfamily/windows.yaml @@ -1,3 +1,5 @@ --- nuclei::settings: install_method: 'release' + +# No data to convert to Version 4 format diff --git a/data/nux/osfamily/RedHat.yaml b/data/nux/osfamily/RedHat.yaml index a6046c3f..b8e46ba6 100644 --- a/data/nux/osfamily/RedHat.yaml +++ b/data/nux/osfamily/RedHat.yaml @@ -3,3 +3,11 @@ nux::settings: repo_package_name: 'nux-dextop-release' tp_prerequisites: - epel + +# Version 4 format + repo: + upstream: + package_name: nux-dextop-release + preinstall: + tp::install: + - epel diff --git a/data/nux/osfamily/RedHat6.yaml b/data/nux/osfamily/RedHat6.yaml index 43cb3cda..ea332ed4 100644 --- a/data/nux/osfamily/RedHat6.yaml +++ b/data/nux/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- nux::settings: repo_package_url: 'http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index cd54284f..abd539d3 100644 --- a/data/nux/osfamily/RedHat7.yaml +++ b/data/nux/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- nux::settings: repo_package_url: 'http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm diff --git a/data/obs-studio/default.yaml b/data/obs-studio/default.yaml index 3d560c80..7b53bb63 100644 --- a/data/obs-studio/default.yaml +++ b/data/obs-studio/default.yaml @@ -4,3 +4,14 @@ obs-studio::settings: snap_package_name: 'obs-studio' website_url: 'https://obsproject.com/' git_source: 'https://github.com/obsproject/obs-studio.git' + +# Version 4 format + packages: + main: + name: obs-studio + providers: + snap: + name: obs-studio + urls: + website: https://obsproject.com/ + source: https://github.com/obsproject/obs-studio.git diff --git a/data/obs-studio/osfamily/Darwin.yaml b/data/obs-studio/osfamily/Darwin.yaml index f4cf9340..c9f9c9de 100644 --- a/data/obs-studio/osfamily/Darwin.yaml +++ b/data/obs-studio/osfamily/Darwin.yaml @@ -1,3 +1,10 @@ --- obs-studio::settings: brew_package_name: 'streamlabs-obs' + +# Version 4 format + packages: + main: + providers: + brew: + name: streamlabs-obs diff --git a/data/obs-studio/osfamily/windows.yaml b/data/obs-studio/osfamily/windows.yaml index 3b919bf9..f958b655 100644 --- a/data/obs-studio/osfamily/windows.yaml +++ b/data/obs-studio/osfamily/windows.yaml @@ -2,3 +2,12 @@ obs-studio::settings: winget_package_name: 'OBSProject.OBSStudio' choco_package_name: 'obs-studio' + +# Version 4 format + packages: + main: + providers: + winget: + name: OBSProject.OBSStudio + choco: + name: obs-studio diff --git a/data/octocatalog-diff/default.yaml b/data/octocatalog-diff/default.yaml index b6ad964f..4185a34c 100644 --- a/data/octocatalog-diff/default.yaml +++ b/data/octocatalog-diff/default.yaml @@ -9,3 +9,22 @@ octocatalog-diff::settings: - make package_prerequisites: - cmake + +# Version 4 format + packages: + main: + name: octocatalog-diff + provider: gem + files: + config: + path: "/etc/octocatalog-diff.cfg.rb" + user_files: + config: + path: "$HOME/.octocatalog-diff.cfg.rb" + preinstall: + tp::install: + - ruby + - ruby-dev + - make + package: + - cmake diff --git a/data/octocatalog-diff/osfamily/Debian.yaml b/data/octocatalog-diff/osfamily/Debian.yaml index bac9fa36..ec7a67ad 100644 --- a/data/octocatalog-diff/osfamily/Debian.yaml +++ b/data/octocatalog-diff/osfamily/Debian.yaml @@ -3,3 +3,9 @@ octocatalog-diff::settings: package_prerequisites: - cmake - pkgconf + +# Version 4 format + preinstall: + package: + - cmake + - pkgconf diff --git a/data/oh-my-zsh/default.yaml b/data/oh-my-zsh/default.yaml index e278670d..31b96ddc 100644 --- a/data/oh-my-zsh/default.yaml +++ b/data/oh-my-zsh/default.yaml @@ -9,3 +9,15 @@ oh-my-zsh::settings: - curl - git - zsh + +# Version 4 format + preinstall: + exec: + 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: + - curl + - git + - zsh diff --git a/data/oh-my-zsh/osfamily/Darwin.yaml b/data/oh-my-zsh/osfamily/Darwin.yaml index 35e73a43..ebbf8686 100644 --- a/data/oh-my-zsh/osfamily/Darwin.yaml +++ b/data/oh-my-zsh/osfamily/Darwin.yaml @@ -3,3 +3,9 @@ oh-my-zsh::settings: package_prerequisites: [] tp_prerequisites: - git + +# Version 4 format + preinstall: + tp::install: + - git + package: [] diff --git a/data/omi/default.yaml b/data/omi/default.yaml index 03f5c643..81660c7f 100644 --- a/data/omi/default.yaml +++ b/data/omi/default.yaml @@ -10,3 +10,32 @@ omi::settings: home_dir_path: '/opt/microsoft/omi/' tp_prerequisites: - 'microsoft_repo' + +# Version 4 format + packages: + main: + name: omi + services: + omid: {} + files: + config: + path: "/etc/opt/omi/conf/omiserver.conf" + user_files: + config: + path: "$HOME/.opt/omi/conf/omiserver.conf" + dirs: + config: + path: "/etc/opt/microsoft/omi/" + log: + path: "/var/opt/omi/log/" + home: + path: "/opt/microsoft/omi/" + user_dirs: + config: + path: "$HOME/.opt/microsoft/omi/" + urls: + website: https://learn.microsoft.com/en-us/system-center/scom/plan-planning-agent-deployment + source: https://github.com/microsoft/omi.git + preinstall: + tp::install: + - microsoft_repo diff --git a/data/omi/osfamily/Darwin.yaml b/data/omi/osfamily/Darwin.yaml index 836f5d33..3a5bc5b4 100644 --- a/data/omi/osfamily/Darwin.yaml +++ b/data/omi/osfamily/Darwin.yaml @@ -3,3 +3,13 @@ omi::settings: package_name: '' winget_package_name: '' choco_package_name: '' + +# Version 4 format + packages: + main: + name: '' + providers: + winget: + name: '' + choco: + name: '' diff --git a/data/omi/osfamily/windows.yaml b/data/omi/osfamily/windows.yaml index 836f5d33..3a5bc5b4 100644 --- a/data/omi/osfamily/windows.yaml +++ b/data/omi/osfamily/windows.yaml @@ -3,3 +3,13 @@ omi::settings: package_name: '' winget_package_name: '' choco_package_name: '' + +# Version 4 format + packages: + main: + name: '' + providers: + winget: + name: '' + choco: + name: '' diff --git a/data/openjdk-jdk/default.yaml b/data/openjdk-jdk/default.yaml index cf92b3a0..1dc65409 100644 --- a/data/openjdk-jdk/default.yaml +++ b/data/openjdk-jdk/default.yaml @@ -1,2 +1,4 @@ --- openjdk-jdk::settings: {} + +# No data to convert to Version 4 format diff --git a/data/openjdk-jdk/operatingsystem/Debian9.yaml b/data/openjdk-jdk/operatingsystem/Debian9.yaml index 56c5de50..8ec8399d 100644 --- a/data/openjdk-jdk/operatingsystem/Debian9.yaml +++ b/data/openjdk-jdk/operatingsystem/Debian9.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-8-jdk' + +# Version 4 format + packages: + main: + name: openjdk-8-jdk diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu.yaml index 56c5de50..8ec8399d 100644 --- a/data/openjdk-jdk/operatingsystem/Ubuntu.yaml +++ b/data/openjdk-jdk/operatingsystem/Ubuntu.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-8-jdk' + +# Version 4 format + packages: + main: + name: openjdk-8-jdk diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml index 24d78536..849397fe 100644 --- a/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml +++ b/data/openjdk-jdk/operatingsystem/Ubuntu10.04.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-6-jdk' + +# Version 4 format + packages: + main: + name: openjdk-6-jdk diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml index 24d78536..849397fe 100644 --- a/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml +++ b/data/openjdk-jdk/operatingsystem/Ubuntu10.10.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-6-jdk' + +# Version 4 format + packages: + main: + name: openjdk-6-jdk diff --git a/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml b/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml index 56c5de50..8ec8399d 100644 --- a/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml +++ b/data/openjdk-jdk/operatingsystem/Ubuntu15.04.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-8-jdk' + +# Version 4 format + packages: + main: + name: openjdk-8-jdk diff --git a/data/openjdk-jdk/osfamily/Debian.yaml b/data/openjdk-jdk/osfamily/Debian.yaml index 77015955..66a2fa2a 100644 --- a/data/openjdk-jdk/osfamily/Debian.yaml +++ b/data/openjdk-jdk/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-7-jdk' + +# Version 4 format + packages: + main: + name: openjdk-7-jdk diff --git a/data/openjdk-jdk/osfamily/Debian15.10.yaml b/data/openjdk-jdk/osfamily/Debian15.10.yaml index 56c5de50..8ec8399d 100644 --- a/data/openjdk-jdk/osfamily/Debian15.10.yaml +++ b/data/openjdk-jdk/osfamily/Debian15.10.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-8-jdk' + +# Version 4 format + packages: + main: + name: openjdk-8-jdk diff --git a/data/openjdk-jdk/osfamily/Debian5.yaml b/data/openjdk-jdk/osfamily/Debian5.yaml index 24d78536..849397fe 100644 --- a/data/openjdk-jdk/osfamily/Debian5.yaml +++ b/data/openjdk-jdk/osfamily/Debian5.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-6-jdk' + +# Version 4 format + packages: + main: + name: openjdk-6-jdk diff --git a/data/openjdk-jdk/osfamily/Debian6.yaml b/data/openjdk-jdk/osfamily/Debian6.yaml index 24d78536..849397fe 100644 --- a/data/openjdk-jdk/osfamily/Debian6.yaml +++ b/data/openjdk-jdk/osfamily/Debian6.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'openjdk-6-jdk' + +# Version 4 format + packages: + main: + name: openjdk-6-jdk diff --git a/data/openjdk-jdk/osfamily/OpenBSD.yaml b/data/openjdk-jdk/osfamily/OpenBSD.yaml index bcd437d0..b4f93cc6 100644 --- a/data/openjdk-jdk/osfamily/OpenBSD.yaml +++ b/data/openjdk-jdk/osfamily/OpenBSD.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'jdk' + +# Version 4 format + packages: + main: + name: jdk diff --git a/data/openjdk-jdk/osfamily/RedHat6.yaml b/data/openjdk-jdk/osfamily/RedHat6.yaml index 6c0668bd..d31318db 100644 --- a/data/openjdk-jdk/osfamily/RedHat6.yaml +++ b/data/openjdk-jdk/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'java-1.6.0-openjdk-devel' + +# Version 4 format + packages: + main: + name: java-1.6.0-openjdk-devel diff --git a/data/openjdk-jdk/osfamily/RedHat7.yaml b/data/openjdk-jdk/osfamily/RedHat7.yaml index e2912741..d1fbf54a 100644 --- a/data/openjdk-jdk/osfamily/RedHat7.yaml +++ b/data/openjdk-jdk/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'java-1.8.0-openjdk-devel' + +# Version 4 format + packages: + main: + name: java-1.8.0-openjdk-devel diff --git a/data/openjdk-jdk/osfamily/Suse.yaml b/data/openjdk-jdk/osfamily/Suse.yaml index 0102ff32..ae655097 100644 --- a/data/openjdk-jdk/osfamily/Suse.yaml +++ b/data/openjdk-jdk/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- openjdk-jdk::settings: package_name: 'java-1_7_0-openjdk-devel' + +# Version 4 format + packages: + main: + name: java-1_7_0-openjdk-devel diff --git a/data/openjdk-jre/default.yaml b/data/openjdk-jre/default.yaml index 6e8b29bd..f4d69d85 100644 --- a/data/openjdk-jre/default.yaml +++ b/data/openjdk-jre/default.yaml @@ -1,2 +1,4 @@ --- openjdk-jre::settings: + +# No data to convert to Version 4 format diff --git a/data/openjdk-jre/operatingsystem/Debian9.yaml b/data/openjdk-jre/operatingsystem/Debian9.yaml index 0a8e92b4..46858040 100644 --- a/data/openjdk-jre/operatingsystem/Debian9.yaml +++ b/data/openjdk-jre/operatingsystem/Debian9.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-8-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-8-jre-headless diff --git a/data/openjdk-jre/operatingsystem/Ubuntu.yaml b/data/openjdk-jre/operatingsystem/Ubuntu.yaml index 0a8e92b4..46858040 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-8-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-8-jre-headless diff --git a/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml b/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml index 4998ec06..8250d00d 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu10.04.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-6-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-6-jre-headless diff --git a/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml b/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml index 4998ec06..8250d00d 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu10.10.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-6-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-6-jre-headless diff --git a/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml b/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml index 0a8e92b4..46858040 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu15.04.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-8-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-8-jre-headless diff --git a/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml b/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml index 0a8e92b4..46858040 100644 --- a/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml +++ b/data/openjdk-jre/operatingsystem/Ubuntu15.10.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-8-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-8-jre-headless diff --git a/data/openjdk-jre/osfamily/Debian.yaml b/data/openjdk-jre/osfamily/Debian.yaml index aabb5dc4..87a5e070 100644 --- a/data/openjdk-jre/osfamily/Debian.yaml +++ b/data/openjdk-jre/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-7-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-7-jre-headless diff --git a/data/openjdk-jre/osfamily/Debian5.yaml b/data/openjdk-jre/osfamily/Debian5.yaml index 4998ec06..8250d00d 100644 --- a/data/openjdk-jre/osfamily/Debian5.yaml +++ b/data/openjdk-jre/osfamily/Debian5.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-6-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-6-jre-headless diff --git a/data/openjdk-jre/osfamily/Debian6.yaml b/data/openjdk-jre/osfamily/Debian6.yaml index 4998ec06..8250d00d 100644 --- a/data/openjdk-jre/osfamily/Debian6.yaml +++ b/data/openjdk-jre/osfamily/Debian6.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'openjdk-6-jre-headless' + +# Version 4 format + packages: + main: + name: openjdk-6-jre-headless diff --git a/data/openjdk-jre/osfamily/OpenBSD.yaml b/data/openjdk-jre/osfamily/OpenBSD.yaml index 87423fc8..ee0d22c3 100644 --- a/data/openjdk-jre/osfamily/OpenBSD.yaml +++ b/data/openjdk-jre/osfamily/OpenBSD.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'jre' + +# Version 4 format + packages: + main: + name: jre diff --git a/data/openjdk-jre/osfamily/RedHat6.yaml b/data/openjdk-jre/osfamily/RedHat6.yaml index 434202f8..409fdd9e 100644 --- a/data/openjdk-jre/osfamily/RedHat6.yaml +++ b/data/openjdk-jre/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'java-1.6.0-openjdk' + +# Version 4 format + packages: + main: + name: java-1.6.0-openjdk diff --git a/data/openjdk-jre/osfamily/RedHat7.yaml b/data/openjdk-jre/osfamily/RedHat7.yaml index 46210d09..ff294a2c 100644 --- a/data/openjdk-jre/osfamily/RedHat7.yaml +++ b/data/openjdk-jre/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'java-1.8.0-openjdk' + +# Version 4 format + packages: + main: + name: java-1.8.0-openjdk diff --git a/data/openjdk-jre/osfamily/Suse.yaml b/data/openjdk-jre/osfamily/Suse.yaml index 561cbb1c..2fb3c578 100644 --- a/data/openjdk-jre/osfamily/Suse.yaml +++ b/data/openjdk-jre/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- openjdk-jre::settings: package_name: 'java-1_7_0-openjdk' + +# Version 4 format + packages: + main: + name: java-1_7_0-openjdk diff --git a/data/openntpd/default.yaml b/data/openntpd/default.yaml index c4c5399c..2bf47ba9 100644 --- a/data/openntpd/default.yaml +++ b/data/openntpd/default.yaml @@ -10,3 +10,33 @@ openntpd::settings: process_name: 'ntpd' process_user: 'openntpd' process_group: 'openntpd' + +# Version 4 format + packages: + main: + name: openntpd + services: + openntpd: + process_name: ntpd + process_user: openntpd + process_group: openntpd + files: + config: + path: "/etc/openntpd/ntpd.conf" + init: + path: "/etc/sysconfig/openntpd" + pid: + path: "/var/run/openntpd.pid" + user_files: + config: + path: "$HOME/.openntpd/ntpd.conf" + dirs: + config: + path: "/etc/openntpd" + user_dirs: + config: + path: "$HOME/.openntpd" + ports: + main_udp: + port: '123' + protocol: udp diff --git a/data/openntpd/osfamily/Debian.yaml b/data/openntpd/osfamily/Debian.yaml index 9bbebacd..62ebc04e 100644 --- a/data/openntpd/osfamily/Debian.yaml +++ b/data/openntpd/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- openntpd::settings: init_file_path: '/etc/default/openntpd' + +# Version 4 format + files: + init: + path: "/etc/default/openntpd" diff --git a/data/openntpd/osfamily/OpenBSD.yaml b/data/openntpd/osfamily/OpenBSD.yaml index 0a3ba0bd..ed2e7089 100644 --- a/data/openntpd/osfamily/OpenBSD.yaml +++ b/data/openntpd/osfamily/OpenBSD.yaml @@ -7,3 +7,26 @@ openntpd::settings: config_dir_path: '' process_user: '_ntp' process_group: '_ntp' + +# Version 4 format + packages: + main: + name: '' + services: + ntpd: + process_user: _ntp + process_group: _ntp + files: + config: + path: "/etc/ntpd.conf" + init: + path: '' + user_files: + config: + path: "$HOME/.ntpd.conf" + dirs: + config: + path: '' + user_dirs: + config: + path: '' diff --git a/data/openssh/default.yaml b/data/openssh/default.yaml index 783c3eff..9cd5711c 100644 --- a/data/openssh/default.yaml +++ b/data/openssh/default.yaml @@ -14,4 +14,35 @@ openssh::settings: nodaemon_args: '-D' validate_cmd: 'sshd -t -f %' version_command: 'ssh -V' - config_file_format: 'inifile' \ No newline at end of file + config_file_format: 'inifile' +# Version 4 format + packages: + main: + name: openssh-server + services: + ssh: + process_name: sshd + process_user: root + process_group: root + nodaemon_args: "-D" + files: + config: + path: "/etc/ssh/sshd_config" + format: inifile + log: + path: "/var/log/messages" + pid: + path: "/var/run/sshd.pid" + user_files: + config: + path: "$HOME/.ssh/sshd_config" + dirs: + config: + path: "/etc/ssh" + user_dirs: + config: + path: "$HOME/.ssh" + ports: + main: + port: '22' + protocol: tcp diff --git a/data/openssh/osfamily/Debian.yaml b/data/openssh/osfamily/Debian.yaml index 0dd89779..ddbbaa83 100644 --- a/data/openssh/osfamily/Debian.yaml +++ b/data/openssh/osfamily/Debian.yaml @@ -5,3 +5,15 @@ openssh::settings: config_file_mode: '0644' init_file_path: '/var/default/ssh' log_file_path: '/var/log/syslog' + +# Version 4 format + packages: + main: + name: openssh-server + services: + ssh: {} + files: + log: + path: "/var/log/syslog" + init: + path: "/var/default/ssh" diff --git a/data/openssh/osfamily/OpenBSD.yaml b/data/openssh/osfamily/OpenBSD.yaml index d2cb735b..257b3c8e 100644 --- a/data/openssh/osfamily/OpenBSD.yaml +++ b/data/openssh/osfamily/OpenBSD.yaml @@ -5,3 +5,15 @@ openssh::settings: config_file_mode: '0644' init_file_path: '' log_file_path: '/var/log/authlog' + +# Version 4 format + packages: + main: + name: '' + services: + sshd: {} + files: + log: + path: "/var/log/authlog" + init: + path: '' diff --git a/data/openssh/osfamily/RedHat.yaml b/data/openssh/osfamily/RedHat.yaml index 83f73782..f04f2cdd 100644 --- a/data/openssh/osfamily/RedHat.yaml +++ b/data/openssh/osfamily/RedHat.yaml @@ -11,3 +11,33 @@ openssh::settings: process_name: 'sshd' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: openssh-server + services: + sshd: + process_name: sshd + process_user: root + process_group: root + files: + config: + path: "/etc/ssh/sshd_config" + log: + path: "/var/log/messages" + pid: + path: "/var/run/sshd.pid" + user_files: + config: + path: "$HOME/.ssh/sshd_config" + dirs: + config: + path: "/etc/ssh" + user_dirs: + config: + path: "$HOME/.ssh" + ports: + main: + port: '22' + protocol: tcp diff --git a/data/openssh/osfamily/Solaris.yaml b/data/openssh/osfamily/Solaris.yaml index 68d2fea4..e0b78fe5 100644 --- a/data/openssh/osfamily/Solaris.yaml +++ b/data/openssh/osfamily/Solaris.yaml @@ -4,3 +4,13 @@ openssh::settings: service_name: 'ssh' config_file_mode: '0600' log_file_path: '/var/adm/authlog' + +# Version 4 format + packages: + main: + name: '' + services: + ssh: {} + files: + log: + path: "/var/adm/authlog" diff --git a/data/openssh/osfamily/Solaris/10.yaml b/data/openssh/osfamily/Solaris/10.yaml index 5bf01afd..f31ec758 100644 --- a/data/openssh/osfamily/Solaris/10.yaml +++ b/data/openssh/osfamily/Solaris/10.yaml @@ -7,3 +7,13 @@ openssh::settings: - 'SUNWsshr' - 'SUNWsshu' + +# Version 4 format + packages: + main: + name: + - SUNWsshcu + - SUNWsshdr + - SUNWsshdu + - SUNWsshr + - SUNWsshu diff --git a/data/openssh/osfamily/Solaris/11.yaml b/data/openssh/osfamily/Solaris/11.yaml index 1a872a55..4b994cfa 100644 --- a/data/openssh/osfamily/Solaris/11.yaml +++ b/data/openssh/osfamily/Solaris/11.yaml @@ -2,3 +2,8 @@ openssh::settings: package_name: 'network/openssh' + +# Version 4 format + packages: + main: + name: network/openssh diff --git a/data/openssh/osfamily/Suse.yaml b/data/openssh/osfamily/Suse.yaml index a0b32cad..bf680f83 100644 --- a/data/openssh/osfamily/Suse.yaml +++ b/data/openssh/osfamily/Suse.yaml @@ -4,3 +4,13 @@ openssh::settings: service_name: 'sshd' config_file_mode: '0640' init_file_path: '/etc/sysconfig/sshd' + +# Version 4 format + packages: + main: + name: openssh + services: + sshd: {} + files: + init: + path: "/etc/sysconfig/sshd" diff --git a/data/openswan/default.yaml b/data/openswan/default.yaml index 2ff64042..d0fb72d7 100644 --- a/data/openswan/default.yaml +++ b/data/openswan/default.yaml @@ -16,3 +16,37 @@ openswan::settings: pid_file_path: '/var/run/pluto' log_file_path: '/var/log/pluto/peer' log_dir_path: '/var/log/pluto' + +# Version 4 format + packages: + main: + name: openswan + services: + ipsec: + process_name: pluto + process_user: root + process_group: root + files: + config: + path: "/etc/ipsec.conf" + log: + path: "/var/log/pluto/peer" + pid: + path: "/var/run/pluto" + user_files: + config: + path: "$HOME/.ipsec.conf" + dirs: + config: + path: "/etc/ipsec.d" + log: + path: "/var/log/pluto" + user_dirs: + config: + path: "$HOME/.ipsec.d" + ports: + main_udp: + port: + - '500' + - '4500' + protocol: udp diff --git a/data/openswan/osfamily/RedHat.yaml b/data/openswan/osfamily/RedHat.yaml index 549e78a9..91334ed9 100644 --- a/data/openswan/osfamily/RedHat.yaml +++ b/data/openswan/osfamily/RedHat.yaml @@ -1,3 +1,7 @@ --- openswan::settings: - package_name: 'libreswan' \ No newline at end of file + package_name: 'libreswan' +# Version 4 format + packages: + main: + name: libreswan diff --git a/data/openvpn/default.yaml b/data/openvpn/default.yaml index c2557c34..f58009ec 100644 --- a/data/openvpn/default.yaml +++ b/data/openvpn/default.yaml @@ -11,3 +11,35 @@ openvpn::settings: process_user: 'openvpn' process_group: 'openvpn' tcp_port: '1194' + +# Version 4 format + packages: + main: + name: openvpn + services: + openvpn: + process_name: openvpn + process_user: openvpn + process_group: openvpn + files: + config: + path: "/etc/openvpn/openvpn.conf" + log: + path: "/var/log/openvpn/openvpn.log" + pid: + path: "/var/run/openvpn.pid" + user_files: + config: + path: "$HOME/.openvpn/openvpn.conf" + dirs: + config: + path: "/etc/openvpn" + log: + path: "/var/log/openvpn" + user_dirs: + config: + path: "$HOME/.openvpn" + ports: + main: + port: '1194' + protocol: tcp diff --git a/data/openvpn/osfamily/Debian.yaml b/data/openvpn/osfamily/Debian.yaml index ff206d48..8c578ecd 100644 --- a/data/openvpn/osfamily/Debian.yaml +++ b/data/openvpn/osfamily/Debian.yaml @@ -2,3 +2,11 @@ openvpn::settings: process_user: 'nobody' init_file_path: '/etc/default/openvpn' + +# Version 4 format + services: + ! '': + process_user: nobody + files: + init: + path: "/etc/default/openvpn" diff --git a/data/openvpn/osfamily/RedHat.yaml b/data/openvpn/osfamily/RedHat.yaml index e4447a78..1df83652 100644 --- a/data/openvpn/osfamily/RedHat.yaml +++ b/data/openvpn/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- openvpn::settings: init_file_path: '/etc/sysconfig/openvpn' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/openvpn" diff --git a/data/openvswitch/default.yaml b/data/openvswitch/default.yaml index 660ff2a7..f217d8a9 100644 --- a/data/openvswitch/default.yaml +++ b/data/openvswitch/default.yaml @@ -10,3 +10,28 @@ openvswitch::settings: process_name: 'openvswitch' process_user: 'openvswitch' process_group: 'openvswitch' + +# Version 4 format + packages: + main: + name: openvswitch-switch + services: + openvswitch-switch: + process_name: openvswitch + process_user: openvswitch + process_group: openvswitch + files: + log: + path: "/var/log/openvswitch/openvswitch.log" + pid: + path: "/var/run/openvswitch.pid" + dirs: + config: + path: "/etc/openvswitch" + conf: + path: "/etc/openvswitch/conf.d" + log: + path: "/var/log/openvswitch" + user_dirs: + config: + path: "$HOME/.openvswitch" diff --git a/data/openvswitch/osfamily/Debian.yaml b/data/openvswitch/osfamily/Debian.yaml index 4e1abf6f..27b59b60 100644 --- a/data/openvswitch/osfamily/Debian.yaml +++ b/data/openvswitch/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- openvswitch::settings: init_file_path: '/etc/default/openvswitch-switch' + +# Version 4 format + files: + init: + path: "/etc/default/openvswitch-switch" diff --git a/data/openvswitch/osfamily/RedHat.yaml b/data/openvswitch/osfamily/RedHat.yaml index 36445e89..1f78dd66 100644 --- a/data/openvswitch/osfamily/RedHat.yaml +++ b/data/openvswitch/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- openvswitch::settings: init_file_path: '/etc/sysconfig/openvswitch-switch' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/openvswitch-switch" diff --git a/data/orientdb/default.yaml b/data/orientdb/default.yaml index c48756ba..e9aad5b1 100644 --- a/data/orientdb/default.yaml +++ b/data/orientdb/default.yaml @@ -14,3 +14,40 @@ orientdb::settings: process_user: 'orientdb' process_group: 'orientdb' tcp_port: '2424' + +# Version 4 format + packages: + main: + name: orientdb + services: + orientdb: + process_name: java + process_extra_name: orientdb + process_user: orientdb + process_group: orientdb + files: + config: + path: "/etc/orientdb/orientdb.conf" + log: + path: "/var/log/orientdb/orient-server.logl.0" + pid: + path: "/var/run/orientdb.pid" + user_files: + config: + path: "$HOME/.orientdb/orientdb.conf" + dirs: + config: + path: "/etc/orientdb" + conf: + path: "/etc/orientdb/conf.d" + log: + path: "/var/log/orientdb" + data: + path: "/var/lib/orientdb" + user_dirs: + config: + path: "$HOME/.orientdb" + ports: + main: + port: '2424' + protocol: tcp diff --git a/data/orientdb/osfamily/Debian.yaml b/data/orientdb/osfamily/Debian.yaml index 4033e069..61cc6773 100644 --- a/data/orientdb/osfamily/Debian.yaml +++ b/data/orientdb/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- orientdb::settings: init_file_path: '/etc/default/orientdb' + +# Version 4 format + files: + init: + path: "/etc/default/orientdb" diff --git a/data/orientdb/osfamily/RedHat.yaml b/data/orientdb/osfamily/RedHat.yaml index d436b016..bb41d4d9 100644 --- a/data/orientdb/osfamily/RedHat.yaml +++ b/data/orientdb/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- orientdb::settings: init_file_path: '/etc/sysconfig/orientdb' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/orientdb" diff --git a/data/pacemaker/default.yaml b/data/pacemaker/default.yaml index c4954aff..9e2f348f 100644 --- a/data/pacemaker/default.yaml +++ b/data/pacemaker/default.yaml @@ -8,3 +8,21 @@ pacemaker::settings: process_name: 'pacemakerd' process_user: 'pacemaker' process_group: 'pacemaker' + +# Version 4 format + packages: + main: + name: pacemaker + services: + pacemaker: + process_name: pacemakerd + process_user: pacemaker + process_group: pacemaker + files: + log: + path: "/var/log/pacemaker/pacemaker.log" + pid: + path: "/var/run/pacemaker.pid" + dirs: + log: + path: "/var/log/pacemaker" diff --git a/data/pacemaker/osfamily/Debian.yaml b/data/pacemaker/osfamily/Debian.yaml index 3e8ff6c0..188a694c 100644 --- a/data/pacemaker/osfamily/Debian.yaml +++ b/data/pacemaker/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- pacemaker::settings: init_file_path: '/etc/default/pacemaker' + +# Version 4 format + files: + init: + path: "/etc/default/pacemaker" diff --git a/data/pacemaker/osfamily/RedHat.yaml b/data/pacemaker/osfamily/RedHat.yaml index 55e04382..3e7e58f2 100644 --- a/data/pacemaker/osfamily/RedHat.yaml +++ b/data/pacemaker/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- pacemaker::settings: init_file_path: '/etc/sysconfig/pacemaker' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/pacemaker" diff --git a/data/packer/default.yaml b/data/packer/default.yaml index 48466d66..d7cfde60 100644 --- a/data/packer/default.yaml +++ b/data/packer/default.yaml @@ -3,3 +3,12 @@ packer::settings: upstream_repo: true package_name: 'packer' process_name: 'packer' + +# Version 4 format + packages: + main: + name: packer + services: + ! '': + process_name: packer + repo: upstream diff --git a/data/packer/upstream/default.yaml b/data/packer/upstream/default.yaml index f9dc43b3..6050e421 100644 --- a/data/packer/upstream/default.yaml +++ b/data/packer/upstream/default.yaml @@ -2,3 +2,8 @@ packer::settings: tp_prerequisites: hashicorp_repo: {} + +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/packetbeat/default.yaml b/data/packetbeat/default.yaml index 1e564526..69eef815 100644 --- a/data/packetbeat/default.yaml +++ b/data/packetbeat/default.yaml @@ -13,3 +13,35 @@ packetbeat::settings: data_dir_path: '/var/lib/packetbeat' process_name: 'packetbeat' + +# Version 4 format + packages: + main: + name: packetbeat + services: + packetbeat: + process_name: packetbeat + files: + config: + path: "/etc/packetbeat/packetbeat.yml" + format: yaml + log: + path: "/var/log/packetbeat/packetbeat" + pid: + path: "/var/run/packetbeat.pid" + user_files: + config: + path: "$HOME/.packetbeat/packetbeat.yml" + dirs: + config: + path: "/etc/packetbeat" + log: + path: "/var/log/packetbeat" + home: + path: "/usr/share/packetbeat" + data: + path: "/var/lib/packetbeat" + user_dirs: + config: + path: "$HOME/.packetbeat" + repo: upstream diff --git a/data/packetbeat/osfamily/Debian.yaml b/data/packetbeat/osfamily/Debian.yaml index 4ef3dca1..892af5ee 100644 --- a/data/packetbeat/osfamily/Debian.yaml +++ b/data/packetbeat/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- packetbeat::settings: init_file_path: '/etc/default/packetbeat' + +# Version 4 format + files: + init: + path: "/etc/default/packetbeat" diff --git a/data/packetbeat/osfamily/RedHat.yaml b/data/packetbeat/osfamily/RedHat.yaml index b2293b05..7de9d614 100644 --- a/data/packetbeat/osfamily/RedHat.yaml +++ b/data/packetbeat/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- packetbeat::settings: init_file_path: '/etc/sysconfig/packetbeat' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/packetbeat" diff --git a/data/packetbeat/osfamily/windows.yaml b/data/packetbeat/osfamily/windows.yaml index 987da4b1..9d1943a4 100644 --- a/data/packetbeat/osfamily/windows.yaml +++ b/data/packetbeat/osfamily/windows.yaml @@ -2,3 +2,11 @@ packetbeat::settings: config_file_path: 'C:\ProgramData\chocolatey\lib\packetbeat\tools\packetbeat.yml' + +# Version 4 format + files: + config: + path: C:\ProgramData\chocolatey\lib\packetbeat\tools\packetbeat.yml + user_files: + config: + path: C:\ProgramData\chocolatey\lib\packetbeat\tools\packetbeat.yml diff --git a/data/packetbeat/upstream/default.yaml b/data/packetbeat/upstream/default.yaml index eab8eeed..66a8ed5d 100644 --- a/data/packetbeat/upstream/default.yaml +++ b/data/packetbeat/upstream/default.yaml @@ -1,4 +1,8 @@ --- packetbeat::settings: tp_prerequisites: - elastic_repo: {} \ No newline at end of file + elastic_repo: {} +# Version 4 format + preinstall: + tp::install: + elastic_repo: {} diff --git a/data/pam/default.yaml b/data/pam/default.yaml index 1b597304..a4a012f4 100644 --- a/data/pam/default.yaml +++ b/data/pam/default.yaml @@ -4,3 +4,22 @@ pam::settings: config_file_path: '/etc/pam.conf' config_dir_path: '/etc/pam.d' conf_dir_path: '/etc/pam.d' + +# Version 4 format + packages: + main: + name: pam + files: + config: + path: "/etc/pam.conf" + user_files: + config: + path: "$HOME/.pam.conf" + dirs: + config: + path: "/etc/pam.d" + conf: + path: "/etc/pam.d" + user_dirs: + config: + path: "$HOME/.pam.d" diff --git a/data/passenger-apache/default.yaml b/data/passenger-apache/default.yaml index bb159c52..0e9da615 100644 --- a/data/passenger-apache/default.yaml +++ b/data/passenger-apache/default.yaml @@ -1,3 +1,8 @@ --- passenger-apache::settings: package_name: 'passenger-apache' + +# Version 4 format + packages: + main: + name: passenger-apache diff --git a/data/passenger-apache/osfamily/Debian.yaml b/data/passenger-apache/osfamily/Debian.yaml index 19e55c09..1d2bea5f 100644 --- a/data/passenger-apache/osfamily/Debian.yaml +++ b/data/passenger-apache/osfamily/Debian.yaml @@ -5,3 +5,16 @@ passenger-apache::settings: apt_repos: 'main' apt_key_server: 'http://keyserver.ubuntu.com' package_name: 'libapache2-mod-passenger' + +# Version 4 format + packages: + main: + name: libapache2-mod-passenger + repo: + upstream: + url: https://oss-binaries.phusionpassenger.com/apt/passenger + key: 561F9B9CAC40B2F7 + yum: + gpgcheck: true + apt: + key_server: http://keyserver.ubuntu.com diff --git a/data/passenger-apache/osfamily/RedHat.yaml b/data/passenger-apache/osfamily/RedHat.yaml index b764eafa..615295f8 100644 --- a/data/passenger-apache/osfamily/RedHat.yaml +++ b/data/passenger-apache/osfamily/RedHat.yaml @@ -7,3 +7,16 @@ passenger-apache::settings: - epel package_prerequisites: - pygpgme + +# Version 4 format + packages: + main: + name: mod_passenger + repo: + upstream: + repofile_url: https://oss-binaries.phusionpassenger.com/yum/definitions/el-passenger.repo + preinstall: + tp::install: + - epel + package: + - pygpgme diff --git a/data/passenger-nginx/default.yaml b/data/passenger-nginx/default.yaml index cd5373bb..ae10b4f2 100644 --- a/data/passenger-nginx/default.yaml +++ b/data/passenger-nginx/default.yaml @@ -1,3 +1,8 @@ --- passenger-nginx::settings: package_name: 'passenger-nginx' + +# Version 4 format + packages: + main: + name: passenger-nginx diff --git a/data/passenger-nginx/osfamily/Debian.yaml b/data/passenger-nginx/osfamily/Debian.yaml index ad1bc106..9d0a5c76 100644 --- a/data/passenger-nginx/osfamily/Debian.yaml +++ b/data/passenger-nginx/osfamily/Debian.yaml @@ -5,3 +5,16 @@ passenger-nginx::settings: apt_repos: 'main' apt_key_server: 'http://keyserver.ubuntu.com' package_name: 'libnginx-mod-http-passenger' + +# Version 4 format + packages: + main: + name: libnginx-mod-http-passenger + repo: + upstream: + url: https://oss-binaries.phusionpassenger.com/apt/passenger + key: 561F9B9CAC40B2F7 + yum: + gpgcheck: true + apt: + key_server: http://keyserver.ubuntu.com diff --git a/data/passenger-nginx/osfamily/RedHat.yaml b/data/passenger-nginx/osfamily/RedHat.yaml index 5f7bee07..09b58b94 100644 --- a/data/passenger-nginx/osfamily/RedHat.yaml +++ b/data/passenger-nginx/osfamily/RedHat.yaml @@ -9,3 +9,18 @@ passenger-nginx::settings: package_prerequisites: - pygpgme - nginx + +# Version 4 format + packages: + main: + name: nginx-mod-http-passenger + repo: + upstream: + url: https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch + key_url: https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt + preinstall: + tp::install: + - epel + package: + - pygpgme + - nginx diff --git a/data/passenger/default.yaml b/data/passenger/default.yaml index d109c98b..0997950e 100644 --- a/data/passenger/default.yaml +++ b/data/passenger/default.yaml @@ -1,3 +1,8 @@ --- passenger::settings: package_name: 'passenger' + +# Version 4 format + packages: + main: + name: passenger diff --git a/data/passenger/osfamily/Debian.yaml b/data/passenger/osfamily/Debian.yaml index 965c5ee7..b99eff7d 100644 --- a/data/passenger/osfamily/Debian.yaml +++ b/data/passenger/osfamily/Debian.yaml @@ -4,3 +4,13 @@ passenger::settings: key: '561F9B9CAC40B2F7' apt_repos: 'main' apt_key_server: 'http://keyserver.ubuntu.com' + +# Version 4 format + repo: + upstream: + url: https://oss-binaries.phusionpassenger.com/apt/passenger + key: 561F9B9CAC40B2F7 + yum: + gpgcheck: true + apt: + key_server: http://keyserver.ubuntu.com diff --git a/data/passenger/osfamily/RedHat.yaml b/data/passenger/osfamily/RedHat.yaml index 82a8eb46..3a458179 100644 --- a/data/passenger/osfamily/RedHat.yaml +++ b/data/passenger/osfamily/RedHat.yaml @@ -2,3 +2,8 @@ passenger::settings: repo_url: 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' + +# Version 4 format + repo: + upstream: + url: https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch diff --git a/data/pe-client-tools/default.yaml b/data/pe-client-tools/default.yaml index 322e8af2..8608d598 100644 --- a/data/pe-client-tools/default.yaml +++ b/data/pe-client-tools/default.yaml @@ -2,4 +2,11 @@ pe-client-tools::settings: package_name: 'pe-client-tools' tp_prerequisites: - puppet_repo: {} \ No newline at end of file + puppet_repo: {} +# Version 4 format + packages: + main: + name: pe-client-tools + preinstall: + tp::install: + puppet_repo: {} diff --git a/data/pgbouncer/default.yaml b/data/pgbouncer/default.yaml index f25c3ac1..432bac71 100644 --- a/data/pgbouncer/default.yaml +++ b/data/pgbouncer/default.yaml @@ -16,3 +16,36 @@ pgbouncer::settings: process_user: 'pgbouncer' process_group: 'pgbouncer' tcp_port: '6432' + +# Version 4 format + packages: + main: + name: pgbouncer + services: + pgbouncer: + process_name: pgbouncer + process_user: pgbouncer + process_group: pgbouncer + files: + config: + path: "/etc/pgbouncer/pgbouncer.ini" + format: inifile_with_stanzas + log: + path: "/var/log/pgbouncer/pgbouncer.log" + pid: + path: "/var/run/pgbouncer/pgbouncer.pid" + user_files: + config: + path: "$HOME/.pgbouncer/pgbouncer.ini" + dirs: + config: + path: "/etc/pgbouncer" + log: + path: "/var/log/pgbouncer" + user_dirs: + config: + path: "$HOME/.pgbouncer" + ports: + main: + port: '6432' + protocol: tcp diff --git a/data/pgbouncer/osfamily/Debian.yaml b/data/pgbouncer/osfamily/Debian.yaml index 67857fdd..e88dcaeb 100644 --- a/data/pgbouncer/osfamily/Debian.yaml +++ b/data/pgbouncer/osfamily/Debian.yaml @@ -8,3 +8,19 @@ pgbouncer::settings: config_file_owner: 'postgres' config_file_group: 'postgres' pid_file_path: '/var/run/postgresql/pgbouncer.pid' + +# Version 4 format + services: + ! '': + process_user: postgres + process_group: postgres + files: + log: + path: "/var/log/postgresql/pgbouncer.log" + init: + path: "/etc/default/pgbouncer" + pid: + path: "/var/run/postgresql/pgbouncer.pid" + dirs: + log: + path: "/var/log/postgresql" diff --git a/data/pgbouncer/osfamily/RedHat.yaml b/data/pgbouncer/osfamily/RedHat.yaml index bcf1732f..2586c06d 100644 --- a/data/pgbouncer/osfamily/RedHat.yaml +++ b/data/pgbouncer/osfamily/RedHat.yaml @@ -2,4 +2,11 @@ pgbouncer::settings: init_file_path: '/etc/sysconfig/pgbouncer' tp_prerequisites: - - epel \ No newline at end of file + - epel +# Version 4 format + files: + init: + path: "/etc/sysconfig/pgbouncer" + preinstall: + tp::install: + - epel diff --git a/data/pgbouncer/upstream/default.yaml b/data/pgbouncer/upstream/default.yaml index 600a3188..b326c959 100644 --- a/data/pgbouncer/upstream/default.yaml +++ b/data/pgbouncer/upstream/default.yaml @@ -2,3 +2,11 @@ pgbouncer::settings: key: 'B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8' key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' + +# Version 4 format + repo: + upstream: + key: B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8 + key_url: https://www.postgresql.org/media/keys/ACCC4CF8.asc + yum: + gpgcheck: true diff --git a/data/pgbouncer/upstream/operatingsystem/Debian10.yaml b/data/pgbouncer/upstream/operatingsystem/Debian10.yaml index 50285c8a..6334aa46 100644 --- a/data/pgbouncer/upstream/operatingsystem/Debian10.yaml +++ b/data/pgbouncer/upstream/operatingsystem/Debian10.yaml @@ -2,3 +2,10 @@ pgbouncer::settings: repo_url: 'http://apt.postgresql.org/pub/repos/apt' apt_release: 'buster-pgdg main' + +# Version 4 format + repo: + upstream: + url: http://apt.postgresql.org/pub/repos/apt + apt: + release: buster-pgdg main diff --git a/data/pgbouncer/upstream/operatingsystem/Debian9.yaml b/data/pgbouncer/upstream/operatingsystem/Debian9.yaml index 9626432a..e76af5ba 100644 --- a/data/pgbouncer/upstream/operatingsystem/Debian9.yaml +++ b/data/pgbouncer/upstream/operatingsystem/Debian9.yaml @@ -2,3 +2,10 @@ pgbouncer::settings: repo_url: 'http://apt.postgresql.org/pub/repos/apt' apt_release: 'stretch-pgdg main' + +# Version 4 format + repo: + upstream: + url: http://apt.postgresql.org/pub/repos/apt + apt: + release: stretch-pgdg main diff --git a/data/pgbouncer/upstream/osfamily/RedHat7.yaml b/data/pgbouncer/upstream/osfamily/RedHat7.yaml index 9b6e2999..76a3255f 100644 --- a/data/pgbouncer/upstream/osfamily/RedHat7.yaml +++ b/data/pgbouncer/upstream/osfamily/RedHat7.yaml @@ -3,3 +3,10 @@ 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' + +# Version 4 format + repo: + upstream: + package_name: pgdp-redhat-repo + package_url: https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm + repofile_name: pgdg-redhat-all diff --git a/data/pgbouncer/upstream/osfamily/RedHat8.yaml b/data/pgbouncer/upstream/osfamily/RedHat8.yaml index 0c5202ed..e972f507 100644 --- a/data/pgbouncer/upstream/osfamily/RedHat8.yaml +++ b/data/pgbouncer/upstream/osfamily/RedHat8.yaml @@ -3,3 +3,10 @@ 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' + +# Version 4 format + repo: + upstream: + package_name: pgdg-redhat-repo + package_url: https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm + repofile_name: pgdg-redhat-all diff --git a/data/php-fpm/default.yaml b/data/php-fpm/default.yaml index 667e4b7f..51b7ae85 100644 --- a/data/php-fpm/default.yaml +++ b/data/php-fpm/default.yaml @@ -9,3 +9,31 @@ php-fpm::settings: log_file_path: '/var/log/php-fpm/error.log' log_dir_path: '/var/log/php-fpm' process_name: 'php-fpm' + +# Version 4 format + packages: + main: + name: php-fpm + services: + php-fpm: + process_name: php-fpm + files: + config: + path: "/etc/php-fpm.conf" + log: + path: "/var/log/php-fpm/error.log" + pid: + path: "/var/run/php-fpm/php-fpm.pid" + user_files: + config: + path: "$HOME/.php-fpm.conf" + dirs: + config: + path: "/etc/php-fpm" + conf: + path: "/etc/php-fpm.d" + log: + path: "/var/log/php-fpm" + user_dirs: + config: + path: "$HOME/.php-fpm" diff --git a/data/php-fpm/osfamily/Debian.yaml b/data/php-fpm/osfamily/Debian.yaml index 892df555..686eec82 100644 --- a/data/php-fpm/osfamily/Debian.yaml +++ b/data/php-fpm/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- php-fpm::settings: init_file_path: '/etc/default/php-fpm' + +# Version 4 format + files: + init: + path: "/etc/default/php-fpm" diff --git a/data/php-fpm/osfamily/RedHat.yaml b/data/php-fpm/osfamily/RedHat.yaml index 20ef08ac..975a3576 100644 --- a/data/php-fpm/osfamily/RedHat.yaml +++ b/data/php-fpm/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- php-fpm::settings: init_file_path: '/etc/sysconfig/php-fpm' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/php-fpm" diff --git a/data/php/default.yaml b/data/php/default.yaml index 6d0b6520..0afb992d 100644 --- a/data/php/default.yaml +++ b/data/php/default.yaml @@ -4,3 +4,22 @@ php::settings: config_file_path: '/etc/php.ini' config_dir_path: '/etc/php' conf_dir_path: '/etc/php/conf.d' + +# Version 4 format + packages: + main: + name: php + files: + config: + path: "/etc/php.ini" + user_files: + config: + path: "$HOME/.php.ini" + dirs: + config: + path: "/etc/php" + conf: + path: "/etc/php/conf.d" + user_dirs: + config: + path: "$HOME/.php" diff --git a/data/php/osfamily/Debian.yaml b/data/php/osfamily/Debian.yaml index c54f0d35..5174fa16 100644 --- a/data/php/osfamily/Debian.yaml +++ b/data/php/osfamily/Debian.yaml @@ -4,3 +4,22 @@ php::settings: config_file_path: '/etc/php5/apache2/php.ini' config_dir_path: '/etc/php5' conf_dir_path: '/etc/php5/conf.d' + +# Version 4 format + packages: + main: + name: php5 + files: + config: + path: "/etc/php5/apache2/php.ini" + user_files: + config: + path: "$HOME/.php5/apache2/php.ini" + dirs: + config: + path: "/etc/php5" + conf: + path: "/etc/php5/conf.d" + user_dirs: + config: + path: "$HOME/.php5" diff --git a/data/php/osfamily/RedHat.yaml b/data/php/osfamily/RedHat.yaml index 92a59c1e..f9ea5051 100644 --- a/data/php/osfamily/RedHat.yaml +++ b/data/php/osfamily/RedHat.yaml @@ -3,3 +3,19 @@ php::settings: config_file_path: '/etc/php.ini' config_dir_path: '/etc/php.d' conf_dir_path: '/etc/php.d' + +# Version 4 format + files: + config: + path: "/etc/php.ini" + user_files: + config: + path: "$HOME/.php.ini" + dirs: + config: + path: "/etc/php.d" + conf: + path: "/etc/php.d" + user_dirs: + config: + path: "$HOME/.php.d" diff --git a/data/php/osfamily/Suse.yaml b/data/php/osfamily/Suse.yaml index c54f0d35..5174fa16 100644 --- a/data/php/osfamily/Suse.yaml +++ b/data/php/osfamily/Suse.yaml @@ -4,3 +4,22 @@ php::settings: config_file_path: '/etc/php5/apache2/php.ini' config_dir_path: '/etc/php5' conf_dir_path: '/etc/php5/conf.d' + +# Version 4 format + packages: + main: + name: php5 + files: + config: + path: "/etc/php5/apache2/php.ini" + user_files: + config: + path: "$HOME/.php5/apache2/php.ini" + dirs: + config: + path: "/etc/php5" + conf: + path: "/etc/php5/conf.d" + user_dirs: + config: + path: "$HOME/.php5" diff --git a/data/postfix/default.yaml b/data/postfix/default.yaml index 6bb30afa..d649117b 100644 --- a/data/postfix/default.yaml +++ b/data/postfix/default.yaml @@ -24,3 +24,39 @@ postfix::settings: mailqueue: 'mailq' validate_cmd: 'postconf -n' config_file_format: 'inifile' + +# Version 4 format + packages: + main: + name: postfix + services: + postfix: + process_name: master + process_user: postfix + process_group: postfix + files: + config: + path: "/etc/postfix/main.cf" + format: inifile + log: + path: "/var/log/maillog" + pid: + path: "/var/spool/postfix/pid/master.pid" + user_files: + config: + path: "$HOME/.postfix/main.cf" + dirs: + config: + path: "/etc/postfix" + data: + path: "/var/spool/postfix" + user_dirs: + config: + path: "$HOME/.postfix" + ports: + main: + port: '25' + protocol: tcp + urls: + website: https://www.postfix.org/ + source: https://github.com/vdukhovni/postfix diff --git a/data/postfix/operatingsystem/Ubuntu14.04.yaml b/data/postfix/operatingsystem/Ubuntu14.04.yaml index fbd5f722..db9f9e3f 100644 --- a/data/postfix/operatingsystem/Ubuntu14.04.yaml +++ b/data/postfix/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,5 @@ --- postfix::settings: daemon_dir_path: '/usr/lib/postfix' + +# No data to convert to Version 4 format diff --git a/data/postfix/osfamily/Debian.yaml b/data/postfix/osfamily/Debian.yaml index 450c0e7b..d954f4e1 100644 --- a/data/postfix/osfamily/Debian.yaml +++ b/data/postfix/osfamily/Debian.yaml @@ -3,3 +3,10 @@ postfix::settings: log_file_path: '/var/log/mail.log' init_file_path: '/etc/default/postfix' daemon_dir_path: '/usr/lib/postfix/sbin' + +# Version 4 format + files: + log: + path: "/var/log/mail.log" + init: + path: "/etc/default/postfix" diff --git a/data/postfix/osfamily/RedHat.yaml b/data/postfix/osfamily/RedHat.yaml index a57fea5d..5a679212 100644 --- a/data/postfix/osfamily/RedHat.yaml +++ b/data/postfix/osfamily/RedHat.yaml @@ -4,3 +4,8 @@ postfix::settings: sendmail_path: '/usr/sbin/sendmail.postfix' newaliases_path: '/usr/bin/newaliases.postfix' mailq_path: '/usr/bin/mailq.postfix' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/postfix" diff --git a/data/postfix/osfamily/Suse.yaml b/data/postfix/osfamily/Suse.yaml index 1a2266c5..26d9e720 100644 --- a/data/postfix/osfamily/Suse.yaml +++ b/data/postfix/osfamily/Suse.yaml @@ -2,3 +2,5 @@ postfix::settings: setgid_group: 'maildrop' daemon_dir_path: '/usr/lib/postfix/bin' + +# No data to convert to Version 4 format diff --git a/data/postgresql/default.yaml b/data/postgresql/default.yaml index 2bd07f2b..41370e33 100644 --- a/data/postgresql/default.yaml +++ b/data/postgresql/default.yaml @@ -12,3 +12,37 @@ postgresql::settings: process_user: 'postgres' process_group: 'postgres' tcp_port: '5432' + +# Version 4 format + packages: + main: + name: postgresql + services: + postgresql: + process_name: postgres + process_user: postgres + process_group: postgres + files: + config: + path: "/var/lib/pgsql/data/postgresql.conf" + log: + path: "/var/lib/pgsql/data/pg_log/postgresql.log" + pid: + path: "/var/run/postgresql/.s.PGSQL.5432" + user_files: + config: + path: "/var/lib/pgsql/data/postgresql.conf" + dirs: + config: + path: "/var/lib/pgsql/data" + log: + path: "/var/lib/pgsql/data/pg_log" + data: + path: "/var/lib/pgsql/data" + user_dirs: + config: + path: "/var/lib/pgsql/data" + ports: + main: + port: '5432' + protocol: tcp diff --git a/data/postgresql/osfamily/Debian.yaml b/data/postgresql/osfamily/Debian.yaml index e812277b..4bb578f5 100644 --- a/data/postgresql/osfamily/Debian.yaml +++ b/data/postgresql/osfamily/Debian.yaml @@ -6,3 +6,25 @@ postgresql::settings: log_file_path: '/var/log/postgresql/postgresql-9.3-main.log' log_dir_path: '/var/log/postgresql' init_file_path: '/etc/default/postgresql' + +# Version 4 format + files: + config: + path: "/etc/postgresql/9.3/main/postgresql.conf" + log: + path: "/var/log/postgresql/postgresql-9.3-main.log" + init: + path: "/etc/default/postgresql" + user_files: + config: + path: "$HOME/.postgresql/9.3/main/postgresql.conf" + dirs: + config: + path: "/etc/postgresql/9.3/main" + log: + path: "/var/log/postgresql" + data: + path: "/var/lib/postgresql/9.3/main" + user_dirs: + config: + path: "$HOME/.postgresql/9.3/main" diff --git a/data/postgresql/osfamily/RedHat.yaml b/data/postgresql/osfamily/RedHat.yaml index 71986a38..0f37391c 100644 --- a/data/postgresql/osfamily/RedHat.yaml +++ b/data/postgresql/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- postgresql::settings: init_file_path: '/etc/sysconfig/postgresql' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/postgresql" diff --git a/data/powershell/default.yaml b/data/powershell/default.yaml index 8c3c87cd..9e16022e 100644 --- a/data/powershell/default.yaml +++ b/data/powershell/default.yaml @@ -7,3 +7,19 @@ powershell::settings: git_source: 'https://github.com/PowerShell/PowerShell.git' tp_prerequisites: - 'microsoft_repo' + +# Version 4 format + packages: + main: + name: powershell + providers: + snap: + name: powershell + urls: + website: https://learn.microsoft.com/powershell/ + source: https://github.com/PowerShell/PowerShell.git + image: + name: microsoft/powershell + preinstall: + tp::install: + - microsoft_repo diff --git a/data/powershell/osfamily/Darwin.yaml b/data/powershell/osfamily/Darwin.yaml index b488fe7c..1f0f32c9 100644 --- a/data/powershell/osfamily/Darwin.yaml +++ b/data/powershell/osfamily/Darwin.yaml @@ -1,3 +1,10 @@ --- powershell::settings: brew_package_name: 'powershell' + +# Version 4 format + packages: + main: + providers: + brew: + name: powershell diff --git a/data/powershell/osfamily/windows.yaml b/data/powershell/osfamily/windows.yaml index 6159162a..a1d2b921 100644 --- a/data/powershell/osfamily/windows.yaml +++ b/data/powershell/osfamily/windows.yaml @@ -2,3 +2,12 @@ powershell::settings: winget_package_name: 'Microsoft.PowerShell' choco_package_name: 'powershell' + +# Version 4 format + packages: + main: + providers: + winget: + name: Microsoft.PowerShell + choco: + name: powershell diff --git a/data/powertoys/default.yaml b/data/powertoys/default.yaml index 33200622..1851b887 100644 --- a/data/powertoys/default.yaml +++ b/data/powertoys/default.yaml @@ -2,3 +2,8 @@ powertoys::settings: website_url: 'https://learn.microsoft.com/windows/powertoys/' git_source: 'https://github.com/microsoft/PowerToys.git' + +# Version 4 format + urls: + website: https://learn.microsoft.com/windows/powertoys/ + source: https://github.com/microsoft/PowerToys.git diff --git a/data/powertoys/osfamily/windows.yaml b/data/powertoys/osfamily/windows.yaml index dde4273f..50e3c944 100644 --- a/data/powertoys/osfamily/windows.yaml +++ b/data/powertoys/osfamily/windows.yaml @@ -3,3 +3,13 @@ powertoys::settings: winget_package_name: 'Microsoft.PowerToys' choco_package_name: 'powertoys' package_name: 'powertoys' + +# Version 4 format + packages: + main: + name: powertoys + providers: + winget: + name: Microsoft.PowerToys + choco: + name: powertoys diff --git a/data/procdump/default.yaml b/data/procdump/default.yaml index 172f85e6..ab8f4609 100644 --- a/data/procdump/default.yaml +++ b/data/procdump/default.yaml @@ -5,3 +5,14 @@ procdump::settings: git_source: 'https://github.com/Sysinternals/ProcDump-for-Linux' tp_prerequisites: - 'microsoft_repo' + +# Version 4 format + packages: + main: + name: procdump + urls: + website: https://learn.microsoft.com/sysinternals/downloads/procdump/ + source: https://github.com/Sysinternals/ProcDump-for-Linux + preinstall: + tp::install: + - microsoft_repo diff --git a/data/procdump/osfamily/Darwin.yaml b/data/procdump/osfamily/Darwin.yaml index 55e5c0e4..1ea8e5f3 100644 --- a/data/procdump/osfamily/Darwin.yaml +++ b/data/procdump/osfamily/Darwin.yaml @@ -1,3 +1,10 @@ --- procdump::settings: brew_package_name: 'procdump' + +# Version 4 format + packages: + main: + providers: + brew: + name: procdump diff --git a/data/procdump/osfamily/windows.yaml b/data/procdump/osfamily/windows.yaml index 6b3fe4eb..57415382 100644 --- a/data/procdump/osfamily/windows.yaml +++ b/data/procdump/osfamily/windows.yaml @@ -1,3 +1,10 @@ --- procdump::settings: choco_package_name: 'procdump' + +# Version 4 format + packages: + main: + providers: + choco: + name: procdump diff --git a/data/profile/default.yaml b/data/profile/default.yaml index 6f2bea17..e380dec4 100644 --- a/data/profile/default.yaml +++ b/data/profile/default.yaml @@ -3,3 +3,19 @@ profile::settings: config_dir_path: '/etc/profile.d' config_file_path: '/etc/profile' conf_dir_path: '/etc/profile.d' + +# Version 4 format + files: + config: + path: "/etc/profile" + user_files: + config: + path: "$HOME/.profile" + dirs: + config: + path: "/etc/profile.d" + conf: + path: "/etc/profile.d" + user_dirs: + config: + path: "$HOME/.profile.d" diff --git a/data/proftpd/default.yaml b/data/proftpd/default.yaml index afc40e23..e0a9470c 100644 --- a/data/proftpd/default.yaml +++ b/data/proftpd/default.yaml @@ -12,3 +12,37 @@ proftpd::settings: process_user: 'proftpd' process_group: 'proftpd' tcp_port: '21' + +# Version 4 format + packages: + main: + name: proftpd + services: + proftpd: + process_name: proftpd + process_user: proftpd + process_group: proftpd + files: + config: + path: "/etc/proftpd/proftpd.conf" + log: + path: "/var/log/proftpd/proftpd.log" + pid: + path: "/var/run/proftpd.pid" + user_files: + config: + path: "$HOME/.proftpd/proftpd.conf" + dirs: + config: + path: "/etc/proftpd" + conf: + path: "/etc/proftpd/conf.d" + log: + path: "/var/log/proftpd" + user_dirs: + config: + path: "$HOME/.proftpd" + ports: + main: + port: '21' + protocol: tcp diff --git a/data/proftpd/osfamily/Debian.yaml b/data/proftpd/osfamily/Debian.yaml index 2d9db3e3..cd02f5f3 100644 --- a/data/proftpd/osfamily/Debian.yaml +++ b/data/proftpd/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- proftpd::settings: init_file_path: '/etc/default/proftpd' + +# Version 4 format + files: + init: + path: "/etc/default/proftpd" diff --git a/data/proftpd/osfamily/RedHat.yaml b/data/proftpd/osfamily/RedHat.yaml index 4db7fa9e..c11ae32a 100644 --- a/data/proftpd/osfamily/RedHat.yaml +++ b/data/proftpd/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- proftpd::settings: init_file_path: '/etc/sysconfig/proftpd' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/proftpd" diff --git a/data/prometheus/default.yaml b/data/prometheus/default.yaml index b6eb9cdb..03ecb5a1 100644 --- a/data/prometheus/default.yaml +++ b/data/prometheus/default.yaml @@ -157,3 +157,32 @@ prometheus::settings: command: 'go install cmd/prometheus/main.go' environment: - 'GO111MODULE=on' + +# Version 4 format + packages: + main: + name: prometheus + services: + prometheus: + process_name: prometheus + process_user: prometheus + process_group: prometheus + files: + config: + path: "/etc/prometheus/prometheus.yml" + format: yaml + init: + path: "/etc/sysconfig/prometheus" + pid: + path: '' + user_files: + config: + path: "$HOME/.prometheus/prometheus.yml" + dirs: + config: + path: "/etc/prometheus" + user_dirs: + config: + path: "$HOME/.prometheus" + preinstall: + tp::install: {} diff --git a/data/prometheus/operatingsystem/Devuan4.yaml b/data/prometheus/operatingsystem/Devuan4.yaml index 8c8357d9..b156cb8c 100644 --- a/data/prometheus/operatingsystem/Devuan4.yaml +++ b/data/prometheus/operatingsystem/Devuan4.yaml @@ -1,3 +1,7 @@ --- prometheus::settings: - pid_file_path: '/run/prometheus/prometheus.pid' \ No newline at end of file + pid_file_path: '/run/prometheus/prometheus.pid' +# Version 4 format + files: + pid: + path: "/run/prometheus/prometheus.pid" diff --git a/data/prometheus/osfamily/Darwin.yaml b/data/prometheus/osfamily/Darwin.yaml index 6ae84bfd..149f6006 100644 --- a/data/prometheus/osfamily/Darwin.yaml +++ b/data/prometheus/osfamily/Darwin.yaml @@ -10,4 +10,10 @@ prometheus::settings: user_dirs: config: - path: '$HOME/Library/Application\ Support/Prometheus/prometheus.yml' \ No newline at end of file + path: '$HOME/Library/Application\ Support/Prometheus/prometheus.yml' +# Version 4 format + packages: + main: + providers: + brew: + name: prometheus diff --git a/data/prometheus/osfamily/Debian.yaml b/data/prometheus/osfamily/Debian.yaml index 0a102727..00043ce0 100644 --- a/data/prometheus/osfamily/Debian.yaml +++ b/data/prometheus/osfamily/Debian.yaml @@ -12,4 +12,8 @@ prometheus::settings: exec: prometheus_init_config: command: 'touch /etc/default/prometheus' - creates: '/etc/default/prometheus' \ No newline at end of file + creates: '/etc/default/prometheus' +# Version 4 format + files: + init: + path: "/etc/default/prometheus" diff --git a/data/prometheus/osfamily/RedHat.yaml b/data/prometheus/osfamily/RedHat.yaml index a4a99454..97ee1b59 100644 --- a/data/prometheus/osfamily/RedHat.yaml +++ b/data/prometheus/osfamily/RedHat.yaml @@ -2,3 +2,7 @@ prometheus::settings: dockerfile_prerequisites: 'RUN yum install -y wget which' install_method: 'release' + +# Version 4 format + image: + dockerfile_prerequisites: RUN yum install -y wget which diff --git a/data/prometheus/osfamily/windows.yaml b/data/prometheus/osfamily/windows.yaml index 3d8c9040..c040277d 100644 --- a/data/prometheus/osfamily/windows.yaml +++ b/data/prometheus/osfamily/windows.yaml @@ -18,3 +18,27 @@ prometheus::settings: config: path: '%APPDATA%\prometheus' + +# Version 4 format + packages: + main: + name: prometheus + providers: + choco: + name: prometheus + services: + ! '': + process_user: LocalSystem + process_group: LocalSystem + files: + config: + path: C:\ProgramData\prometheus\prometheus\etc\prometheus.yml + user_files: + config: + path: C:\ProgramData\prometheus\prometheus\etc\prometheus.yml + dirs: + config: + path: C:\ProgramData\prometheus\prometheus\etc + user_dirs: + config: + path: C:\ProgramData\prometheus\prometheus\etc diff --git a/data/prometheus/osfamily/windows11.yaml b/data/prometheus/osfamily/windows11.yaml index ecf08bd2..a69bbbf3 100644 --- a/data/prometheus/osfamily/windows11.yaml +++ b/data/prometheus/osfamily/windows11.yaml @@ -1,3 +1,8 @@ --- prometheus::settings: package_name: 'prometheus' + +# Version 4 format + packages: + main: + name: prometheus diff --git a/data/psmisc/default.yaml b/data/psmisc/default.yaml index 59042422..c8b430f5 100644 --- a/data/psmisc/default.yaml +++ b/data/psmisc/default.yaml @@ -1,3 +1,8 @@ --- psmisc::settings: package_name: 'psmisc' + +# Version 4 format + packages: + main: + name: psmisc diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml index dcfb1542..bd0c1af9 100644 --- a/data/puppet-agent/default.yaml +++ b/data/puppet-agent/default.yaml @@ -14,3 +14,36 @@ puppet-agent::settings: log_dir_path: - '/var/log/puppetlabs/puppet' - '/var/log/puppetlabs/pxp-agent' + +# Version 4 format + packages: + main: + name: puppet-agent + services: + ? - puppet + - pxp-agent + : process_name: puppet + process_user: root + process_group: root + files: + config: + path: "/etc/puppetlabs/puppet/puppet.conf" + log: + path: + - "/var/log/puppet/pxp-agent/pxp-agent.log" + pid: + path: "/var/run/puppetlabs/agent.pid" + user_files: + config: + path: "$HOME/.puppetlabs/puppet/puppet.conf" + dirs: + config: + path: "/etc/puppetlabs/puppet" + log: + path: + - "/var/log/puppetlabs/puppet" + - "/var/log/puppetlabs/pxp-agent" + user_dirs: + config: + path: "$HOME/.puppetlabs/puppet" + repo: upstream diff --git a/data/puppet-agent/osfamily/Debian.yaml b/data/puppet-agent/osfamily/Debian.yaml index 3bd3219c..3c0099c6 100644 --- a/data/puppet-agent/osfamily/Debian.yaml +++ b/data/puppet-agent/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- puppet-agent::settings: init_file_path: '/etc/default/puppet' + +# Version 4 format + files: + init: + path: "/etc/default/puppet" diff --git a/data/puppet-agent/osfamily/RedHat.yaml b/data/puppet-agent/osfamily/RedHat.yaml index f0afb12f..fa8ac99d 100644 --- a/data/puppet-agent/osfamily/RedHat.yaml +++ b/data/puppet-agent/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ puppet-agent::settings: init_file_path: '/etc/sysconfig/puppet-agent' dockerfile_prerequisites: 'RUN yum install -y wget which' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/puppet-agent" + image: + dockerfile_prerequisites: RUN yum install -y wget which diff --git a/data/puppet-agent/upstream/default.yaml b/data/puppet-agent/upstream/default.yaml index 6d5fd2a6..edeae582 100644 --- a/data/puppet-agent/upstream/default.yaml +++ b/data/puppet-agent/upstream/default.yaml @@ -106,3 +106,8 @@ puppet-agent::settings: path: /opt/puppetlabs/puppet/vendor_modules yaml: path: /opt/puppetlabs/puppet/cache/yaml + +# Version 4 format + preinstall: + tp::install: + puppet-agent_repo: {} diff --git a/data/puppet-agent/upstream/osfamily/Linux.yaml b/data/puppet-agent/upstream/osfamily/Linux.yaml index d763de76..c7bf2e9e 100644 --- a/data/puppet-agent/upstream/osfamily/Linux.yaml +++ b/data/puppet-agent/upstream/osfamily/Linux.yaml @@ -1,3 +1,10 @@ --- puppet-agent::settings: 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 " + +# Version 4 format + image: + 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 index d1c5fcfd..7bbddf48 100644 --- a/data/puppet-agent/upstream/osfamily/windows.yaml +++ b/data/puppet-agent/upstream/osfamily/windows.yaml @@ -13,3 +13,27 @@ puppet-agent::settings: log_dir_path: 'C:\ProgramData\PuppetLabs\var\log' process_user: 'LocalSystem' process_group: 'LocalSystem' + +# Version 4 format + services: + ! '': + process_user: LocalSystem + process_group: LocalSystem + files: + config: + path: C:\ProgramData\PuppetLabs\puppet-agent\etc\puppet-agent.conf + log: + path: C:\ProgramData\PuppetLabs\var\log\puppet-agent.log + pid: + path: C:\ProgramData\PuppetLabs\var\run\agent.pid + user_files: + config: + path: C:\ProgramData\PuppetLabs\puppet-agent\etc\puppet-agent.conf + dirs: + config: + path: C:\ProgramData\PuppetLabs\puppet-agent\etc + log: + path: C:\ProgramData\PuppetLabs\var\log + user_dirs: + config: + path: C:\ProgramData\PuppetLabs\puppet-agent\etc diff --git a/data/puppet/default.yaml b/data/puppet/default.yaml index dcb57328..4a05b77d 100644 --- a/data/puppet/default.yaml +++ b/data/puppet/default.yaml @@ -10,3 +10,30 @@ puppet::settings: process_name: 'puppet' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: puppet + services: + puppet: + process_name: puppet + process_user: root + process_group: root + files: + config: + path: "/etc/puppet/puppet.conf" + pid: + path: "/var/run/puppet/puppet.pid" + user_files: + config: + path: "$HOME/.puppet/puppet.conf" + dirs: + config: + path: "/etc/puppet" + log: + path: "/var/log/puppet" + user_dirs: + config: + path: "$HOME/.puppet" + repo: upstream diff --git a/data/puppet/osfamily/Debian.yaml b/data/puppet/osfamily/Debian.yaml index 876f0ba9..fc526c22 100644 --- a/data/puppet/osfamily/Debian.yaml +++ b/data/puppet/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- puppet::settings: init_file_path: '/etc/default/puppet' + +# Version 4 format + files: + init: + path: "/etc/default/puppet" diff --git a/data/puppet/osfamily/RedHat.yaml b/data/puppet/osfamily/RedHat.yaml index bbdd2f2c..87a030ba 100644 --- a/data/puppet/osfamily/RedHat.yaml +++ b/data/puppet/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ puppet::settings: init_file_path: '/etc/sysconfig/puppet' dockerfile_prerequisites: 'RUN yum install -y wget which' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/puppet" + image: + dockerfile_prerequisites: RUN yum install -y wget which diff --git a/data/puppet/upstream/default.yaml b/data/puppet/upstream/default.yaml index d24562c7..c4c919a9 100644 --- a/data/puppet/upstream/default.yaml +++ b/data/puppet/upstream/default.yaml @@ -21,4 +21,37 @@ puppet::settings: process_user: 'root' process_group: 'root' tp_prerequisites: - puppet_repo: {} \ No newline at end of file + puppet_repo: {} +# Version 4 format + packages: + main: + name: puppet-agent + services: + puppet: + process_name: puppet + process_user: root + process_group: root + files: + config: + path: "/etc/puppetlabs/puppet/puppet.conf" + log: + path: + - "/var/log/puppetlabs/puppet/puppet.log" + - "/var/log/puppetlabs/pxp-agent/pxp-agent.log" + - "/var/log/puppetlabs/mcollective-log" + pid: + path: "/var/run/puppetlabs/agent.pid" + user_files: + config: + path: "$HOME/.puppetlabs/puppet/puppet.conf" + dirs: + config: + path: "/etc/puppetlabs/puppet/" + log: + path: "/var/log/puppetlabs/puppet" + user_dirs: + config: + path: "$HOME/.puppetlabs/puppet/" + preinstall: + tp::install: + puppet_repo: {} diff --git a/data/puppet/upstream/osfamily/Linux.yaml b/data/puppet/upstream/osfamily/Linux.yaml index e40a569d..f845a35f 100644 --- a/data/puppet/upstream/osfamily/Linux.yaml +++ b/data/puppet/upstream/osfamily/Linux.yaml @@ -2,3 +2,13 @@ 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 " + +# Version 4 format + packages: + main: + name: '' + image: + 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/windows.yaml b/data/puppet/upstream/osfamily/windows.yaml index 0819f1ed..05398245 100644 --- a/data/puppet/upstream/osfamily/windows.yaml +++ b/data/puppet/upstream/osfamily/windows.yaml @@ -14,3 +14,32 @@ puppet::settings: process_user: 'LocalSystem' process_group: 'LocalSystem' winget_package_name: 'Puppet.puppet-agent' + +# Version 4 format + packages: + main: + providers: + winget: + name: Puppet.puppet-agent + services: + ! '': + process_user: LocalSystem + process_group: LocalSystem + files: + config: + path: C:\ProgramData\PuppetLabs\puppet\etc\puppet.conf + log: + path: C:\ProgramData\PuppetLabs\var\log\puppet.log + pid: + path: C:\ProgramData\PuppetLabs\var\run\agent.pid + user_files: + config: + path: C:\ProgramData\PuppetLabs\puppet\etc\puppet.conf + dirs: + config: + path: C:\ProgramData\PuppetLabs\puppet\etc + log: + path: C:\ProgramData\PuppetLabs\var\log + user_dirs: + config: + path: C:\ProgramData\PuppetLabs\puppet\etc diff --git a/data/puppet/upstream/osfamily/windows11.yaml b/data/puppet/upstream/osfamily/windows11.yaml index ecd89b6e..b0c2d496 100644 --- a/data/puppet/upstream/osfamily/windows11.yaml +++ b/data/puppet/upstream/osfamily/windows11.yaml @@ -1,3 +1,8 @@ --- puppet::settings: package_name: 'Puppet.puppet-agent' + +# Version 4 format + packages: + main: + name: Puppet.puppet-agent diff --git a/data/puppet_repo/default.yaml b/data/puppet_repo/default.yaml index 1926ce59..3ac287c9 100644 --- a/data/puppet_repo/default.yaml +++ b/data/puppet_repo/default.yaml @@ -1,3 +1,6 @@ --- puppet_repo::settings: upstream_repo: true + +# Version 4 format + repo: upstream diff --git a/data/puppet_repo/upstream/default.yaml b/data/puppet_repo/upstream/default.yaml index acfcd1b0..fd31117b 100644 --- a/data/puppet_repo/upstream/default.yaml +++ b/data/puppet_repo/upstream/default.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_name: 'puppet-release' + +# Version 4 format + repo: + upstream: + package_name: puppet-release diff --git a/data/puppet_repo/upstream/operatingsystem/Debian10.yaml b/data/puppet_repo/upstream/operatingsystem/Debian10.yaml index 8ecfe2b6..d84493bf 100644 --- a/data/puppet_repo/upstream/operatingsystem/Debian10.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Debian10.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://apt.puppet.com/puppet-release-buster.deb' + +# Version 4 format + repo: + upstream: + package_url: https://apt.puppet.com/puppet-release-buster.deb diff --git a/data/puppet_repo/upstream/operatingsystem/Debian11.yaml b/data/puppet_repo/upstream/operatingsystem/Debian11.yaml index 006cf23c..27a315f6 100644 --- a/data/puppet_repo/upstream/operatingsystem/Debian11.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Debian11.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://apt.puppet.com/puppet-release-bullseye.deb' + +# Version 4 format + repo: + upstream: + 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 a5c0377a..786c532b 100644 --- a/data/puppet_repo/upstream/operatingsystem/Debian7.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Debian7.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'http://apt.puppet.com/eol-releases/puppetlabs-release-wheezy.deb' + +# Version 4 format + repo: + upstream: + 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 1bfc4db9..ebba6120 100644 --- a/data/puppet_repo/upstream/operatingsystem/Debian8.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Debian8.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'http://apt.puppet.com/eol-releases/puppetlabs-release-jessie.deb' + +# Version 4 format + repo: + upstream: + package_url: http://apt.puppet.com/eol-releases/puppetlabs-release-jessie.deb diff --git a/data/puppet_repo/upstream/operatingsystem/Debian9.yaml b/data/puppet_repo/upstream/operatingsystem/Debian9.yaml index 8756a388..df6f193b 100644 --- a/data/puppet_repo/upstream/operatingsystem/Debian9.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Debian9.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://apt.puppet.com/puppet-release-stretch.deb' + +# Version 4 format + repo: + upstream: + package_url: https://apt.puppet.com/puppet-release-stretch.deb diff --git a/data/puppet_repo/upstream/operatingsystem/Devuan4.yaml b/data/puppet_repo/upstream/operatingsystem/Devuan4.yaml index 006cf23c..27a315f6 100644 --- a/data/puppet_repo/upstream/operatingsystem/Devuan4.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Devuan4.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://apt.puppet.com/puppet-release-bullseye.deb' + +# Version 4 format + repo: + upstream: + package_url: https://apt.puppet.com/puppet-release-bullseye.deb diff --git a/data/puppet_repo/upstream/operatingsystem/Fedora30.yaml b/data/puppet_repo/upstream/operatingsystem/Fedora30.yaml index 62ac2a9e..6156087e 100644 --- a/data/puppet_repo/upstream/operatingsystem/Fedora30.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Fedora30.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-fedora-30.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index c7bd0803..f5327369 100644 --- a/data/puppet_repo/upstream/operatingsystem/Fedora31.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Fedora31.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-fedora-31.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index f170ff9e..7c67c5d7 100644 --- a/data/puppet_repo/upstream/operatingsystem/Fedora32.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Fedora32.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-fedora-32.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://yum.puppet.com/puppet/puppet-release-fedora-32.noarch.rpm diff --git a/data/puppet_repo/upstream/operatingsystem/Fedora34.yaml b/data/puppet_repo/upstream/operatingsystem/Fedora34.yaml index 05235617..a41be567 100644 --- a/data/puppet_repo/upstream/operatingsystem/Fedora34.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Fedora34.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-fedora-34.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 caacc4b6..b2fab62f 100644 --- a/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'http://apt.puppet.com/eol-releases/puppetlabs-release-trusty.deb' + +# Version 4 format + repo: + upstream: + package_url: http://apt.puppet.com/eol-releases/puppetlabs-release-trusty.deb diff --git a/data/puppet_repo/upstream/operatingsystem/Ubuntu16.04.yaml b/data/puppet_repo/upstream/operatingsystem/Ubuntu16.04.yaml index b2a8edad..4c10dfc7 100644 --- a/data/puppet_repo/upstream/operatingsystem/Ubuntu16.04.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu16.04.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://apt.puppet.com/puppet-release-xenial.deb' + +# Version 4 format + repo: + upstream: + 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 index 717cc743..42025064 100644 --- a/data/puppet_repo/upstream/operatingsystem/Ubuntu18.04.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu18.04.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://apt.puppet.com/puppet-release-bionic.deb' + +# Version 4 format + repo: + upstream: + 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 index c68048da..7a471ace 100644 --- a/data/puppet_repo/upstream/operatingsystem/Ubuntu20.04.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu20.04.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://apt.puppet.com/puppet-release-focal.deb' + +# Version 4 format + repo: + upstream: + package_url: https://apt.puppet.com/puppet-release-focal.deb diff --git a/data/puppet_repo/upstream/operatingsystem/Ubuntu22.04.yaml b/data/puppet_repo/upstream/operatingsystem/Ubuntu22.04.yaml index 93d3ec78..2f1fed61 100644 --- a/data/puppet_repo/upstream/operatingsystem/Ubuntu22.04.yaml +++ b/data/puppet_repo/upstream/operatingsystem/Ubuntu22.04.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://apt.puppet.com/puppet-release-jammy.deb' + +# Version 4 format + repo: + upstream: + package_url: https://apt.puppet.com/puppet-release-jammy.deb diff --git a/data/puppet_repo/upstream/osfamily/Darwin.yaml b/data/puppet_repo/upstream/osfamily/Darwin.yaml index 559bfbdc..d844a726 100644 --- a/data/puppet_repo/upstream/osfamily/Darwin.yaml +++ b/data/puppet_repo/upstream/osfamily/Darwin.yaml @@ -1,4 +1,11 @@ --- puppet_repo::settings: brew_tap: 'puppetlabs/puppet' - package_provider: tap \ No newline at end of file + package_provider: tap +# Version 4 format + packages: + main: + provider: tap + repo: + upstream: + brew_tap: puppetlabs/puppet diff --git a/data/puppet_repo/upstream/osfamily/RedHat5.yaml b/data/puppet_repo/upstream/osfamily/RedHat5.yaml index eb0036fe..b90016eb 100644 --- a/data/puppet_repo/upstream/osfamily/RedHat5.yaml +++ b/data/puppet_repo/upstream/osfamily/RedHat5.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-5.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index 43c820ef..ceec9608 100644 --- a/data/puppet_repo/upstream/osfamily/RedHat6.yaml +++ b/data/puppet_repo/upstream/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-6.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index 4b590dbf..edcf1bb6 100644 --- a/data/puppet_repo/upstream/osfamily/RedHat7.yaml +++ b/data/puppet_repo/upstream/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-7.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index b19eec8e..02d8c383 100644 --- a/data/puppet_repo/upstream/osfamily/RedHat8.yaml +++ b/data/puppet_repo/upstream/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-8.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://yum.puppet.com/puppet/puppet-release-el-8.noarch.rpm diff --git a/data/puppet_repo/upstream/osfamily/RedHat9.yaml b/data/puppet_repo/upstream/osfamily/RedHat9.yaml index 53de43a3..73152368 100644 --- a/data/puppet_repo/upstream/osfamily/RedHat9.yaml +++ b/data/puppet_repo/upstream/osfamily/RedHat9.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-el-9.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://yum.puppet.com/puppet/puppet-release-el-9.noarch.rpm diff --git a/data/puppet_repo/upstream/osfamily/Suse11.yaml b/data/puppet_repo/upstream/osfamily/Suse11.yaml index 09ea415d..2847535f 100644 --- a/data/puppet_repo/upstream/osfamily/Suse11.yaml +++ b/data/puppet_repo/upstream/osfamily/Suse11.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet6/puppet6-release-sles-11.noarch.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://yum.puppet.com/puppet6/puppet6-release-sles-11.noarch.rpm diff --git a/data/puppet_repo/upstream/osfamily/Suse12.yaml b/data/puppet_repo/upstream/osfamily/Suse12.yaml index 0a15b5f2..13f43e38 100644 --- a/data/puppet_repo/upstream/osfamily/Suse12.yaml +++ b/data/puppet_repo/upstream/osfamily/Suse12.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-sles-12.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index 09b062b9..dc0974da 100644 --- a/data/puppet_repo/upstream/osfamily/Suse15.yaml +++ b/data/puppet_repo/upstream/osfamily/Suse15.yaml @@ -1,3 +1,8 @@ --- puppet_repo::settings: repo_package_url: 'https://yum.puppet.com/puppet/puppet-release-sles-15.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 e9e732f5..1885e28d 100644 --- a/data/puppetdb-termini/default.yaml +++ b/data/puppetdb-termini/default.yaml @@ -4,4 +4,23 @@ puppetdb-termini::settings: config_file_path: '/etc/puppetlabs/puppet/puppetdb.conf' config_dir_path: '/etc/puppetlabs/puppet' tp_prerequisites: - puppet_repo: {} \ No newline at end of file + puppet_repo: {} +# Version 4 format + packages: + main: + name: puppetdb-termini + files: + config: + path: "/etc/puppetlabs/puppet/puppetdb.conf" + user_files: + config: + path: "$HOME/.puppetlabs/puppet/puppetdb.conf" + dirs: + config: + path: "/etc/puppetlabs/puppet" + user_dirs: + config: + path: "$HOME/.puppetlabs/puppet" + preinstall: + tp::install: + puppet_repo: {} diff --git a/data/puppetdb/default.yaml b/data/puppetdb/default.yaml index de3bcc98..84250edc 100644 --- a/data/puppetdb/default.yaml +++ b/data/puppetdb/default.yaml @@ -20,4 +20,43 @@ puppetdb::settings: - '/var/log/puppetlabs/puppetdb/puppetdb.log' - '/var/log/puppetlabs/puppetdb/puppetdb-accesss.log' tp_prerequisites: - puppet_repo: {} \ No newline at end of file + puppet_repo: {} +# Version 4 format + packages: + main: + name: puppetdb + services: + puppetdb: + process_name: java + process_extra_name: puppetdb + process_user: puppetdb + process_group: puppetdb + files: + config: + path: "/etc/puppetlabs/puppetsdb/bootstrap.cfg" + log: + path: + - "/var/log/puppetlabs/puppetdb/puppetdb.log" + - "/var/log/puppetlabs/puppetdb/puppetdb-accesss.log" + pid: + path: "/var/run/puppetlabs/puppetdb/puppetdb.pid" + user_files: + config: + path: "$HOME/.puppetlabs/puppetsdb/bootstrap.cfg" + dirs: + config: + path: "/etc/puppetlabs/puppetdb" + conf: + path: "/etc/puppetlabs/puppetdb/conf.d" + log: + path: "/var/log/puppetlabs/puppetdb" + user_dirs: + config: + path: "$HOME/.puppetlabs/puppetdb" + ports: + main: + port: '8080' + protocol: tcp + preinstall: + tp::install: + puppet_repo: {} diff --git a/data/puppetdb/osfamily/Debian.yaml b/data/puppetdb/osfamily/Debian.yaml index a5050c36..2a2f6ef9 100644 --- a/data/puppetdb/osfamily/Debian.yaml +++ b/data/puppetdb/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- puppetdb::settings: init_file_path: '/etc/default/puppetdb' + +# Version 4 format + files: + init: + path: "/etc/default/puppetdb" diff --git a/data/puppetdb/osfamily/RedHat.yaml b/data/puppetdb/osfamily/RedHat.yaml index 4c9650ed..21e13aff 100644 --- a/data/puppetdb/osfamily/RedHat.yaml +++ b/data/puppetdb/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- puppetdb::settings: init_file_path: '/etc/sysconfig/puppetdb' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/puppetdb" diff --git a/data/puppetserver/default.yaml b/data/puppetserver/default.yaml index bbc9dde0..1e32abc0 100644 --- a/data/puppetserver/default.yaml +++ b/data/puppetserver/default.yaml @@ -23,4 +23,41 @@ puppetserver::settings: - '/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 + puppet_repo: {} +# Version 4 format + packages: + main: + name: puppetserver + services: + puppetserver: + process_name: puppet + process_user: puppet + process_group: puppet + nodaemon_args: foreground + files: + config: + path: "/etc/puppetlabs/puppetserver/puppetserver.conf" + log: + 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" + pid: + path: "/var/run/puppetlabs/puppetserver/puppetserver.pid" + user_files: + config: + path: "$HOME/.puppetlabs/puppetserver/puppetserver.conf" + dirs: + config: + path: "/etc/puppetlabs/puppetserver" + conf: + path: "/etc/puppetlabs/puppetserver/conf.d" + log: + path: "/var/log/puppetlabs/puppetserver" + user_dirs: + config: + path: "$HOME/.puppetlabs/puppetserver" + preinstall: + tp::install: + puppet_repo: {} diff --git a/data/puppetserver/osfamily/Debian.yaml b/data/puppetserver/osfamily/Debian.yaml index b80ebbcb..4de40633 100644 --- a/data/puppetserver/osfamily/Debian.yaml +++ b/data/puppetserver/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- puppetserver::settings: init_file_path: '/etc/default/puppetserver' + +# Version 4 format + files: + init: + path: "/etc/default/puppetserver" diff --git a/data/puppetserver/osfamily/RedHat.yaml b/data/puppetserver/osfamily/RedHat.yaml index 6c4c1d86..ad00f3f0 100644 --- a/data/puppetserver/osfamily/RedHat.yaml +++ b/data/puppetserver/osfamily/RedHat.yaml @@ -2,3 +2,10 @@ puppetserver::settings: init_file_path: '/etc/sysconfig/puppetserver' dockerfile_prerequisites: 'RUN yum install -y wget' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/puppetserver" + image: + dockerfile_prerequisites: RUN yum install -y wget diff --git a/data/pwgen/default.yaml b/data/pwgen/default.yaml index 22f29324..d41eb9cd 100644 --- a/data/pwgen/default.yaml +++ b/data/pwgen/default.yaml @@ -1,3 +1,8 @@ --- pwgen::settings: package_name: 'pwgen' + +# Version 4 format + packages: + main: + name: pwgen diff --git a/data/pwgen/operatingsystem/OracleLinux.yaml b/data/pwgen/operatingsystem/OracleLinux.yaml index 09c500c3..5b9e63e2 100644 --- a/data/pwgen/operatingsystem/OracleLinux.yaml +++ b/data/pwgen/operatingsystem/OracleLinux.yaml @@ -1,3 +1,8 @@ --- pwgen::settings: package_name: '' + +# Version 4 format + packages: + main: + name: '' diff --git a/data/python-pip/default.yaml b/data/python-pip/default.yaml index 417751a2..33d7ab5a 100644 --- a/data/python-pip/default.yaml +++ b/data/python-pip/default.yaml @@ -13,3 +13,18 @@ python-pip::settings: cache_info: 'pip cache info' check: 'pip check' config_debug: 'pip config debug' + +# Version 4 format + packages: + main: + name: python-pip + files: + config: + path: "/etc/pip.conf" + format: inifile_with_stanzas + user_files: + config: + path: "$HOME/.pip.conf" + urls: + website: https://pypi.org/project/pip/ + source: https://github.com/pypa/pip diff --git a/data/python-pip/osfamily/Debian.yaml b/data/python-pip/osfamily/Debian.yaml index be597202..e05808d7 100644 --- a/data/python-pip/osfamily/Debian.yaml +++ b/data/python-pip/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- python-pip::settings: package_name: 'python3-pip' + +# Version 4 format + packages: + main: + name: python3-pip diff --git a/data/python-pip/osfamily/Debian20.04.yaml b/data/python-pip/osfamily/Debian20.04.yaml index be597202..e05808d7 100644 --- a/data/python-pip/osfamily/Debian20.04.yaml +++ b/data/python-pip/osfamily/Debian20.04.yaml @@ -1,3 +1,8 @@ --- python-pip::settings: package_name: 'python3-pip' + +# Version 4 format + packages: + main: + name: python3-pip diff --git a/data/python-pip/osfamily/Debian22.04.yaml b/data/python-pip/osfamily/Debian22.04.yaml index be597202..e05808d7 100644 --- a/data/python-pip/osfamily/Debian22.04.yaml +++ b/data/python-pip/osfamily/Debian22.04.yaml @@ -1,3 +1,8 @@ --- python-pip::settings: package_name: 'python3-pip' + +# Version 4 format + packages: + main: + name: python3-pip diff --git a/data/python-pip/osfamily/Fedora36.yaml b/data/python-pip/osfamily/Fedora36.yaml index 17d6ca57..582b68ae 100644 --- a/data/python-pip/osfamily/Fedora36.yaml +++ b/data/python-pip/osfamily/Fedora36.yaml @@ -1,3 +1,7 @@ --- python-pip::settings: - package_name: 'python3-pip' \ No newline at end of file + package_name: 'python3-pip' +# Version 4 format + packages: + main: + name: python3-pip diff --git a/data/python-pip/osfamily/RedHat7.yaml b/data/python-pip/osfamily/RedHat7.yaml index 17d6ca57..582b68ae 100644 --- a/data/python-pip/osfamily/RedHat7.yaml +++ b/data/python-pip/osfamily/RedHat7.yaml @@ -1,3 +1,7 @@ --- python-pip::settings: - package_name: 'python3-pip' \ No newline at end of file + package_name: 'python3-pip' +# Version 4 format + packages: + main: + name: python3-pip diff --git a/data/python-pip/osfamily/RedHat8.yaml b/data/python-pip/osfamily/RedHat8.yaml index be597202..e05808d7 100644 --- a/data/python-pip/osfamily/RedHat8.yaml +++ b/data/python-pip/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- python-pip::settings: package_name: 'python3-pip' + +# Version 4 format + packages: + main: + name: python3-pip diff --git a/data/python-pip/osfamily/RedHat9.yaml b/data/python-pip/osfamily/RedHat9.yaml index 17d6ca57..582b68ae 100644 --- a/data/python-pip/osfamily/RedHat9.yaml +++ b/data/python-pip/osfamily/RedHat9.yaml @@ -1,3 +1,7 @@ --- python-pip::settings: - package_name: 'python3-pip' \ No newline at end of file + package_name: 'python3-pip' +# Version 4 format + packages: + main: + name: python3-pip diff --git a/data/python-pip/osfamily/Suse.yaml b/data/python-pip/osfamily/Suse.yaml index be597202..e05808d7 100644 --- a/data/python-pip/osfamily/Suse.yaml +++ b/data/python-pip/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- python-pip::settings: package_name: 'python3-pip' + +# Version 4 format + packages: + main: + name: python3-pip diff --git a/data/python-pip/osfamily/windows.yaml b/data/python-pip/osfamily/windows.yaml index 73205a94..14a44bd0 100644 --- a/data/python-pip/osfamily/windows.yaml +++ b/data/python-pip/osfamily/windows.yaml @@ -1,3 +1,7 @@ --- python-pip::settings: - package_name: 'python' \ No newline at end of file + package_name: 'python' +# Version 4 format + packages: + main: + name: python diff --git a/data/pytorch/default.yaml b/data/pytorch/default.yaml index 8528b2bd..85877ce2 100644 --- a/data/pytorch/default.yaml +++ b/data/pytorch/default.yaml @@ -6,3 +6,12 @@ pytorch::settings: - 'torchaudio' package_provider: 'pip' + +# Version 4 format + packages: + main: + name: + - torch + - torchvision + - torchaudio + provider: pip diff --git a/data/quagga/default.yaml b/data/quagga/default.yaml index c6c38768..77f52ce8 100644 --- a/data/quagga/default.yaml +++ b/data/quagga/default.yaml @@ -11,3 +11,33 @@ quagga::settings: process_name: 'quagga' process_user: 'quagga' process_group: 'quagga' + +# Version 4 format + packages: + main: + name: quagga + services: + quagga: + process_name: quagga + process_user: quagga + process_group: quagga + files: + config: + path: "/etc/quagga/daemons" + log: + path: "/var/log/quagga/quagga.log" + pid: + path: "/var/run/quagga.pid" + user_files: + config: + path: "$HOME/.quagga/daemons" + dirs: + config: + path: "/etc/quagga" + conf: + path: "/etc/quagga/conf.d" + log: + path: "/var/log/quagga" + user_dirs: + config: + path: "$HOME/.quagga" diff --git a/data/quagga/osfamily/Debian.yaml b/data/quagga/osfamily/Debian.yaml index 06e262d9..13d9895a 100644 --- a/data/quagga/osfamily/Debian.yaml +++ b/data/quagga/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- quagga::settings: init_file_path: '/etc/default/quagga' + +# Version 4 format + files: + init: + path: "/etc/default/quagga" diff --git a/data/quagga/osfamily/RedHat.yaml b/data/quagga/osfamily/RedHat.yaml index 44e2878d..8c1307fa 100644 --- a/data/quagga/osfamily/RedHat.yaml +++ b/data/quagga/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- quagga::settings: init_file_path: '/etc/sysconfig/quagga' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/quagga" diff --git a/data/quantum/default.yaml b/data/quantum/default.yaml index 21ca04b5..54b86364 100644 --- a/data/quantum/default.yaml +++ b/data/quantum/default.yaml @@ -8,3 +8,28 @@ quantum::settings: process_name: 'quantum' process_user: 'quantum' process_group: 'quantum' + +# Version 4 format + services: + ! '': + process_name: quantum + process_user: quantum + process_group: quantum + files: + config: + path: "/etc/quantum/quantum.conf" + log: + path: "/var/log/quantum/quantum.log" + pid: + path: "/var/run/quantum.pid" + user_files: + config: + path: "$HOME/.quantum/quantum.conf" + dirs: + config: + path: "/etc/quantum" + log: + path: "/var/log/quantum" + user_dirs: + config: + path: "$HOME/.quantum" diff --git a/data/quantum/osfamily/Debian.yaml b/data/quantum/osfamily/Debian.yaml index 20746f9c..56c5fbd7 100644 --- a/data/quantum/osfamily/Debian.yaml +++ b/data/quantum/osfamily/Debian.yaml @@ -3,3 +3,13 @@ quantum::settings: package_name: 'quantum-server' service_name: 'quantum-server' init_file_path: '/etc/default/quantum' + +# Version 4 format + packages: + main: + name: quantum-server + services: + quantum-server: {} + files: + init: + path: "/etc/default/quantum" diff --git a/data/quantum/osfamily/RedHat.yaml b/data/quantum/osfamily/RedHat.yaml index 31b6bf60..e74cb228 100644 --- a/data/quantum/osfamily/RedHat.yaml +++ b/data/quantum/osfamily/RedHat.yaml @@ -3,3 +3,13 @@ quantum::settings: package_name: 'openstack-quantum' service_name: 'openstack-quantum-server' init_file_path: '/etc/sysconfig/quantum' + +# Version 4 format + packages: + main: + name: openstack-quantum + services: + openstack-quantum-server: {} + files: + init: + path: "/etc/sysconfig/quantum" diff --git a/data/r10k/default.yaml b/data/r10k/default.yaml index 8e37d2d3..d32c6e7f 100644 --- a/data/r10k/default.yaml +++ b/data/r10k/default.yaml @@ -5,3 +5,18 @@ r10k::settings: config_file_path: '/etc/r10k.yaml' tp_prerequisites: - ruby + +# Version 4 format + packages: + main: + name: r10k + provider: gem + files: + config: + path: "/etc/r10k.yaml" + user_files: + config: + path: "$HOME/.r10k.yaml" + preinstall: + tp::install: + - ruby diff --git a/data/rabbitmq/default.yaml b/data/rabbitmq/default.yaml index a918f136..74d3d576 100644 --- a/data/rabbitmq/default.yaml +++ b/data/rabbitmq/default.yaml @@ -11,3 +11,35 @@ rabbitmq::settings: process_user: 'rabbitmq' process_group: 'rabbitmq' tcp_port: '5672' + +# Version 4 format + packages: + main: + name: rabbitmq + services: + rabbitmq: + process_name: rabbitmq + process_user: rabbitmq + process_group: rabbitmq + files: + config: + path: "/etc/rabbitmq/rabbitmq.config" + log: + path: "/var/log/rabbitmq/rabbitmq.log" + pid: + path: "/var/run/rabbitmq.pid" + user_files: + config: + path: "$HOME/.rabbitmq/rabbitmq.config" + dirs: + config: + path: "/etc/rabbitmq" + log: + path: "/var/log/rabbitmq" + user_dirs: + config: + path: "$HOME/.rabbitmq" + ports: + main: + port: '5672' + protocol: tcp diff --git a/data/rabbitmq/osfamily/Debian.yaml b/data/rabbitmq/osfamily/Debian.yaml index ca0ab75d..39dab415 100644 --- a/data/rabbitmq/osfamily/Debian.yaml +++ b/data/rabbitmq/osfamily/Debian.yaml @@ -3,3 +3,13 @@ rabbitmq::settings: package_name: 'rabbitmq-server' service_name: 'rabbitmq-server' init_file_path: '/etc/default/rabbitmq-server' + +# Version 4 format + packages: + main: + name: rabbitmq-server + services: + rabbitmq-server: {} + files: + init: + path: "/etc/default/rabbitmq-server" diff --git a/data/rabbitmq/osfamily/RedHat.yaml b/data/rabbitmq/osfamily/RedHat.yaml index f00cb5cc..a0dd81ed 100644 --- a/data/rabbitmq/osfamily/RedHat.yaml +++ b/data/rabbitmq/osfamily/RedHat.yaml @@ -3,3 +3,13 @@ rabbitmq::settings: package_name: 'rabbitmq-server' service_name: 'rabbitmq-server' init_file_path: '/etc/sysconfig/rabbitmq-server' + +# Version 4 format + packages: + main: + name: rabbitmq-server + services: + rabbitmq-server: {} + files: + init: + path: "/etc/sysconfig/rabbitmq-server" diff --git a/data/rails/default.yaml b/data/rails/default.yaml index b6909592..834f55fa 100644 --- a/data/rails/default.yaml +++ b/data/rails/default.yaml @@ -1,3 +1,8 @@ --- rails::settings: package_name: 'rails' + +# Version 4 format + packages: + main: + name: rails diff --git a/data/rails/osfamily/Debian.yaml b/data/rails/osfamily/Debian.yaml index df0db60d..de22a36a 100644 --- a/data/rails/osfamily/Debian.yaml +++ b/data/rails/osfamily/Debian.yaml @@ -3,3 +3,9 @@ rails::settings: package_prerequisites: - 'ruby-dev' - 'zlib1g-dev' + +# Version 4 format + preinstall: + package: + - ruby-dev + - zlib1g-dev diff --git a/data/rails/osfamily/RedHat.yaml b/data/rails/osfamily/RedHat.yaml index 5c9d2147..07ba8545 100644 --- a/data/rails/osfamily/RedHat.yaml +++ b/data/rails/osfamily/RedHat.yaml @@ -3,3 +3,9 @@ rails::settings: package_prerequisites: - 'ruby-devel' - 'zlib-devel' + +# Version 4 format + preinstall: + package: + - ruby-devel + - zlib-devel diff --git a/data/redis/default.yaml b/data/redis/default.yaml index cae5f4a9..71cce4b8 100644 --- a/data/redis/default.yaml +++ b/data/redis/default.yaml @@ -11,3 +11,33 @@ redis::settings: process_group: 'redis' process_name: 'redis-server' process_args: '/etc/redis/redis.conf' + +# Version 4 format + packages: + main: + name: redis + services: + redis: + process_name: redis-server + process_user: redis + process_group: redis + files: + config: + path: "/etc/redis/redis.conf" + log: + path: "/var/log/redis.log" + pid: + path: "/var/run/redis.pid" + user_files: + config: + path: "$HOME/.redis/redis.conf" + dirs: + config: + path: "/etc/redis" + user_dirs: + config: + path: "$HOME/.redis" + ports: + main: + port: '6379' + protocol: tcp diff --git a/data/redis/operatingsystem/testos-0.0.1.yaml b/data/redis/operatingsystem/testos-0.0.1.yaml index 20d60e15..af199f83 100644 --- a/data/redis/operatingsystem/testos-0.0.1.yaml +++ b/data/redis/operatingsystem/testos-0.0.1.yaml @@ -9,3 +9,22 @@ redis::settings: config_file_group: 'test' config_file_mode: '0644' config_dir_path: '/etc/redis-testos001' + +# Version 4 format + packages: + main: + name: redis-testos001 + services: + redis-testos001: {} + files: + config: + path: "/etc/redis-testos001/redis.conf" + user_files: + config: + path: "$HOME/.redis-testos001/redis.conf" + dirs: + config: + path: "/etc/redis-testos001" + user_dirs: + config: + path: "$HOME/.redis-testos001" diff --git a/data/redis/operatingsystem/testos.yaml b/data/redis/operatingsystem/testos.yaml index f314dd97..b8bc77c1 100644 --- a/data/redis/operatingsystem/testos.yaml +++ b/data/redis/operatingsystem/testos.yaml @@ -9,3 +9,22 @@ redis::settings: config_file_group: 'test' config_file_mode: '0644' config_dir_path: '/etc/redis-testos' + +# Version 4 format + packages: + main: + name: redis-testos + services: + redis-testos: {} + files: + config: + path: "/etc/redis-testos/redis.conf" + user_files: + config: + path: "$HOME/.redis-testos/redis.conf" + dirs: + config: + path: "/etc/redis-testos" + user_dirs: + config: + path: "$HOME/.redis-testos" diff --git a/data/redis/osfamily/Debian.yaml b/data/redis/osfamily/Debian.yaml index f227e3b3..a7100a35 100644 --- a/data/redis/osfamily/Debian.yaml +++ b/data/redis/osfamily/Debian.yaml @@ -3,3 +3,13 @@ redis::settings: init_file_path: '/etc/default/redis-server' package_name: 'redis-server' service_name: 'redis-server' + +# Version 4 format + packages: + main: + name: redis-server + services: + redis-server: {} + files: + init: + path: "/etc/default/redis-server" diff --git a/data/redis/osfamily/RedHat.yaml b/data/redis/osfamily/RedHat.yaml index 13bd3eec..5c5880ed 100644 --- a/data/redis/osfamily/RedHat.yaml +++ b/data/redis/osfamily/RedHat.yaml @@ -2,3 +2,11 @@ redis::settings: config_file_path: '/etc/redis.conf' process_args: '/etc/redis.conf --daemonize no' + +# Version 4 format + files: + config: + path: "/etc/redis.conf" + user_files: + config: + path: "$HOME/.redis.conf" diff --git a/data/redis/osfamily/test.yaml b/data/redis/osfamily/test.yaml index 2cfdb54b..050d1ada 100644 --- a/data/redis/osfamily/test.yaml +++ b/data/redis/osfamily/test.yaml @@ -15,3 +15,24 @@ redis::settings: config_dir_owner: 'test' config_dir_group: 'test' config_dir_mode: '0644' + +# Version 4 format + packages: + main: + name: redis-test + services: + redis-test: {} + files: + config: + path: "/etc/redis-test/redis.conf" + init: + path: "/etc/sysconfig/redis-test" + user_files: + config: + path: "$HOME/.redis-test/redis.conf" + dirs: + config: + path: "/etc/redis-test" + user_dirs: + config: + path: "$HOME/.redis-test" diff --git a/data/reference/default.yaml b/data/reference/default.yaml index ca71e8ec..ad4d5173 100644 --- a/data/reference/default.yaml +++ b/data/reference/default.yaml @@ -815,3 +815,65 @@ reference::settings: # The git repository of the application. Maps to v3 git_source source: ~ + +# Version 4 format + packages: + main: + name: reference + services: + reference: + process_name: reference + process_user: root + process_group: root + nodaemon_args: "-D" + files: + config: + path: "/etc/reference/reference.conf" + format: yaml + log: + path: + - "/var/log/reference/reference.log" + init: + path: "/etc/sysconfig/reference.conf" + pid: + path: "/run/reference.pid" + user_files: + config: + path: "$HOME/.reference/reference.conf" + dirs: + config: + path: "/etc/reference" + log: + path: + - "/var/log/reference" + home: + path: "/var/lib/reference" + data: + path: "/var/lib/reference" + user_dirs: + config: + path: "$HOME/.reference" + ports: + main: + port: 42 + protocol: tcp + main_udp: + port: 42 + protocol: udp + image: + name: reference/reference + dockerfile_prerequisites: RUN apt-get update && apt-get install -y --force-yes --no-install-recommends + wget + repo: + upstream: + package_name: reference-release + package_params: {} + repofile_name: reference + yum: + params: {} + preinstall: + tp::install: [] + exec: {} + package: [] + postinstall: + extra: {} diff --git a/data/reference/osfamily/Darwin.yaml b/data/reference/osfamily/Darwin.yaml index 0edcb020..5be45b62 100644 --- a/data/reference/osfamily/Darwin.yaml +++ b/data/reference/osfamily/Darwin.yaml @@ -10,3 +10,13 @@ reference::settings: # If set, the string used is the title of a package resource installed via # the tap provider. brew_tap: 'reference/reference' + +# Version 4 format + packages: + main: + providers: + brew: + name: reference + repo: + upstream: + brew_tap: reference/reference diff --git a/data/reference/osfamily/Debian.yaml b/data/reference/osfamily/Debian.yaml index c46f43ef..1b1494ef 100644 --- a/data/reference/osfamily/Debian.yaml +++ b/data/reference/osfamily/Debian.yaml @@ -8,3 +8,8 @@ reference::settings: files: init: path: '/etc/default/reference' + +# Version 4 format + files: + init: + path: "/etc/default/reference" diff --git a/data/reference/osfamily/RedHat.yaml b/data/reference/osfamily/RedHat.yaml index c757b372..f4ff1584 100644 --- a/data/reference/osfamily/RedHat.yaml +++ b/data/reference/osfamily/RedHat.yaml @@ -1,3 +1,7 @@ --- reference::settings: dockerfile_prerequisites: 'RUN yum install -y wget which' + +# Version 4 format + image: + dockerfile_prerequisites: RUN yum install -y wget which diff --git a/data/reference/osfamily/windows.yaml b/data/reference/osfamily/windows.yaml index ee6eecc0..9f53e55c 100644 --- a/data/reference/osfamily/windows.yaml +++ b/data/reference/osfamily/windows.yaml @@ -14,3 +14,12 @@ reference::settings: # (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' + +# Version 4 format + packages: + main: + providers: + winget: + name: reference.reference + choco: + name: reference diff --git a/data/remi/osfamily/CentOS6.yaml b/data/remi/osfamily/CentOS6.yaml index eaa4ac33..9676c8ac 100644 --- a/data/remi/osfamily/CentOS6.yaml +++ b/data/remi/osfamily/CentOS6.yaml @@ -1,3 +1,8 @@ --- remi::settings: repo_package_url: 'https://rpms.remirepo.net/enterprise/remi-release-6.rpm' + +# Version 4 format + repo: + upstream: + 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 index ee1e40e1..37bf0441 100644 --- a/data/remi/osfamily/CentOS7.yaml +++ b/data/remi/osfamily/CentOS7.yaml @@ -1,3 +1,8 @@ --- remi::settings: repo_package_url: 'https://rpms.remirepo.net/enterprise/remi-release-7.rpm' + +# Version 4 format + repo: + upstream: + 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 index 2ca4818c..0e8fd3fe 100644 --- a/data/remi/osfamily/RedHat.yaml +++ b/data/remi/osfamily/RedHat.yaml @@ -3,3 +3,11 @@ remi::settings: repo_package_name: 'remi-release' tp_prerequisites: - epel + +# Version 4 format + repo: + upstream: + package_name: remi-release + preinstall: + tp::install: + - epel diff --git a/data/remi/osfamily/RedHat6.yaml b/data/remi/osfamily/RedHat6.yaml index 1e9e47f7..c6796885 100644 --- a/data/remi/osfamily/RedHat6.yaml +++ b/data/remi/osfamily/RedHat6.yaml @@ -4,4 +4,13 @@ remi::settings: 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 + unless: 'subscription-manager list --consumed | grep rhel-6-server-optional-rpms' +# Version 4 format + repo: + upstream: + package_url: https://rpms.remirepo.net/enterprise/remi-release-6.rpm + postinstall: + exec: + 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 diff --git a/data/remi/osfamily/RedHat7.yaml b/data/remi/osfamily/RedHat7.yaml index 2409baa3..601bd6e2 100644 --- a/data/remi/osfamily/RedHat7.yaml +++ b/data/remi/osfamily/RedHat7.yaml @@ -4,4 +4,13 @@ remi::settings: 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 + unless: 'subscription-manager list --consumed | grep rhel-7-server-optional-rpms' +# Version 4 format + repo: + upstream: + package_url: https://rpms.remirepo.net/enterprise/remi-release-7.rpm + postinstall: + exec: + 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 diff --git a/data/remi/osfamily/RedHat8.yaml b/data/remi/osfamily/RedHat8.yaml index acae5c43..83b20232 100644 --- a/data/remi/osfamily/RedHat8.yaml +++ b/data/remi/osfamily/RedHat8.yaml @@ -1,3 +1,8 @@ --- remi::settings: repo_package_url: 'https://rpms.remirepo.net/enterprise/remi-release-8.rpm' + +# Version 4 format + repo: + upstream: + package_url: https://rpms.remirepo.net/enterprise/remi-release-8.rpm diff --git a/data/rinse/default.yaml b/data/rinse/default.yaml index 319ecd8a..6825322f 100644 --- a/data/rinse/default.yaml +++ b/data/rinse/default.yaml @@ -3,3 +3,20 @@ rinse::settings: package_name: 'rinse' config_file_path: '/etc/rinse/rinse.conf' config_dir_path: '/etc/rinse' + +# Version 4 format + packages: + main: + name: rinse + files: + config: + path: "/etc/rinse/rinse.conf" + user_files: + config: + path: "$HOME/.rinse/rinse.conf" + dirs: + config: + path: "/etc/rinse" + user_dirs: + config: + path: "$HOME/.rinse" diff --git a/data/rinse/osfamily/Debian.yaml b/data/rinse/osfamily/Debian.yaml index 5b443365..a7c6331f 100644 --- a/data/rinse/osfamily/Debian.yaml +++ b/data/rinse/osfamily/Debian.yaml @@ -1,3 +1,11 @@ --- rinse::settings: config_file_path: '/etc/rinse/rinse.conf' + +# Version 4 format + files: + config: + path: "/etc/rinse/rinse.conf" + user_files: + config: + path: "$HOME/.rinse/rinse.conf" diff --git a/data/rpmfusion-free/osfamily/CentOS8.yaml b/data/rpmfusion-free/osfamily/CentOS8.yaml index b49a2d46..dd6a5abb 100644 --- a/data/rpmfusion-free/osfamily/CentOS8.yaml +++ b/data/rpmfusion-free/osfamily/CentOS8.yaml @@ -4,3 +4,10 @@ rpmfusion-free::settings: enable_pmfusion_free: command: 'dnf config-manager --enable PowerTools' unless: 'dnf repolist | grep PowerTools' + +# Version 4 format + postinstall: + exec: + enable_pmfusion_free: + command: dnf config-manager --enable PowerTools + unless: dnf repolist | grep PowerTools diff --git a/data/rpmfusion-free/osfamily/RedHat.yaml b/data/rpmfusion-free/osfamily/RedHat.yaml index f37697a7..8dd17bbf 100644 --- a/data/rpmfusion-free/osfamily/RedHat.yaml +++ b/data/rpmfusion-free/osfamily/RedHat.yaml @@ -3,3 +3,11 @@ rpmfusion-free::settings: repo_package_name: 'rpmfusion-free-release' tp_prerequisites: - epel + +# Version 4 format + repo: + upstream: + package_name: rpmfusion-free-release + preinstall: + tp::install: + - epel diff --git a/data/rpmfusion-free/osfamily/RedHat6.yaml b/data/rpmfusion-free/osfamily/RedHat6.yaml index d971df2b..9d672df7 100644 --- a/data/rpmfusion-free/osfamily/RedHat6.yaml +++ b/data/rpmfusion-free/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- rpmfusion-free::settings: repo_package_url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index ee01d1b3..7ee2298a 100644 --- a/data/rpmfusion-free/osfamily/RedHat7.yaml +++ b/data/rpmfusion-free/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- rpmfusion-free::settings: repo_package_url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index e56dc7c4..0388f857 100644 --- a/data/rpmfusion-free/osfamily/RedHat8.yaml +++ b/data/rpmfusion-free/osfamily/RedHat8.yaml @@ -5,3 +5,15 @@ rpmfusion-free::settings: 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 + +# Version 4 format + repo: + upstream: + package_url: https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm + postinstall: + exec: + 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 diff --git a/data/rpmfusion-nonfree/osfamily/CentOS8.yaml b/data/rpmfusion-nonfree/osfamily/CentOS8.yaml index bb3cdfc8..7aa27d65 100644 --- a/data/rpmfusion-nonfree/osfamily/CentOS8.yaml +++ b/data/rpmfusion-nonfree/osfamily/CentOS8.yaml @@ -3,4 +3,10 @@ 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 + unless: 'dnf repolist | grep PowerTools' +# Version 4 format + postinstall: + exec: + enable_pmfusion_free: + command: dnf config-manager --enable PowerTools + unless: dnf repolist | grep PowerTools diff --git a/data/rpmfusion-nonfree/osfamily/RedHat.yaml b/data/rpmfusion-nonfree/osfamily/RedHat.yaml index b4c75cb9..3ba1a8f0 100644 --- a/data/rpmfusion-nonfree/osfamily/RedHat.yaml +++ b/data/rpmfusion-nonfree/osfamily/RedHat.yaml @@ -3,3 +3,11 @@ rpmfusion-nonfree::settings: repo_package_name: 'rpmfusion-nonfree-release' tp_prerequisites: - epel + +# Version 4 format + repo: + upstream: + package_name: rpmfusion-nonfree-release + preinstall: + tp::install: + - epel diff --git a/data/rpmfusion-nonfree/osfamily/RedHat6.yaml b/data/rpmfusion-nonfree/osfamily/RedHat6.yaml index d9133dc9..0a4214ae 100644 --- a/data/rpmfusion-nonfree/osfamily/RedHat6.yaml +++ b/data/rpmfusion-nonfree/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- rpmfusion-nonfree::settings: repo_package_url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-6.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index 350eb7d7..36d395cd 100644 --- a/data/rpmfusion-nonfree/osfamily/RedHat7.yaml +++ b/data/rpmfusion-nonfree/osfamily/RedHat7.yaml @@ -1,3 +1,8 @@ --- rpmfusion-nonfree::settings: repo_package_url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm' + +# Version 4 format + repo: + upstream: + 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 index 572eb167..e3cab534 100644 --- a/data/rpmfusion-nonfree/osfamily/RedHat8.yaml +++ b/data/rpmfusion-nonfree/osfamily/RedHat8.yaml @@ -4,4 +4,15 @@ rpmfusion-nonfree::settings: 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 + unless: 'subscription-manager list --consumed | grep codeready-builder-for-rhel-8-$(uname -m)-rpms' +# Version 4 format + repo: + upstream: + package_url: https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-8.noarch.rpm + postinstall: + exec: + 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 diff --git a/data/rsync/default.yaml b/data/rsync/default.yaml index c30b5694..eba42dd6 100644 --- a/data/rsync/default.yaml +++ b/data/rsync/default.yaml @@ -8,3 +8,25 @@ rsync::settings: process_user: 'root' process_group: 'root' tcp_port: '873' + +# Version 4 format + packages: + main: + name: rsync + services: + rsync: + process_name: rsync + process_user: root + process_group: root + files: + config: + path: "/etc/rsyncd.conf" + pid: + path: "/var/run/rsync.pid" + user_files: + config: + path: "$HOME/.rsyncd.conf" + ports: + main: + port: '873' + protocol: tcp diff --git a/data/rsync/osfamily/Debian.yaml b/data/rsync/osfamily/Debian.yaml index 590b380d..e31e127e 100644 --- a/data/rsync/osfamily/Debian.yaml +++ b/data/rsync/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- rsync::settings: init_file_path: '/etc/default/rsync' + +# Version 4 format + files: + init: + path: "/etc/default/rsync" diff --git a/data/rsync/osfamily/FreeBSD.yaml b/data/rsync/osfamily/FreeBSD.yaml index 55857727..c8969120 100644 --- a/data/rsync/osfamily/FreeBSD.yaml +++ b/data/rsync/osfamily/FreeBSD.yaml @@ -6,3 +6,19 @@ rsync::settings: process_group: 'wheel' tcp_port: '873' + +# Version 4 format + services: + rsyncd: + process_name: rsync + process_group: + files: + config: + path: "/usr/local/etc/rsyncd.conf" + user_files: + config: + path: "/usr/local$HOME/.rsyncd.conf" + ports: + main: + port: '873' + protocol: tcp diff --git a/data/rsync/osfamily/RedHat.yaml b/data/rsync/osfamily/RedHat.yaml index 2d56d2b1..89d5e559 100644 --- a/data/rsync/osfamily/RedHat.yaml +++ b/data/rsync/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- rsync::settings: init_file_path: '/etc/sysconfig/rsync' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/rsync" diff --git a/data/rsyslog-relp/default.yaml b/data/rsyslog-relp/default.yaml index 3995ba95..ac8807c2 100644 --- a/data/rsyslog-relp/default.yaml +++ b/data/rsyslog-relp/default.yaml @@ -1,3 +1,8 @@ --- rsyslog-relp::settings: package_name: 'rsyslog-relp' + +# Version 4 format + packages: + main: + name: rsyslog-relp diff --git a/data/rsyslog/default.yaml b/data/rsyslog/default.yaml index b6034bf5..f112cf1c 100644 --- a/data/rsyslog/default.yaml +++ b/data/rsyslog/default.yaml @@ -14,3 +14,39 @@ rsyslog::settings: process_user: 'root' process_group: 'root' version_command: 'rsyslogd -v' + +# Version 4 format + packages: + main: + name: rsyslog + services: + rsyslog: + process_name: rsyslogd + process_user: root + process_group: root + files: + config: + path: "/etc/rsyslog.conf" + log: + path: "/var/log/messages" + init: + path: "/etc/sysconfig/rsyslog" + pid: + path: "/var/run/rsyslog.pid" + user_files: + config: + path: "$HOME/.rsyslog.conf" + dirs: + config: + path: "/etc/rsyslog.d" + conf: + path: "/etc/rsyslog.d" + data: + path: "/var/log" + user_dirs: + config: + path: "$HOME/.rsyslog.d" + ports: + main_udp: + port: '69' + protocol: udp diff --git a/data/rsyslog/osfamily/Debian.yaml b/data/rsyslog/osfamily/Debian.yaml index 5f7d0596..0479aa6d 100644 --- a/data/rsyslog/osfamily/Debian.yaml +++ b/data/rsyslog/osfamily/Debian.yaml @@ -3,3 +3,12 @@ rsyslog::settings: init_file_path: '/etc/default/rsyslog' pid_file_path: '/var/run/rsyslogd.pid' log_file_path: '/var/log/syslog' + +# Version 4 format + files: + log: + path: "/var/log/syslog" + init: + path: "/etc/default/rsyslog" + pid: + path: "/var/run/rsyslogd.pid" diff --git a/data/ruby-dev/default.yaml b/data/ruby-dev/default.yaml index 8dfcfd91..57f856a6 100644 --- a/data/ruby-dev/default.yaml +++ b/data/ruby-dev/default.yaml @@ -1,3 +1,8 @@ --- ruby-dev::settings: package_name: 'ruby-dev' + +# Version 4 format + packages: + main: + name: ruby-dev diff --git a/data/ruby-dev/osfamily/Debian.yaml b/data/ruby-dev/osfamily/Debian.yaml index 8dfcfd91..57f856a6 100644 --- a/data/ruby-dev/osfamily/Debian.yaml +++ b/data/ruby-dev/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- ruby-dev::settings: package_name: 'ruby-dev' + +# Version 4 format + packages: + main: + name: ruby-dev diff --git a/data/ruby-dev/osfamily/RedHat.yaml b/data/ruby-dev/osfamily/RedHat.yaml index ce30cc8a..30e03f92 100644 --- a/data/ruby-dev/osfamily/RedHat.yaml +++ b/data/ruby-dev/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- ruby-dev::settings: package_name: 'ruby-devel' + +# Version 4 format + packages: + main: + name: ruby-devel diff --git a/data/ruby-dev/osfamily/Suse.yaml b/data/ruby-dev/osfamily/Suse.yaml index ce30cc8a..30e03f92 100644 --- a/data/ruby-dev/osfamily/Suse.yaml +++ b/data/ruby-dev/osfamily/Suse.yaml @@ -1,3 +1,8 @@ --- ruby-dev::settings: package_name: 'ruby-devel' + +# Version 4 format + packages: + main: + name: ruby-devel diff --git a/data/ruby/default.yaml b/data/ruby/default.yaml index 64d4e988..5f79be5b 100644 --- a/data/ruby/default.yaml +++ b/data/ruby/default.yaml @@ -1,3 +1,8 @@ --- ruby::settings: package_name: 'ruby' + +# Version 4 format + packages: + main: + name: ruby diff --git a/data/ruby/osfamily/RedHat6.yaml b/data/ruby/osfamily/RedHat6.yaml index 08a37ed3..6e8d9786 100644 --- a/data/ruby/osfamily/RedHat6.yaml +++ b/data/ruby/osfamily/RedHat6.yaml @@ -1,3 +1,8 @@ --- ruby::settings: package_name: 'rubygems' + +# Version 4 format + packages: + main: + name: rubygems diff --git a/data/rundeck/default.yaml b/data/rundeck/default.yaml index 663334d9..cb528c55 100644 --- a/data/rundeck/default.yaml +++ b/data/rundeck/default.yaml @@ -18,3 +18,38 @@ rundeck::settings: config_file_mode: '0640' tp_prerequisites: - 'openjdk-jdk' + +# Version 4 format + packages: + main: + name: rundeck + services: + rundeckd: + process_name: rundeck + process_user: rundeck + process_group: rundeck + files: + config: + path: "/etc/rundeck/framework.properties" + log: + path: "/var/log/rundeck/rundeck.log" + init: + path: "/etc/rundeck/profile" + pid: + path: "/var/run/rundeckd.pid" + user_files: + config: + path: "$HOME/.rundeck/framework.properties" + dirs: + config: + path: "/etc/rundeck" + log: + path: "/var/log/rundeck" + ssl: + path: "/etc/rundeck/ssl" + user_dirs: + config: + path: "$HOME/.rundeck" + preinstall: + tp::install: + - openjdk-jdk diff --git a/data/rundeck/osfamily/Debian.yaml b/data/rundeck/osfamily/Debian.yaml index d1c4cd6f..e62822bb 100644 --- a/data/rundeck/osfamily/Debian.yaml +++ b/data/rundeck/osfamily/Debian.yaml @@ -1,2 +1,4 @@ --- rundeck::settings: {} + +# No data to convert to Version 4 format diff --git a/data/rundeck/osfamily/RedHat.yaml b/data/rundeck/osfamily/RedHat.yaml index 3b755515..041bbff3 100644 --- a/data/rundeck/osfamily/RedHat.yaml +++ b/data/rundeck/osfamily/RedHat.yaml @@ -2,3 +2,9 @@ rundeck::settings: repo_package_url: 'http://repo.rundeck.org/latest.rpm' repo_package_name: 'rundeck-repo' + +# Version 4 format + repo: + upstream: + package_name: rundeck-repo + package_url: http://repo.rundeck.org/latest.rpm diff --git a/data/samba/default.yaml b/data/samba/default.yaml index 35be646a..b70a4971 100644 --- a/data/samba/default.yaml +++ b/data/samba/default.yaml @@ -12,3 +12,36 @@ samba::settings: - '/var/log/samba/log.nmbd' process_user: 'samba' process_group: 'samba' + +# Version 4 format + packages: + main: + name: samba + services: + smb: + process_user: samba + process_group: samba + files: + config: + path: "/etc/samba/smb.conf" + log: + path: + - "/var/log/samba/log.smbd" + - "/var/log/samba/log.nmbd" + init: + path: "/etc/sysconfig/samba" + pid: + path: "/var/run/smbd.pid" + user_files: + config: + path: "$HOME/.samba/smb.conf" + dirs: + config: + path: "/etc/samba" + user_dirs: + config: + path: "$HOME/.samba" + ports: + main: + port: '445' + protocol: tcp diff --git a/data/samba/operatingsystem/Debian9.yaml b/data/samba/operatingsystem/Debian9.yaml index 353ef147..1e0c2bab 100644 --- a/data/samba/operatingsystem/Debian9.yaml +++ b/data/samba/operatingsystem/Debian9.yaml @@ -1,3 +1,7 @@ --- samba::settings: service_name: 'smb' + +# Version 4 format + services: + smb: {} diff --git a/data/samba/osfamily/Debian.yaml b/data/samba/osfamily/Debian.yaml index a641a24e..3318cd19 100644 --- a/data/samba/osfamily/Debian.yaml +++ b/data/samba/osfamily/Debian.yaml @@ -4,3 +4,12 @@ samba::settings: init_file_path: '/etc/default/samba' pid_file_path: '/var/run/samba/smbd.pid' + +# Version 4 format + services: + samba: {} + files: + init: + path: "/etc/default/samba" + pid: + path: "/var/run/samba/smbd.pid" diff --git a/data/samba/osfamily/Suse.yaml b/data/samba/osfamily/Suse.yaml index d0101a0d..d121e5f1 100644 --- a/data/samba/osfamily/Suse.yaml +++ b/data/samba/osfamily/Suse.yaml @@ -3,3 +3,10 @@ samba::settings: log_file_path: - '/var/log/samba/log.smbd' - '/var/log/samba/cores/smbd' + +# Version 4 format + files: + log: + path: + - "/var/log/samba/log.smbd" + - "/var/log/samba/cores/smbd" diff --git a/data/sample/default.yaml b/data/sample/default.yaml index 0f3cfc7b..4bbd5434 100644 --- a/data/sample/default.yaml +++ b/data/sample/default.yaml @@ -142,3 +142,7 @@ sample::settings: resources: {} manage_service: false manage_user: false + +# Version 4 format + preinstall: + tp::install: {} diff --git a/data/sample/osfamily/Darwin.yaml b/data/sample/osfamily/Darwin.yaml index 73ba7d0a..9ab977be 100644 --- a/data/sample/osfamily/Darwin.yaml +++ b/data/sample/osfamily/Darwin.yaml @@ -8,4 +8,10 @@ sample::settings: user_dirs: config: - path: '$HOME/Library/Application\ Support/sample/sample.conf' \ No newline at end of file + path: '$HOME/Library/Application\ Support/sample/sample.conf' +# Version 4 format + packages: + main: + providers: + brew: + name: sample diff --git a/data/sample/osfamily/Debian.yaml b/data/sample/osfamily/Debian.yaml index 8c6299cf..81692664 100644 --- a/data/sample/osfamily/Debian.yaml +++ b/data/sample/osfamily/Debian.yaml @@ -3,4 +3,5 @@ sample::settings: files: init: - path: '/etc/default/sample' \ No newline at end of file + path: '/etc/default/sample' +# No data to convert to Version 4 format diff --git a/data/sample/osfamily/RedHat.yaml b/data/sample/osfamily/RedHat.yaml index dfab05c4..62d96abf 100644 --- a/data/sample/osfamily/RedHat.yaml +++ b/data/sample/osfamily/RedHat.yaml @@ -1,3 +1,7 @@ --- sample::settings: dockerfile_prerequisites: 'RUN yum install -y wget which' + +# Version 4 format + image: + dockerfile_prerequisites: RUN yum install -y wget which diff --git a/data/sample/osfamily/windows.yaml b/data/sample/osfamily/windows.yaml index 9098e8bf..a7fd7c22 100644 --- a/data/sample/osfamily/windows.yaml +++ b/data/sample/osfamily/windows.yaml @@ -11,4 +11,9 @@ sample::settings: user_dirs: config: - path: '%APPDATA%\sample' \ No newline at end of file + path: '%APPDATA%\sample' +# Version 4 format + packages: + main: + provider: windows + 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 779c5fe7..8cbc70d8 100644 --- a/data/scikit-learn/default.yaml +++ b/data/scikit-learn/default.yaml @@ -2,3 +2,9 @@ scikit-learn::settings: package_name: 'scikit-learn' package_provider: 'pip' + +# Version 4 format + packages: + main: + name: scikit-learn + provider: pip diff --git a/data/scikit-learn/osfamily/Debian.yaml b/data/scikit-learn/osfamily/Debian.yaml index e6cafe1a..9e4fa221 100644 --- a/data/scikit-learn/osfamily/Debian.yaml +++ b/data/scikit-learn/osfamily/Debian.yaml @@ -5,3 +5,12 @@ scikit-learn::settings: - 'python3-sklearn-lib' - 'python3-sklearn-doc' package_provider: 'apt' + +# Version 4 format + packages: + main: + name: + - python3-sklearn + - python3-sklearn-lib + - python3-sklearn-doc + provider: apt diff --git a/data/scikit-learn/osfamily/RedHat.yaml b/data/scikit-learn/osfamily/RedHat.yaml index 51a96080..382ebb79 100644 --- a/data/scikit-learn/osfamily/RedHat.yaml +++ b/data/scikit-learn/osfamily/RedHat.yaml @@ -2,3 +2,9 @@ scikit-learn::settings: package_name: python3-scikit-learn package_provider: 'yum' + +# Version 4 format + packages: + main: + name: python3-scikit-learn + provider: yum diff --git a/data/scl/operatingsystem/CentOS.yaml b/data/scl/operatingsystem/CentOS.yaml index 5ed7dcdf..18c3b80c 100644 --- a/data/scl/operatingsystem/CentOS.yaml +++ b/data/scl/operatingsystem/CentOS.yaml @@ -1,3 +1,8 @@ --- scl::settings: package_name: 'centos-release-scl' + +# Version 4 format + packages: + main: + name: centos-release-scl diff --git a/data/scl/operatingsystem/RedHat6.yaml b/data/scl/operatingsystem/RedHat6.yaml index c3c69128..d4f96343 100644 --- a/data/scl/operatingsystem/RedHat6.yaml +++ b/data/scl/operatingsystem/RedHat6.yaml @@ -4,3 +4,10 @@ scl::settings: subscription_scl: command: 'subscription-manager repos --enable rhel-server-rhscl-6-rpms' unless: 'subscription-manager repos --list | grep scl' + +# Version 4 format + preinstall: + exec: + 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 ab692532..ac51b6be 100644 --- a/data/scl/operatingsystem/RedHat7.yaml +++ b/data/scl/operatingsystem/RedHat7.yaml @@ -4,3 +4,10 @@ scl::settings: subscription_scl: command: 'subscription-manager repos --enable rhel-server-rhscl-7-rpms' unless: 'subscription-manager repos --list | grep scl' + +# Version 4 format + preinstall: + exec: + subscription_scl: + command: subscription-manager repos --enable rhel-server-rhscl-7-rpms + unless: subscription-manager repos --list | grep scl diff --git a/data/screen/default.yaml b/data/screen/default.yaml index 77ca6ca4..7d5c879f 100644 --- a/data/screen/default.yaml +++ b/data/screen/default.yaml @@ -2,3 +2,14 @@ screen::settings: package_name: 'screen' config_file_path: '/etc/screenrc' + +# Version 4 format + packages: + main: + name: screen + files: + config: + path: "/etc/screenrc" + user_files: + config: + path: "$HOME/.screenrc" diff --git a/data/scx/default.yaml b/data/scx/default.yaml index 68771323..8fb4c6b7 100644 --- a/data/scx/default.yaml +++ b/data/scx/default.yaml @@ -8,3 +8,24 @@ scx::settings: home_dir_path: '/opt/microsoft/scx/' tp_prerequisites: - 'microsoft_repo' + +# Version 4 format + packages: + main: + name: scx + dirs: + config: + path: "/etc/opt/microsoft/scx/" + log: + path: "/var/opt/microsoft/scx/log/" + home: + path: "/opt/microsoft/scx/" + user_dirs: + config: + path: "$HOME/.opt/microsoft/scx/" + urls: + website: https://learn.microsoft.com/en-us/system-center/scom/manage-security-administer-crossplat-agent + source: https://github.com/microsoft/SCXcore.git + preinstall: + tp::install: + - microsoft_repo diff --git a/data/scx/osfamily/windows.yaml b/data/scx/osfamily/windows.yaml index eca7d670..7df81a15 100644 --- a/data/scx/osfamily/windows.yaml +++ b/data/scx/osfamily/windows.yaml @@ -3,3 +3,13 @@ scx::settings: package_name: '' winget_package_name: '' choco_package_name: '' + +# Version 4 format + packages: + main: + name: '' + providers: + winget: + name: '' + choco: + name: '' diff --git a/data/sendmail/default.yaml b/data/sendmail/default.yaml index c938aec8..5736a4f6 100644 --- a/data/sendmail/default.yaml +++ b/data/sendmail/default.yaml @@ -10,3 +10,33 @@ sendmail::settings: process_user: 'root' process_group: 'root' tcp_port: '25' + +# Version 4 format + packages: + main: + name: sendmail + services: + sendmail: + process_name: sendmail + process_user: root + process_group: root + files: + config: + path: "/etc/mail/sendmail.mc" + log: + path: "/var/log/maillog" + pid: + path: "/var/run/sendmail.pid" + user_files: + config: + path: "$HOME/.mail/sendmail.mc" + dirs: + config: + path: "/etc/mail" + user_dirs: + config: + path: "$HOME/.mail" + ports: + main: + port: '25' + protocol: tcp diff --git a/data/sendmail/osfamily/Debian.yaml b/data/sendmail/osfamily/Debian.yaml index 9865d9ff..8ec9b5f3 100644 --- a/data/sendmail/osfamily/Debian.yaml +++ b/data/sendmail/osfamily/Debian.yaml @@ -3,3 +3,13 @@ sendmail::settings: package_name: 'sendmail-bin' log_file_path: '/var/log/mail.log' init_file_path: '/etc/default/sendmail' + +# Version 4 format + packages: + main: + name: sendmail-bin + files: + log: + path: "/var/log/mail.log" + init: + path: "/etc/default/sendmail" diff --git a/data/sendmail/osfamily/RedHat.yaml b/data/sendmail/osfamily/RedHat.yaml index ff9d0227..4a684350 100644 --- a/data/sendmail/osfamily/RedHat.yaml +++ b/data/sendmail/osfamily/RedHat.yaml @@ -2,3 +2,11 @@ sendmail::settings: package_name: 'sendmail-cf' init_file_path: '/etc/sysconfig/sendmail' + +# Version 4 format + packages: + main: + name: sendmail-cf + files: + init: + path: "/etc/sysconfig/sendmail" diff --git a/data/sensu/default.yaml b/data/sensu/default.yaml index 57cfa2b6..bc0f0e1f 100644 --- a/data/sensu/default.yaml +++ b/data/sensu/default.yaml @@ -21,3 +21,38 @@ sensu::settings: process_user: 'sensu' process_group: 'sensu' init_file_path: '/etc/default/sensu' + +# Version 4 format + packages: + main: + name: sensu + services: + sensu-client: + process_name: sensu + process_user: sensu + process_group: sensu + files: + config: + path: "/etc/sensu/config.json" + log: + path: + - "/var/log/sensu/sensu-client.log" + - "/var/log/sensu/sensu-server.log" + - "/var/log/sensu/sensu-api.log" + init: + path: "/etc/default/sensu" + pid: + path: "/var/run/sensu/sensu-client.pid" + user_files: + config: + path: "$HOME/.sensu/config.json" + dirs: + config: + path: "/etc/sensu" + conf: + path: "/etc/sensu/conf.d" + log: + path: "/var/log/sensu" + user_dirs: + config: + path: "$HOME/.sensu" diff --git a/data/serf/default.yaml b/data/serf/default.yaml index 3cd04f93..9aa7241a 100644 --- a/data/serf/default.yaml +++ b/data/serf/default.yaml @@ -28,4 +28,12 @@ serf::settings: '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 + 'version': 'Prints the Serf version' +# Version 4 format + packages: + main: + name: serf + services: + ! '': + process_name: serf + repo: upstream diff --git a/data/serf/upstream/default.yaml b/data/serf/upstream/default.yaml index b7d4f418..ab58d86e 100644 --- a/data/serf/upstream/default.yaml +++ b/data/serf/upstream/default.yaml @@ -1,4 +1,8 @@ --- serf::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/snmp/default.yaml b/data/snmp/default.yaml index ee9f03ce..f26693b5 100644 --- a/data/snmp/default.yaml +++ b/data/snmp/default.yaml @@ -177,3 +177,37 @@ snmp::settings: resources: {} manage_service: false manage_user: false + +# Version 4 format + packages: + main: + name: snmpd + services: + snmpd: + process_name: snmpd + process_user: snmpd + process_group: snmpd + files: + config: + path: "/etc/snmp/snmpd.conf" + log: + path: "/var/log/snmpd/snmpd.log" + pid: + path: "/var/run/snmpd.pid" + user_files: + config: + path: "$HOME/.snmp/snmpd.conf" + dirs: + config: + path: "/etc/snmp" + log: + path: "/var/log/snmpd" + user_dirs: + config: + path: "$HOME/.snmp" + ports: + main_udp: + port: '161' + protocol: udp + preinstall: + tp::install: {} diff --git a/data/snmp/osfamily/Darwin.yaml b/data/snmp/osfamily/Darwin.yaml index fa4f159b..4e3ee367 100644 --- a/data/snmp/osfamily/Darwin.yaml +++ b/data/snmp/osfamily/Darwin.yaml @@ -8,4 +8,10 @@ snmp::settings: user_dirs: config: - path: '$HOME/Library/Application\ Support/snmp/snmp.conf' \ No newline at end of file + path: '$HOME/Library/Application\ Support/snmp/snmp.conf' +# Version 4 format + packages: + main: + providers: + brew: + name: snmp diff --git a/data/snmp/osfamily/Debian.yaml b/data/snmp/osfamily/Debian.yaml index e5c83a39..3058b0aa 100644 --- a/data/snmp/osfamily/Debian.yaml +++ b/data/snmp/osfamily/Debian.yaml @@ -21,4 +21,18 @@ snmp::settings: path: '/etc/snmp/snmptrapd.conf' snmptrapd_init: path: '/etc/default/snmptrapd' - format: 'inifile' \ No newline at end of file + format: 'inifile' +# Version 4 format + services: + ! '': + process_user: snmp + process_group: snmp + files: + init: + path: "/etc/default/snmpd" + dirs: + config: + path: "/etc/snmp" + user_dirs: + config: + path: "$HOME/.snmp" diff --git a/data/snmp/osfamily/OpenBSD.yaml b/data/snmp/osfamily/OpenBSD.yaml index 3de51418..5e4a03b1 100644 --- a/data/snmp/osfamily/OpenBSD.yaml +++ b/data/snmp/osfamily/OpenBSD.yaml @@ -4,3 +4,22 @@ snmp::settings: service_name: 'netsnmpd' config_file_path: '/etc/snmp/snmpd.conf' config_dir_path: '/etc/snmp' + +# Version 4 format + packages: + main: + name: net-snmp + services: + netsnmpd: {} + files: + config: + path: "/etc/snmp/snmpd.conf" + user_files: + config: + path: "$HOME/.snmp/snmpd.conf" + dirs: + config: + path: "/etc/snmp" + user_dirs: + config: + path: "$HOME/.snmp" diff --git a/data/snmp/osfamily/RedHat.yaml b/data/snmp/osfamily/RedHat.yaml index 2292d374..b335885f 100644 --- a/data/snmp/osfamily/RedHat.yaml +++ b/data/snmp/osfamily/RedHat.yaml @@ -11,4 +11,11 @@ snmp::settings: files: init: - path: '/etc/sysconfig/snmpd' \ No newline at end of file + path: '/etc/sysconfig/snmpd' +# Version 4 format + packages: + main: + name: net-snmp + files: + init: + path: "/etc/sysconfig/snmpd" diff --git a/data/snmp/osfamily/Solaris.yaml b/data/snmp/osfamily/Solaris.yaml index ad4aa0b0..b9967c80 100644 --- a/data/snmp/osfamily/Solaris.yaml +++ b/data/snmp/osfamily/Solaris.yaml @@ -6,3 +6,22 @@ snmp::settings: config_file_mode: '0444' config_file_group: 'bin' config_dir_path: '/etc/net-snmp/snmp' + +# Version 4 format + packages: + main: + name: net-snmp + services: + net-snmp: {} + files: + config: + path: "/etc/net-snmp/snmp/snmpd.conf" + user_files: + config: + path: "$HOME/.net-snmp/snmp/snmpd.conf" + dirs: + config: + path: "/etc/net-snmp/snmp" + user_dirs: + config: + path: "$HOME/.net-snmp/snmp" diff --git a/data/snmp/osfamily/windows.yaml b/data/snmp/osfamily/windows.yaml index 7670fdad..ec9d1987 100644 --- a/data/snmp/osfamily/windows.yaml +++ b/data/snmp/osfamily/windows.yaml @@ -11,4 +11,9 @@ snmp::settings: user_dirs: config: - path: '%APPDATA%\snmp' \ No newline at end of file + path: '%APPDATA%\snmp' +# Version 4 format + packages: + main: + provider: windows + source: https://github.com/snmp/snmp/releases/download/v$VERSION/snmp_$VERSION_$OS_$ARCH.msi diff --git a/data/spiderfoot/default.yaml b/data/spiderfoot/default.yaml index 19df682b..78306cb3 100644 --- a/data/spiderfoot/default.yaml +++ b/data/spiderfoot/default.yaml @@ -59,3 +59,19 @@ spiderfoot::settings: issues: https://github.com/smicallef/spiderfoot/issues documentation: https://www.spiderfoot.net/documentation/ source: https://github.com/smicallef/spiderfoot + +# Version 4 format + packages: + main: + name: spiderfoot + provider: pip + services: + spiderfoot: + process_name: sf.py + process_user: root + process_group: root + urls: + source: https://github.com/smicallef/spiderfoot + preinstall: + tp::install: + - python-pip diff --git a/data/spiderfoot/operatingsystem/Debian10.yaml b/data/spiderfoot/operatingsystem/Debian10.yaml index e0c233de..7a764fef 100644 --- a/data/spiderfoot/operatingsystem/Debian10.yaml +++ b/data/spiderfoot/operatingsystem/Debian10.yaml @@ -4,3 +4,5 @@ spiderfoot::settings: execs: - name: build command: 'pip3 install -r requirements.txt' + +# No data to convert to Version 4 format diff --git a/data/spiderfoot/operatingsystem/Debian9.yaml b/data/spiderfoot/operatingsystem/Debian9.yaml index e0c233de..7a764fef 100644 --- a/data/spiderfoot/operatingsystem/Debian9.yaml +++ b/data/spiderfoot/operatingsystem/Debian9.yaml @@ -4,3 +4,5 @@ spiderfoot::settings: execs: - name: build command: 'pip3 install -r requirements.txt' + +# No data to convert to Version 4 format diff --git a/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml b/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml index e0c233de..7a764fef 100644 --- a/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml +++ b/data/spiderfoot/operatingsystem/Ubuntu16.04.yaml @@ -4,3 +4,5 @@ spiderfoot::settings: execs: - name: build command: 'pip3 install -r requirements.txt' + +# No data to convert to Version 4 format diff --git a/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml b/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml index e0c233de..7a764fef 100644 --- a/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml +++ b/data/spiderfoot/operatingsystem/Ubuntu18.04.yaml @@ -4,3 +4,5 @@ spiderfoot::settings: execs: - name: build command: 'pip3 install -r requirements.txt' + +# No data to convert to Version 4 format diff --git a/data/spiderfoot/osfamily/Darwin.yaml b/data/spiderfoot/osfamily/Darwin.yaml index 296744b9..dc330fc3 100644 --- a/data/spiderfoot/osfamily/Darwin.yaml +++ b/data/spiderfoot/osfamily/Darwin.yaml @@ -1,3 +1,10 @@ --- spiderfoot::settings: brew_package_name: 'spiderfoot' + +# Version 4 format + packages: + main: + providers: + brew: + name: spiderfoot diff --git a/data/spiderfoot/osfamily/Debian.yaml b/data/spiderfoot/osfamily/Debian.yaml index 10a94ad4..9d199902 100644 --- a/data/spiderfoot/osfamily/Debian.yaml +++ b/data/spiderfoot/osfamily/Debian.yaml @@ -6,4 +6,9 @@ spiderfoot::settings: init: path: '/etc/default/spiderfoot' - upstream_repo: true \ No newline at end of file + upstream_repo: true +# Version 4 format + files: + init: + path: "/etc/default/spiderfoot" + repo: upstream diff --git a/data/spiderfoot/osfamily/RedHat.yaml b/data/spiderfoot/osfamily/RedHat.yaml index 2c18798b..d4c98e46 100644 --- a/data/spiderfoot/osfamily/RedHat.yaml +++ b/data/spiderfoot/osfamily/RedHat.yaml @@ -1,3 +1,7 @@ --- spiderfoot::settings: dockerfile_prerequisites: 'RUN yum install -y wget which' + +# Version 4 format + image: + dockerfile_prerequisites: RUN yum install -y wget which diff --git a/data/spiderfoot/osfamily/windows.yaml b/data/spiderfoot/osfamily/windows.yaml index 4b0b357b..8ad3441a 100644 --- a/data/spiderfoot/osfamily/windows.yaml +++ b/data/spiderfoot/osfamily/windows.yaml @@ -10,4 +10,11 @@ spiderfoot::settings: path: ~ mode: '0755' manage_service: false - manage_user: false \ No newline at end of file + manage_user: false +# Version 4 format + packages: + main: + name: spiderfoot + providers: + choco: + name: spiderfoot diff --git a/data/spiderfoot/osfamily/windows11.yaml b/data/spiderfoot/osfamily/windows11.yaml index 351405bf..25543bb5 100644 --- a/data/spiderfoot/osfamily/windows11.yaml +++ b/data/spiderfoot/osfamily/windows11.yaml @@ -1,3 +1,8 @@ --- spiderfoot::settings: package_name: 'spiderfoot' + +# Version 4 format + packages: + main: + name: spiderfoot diff --git a/data/squid/default.yaml b/data/squid/default.yaml index 863afa4b..ec402ac1 100644 --- a/data/squid/default.yaml +++ b/data/squid/default.yaml @@ -9,3 +9,31 @@ squid::settings: process_user: 'squid' process_group: 'squid' tcp_port: '3128' + +# Version 4 format + packages: + main: + name: squid + services: + squid: + process_name: squid + process_user: squid + process_group: squid + files: + config: + path: "/etc/squid/squid.conf" + pid: + path: "/var/run/squid.pid" + user_files: + config: + path: "$HOME/.squid/squid.conf" + dirs: + config: + path: "/etc/squid" + user_dirs: + config: + path: "$HOME/.squid" + ports: + main: + port: '3128' + protocol: tcp diff --git a/data/squid/osfamily/Debian9.yaml b/data/squid/osfamily/Debian9.yaml index 82c72ed6..4e007bb2 100644 --- a/data/squid/osfamily/Debian9.yaml +++ b/data/squid/osfamily/Debian9.yaml @@ -5,3 +5,24 @@ squid::settings: config_file_path: '/etc/squid3/squid.conf' config_dir_path: '/etc/squid3' pid_file_path: '/var/run/squid3.pid' + +# Version 4 format + packages: + main: + name: squid3 + services: + squid3: {} + files: + config: + path: "/etc/squid3/squid.conf" + pid: + path: "/var/run/squid3.pid" + user_files: + config: + path: "$HOME/.squid3/squid.conf" + dirs: + config: + path: "/etc/squid3" + user_dirs: + config: + path: "$HOME/.squid3" diff --git a/data/ssmtp/default.yaml b/data/ssmtp/default.yaml index 4b80172d..bcbd4128 100644 --- a/data/ssmtp/default.yaml +++ b/data/ssmtp/default.yaml @@ -5,3 +5,20 @@ ssmtp::settings: config_file_group: 'mail' config_file_mode: '0640' config_dir_path: '/etc/ssmtp' + +# Version 4 format + packages: + main: + name: ssmtp + files: + config: + path: "/etc/ssmtp/ssmtp.conf" + user_files: + config: + path: "$HOME/.ssmtp/ssmtp.conf" + dirs: + config: + path: "/etc/ssmtp" + user_dirs: + config: + path: "$HOME/.ssmtp" diff --git a/data/strace/default.yaml b/data/strace/default.yaml index f42d283c..73ca039b 100644 --- a/data/strace/default.yaml +++ b/data/strace/default.yaml @@ -1,3 +1,8 @@ --- strace::settings: package_name: 'strace' + +# Version 4 format + packages: + main: + name: strace diff --git a/data/subversion/default.yaml b/data/subversion/default.yaml index 8763a2df..81b2ad15 100644 --- a/data/subversion/default.yaml +++ b/data/subversion/default.yaml @@ -3,3 +3,20 @@ subversion::settings: package_name: 'subversion' config_file_path: '/etc/subversion/config.conf' config_dir_path: '/etc/subversion' + +# Version 4 format + packages: + main: + name: subversion + files: + config: + path: "/etc/subversion/config.conf" + user_files: + config: + path: "$HOME/.subversion/config.conf" + dirs: + config: + path: "/etc/subversion" + user_dirs: + config: + path: "$HOME/.subversion" diff --git a/data/sudo/default.yaml b/data/sudo/default.yaml index 58515cc6..0990c87f 100644 --- a/data/sudo/default.yaml +++ b/data/sudo/default.yaml @@ -3,3 +3,17 @@ sudo::settings: config_file_path: '/etc/sudoers' config_file_mode: '0440' config_dir_path: '/etc/sudoers.d' + +# Version 4 format + files: + config: + path: "/etc/sudoers" + user_files: + config: + path: "$HOME/.sudoers" + dirs: + config: + path: "/etc/sudoers.d" + user_dirs: + config: + path: "$HOME/.sudoers.d" diff --git a/data/supervisor/default.yaml b/data/supervisor/default.yaml index a3749db8..51906fd1 100644 --- a/data/supervisor/default.yaml +++ b/data/supervisor/default.yaml @@ -10,3 +10,27 @@ supervisor::settings: process_name: 'supervisord' nodaemon_args: '--nodaemon' config_file_extension: 'conf' + +# Version 4 format + packages: + main: + name: supervisor + services: + supervisor: + process_name: supervisord + nodaemon_args: "--nodaemon" + files: + log: + path: "/var/log/supervisor.log" + pid: + path: "/var/run/supervisor.pid" + dirs: + config: + path: "/etc/supervisor" + conf: + path: "/etc/supervisor/conf.d" + log: + path: "/var/log/supervisor" + user_dirs: + config: + path: "$HOME/.supervisor" diff --git a/data/supervisor/osfamily/Debian.yaml b/data/supervisor/osfamily/Debian.yaml index 11f5971f..7ac9d398 100644 --- a/data/supervisor/osfamily/Debian.yaml +++ b/data/supervisor/osfamily/Debian.yaml @@ -3,3 +3,13 @@ supervisor::settings: init_file_path: '/etc/default/supervisor' config_file_path: '/etc/supervisor/supervisord.conf' process_args: '-c /etc/supervisor/supervisord.conf' + +# Version 4 format + files: + config: + path: "/etc/supervisor/supervisord.conf" + init: + path: "/etc/default/supervisor" + user_files: + config: + path: "$HOME/.supervisor/supervisord.conf" diff --git a/data/supervisor/osfamily/Linux.yaml b/data/supervisor/osfamily/Linux.yaml index 4e2b4aad..e382ae07 100644 --- a/data/supervisor/osfamily/Linux.yaml +++ b/data/supervisor/osfamily/Linux.yaml @@ -4,3 +4,21 @@ supervisor::settings: config_dir_path: '' conf_dir_path: '' service_name: 'supervisord' + +# Version 4 format + services: + supervisord: {} + files: + config: + path: "/etc/supervisord.conf" + user_files: + config: + path: "$HOME/.supervisord.conf" + dirs: + config: + path: '' + conf: + path: '' + user_dirs: + config: + path: '' diff --git a/data/supervisor/osfamily/RedHat.yaml b/data/supervisor/osfamily/RedHat.yaml index 5efdf152..28989985 100644 --- a/data/supervisor/osfamily/RedHat.yaml +++ b/data/supervisor/osfamily/RedHat.yaml @@ -5,3 +5,19 @@ supervisor::settings: conf_dir_path: '/etc/supervisord.d' process_args: '-c /etc/supervisord.conf' config_file_extension: 'ini' + +# Version 4 format + files: + config: + path: "/etc/supervisord.conf" + user_files: + config: + path: "$HOME/.supervisord.conf" + dirs: + config: + path: "/etc/supervisord.d" + conf: + path: "/etc/supervisord.d" + user_dirs: + config: + path: "$HOME/.supervisord.d" diff --git a/data/supervisor/osfamily/RedHat6.yaml b/data/supervisor/osfamily/RedHat6.yaml index 6c4dd075..6e38cbd0 100644 --- a/data/supervisor/osfamily/RedHat6.yaml +++ b/data/supervisor/osfamily/RedHat6.yaml @@ -3,3 +3,19 @@ supervisor::settings: config_file_path: '/etc/supervisord.conf' config_dir_path: '' conf_dir_path: '' + +# Version 4 format + files: + config: + path: "/etc/supervisord.conf" + user_files: + config: + path: "$HOME/.supervisord.conf" + dirs: + config: + path: '' + conf: + path: '' + user_dirs: + config: + path: '' diff --git a/data/surfex/default.yaml b/data/surfex/default.yaml index c125d612..fba1e47f 100644 --- a/data/surfex/default.yaml +++ b/data/surfex/default.yaml @@ -44,3 +44,7 @@ surfex::settings: resources: {} manage_service: false manage_user: false + +# Version 4 format + preinstall: + tp::install: {} diff --git a/data/sysdig/default.yaml b/data/sysdig/default.yaml index 2ed32700..cee198af 100644 --- a/data/sysdig/default.yaml +++ b/data/sysdig/default.yaml @@ -2,3 +2,9 @@ sysdig::settings: upstream_repo: true package_name: 'sysdig' + +# Version 4 format + packages: + main: + name: sysdig + repo: upstream diff --git a/data/sysdig/upstream/operatingsystem/Ubuntu14.04.yaml b/data/sysdig/upstream/operatingsystem/Ubuntu14.04.yaml index 435a9813..8608d28d 100644 --- a/data/sysdig/upstream/operatingsystem/Ubuntu14.04.yaml +++ b/data/sysdig/upstream/operatingsystem/Ubuntu14.04.yaml @@ -1,3 +1,10 @@ --- sysdig::settings: key: 'F1C3BD80' + +# Version 4 format + repo: + upstream: + key: F1C3BD80 + yum: + gpgcheck: true diff --git a/data/sysdig/upstream/osfamily/Debian.yaml b/data/sysdig/upstream/osfamily/Debian.yaml index 1a25b393..37152dbf 100644 --- a/data/sysdig/upstream/osfamily/Debian.yaml +++ b/data/sysdig/upstream/osfamily/Debian.yaml @@ -7,3 +7,8 @@ sysdig::settings: repo_file_url: 'https://download.sysdig.com/stable/deb/draios.list' repo_file_name: 'draios.list' + +# Version 4 format + repo: + upstream: + repofile_url: https://download.sysdig.com/stable/deb/draios.list diff --git a/data/sysdig/upstream/osfamily/RedHat.yaml b/data/sysdig/upstream/osfamily/RedHat.yaml index 5a07b5a2..1134c95f 100644 --- a/data/sysdig/upstream/osfamily/RedHat.yaml +++ b/data/sysdig/upstream/osfamily/RedHat.yaml @@ -8,3 +8,12 @@ sysdig::settings: - epel repo_file_url: 'https://download.sysdig.com/stable/rpm/draios.repo' repo_file_name: 'draios.repo' + +# Version 4 format + repo: + upstream: + repofile_url: https://download.sysdig.com/stable/rpm/draios.repo + preinstall: + tp::install: + - dkms + - epel diff --git a/data/sysdig/upstream/osfamily/RedHat9.yaml b/data/sysdig/upstream/osfamily/RedHat9.yaml index a21b479a..8172859f 100644 --- a/data/sysdig/upstream/osfamily/RedHat9.yaml +++ b/data/sysdig/upstream/osfamily/RedHat9.yaml @@ -9,3 +9,15 @@ sysdig::settings: disallow_sha1: command: '/usr/bin/update-crypto-policies --set DEFAULT' onlyif: '/usr/bin/update-crypto-policies --show | grep SHA1' + +# Version 4 format + preinstall: + exec: + allow_sha1: + command: "/usr/bin/update-crypto-policies --set DEFAULT:SHA1" + unless: dnf info sysdig + postinstall: + exec: + disallow_sha1: + command: "/usr/bin/update-crypto-policies --set DEFAULT" + onlyif: "/usr/bin/update-crypto-policies --show | grep SHA1" diff --git a/data/sysdig/upstream/osfamily/Suse.yaml b/data/sysdig/upstream/osfamily/Suse.yaml index cf7689a8..76c9ac31 100644 --- a/data/sysdig/upstream/osfamily/Suse.yaml +++ b/data/sysdig/upstream/osfamily/Suse.yaml @@ -1,3 +1,5 @@ --- sysdig::settings: package_name: ~ + +# No data to convert to Version 4 format diff --git a/data/sysfs/default.yaml b/data/sysfs/default.yaml index 7472297b..2ea05a44 100644 --- a/data/sysfs/default.yaml +++ b/data/sysfs/default.yaml @@ -5,3 +5,24 @@ sysfs::settings: config_file_path: '/etc/sysfs.conf' config_dir_path: '/etc/sysfs.d' conf_dir_path: '/etc/sysfs.d' + +# Version 4 format + packages: + main: + name: sysfsutils + services: + sysfsutils: {} + files: + config: + path: "/etc/sysfs.conf" + user_files: + config: + path: "$HOME/.sysfs.conf" + dirs: + config: + path: "/etc/sysfs.d" + conf: + path: "/etc/sysfs.d" + user_dirs: + config: + path: "$HOME/.sysfs.d" diff --git a/data/sysinternals/default.yaml b/data/sysinternals/default.yaml index 9207d498..21709eb9 100644 --- a/data/sysinternals/default.yaml +++ b/data/sysinternals/default.yaml @@ -5,3 +5,14 @@ sysinternals::settings: git_source: 'https://github.com/Sysinternals/SysinternalsEBPF.git' tp_prerequisites: - 'microsoft_repo' + +# Version 4 format + packages: + main: + name: sysinternalsebpf + urls: + website: https://learn.microsoft.com/sysinternals/ + source: https://github.com/Sysinternals/SysinternalsEBPF.git + preinstall: + tp::install: + - microsoft_repo diff --git a/data/sysinternals/osfamily/windows.yaml b/data/sysinternals/osfamily/windows.yaml index dd73911b..7fd4b3b6 100644 --- a/data/sysinternals/osfamily/windows.yaml +++ b/data/sysinternals/osfamily/windows.yaml @@ -3,3 +3,13 @@ sysinternals::settings: winget_package_name: 'Microsoft.PowerShell' choco_package_name: 'sysinternals' package_name: 'sysinternals' + +# Version 4 format + packages: + main: + name: sysinternals + providers: + winget: + name: Microsoft.PowerShell + choco: + name: sysinternals diff --git a/data/sysklogd/default.yaml b/data/sysklogd/default.yaml index 0a575548..cd38a6c1 100644 --- a/data/sysklogd/default.yaml +++ b/data/sysklogd/default.yaml @@ -9,3 +9,25 @@ sysklogd::settings: process_name: 'syslogd' process_user: 'syslog' process_group: 'syslog' + +# Version 4 format + packages: + main: + name: sysklogd + services: + syslog: + process_name: syslogd + process_user: syslog + process_group: syslog + files: + config: + path: "/etc/syslog.conf" + log: + path: "/var/log/messages" + init: + path: "/etc/sysconfig/sysklogd" + pid: + path: "/var/run/syslogd.pid" + user_files: + config: + path: "$HOME/.syslog.conf" diff --git a/data/sysklogd/osfamily/Debian.yaml b/data/sysklogd/osfamily/Debian.yaml index 89ddabda..691476e6 100644 --- a/data/sysklogd/osfamily/Debian.yaml +++ b/data/sysklogd/osfamily/Debian.yaml @@ -2,3 +2,10 @@ sysklogd::settings: init_file_path: '/etc/default/sysklogd' log_file_path: '/var/log/syslog' + +# Version 4 format + files: + log: + path: "/var/log/syslog" + init: + path: "/etc/default/sysklogd" diff --git a/data/syslog-ng/default.yaml b/data/syslog-ng/default.yaml index a56a7fdd..7bee2284 100644 --- a/data/syslog-ng/default.yaml +++ b/data/syslog-ng/default.yaml @@ -8,3 +8,27 @@ syslog-ng::settings: process_name: 'syslog-ng' process_user: 'syslog-ng' process_group: 'syslog-ng' + +# Version 4 format + packages: + main: + name: syslog-ng + services: + syslog-ng: + process_name: syslog-ng + process_user: syslog-ng + process_group: syslog-ng + files: + config: + path: "/etc/syslog-ng/syslog-ng.conf" + pid: + path: "/var/run/syslog-ng.pid" + user_files: + config: + path: "$HOME/.syslog-ng/syslog-ng.conf" + dirs: + config: + path: "/etc/syslog-ng" + user_dirs: + config: + path: "$HOME/.syslog-ng" diff --git a/data/syslog-ng/osfamily/Debian.yaml b/data/syslog-ng/osfamily/Debian.yaml index 3c79f37e..957abe1d 100644 --- a/data/syslog-ng/osfamily/Debian.yaml +++ b/data/syslog-ng/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- syslog-ng::settings: init_file_path: '/etc/default/syslog-ng' + +# Version 4 format + files: + init: + path: "/etc/default/syslog-ng" diff --git a/data/syslog-ng/osfamily/RedHat.yaml b/data/syslog-ng/osfamily/RedHat.yaml index dc286daf..53f242e2 100644 --- a/data/syslog-ng/osfamily/RedHat.yaml +++ b/data/syslog-ng/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- syslog-ng::settings: init_file_path: '/etc/sysconfig/syslog-ng' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/syslog-ng" diff --git a/data/sysmon/default.yaml b/data/sysmon/default.yaml index ec75f415..6fcc9e41 100644 --- a/data/sysmon/default.yaml +++ b/data/sysmon/default.yaml @@ -5,3 +5,14 @@ sysmon::settings: git_source: 'https://github.com/Sysinternals/SysmonForLinux' tp_prerequisites: - 'microsoft_repo' + +# Version 4 format + packages: + main: + name: sysmonforlinux + urls: + website: https://learn.microsoft.com/en-us/sysinternals/downloads/sysmon/ + source: https://github.com/Sysinternals/SysmonForLinux + preinstall: + tp::install: + - microsoft_repo diff --git a/data/sysmon/osfamily/windows.yaml b/data/sysmon/osfamily/windows.yaml index 72170f5b..c1924f29 100644 --- a/data/sysmon/osfamily/windows.yaml +++ b/data/sysmon/osfamily/windows.yaml @@ -1,4 +1,11 @@ --- sysmon::settings: choco_package_name: 'sysmon' - package_name: 'sysmon' \ No newline at end of file + package_name: 'sysmon' +# Version 4 format + packages: + main: + name: sysmon + providers: + choco: + name: sysmon diff --git a/data/sysstat/default.yaml b/data/sysstat/default.yaml index 4671ce7f..87097836 100644 --- a/data/sysstat/default.yaml +++ b/data/sysstat/default.yaml @@ -6,3 +6,26 @@ sysstat::settings: config_dir_path: '/etc/sysstat' log_file_path: '/var/log/sysstat/sa' log_dir_path: '/var/log/sysstat' + +# Version 4 format + packages: + main: + name: sysstat + services: + sysstat: {} + files: + config: + path: "/etc/sysstat/sysstat" + log: + path: "/var/log/sysstat/sa" + user_files: + config: + path: "$HOME/.sysstat/sysstat" + dirs: + config: + path: "/etc/sysstat" + log: + path: "/var/log/sysstat" + user_dirs: + config: + path: "$HOME/.sysstat" diff --git a/data/sysstat/osfamily/Debian.yaml b/data/sysstat/osfamily/Debian.yaml index b5ca3674..b84b6392 100644 --- a/data/sysstat/osfamily/Debian.yaml +++ b/data/sysstat/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- sysstat::settings: init_file_path: '/etc/default/sysstat' + +# Version 4 format + files: + init: + path: "/etc/default/sysstat" diff --git a/data/sysstat/osfamily/RedHat.yaml b/data/sysstat/osfamily/RedHat.yaml index c3ceed9a..8f72942b 100644 --- a/data/sysstat/osfamily/RedHat.yaml +++ b/data/sysstat/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- sysstat::settings: init_file_path: '/etc/sysconfig/sysstat' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/sysstat" diff --git a/data/tcpdump/default.yaml b/data/tcpdump/default.yaml index 8654a979..aa5c295f 100644 --- a/data/tcpdump/default.yaml +++ b/data/tcpdump/default.yaml @@ -1,3 +1,8 @@ --- tcpdump::settings: package_name: 'tcpdump' + +# Version 4 format + packages: + main: + name: tcpdump diff --git a/data/telegram-desktop/default.yaml b/data/telegram-desktop/default.yaml index 6199a8da..a9f3a3e7 100644 --- a/data/telegram-desktop/default.yaml +++ b/data/telegram-desktop/default.yaml @@ -4,3 +4,14 @@ telegram-desktop::settings: snap_package_name: 'telegram-desktop' website_url: 'https://desktop.telegram.org/' git_source: 'https://github.com/telegramdesktop/tdesktop.git' + +# Version 4 format + packages: + main: + name: telegram-desktop + providers: + snap: + name: telegram-desktop + urls: + website: https://desktop.telegram.org/ + source: https://github.com/telegramdesktop/tdesktop.git diff --git a/data/telegram-desktop/osfamily/Darwin.yaml b/data/telegram-desktop/osfamily/Darwin.yaml index bcb86946..00afd445 100644 --- a/data/telegram-desktop/osfamily/Darwin.yaml +++ b/data/telegram-desktop/osfamily/Darwin.yaml @@ -1,3 +1,10 @@ --- telegram-desktop::settings: brew_package_name: 'telegram-desktop' + +# Version 4 format + packages: + main: + providers: + brew: + name: telegram-desktop diff --git a/data/telegram-desktop/osfamily/windows.yaml b/data/telegram-desktop/osfamily/windows.yaml index b8a64397..035a1984 100644 --- a/data/telegram-desktop/osfamily/windows.yaml +++ b/data/telegram-desktop/osfamily/windows.yaml @@ -2,3 +2,12 @@ telegram-desktop::settings: winget_package_name: 'Telegram.TelegramDesktop' choco_package_name: 'telegram-desktop' + +# Version 4 format + packages: + main: + providers: + winget: + name: Telegram.TelegramDesktop + choco: + name: telegram-desktop diff --git a/data/telnet/default.yaml b/data/telnet/default.yaml index b165e622..5df9dcf0 100644 --- a/data/telnet/default.yaml +++ b/data/telnet/default.yaml @@ -1,3 +1,8 @@ --- telnet::settings: package_name: 'telnet' + +# Version 4 format + packages: + main: + name: telnet diff --git a/data/tensorflow/default.yaml b/data/tensorflow/default.yaml index 5123013f..0c6e60bf 100644 --- a/data/tensorflow/default.yaml +++ b/data/tensorflow/default.yaml @@ -3,3 +3,9 @@ tensorflow::settings: package_name: tensorflow package_provider: 'pip' + +# Version 4 format + packages: + main: + name: tensorflow + provider: pip diff --git a/data/terraform/default.yaml b/data/terraform/default.yaml index 4fb31c87..d2fdcef8 100644 --- a/data/terraform/default.yaml +++ b/data/terraform/default.yaml @@ -3,3 +3,9 @@ terraform::settings: upstream_repo: true package_name: 'terraform' + +# Version 4 format + packages: + main: + name: terraform + repo: upstream diff --git a/data/terraform/upstream/default.yaml b/data/terraform/upstream/default.yaml index 05631edc..27f42c88 100644 --- a/data/terraform/upstream/default.yaml +++ b/data/terraform/upstream/default.yaml @@ -1,4 +1,8 @@ --- terraform::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/test/default.yaml b/data/test/default.yaml index 8f019b5a..34f040de 100644 --- a/data/test/default.yaml +++ b/data/test/default.yaml @@ -12,3 +12,37 @@ test::settings: process_user: 'test' process_group: 'test' tcp_port: '6379' + +# Version 4 format + packages: + main: + name: '' + services: + '': + process_name: test + process_user: test + process_group: test + files: + config: + path: "/etc/test/test.conf" + log: + path: "/var/log/test/test.log" + pid: + path: "/var/run/test.pid" + user_files: + config: + path: "$HOME/.test/test.conf" + dirs: + config: + path: "/etc/test" + conf: + path: "/etc/test/conf.d" + log: + path: "/var/log/test" + user_dirs: + config: + path: "$HOME/.test" + ports: + main: + port: '6379' + protocol: tcp diff --git a/data/test/osfamily/Debian.yaml b/data/test/osfamily/Debian.yaml index 7ccf2845..cfa9f903 100644 --- a/data/test/osfamily/Debian.yaml +++ b/data/test/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- test::settings: init_file_path: '/etc/default/test' + +# Version 4 format + files: + init: + path: "/etc/default/test" diff --git a/data/test/osfamily/RedHat.yaml b/data/test/osfamily/RedHat.yaml index f74d1e96..9e6ea662 100644 --- a/data/test/osfamily/RedHat.yaml +++ b/data/test/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- test::settings: init_file_path: '/etc/sysconfig/test' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/test" diff --git a/data/tftpd/default.yaml b/data/tftpd/default.yaml index 7b49482e..9e6d7adb 100644 --- a/data/tftpd/default.yaml +++ b/data/tftpd/default.yaml @@ -12,3 +12,37 @@ tftpd::settings: process_name: 'in.tftpd' process_user: 'root' process_group: 'root' + +# Version 4 format + packages: + main: + name: tftpd + services: + tftpd: + process_name: in.tftpd + process_user: root + process_group: root + files: + config: + path: "/etc/tftpd/tftpd.conf" + log: + path: "/var/log/messages" + init: + path: "/etc/sysconfig/tftpd-hpa" + pid: + path: "/var/run/tftpd.pid" + user_files: + config: + path: "$HOME/.tftpd/tftpd.conf" + dirs: + config: + path: "/etc/tftpd" + data: + path: "/tftproot" + user_dirs: + config: + path: "$HOME/.tftpd" + ports: + main_udp: + port: '69' + protocol: udp diff --git a/data/tftpd/osfamily/Debian.yaml b/data/tftpd/osfamily/Debian.yaml index 8be43791..46dc4e3b 100644 --- a/data/tftpd/osfamily/Debian.yaml +++ b/data/tftpd/osfamily/Debian.yaml @@ -6,3 +6,20 @@ tftpd::settings: pid_file_path: '/var/run/tftpd-hpa.pid' log_file_path: '/var/log/syslog' data_dir_path: '/srv/tftp' + +# Version 4 format + packages: + main: + name: tftpd-hpa + services: + tftpd-hpa: {} + files: + log: + path: "/var/log/syslog" + init: + path: "/etc/default/tftpd-hpa" + pid: + path: "/var/run/tftpd-hpa.pid" + dirs: + data: + path: "/srv/tftp" diff --git a/data/tinc/default.yaml b/data/tinc/default.yaml index 9772a01c..6fc4f78d 100644 --- a/data/tinc/default.yaml +++ b/data/tinc/default.yaml @@ -12,3 +12,37 @@ tinc::settings: process_user: 'tinc' process_group: 'tinc' tcp_port: '655' + +# Version 4 format + packages: + main: + name: tinc + services: + tinc: + process_name: tincd + process_user: tinc + process_group: tinc + files: + config: + path: "/etc/tinc/tinc.conf" + log: + path: "/var/log/tinc/tinc.log" + pid: + path: "/var/run/tinc.pid" + user_files: + config: + path: "$HOME/.tinc/tinc.conf" + dirs: + config: + path: "/etc/tinc" + conf: + path: "/etc/tinc/conf.d" + log: + path: "/var/log/tinc" + user_dirs: + config: + path: "$HOME/.tinc" + ports: + main: + port: '655' + protocol: tcp diff --git a/data/tinc/osfamily/Debian.yaml b/data/tinc/osfamily/Debian.yaml index 1bc8dff2..7e2eee3d 100644 --- a/data/tinc/osfamily/Debian.yaml +++ b/data/tinc/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- tinc::settings: init_file_path: '/etc/default/tinc' + +# Version 4 format + files: + init: + path: "/etc/default/tinc" diff --git a/data/tinc/osfamily/RedHat.yaml b/data/tinc/osfamily/RedHat.yaml index b6e0af46..89a3641f 100644 --- a/data/tinc/osfamily/RedHat.yaml +++ b/data/tinc/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- tinc::settings: init_file_path: '/etc/sysconfig/tinc' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/tinc" diff --git a/data/tree/default.yaml b/data/tree/default.yaml index 97685587..f41b0a16 100644 --- a/data/tree/default.yaml +++ b/data/tree/default.yaml @@ -1,3 +1,8 @@ --- tree::settings: package_name: 'tree' + +# Version 4 format + packages: + main: + name: tree diff --git a/data/trickle/default.yaml b/data/trickle/default.yaml index f423ce22..36fe44ea 100644 --- a/data/trickle/default.yaml +++ b/data/trickle/default.yaml @@ -1,3 +1,8 @@ --- trickle::settings: package_name: 'trickle' + +# Version 4 format + packages: + main: + name: trickle diff --git a/data/trickle/operatingsystem/OracleLinux.yaml b/data/trickle/operatingsystem/OracleLinux.yaml index 33f5fbff..4ec27f99 100644 --- a/data/trickle/operatingsystem/OracleLinux.yaml +++ b/data/trickle/operatingsystem/OracleLinux.yaml @@ -1,3 +1,8 @@ --- trickle::settings: package_name: '' + +# Version 4 format + packages: + main: + name: '' diff --git a/data/twitch-studio/default.yaml b/data/twitch-studio/default.yaml index 9e64c120..e25bd203 100644 --- a/data/twitch-studio/default.yaml +++ b/data/twitch-studio/default.yaml @@ -2,3 +2,10 @@ twitch-studio::settings: package_name: '' website_url: 'https://www.twitch.tv/' + +# Version 4 format + packages: + main: + name: '' + urls: + website: https://www.twitch.tv/ diff --git a/data/twitch-studio/osfamily/Darwin.yaml b/data/twitch-studio/osfamily/Darwin.yaml index c5515d82..d619588e 100644 --- a/data/twitch-studio/osfamily/Darwin.yaml +++ b/data/twitch-studio/osfamily/Darwin.yaml @@ -1,3 +1,10 @@ --- twitch-studio::settings: brew_package_name: 'twitch-studio' + +# Version 4 format + packages: + main: + providers: + brew: + name: twitch-studio diff --git a/data/twitch-studio/osfamily/windows.yaml b/data/twitch-studio/osfamily/windows.yaml index 08d31d39..985021c1 100644 --- a/data/twitch-studio/osfamily/windows.yaml +++ b/data/twitch-studio/osfamily/windows.yaml @@ -3,3 +3,13 @@ twitch-studio::settings: winget_package_name: 'Twitch.TwitchStudio' choco_package_name: 'twitch-studio' package_name: 'twitch-studio' + +# Version 4 format + packages: + main: + name: twitch-studio + providers: + winget: + name: Twitch.TwitchStudio + choco: + name: twitch-studio diff --git a/data/twitch/default.yaml b/data/twitch/default.yaml index 1661c5fa..a12e56f8 100644 --- a/data/twitch/default.yaml +++ b/data/twitch/default.yaml @@ -4,3 +4,14 @@ twitch::settings: snap_package_name: 'twitch' website_url: 'https://desktop.telegram.org/' git_source: 'https://github.com/telegramdesktop/tdesktop.git' + +# Version 4 format + packages: + main: + name: twitch + providers: + snap: + name: twitch + urls: + website: https://desktop.telegram.org/ + source: https://github.com/telegramdesktop/tdesktop.git diff --git a/data/twitch/osfamily/Darwin.yaml b/data/twitch/osfamily/Darwin.yaml index 219b1a42..477096dc 100644 --- a/data/twitch/osfamily/Darwin.yaml +++ b/data/twitch/osfamily/Darwin.yaml @@ -1,4 +1,11 @@ --- twitch::settings: brew_package_name: 'streamlink-twitch-gui' - package_name: 'streamlink-twitch-gui' \ No newline at end of file + package_name: 'streamlink-twitch-gui' +# Version 4 format + packages: + main: + name: streamlink-twitch-gui + providers: + brew: + name: streamlink-twitch-gui diff --git a/data/twitch/osfamily/windows.yaml b/data/twitch/osfamily/windows.yaml index e6cd7a1e..767aad1d 100644 --- a/data/twitch/osfamily/windows.yaml +++ b/data/twitch/osfamily/windows.yaml @@ -2,3 +2,12 @@ twitch::settings: winget_package_name: 'Streamlink.Streamlink.TwitchGui' choco_package_name: 'twitch' + +# Version 4 format + packages: + main: + providers: + winget: + name: Streamlink.Streamlink.TwitchGui + choco: + name: twitch diff --git a/data/ulyaoth/osfamily/RedHat.yaml b/data/ulyaoth/osfamily/RedHat.yaml index 3e38d01e..7be38899 100644 --- a/data/ulyaoth/osfamily/RedHat.yaml +++ b/data/ulyaoth/osfamily/RedHat.yaml @@ -2,3 +2,9 @@ ulyaoth::settings: repo_package_name: 'ulyaoth' repo_package_url: 'https://downloads.ulyaoth.com/rpm/ulyaoth-latest.rhel.x86_64.rpm' + +# Version 4 format + repo: + upstream: + package_name: ulyaoth + package_url: https://downloads.ulyaoth.com/rpm/ulyaoth-latest.rhel.x86_64.rpm diff --git a/data/unzip/default.yaml b/data/unzip/default.yaml index e3b4e419..39869bd3 100644 --- a/data/unzip/default.yaml +++ b/data/unzip/default.yaml @@ -1,3 +1,8 @@ --- unzip::settings: package_name: 'unzip' + +# Version 4 format + packages: + main: + name: unzip diff --git a/data/unzip/osfamily/windows.yaml b/data/unzip/osfamily/windows.yaml index 76c67573..bdc8100f 100644 --- a/data/unzip/osfamily/windows.yaml +++ b/data/unzip/osfamily/windows.yaml @@ -1,3 +1,8 @@ --- unzip::settings: package_name: 'zip' + +# Version 4 format + packages: + main: + name: zip diff --git a/data/vagrant/default.yaml b/data/vagrant/default.yaml index 73fc5e89..db640e4f 100644 --- a/data/vagrant/default.yaml +++ b/data/vagrant/default.yaml @@ -7,3 +7,17 @@ vagrant::settings: info_commands: global-status: 'vagrant global-status' git_source: https://github.com/hashicorp/vagrant.git + +# Version 4 format + packages: + main: + name: vagrant + services: + ! '': + process_name: vagrant + dirs: + home: + path: "/opt/vagrant" + urls: + source: https://github.com/hashicorp/vagrant.git + repo: upstream diff --git a/data/vagrant/upstream/default.yaml b/data/vagrant/upstream/default.yaml index fa573992..e4b4f50d 100644 --- a/data/vagrant/upstream/default.yaml +++ b/data/vagrant/upstream/default.yaml @@ -1,4 +1,8 @@ --- vagrant::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/varnish/default.yaml b/data/varnish/default.yaml index f2572c50..e6719f2d 100644 --- a/data/varnish/default.yaml +++ b/data/varnish/default.yaml @@ -13,3 +13,38 @@ varnish::settings: process_group: 'varnish' tcp_port: '6081' nodaemon_args: '-F' + +# Version 4 format + packages: + main: + name: varnish + services: + varnish: + process_name: varnish + process_user: varnish + process_group: varnish + nodaemon_args: "-F" + files: + config: + path: "/etc/varnish/default.vcl" + log: + path: "/var/log/varnish/varnish.log" + pid: + path: "/var/run/varnish.pid" + user_files: + config: + path: "$HOME/.varnish/default.vcl" + dirs: + config: + path: "/etc/varnish" + conf: + path: "/etc/varnish/conf.d" + log: + path: "/var/log/varnish" + user_dirs: + config: + path: "$HOME/.varnish" + ports: + main: + port: '6081' + protocol: tcp diff --git a/data/varnish/osfamily/Debian.yaml b/data/varnish/osfamily/Debian.yaml index 32978618..e718976b 100644 --- a/data/varnish/osfamily/Debian.yaml +++ b/data/varnish/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- varnish::settings: init_file_path: '/etc/default/varnish' + +# Version 4 format + files: + init: + path: "/etc/default/varnish" diff --git a/data/varnish/osfamily/RedHat.yaml b/data/varnish/osfamily/RedHat.yaml index 396c337b..529fbd7d 100644 --- a/data/varnish/osfamily/RedHat.yaml +++ b/data/varnish/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- varnish::settings: init_file_path: '/etc/sysconfig/varnish' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/varnish" diff --git a/data/varnish/osfamily/Suse12.yaml b/data/varnish/osfamily/Suse12.yaml index 03479f0b..74432cc3 100644 --- a/data/varnish/osfamily/Suse12.yaml +++ b/data/varnish/osfamily/Suse12.yaml @@ -5,3 +5,19 @@ varnish::settings: init_file_path: '/etc/sysconfig/varnish' config_file_path: '/etc/varnish/vcl.conf' pid_file_path: '/var/run/varnishd.pid' + +# Version 4 format + files: + config: + path: "/etc/varnish/vcl.conf" + init: + path: "/etc/sysconfig/varnish" + pid: + path: "/var/run/varnishd.pid" + user_files: + config: + path: "$HOME/.varnish/vcl.conf" + repo: + upstream: + name: server_http + zypper_repofile_url: http://download.opensuse.org/repositories/server:/http/SLE_12/server:http.repo diff --git a/data/vault-enterprise/default.yaml b/data/vault-enterprise/default.yaml index 3ef1e2dd..e7378f7e 100644 --- a/data/vault-enterprise/default.yaml +++ b/data/vault-enterprise/default.yaml @@ -9,3 +9,31 @@ vault-enterprise::settings: data_dir_path: '/opt/vault' config_file_format: 'hcl' tcp_port: 8200 + +# Version 4 format + packages: + main: + name: vault-enterprise + services: + vault: + process_name: vault + files: + config: + path: "/etc/vault.d/vault.hcl" + format: hcl + user_files: + config: + path: "$HOME/.vault.d/vault.hcl" + dirs: + config: + path: "/etc/vault.d" + data: + path: "/opt/vault" + user_dirs: + config: + path: "$HOME/.vault.d" + ports: + main: + port: 8200 + protocol: tcp + repo: upstream diff --git a/data/vault-enterprise/upstream/default.yaml b/data/vault-enterprise/upstream/default.yaml index 8e885ab9..332477ec 100644 --- a/data/vault-enterprise/upstream/default.yaml +++ b/data/vault-enterprise/upstream/default.yaml @@ -1,4 +1,8 @@ --- vault-enterprise::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/vault/default.yaml b/data/vault/default.yaml index cb4b13c8..97d7b286 100644 --- a/data/vault/default.yaml +++ b/data/vault/default.yaml @@ -12,3 +12,33 @@ vault::settings: git_source: https://github.com/hashicorp/vault.git info_commands: vault_status: 'vault status' + +# Version 4 format + packages: + main: + name: vault + services: + vault: + process_name: vault + files: + config: + path: "/etc/vault.d/vault.hcl" + format: hcl + user_files: + config: + path: "$HOME/.vault.d/vault.hcl" + dirs: + config: + path: "/etc/vault.d" + data: + path: "/opt/vault" + user_dirs: + config: + path: "$HOME/.vault.d" + ports: + main: + port: 8200 + protocol: tcp + urls: + source: https://github.com/hashicorp/vault.git + repo: upstream diff --git a/data/vault/upstream/default.yaml b/data/vault/upstream/default.yaml index 89b239bd..b22ec512 100644 --- a/data/vault/upstream/default.yaml +++ b/data/vault/upstream/default.yaml @@ -2,3 +2,8 @@ vault::settings: tp_prerequisites: hashicorp_repo: {} + +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/vim/default.yaml b/data/vim/default.yaml index 9ba0953b..b8c7c604 100644 --- a/data/vim/default.yaml +++ b/data/vim/default.yaml @@ -3,3 +3,20 @@ vim::settings: package_name: 'vim' config_file_path: '/etc/vim/vimrc' config_dir_path: '/etc/vim' + +# Version 4 format + packages: + main: + name: vim + files: + config: + path: "/etc/vim/vimrc" + user_files: + config: + path: "$HOME/.vim/vimrc" + dirs: + config: + path: "/etc/vim" + user_dirs: + config: + path: "$HOME/.vim" diff --git a/data/vim/operatingsystem/Fedora36.yaml b/data/vim/operatingsystem/Fedora36.yaml index b75108ce..e8d1cd98 100644 --- a/data/vim/operatingsystem/Fedora36.yaml +++ b/data/vim/operatingsystem/Fedora36.yaml @@ -2,3 +2,14 @@ vim::settings: config_file_path: '/etc/vimrc' package_name: 'vim-enhanced' + +# Version 4 format + packages: + main: + name: vim-enhanced + files: + config: + path: "/etc/vimrc" + user_files: + config: + path: "$HOME/.vimrc" diff --git a/data/vim/osfamily/RedHat.yaml b/data/vim/osfamily/RedHat.yaml index ab6779fe..11dfac91 100644 --- a/data/vim/osfamily/RedHat.yaml +++ b/data/vim/osfamily/RedHat.yaml @@ -1,3 +1,11 @@ --- vim::settings: config_file_path: '/etc/vimrc' + +# Version 4 format + files: + config: + path: "/etc/vimrc" + user_files: + config: + path: "$HOME/.vimrc" diff --git a/data/vim/osfamily/RedHat8.yaml b/data/vim/osfamily/RedHat8.yaml index b75108ce..e8d1cd98 100644 --- a/data/vim/osfamily/RedHat8.yaml +++ b/data/vim/osfamily/RedHat8.yaml @@ -2,3 +2,14 @@ vim::settings: config_file_path: '/etc/vimrc' package_name: 'vim-enhanced' + +# Version 4 format + packages: + main: + name: vim-enhanced + files: + config: + path: "/etc/vimrc" + user_files: + config: + path: "$HOME/.vimrc" diff --git a/data/vim/osfamily/RedHat9.yaml b/data/vim/osfamily/RedHat9.yaml index b75108ce..e8d1cd98 100644 --- a/data/vim/osfamily/RedHat9.yaml +++ b/data/vim/osfamily/RedHat9.yaml @@ -2,3 +2,14 @@ vim::settings: config_file_path: '/etc/vimrc' package_name: 'vim-enhanced' + +# Version 4 format + packages: + main: + name: vim-enhanced + files: + config: + path: "/etc/vimrc" + user_files: + config: + path: "$HOME/.vimrc" diff --git a/data/virtualbox/default.yaml b/data/virtualbox/default.yaml index 5834a1cb..1d6145a3 100644 --- a/data/virtualbox/default.yaml +++ b/data/virtualbox/default.yaml @@ -3,3 +3,16 @@ virtualbox::settings: package_name: 'virtualbox-6.0' service_name: 'vboxdrv' config_dir_path: '/etc/vbox' + +# Version 4 format + packages: + main: + name: virtualbox-6.0 + services: + vboxdrv: {} + dirs: + config: + path: "/etc/vbox" + user_dirs: + config: + path: "$HOME/.vbox" diff --git a/data/virtualbox/operatingsystem/Debian7.yaml b/data/virtualbox/operatingsystem/Debian7.yaml index d5aaa34c..f02fead5 100644 --- a/data/virtualbox/operatingsystem/Debian7.yaml +++ b/data/virtualbox/operatingsystem/Debian7.yaml @@ -2,3 +2,11 @@ virtualbox::settings: key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + +# Version 4 format + repo: + upstream: + key: 7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139 + key_url: https://www.virtualbox.org/download/oracle_vbox.asc + yum: + gpgcheck: true diff --git a/data/virtualbox/operatingsystem/Ubuntu14.04.yaml b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml index d5aaa34c..f02fead5 100644 --- a/data/virtualbox/operatingsystem/Ubuntu14.04.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu14.04.yaml @@ -2,3 +2,11 @@ virtualbox::settings: key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + +# Version 4 format + repo: + upstream: + key: 7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139 + key_url: https://www.virtualbox.org/download/oracle_vbox.asc + yum: + gpgcheck: true diff --git a/data/virtualbox/operatingsystem/Ubuntu14.10.yaml b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml index d5aaa34c..f02fead5 100644 --- a/data/virtualbox/operatingsystem/Ubuntu14.10.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu14.10.yaml @@ -2,3 +2,11 @@ virtualbox::settings: key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + +# Version 4 format + repo: + upstream: + key: 7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139 + key_url: https://www.virtualbox.org/download/oracle_vbox.asc + yum: + gpgcheck: true diff --git a/data/virtualbox/operatingsystem/Ubuntu15.04.yaml b/data/virtualbox/operatingsystem/Ubuntu15.04.yaml index d5aaa34c..f02fead5 100644 --- a/data/virtualbox/operatingsystem/Ubuntu15.04.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu15.04.yaml @@ -2,3 +2,11 @@ virtualbox::settings: key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + +# Version 4 format + repo: + upstream: + key: 7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139 + key_url: https://www.virtualbox.org/download/oracle_vbox.asc + yum: + gpgcheck: true diff --git a/data/virtualbox/operatingsystem/Ubuntu15.10.yaml b/data/virtualbox/operatingsystem/Ubuntu15.10.yaml index d5aaa34c..f02fead5 100644 --- a/data/virtualbox/operatingsystem/Ubuntu15.10.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu15.10.yaml @@ -2,3 +2,11 @@ virtualbox::settings: key: '7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139' key_url: 'https://www.virtualbox.org/download/oracle_vbox.asc' + +# Version 4 format + repo: + upstream: + key: 7B0F AB3A 13B9 0743 5925 D9C9 5442 2A4B 98AB 5139 + key_url: https://www.virtualbox.org/download/oracle_vbox.asc + yum: + gpgcheck: true diff --git a/data/virtualbox/operatingsystem/Ubuntu18.04.yaml b/data/virtualbox/operatingsystem/Ubuntu18.04.yaml index 73ed9775..6ad00cb7 100644 --- a/data/virtualbox/operatingsystem/Ubuntu18.04.yaml +++ b/data/virtualbox/operatingsystem/Ubuntu18.04.yaml @@ -3,3 +3,11 @@ 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' + +# Version 4 format + repo: + upstream: + key: B9F8 D658 297A F3EF C18D 5CDF A2F6 83C5 2980 AECF + key_url: https://www.virtualbox.org/download/oracle_vbox_2016.asc + yum: + gpgcheck: true diff --git a/data/virtualbox/osfamily/Debian.yaml b/data/virtualbox/osfamily/Debian.yaml index 9cf1520b..c8181f34 100644 --- a/data/virtualbox/osfamily/Debian.yaml +++ b/data/virtualbox/osfamily/Debian.yaml @@ -7,3 +7,12 @@ virtualbox::settings: # 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' + +# Version 4 format + repo: + upstream: + 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 + yum: + gpgcheck: true diff --git a/data/virtualbox/osfamily/RedHat.yaml b/data/virtualbox/osfamily/RedHat.yaml index b60be963..7e477130 100644 --- a/data/virtualbox/osfamily/RedHat.yaml +++ b/data/virtualbox/osfamily/RedHat.yaml @@ -7,3 +7,17 @@ virtualbox::settings: - gcc - make - kernel-devel + +# Version 4 format + repo: + upstream: + url: http://download.virtualbox.org/virtualbox/rpm/el/$releasever/$basearch + key: 7B0FAB3A + key_url: https://www.virtualbox.org/download/oracle_vbox.asc + yum: + gpgcheck: true + preinstall: + package: + - gcc + - make + - kernel-devel diff --git a/data/vscode/default.yaml b/data/vscode/default.yaml index c9093c45..61e0ebfc 100644 --- a/data/vscode/default.yaml +++ b/data/vscode/default.yaml @@ -9,3 +9,19 @@ vscode::settings: user_config_dir_path: '$HOME/.config/Code/User/' tp_prerequisites: - 'microsoft_repo' + +# Version 4 format + packages: + main: + name: vscode + files: + config: + format: json + urls: + website: https://code.visualstudio.com/ + source: https://github.com/microsoft/vscode + image: + name: bitnami/vscode + preinstall: + tp::install: + - microsoft_repo diff --git a/data/vscode/osfamily/Darwin.yaml b/data/vscode/osfamily/Darwin.yaml index e4b952d3..f54a26e3 100644 --- a/data/vscode/osfamily/Darwin.yaml +++ b/data/vscode/osfamily/Darwin.yaml @@ -2,4 +2,8 @@ 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 + user_config_dir_path: '$HOME/Library/Application\ Support/Code/User/' +# Version 4 format + packages: + main: + name: visual-studio-code diff --git a/data/vscode/osfamily/Debian.yaml b/data/vscode/osfamily/Debian.yaml index cb82b85c..c716724b 100644 --- a/data/vscode/osfamily/Debian.yaml +++ b/data/vscode/osfamily/Debian.yaml @@ -1,3 +1,10 @@ --- vscode::settings: snap_package_name: 'code' + +# Version 4 format + packages: + main: + providers: + snap: + name: code diff --git a/data/vscode/osfamily/RedHat.yaml b/data/vscode/osfamily/RedHat.yaml index cb82b85c..c716724b 100644 --- a/data/vscode/osfamily/RedHat.yaml +++ b/data/vscode/osfamily/RedHat.yaml @@ -1,3 +1,10 @@ --- vscode::settings: snap_package_name: 'code' + +# Version 4 format + packages: + main: + providers: + snap: + name: code diff --git a/data/vscode/osfamily/windows.yaml b/data/vscode/osfamily/windows.yaml index 09e3e103..2a0f0b25 100644 --- a/data/vscode/osfamily/windows.yaml +++ b/data/vscode/osfamily/windows.yaml @@ -5,3 +5,12 @@ vscode::settings: user_config_file_path: '%APPDATA%\Code\User\settings.json' user_config_dir_path: '%APPDATA%\Code\User' + +# Version 4 format + packages: + main: + providers: + winget: + name: Microsoft.VisualStudioCode + choco: + name: vscode diff --git a/data/vsftpd/default.yaml b/data/vsftpd/default.yaml index 603fc6fc..055a0dcb 100644 --- a/data/vsftpd/default.yaml +++ b/data/vsftpd/default.yaml @@ -11,3 +11,35 @@ vsftpd::settings: process_user: 'vsftpd' process_group: 'vsftpd' tcp_port: '21' + +# Version 4 format + packages: + main: + name: vsftpd + services: + vsftpd: + process_name: vsftpd + process_user: vsftpd + process_group: vsftpd + files: + config: + path: "/etc/vsftpd/vsftpd.conf" + log: + path: "/var/log/vsftpd/vsftpd.log" + pid: + path: "/var/run/vsftpd.pid" + user_files: + config: + path: "$HOME/.vsftpd/vsftpd.conf" + dirs: + config: + path: "/etc/vsftpd" + log: + path: "/var/log/vsftpd" + user_dirs: + config: + path: "$HOME/.vsftpd" + ports: + main: + port: '21' + protocol: tcp diff --git a/data/vsftpd/osfamily/Debian.yaml b/data/vsftpd/osfamily/Debian.yaml index 5a7b313c..6d528778 100644 --- a/data/vsftpd/osfamily/Debian.yaml +++ b/data/vsftpd/osfamily/Debian.yaml @@ -6,3 +6,23 @@ vsftpd::settings: data_dir_path: '/srv/ftp' log_file_path: '/var/log/vsftpd.log' init_file_path: '/etc/default/vsftpd' + +# Version 4 format + services: + ! '': + process_user: root + files: + config: + path: "/etc/vsftpd.conf" + log: + path: "/var/log/vsftpd.log" + init: + path: "/etc/default/vsftpd" + pid: + path: "/var/run/vsftpd/vsftpd.pid" + user_files: + config: + path: "$HOME/.vsftpd.conf" + dirs: + data: + path: "/srv/ftp" diff --git a/data/vsftpd/osfamily/RedHat.yaml b/data/vsftpd/osfamily/RedHat.yaml index 9968b491..de5ce581 100644 --- a/data/vsftpd/osfamily/RedHat.yaml +++ b/data/vsftpd/osfamily/RedHat.yaml @@ -3,3 +3,13 @@ vsftpd::settings: data_dir_path: '/var/ftp/pub' log_file_path: '/var/log/xferlog' init_file_path: '/etc/sysconfig/vsftpd' + +# Version 4 format + files: + log: + path: "/var/log/xferlog" + init: + path: "/etc/sysconfig/vsftpd" + dirs: + data: + path: "/var/ftp/pub" diff --git a/data/waypoint/default.yaml b/data/waypoint/default.yaml index 1365beef..6cab8fa7 100644 --- a/data/waypoint/default.yaml +++ b/data/waypoint/default.yaml @@ -4,3 +4,12 @@ waypoint::settings: package_name: 'waypoint' process_name: 'waypoint' + +# Version 4 format + packages: + main: + name: waypoint + services: + ! '': + process_name: waypoint + repo: upstream diff --git a/data/waypoint/upstream/default.yaml b/data/waypoint/upstream/default.yaml index 3c39472c..4f28aed7 100644 --- a/data/waypoint/upstream/default.yaml +++ b/data/waypoint/upstream/default.yaml @@ -1,4 +1,8 @@ --- waypoint::settings: tp_prerequisites: - hashicorp_repo: {} \ No newline at end of file + hashicorp_repo: {} +# Version 4 format + preinstall: + tp::install: + hashicorp_repo: {} diff --git a/data/wazuh-agent/default.yaml b/data/wazuh-agent/default.yaml index d2d44511..968bee58 100644 --- a/data/wazuh-agent/default.yaml +++ b/data/wazuh-agent/default.yaml @@ -9,3 +9,28 @@ wazuh-agent::settings: process_name: 'ossec-agentd' process_user: 'ossec' process_group: 'ossec' + +# Version 4 format + packages: + main: + name: wazuh-agent + services: + wazuh-agent: + process_name: ossec-agentd + process_user: ossec + process_group: ossec + files: + config: + path: "/var/ossec/etc/ossec.conf" + user_files: + config: + path: "/var/ossec$HOME/.ossec.conf" + dirs: + config: + path: "/var/ossec/etc" + home: + path: "/var/ossec" + user_dirs: + config: + path: "/var/ossec/etc" + repo: upstream diff --git a/data/wazuh-agent/upstream/osfamily/Debian.yaml b/data/wazuh-agent/upstream/osfamily/Debian.yaml index 80cd5e8a..f6732c2d 100644 --- a/data/wazuh-agent/upstream/osfamily/Debian.yaml +++ b/data/wazuh-agent/upstream/osfamily/Debian.yaml @@ -4,4 +4,14 @@ wazuh-agent::settings: 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 + apt_repos: 'main' +# Version 4 format + repo: + upstream: + 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 + yum: + gpgcheck: true + apt: + release: stable diff --git a/data/wazuh-agent/upstream/osfamily/RedHat.yaml b/data/wazuh-agent/upstream/osfamily/RedHat.yaml index 22e72ccf..a0a71b54 100644 --- a/data/wazuh-agent/upstream/osfamily/RedHat.yaml +++ b/data/wazuh-agent/upstream/osfamily/RedHat.yaml @@ -3,3 +3,12 @@ wazuh-agent::settings: repo_url: 'https://packages.wazuh.com/3.x/yum/' key: '0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145' key_url: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' + +# Version 4 format + repo: + upstream: + url: https://packages.wazuh.com/3.x/yum/ + key: 0DCF CA55 47B1 9D2A 6099 5060 96B3 EE5F 2911 1145 + key_url: https://packages.wazuh.com/key/GPG-KEY-WAZUH + yum: + gpgcheck: true diff --git a/data/wazuh-agent/upstream/osfamily/Suse.yaml b/data/wazuh-agent/upstream/osfamily/Suse.yaml index c44a421a..40880546 100644 --- a/data/wazuh-agent/upstream/osfamily/Suse.yaml +++ b/data/wazuh-agent/upstream/osfamily/Suse.yaml @@ -1,3 +1,5 @@ --- wazuh-agent::settings: package_name: ~ + +# No data to convert to Version 4 format diff --git a/data/wazuh-server/upstream/osfamily/Debian.yaml b/data/wazuh-server/upstream/osfamily/Debian.yaml index 6ae92355..600ad822 100644 --- a/data/wazuh-server/upstream/osfamily/Debian.yaml +++ b/data/wazuh-server/upstream/osfamily/Debian.yaml @@ -4,4 +4,14 @@ wazuh-server::settings: 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 + apt_repos: 'main' +# Version 4 format + repo: + upstream: + 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 + yum: + gpgcheck: true + apt: + release: stable diff --git a/data/wazuh-server/upstream/osfamily/RedHat.yaml b/data/wazuh-server/upstream/osfamily/RedHat.yaml index 426884ef..d076651c 100644 --- a/data/wazuh-server/upstream/osfamily/RedHat.yaml +++ b/data/wazuh-server/upstream/osfamily/RedHat.yaml @@ -3,3 +3,12 @@ wazuh-server::settings: repo_url: 'https://packages.wazuh.com/3.x/yum/' key: 'F1C3BD80' key_url: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' + +# Version 4 format + repo: + upstream: + url: https://packages.wazuh.com/3.x/yum/ + key: F1C3BD80 + key_url: https://packages.wazuh.com/key/GPG-KEY-WAZUH + yum: + gpgcheck: true diff --git a/data/wazuh-server/upstream/osfamily/Suse.yaml b/data/wazuh-server/upstream/osfamily/Suse.yaml index 27ce2eae..5c47559a 100644 --- a/data/wazuh-server/upstream/osfamily/Suse.yaml +++ b/data/wazuh-server/upstream/osfamily/Suse.yaml @@ -1,3 +1,5 @@ --- wazuh-server::settings: package_name: ~ + +# No data to convert to Version 4 format diff --git a/data/webex-meetings/default.yaml b/data/webex-meetings/default.yaml index 4967e188..82814a63 100644 --- a/data/webex-meetings/default.yaml +++ b/data/webex-meetings/default.yaml @@ -4,3 +4,14 @@ webex-meetings::settings: snap_package_name: 'webex-meetings' website_url: 'https://desktop.telegram.org/' git_source: 'https://github.com/telegramdesktop/tdesktop.git' + +# Version 4 format + packages: + main: + name: '' + providers: + snap: + name: webex-meetings + urls: + website: https://desktop.telegram.org/ + source: https://github.com/telegramdesktop/tdesktop.git diff --git a/data/webex-meetings/osfamily/Darwin.yaml b/data/webex-meetings/osfamily/Darwin.yaml index 2995e81d..bfb0655b 100644 --- a/data/webex-meetings/osfamily/Darwin.yaml +++ b/data/webex-meetings/osfamily/Darwin.yaml @@ -2,3 +2,11 @@ webex-meetings::settings: brew_package_name: 'webex-meetings' package_name: 'webex-meetings' + +# Version 4 format + packages: + main: + name: webex-meetings + providers: + brew: + name: webex-meetings diff --git a/data/webex-meetings/osfamily/windows.yaml b/data/webex-meetings/osfamily/windows.yaml index da9b5b4b..d4cb1207 100644 --- a/data/webex-meetings/osfamily/windows.yaml +++ b/data/webex-meetings/osfamily/windows.yaml @@ -3,3 +3,13 @@ webex-meetings::settings: winget_package_name: 'Cisco.CiscoWebexMeetings' choco_package_name: 'webex-meetings' package_name: 'webex-meetings' + +# Version 4 format + packages: + main: + name: webex-meetings + providers: + winget: + name: Cisco.CiscoWebexMeetings + choco: + name: webex-meetings diff --git a/data/webex/default.yaml b/data/webex/default.yaml index 382c2469..288dca58 100644 --- a/data/webex/default.yaml +++ b/data/webex/default.yaml @@ -3,3 +3,13 @@ webex::settings: package_name: '' snap_package_name: 'webex' website_url: 'https://www.webex.com' + +# Version 4 format + packages: + main: + name: '' + providers: + snap: + name: webex + urls: + website: https://www.webex.com diff --git a/data/webex/osfamily/Darwin.yaml b/data/webex/osfamily/Darwin.yaml index ba187a61..ff2b39e9 100644 --- a/data/webex/osfamily/Darwin.yaml +++ b/data/webex/osfamily/Darwin.yaml @@ -2,3 +2,11 @@ webex::settings: brew_package_name: 'webex' package_name: 'webex' + +# Version 4 format + packages: + main: + name: webex + providers: + brew: + name: webex diff --git a/data/webex/osfamily/windows.yaml b/data/webex/osfamily/windows.yaml index cdf1686e..3edb29fc 100644 --- a/data/webex/osfamily/windows.yaml +++ b/data/webex/osfamily/windows.yaml @@ -3,3 +3,13 @@ webex::settings: winget_package_name: 'Cisco.WebexTeams' choco_package_name: 'webex' package_name: 'webex' + +# Version 4 format + packages: + main: + name: webex + providers: + winget: + name: Cisco.WebexTeams + choco: + name: webex diff --git a/data/wpscan/default.yaml b/data/wpscan/default.yaml index 4f315bd6..95c0c672 100644 --- a/data/wpscan/default.yaml +++ b/data/wpscan/default.yaml @@ -12,3 +12,8 @@ wpscan::settings: command: 'bundle install --without test' tp_prerequisites: - ruby + +# Version 4 format + preinstall: + tp::install: + - ruby diff --git a/data/xinetd/default.yaml b/data/xinetd/default.yaml index 2a75b7be..82fe4c8c 100644 --- a/data/xinetd/default.yaml +++ b/data/xinetd/default.yaml @@ -9,3 +9,29 @@ xinetd::settings: process_name: 'xinetd' process_user: 'xinetd' process_group: 'xinetd' + +# Version 4 format + packages: + main: + name: xinetd + services: + xinetd: + process_name: xinetd + process_user: xinetd + process_group: xinetd + files: + config: + path: "/etc/xinetd.conf" + init: + path: "/etc/sysconfig/xinetd" + pid: + path: "/var/run/xinetd.pid" + user_files: + config: + path: "$HOME/.xinetd.conf" + dirs: + config: + path: "/etc/xinetd.d" + user_dirs: + config: + path: "$HOME/.xinetd.d" diff --git a/data/xinetd/osfamily/Debian.yaml b/data/xinetd/osfamily/Debian.yaml index d8230475..e8bad366 100644 --- a/data/xinetd/osfamily/Debian.yaml +++ b/data/xinetd/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- xinetd::settings: init_file_path: '/etc/default/xinetd' + +# Version 4 format + files: + init: + path: "/etc/default/xinetd" diff --git a/data/yarn/default.yaml b/data/yarn/default.yaml index d68b8c02..28cf1cc0 100644 --- a/data/yarn/default.yaml +++ b/data/yarn/default.yaml @@ -1,3 +1,8 @@ --- yarn::settings: package_name: 'yarn' + +# Version 4 format + packages: + main: + name: yarn diff --git a/data/yarn/osfamily/Debian.yaml b/data/yarn/osfamily/Debian.yaml index 63e2d9d4..183771d5 100644 --- a/data/yarn/osfamily/Debian.yaml +++ b/data/yarn/osfamily/Debian.yaml @@ -5,3 +5,14 @@ yarn::settings: key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg' apt_repos: 'main' apt_release: 'stable' + +# Version 4 format + repo: + upstream: + url: https://dl.yarnpkg.com/debian/ + key: D88E42B4 + key_url: https://dl.yarnpkg.com/debian/pubkey.gpg + yum: + gpgcheck: true + apt: + release: stable diff --git a/data/yarn/osfamily/RedHat.yaml b/data/yarn/osfamily/RedHat.yaml index fe5279e3..056841c1 100644 --- a/data/yarn/osfamily/RedHat.yaml +++ b/data/yarn/osfamily/RedHat.yaml @@ -4,3 +4,10 @@ yarn::settings: repo_description: 'Yarn Repository' repo_url: 'https://dl.yarnpkg.com/rpm/' key_url: 'https://dl.yarnpkg.com/rpm/pubkey.gpg' + +# Version 4 format + repo: + upstream: + url: https://dl.yarnpkg.com/rpm/ + description: Yarn Repository + key_url: https://dl.yarnpkg.com/rpm/pubkey.gpg diff --git a/data/yum-cron/default.yaml b/data/yum-cron/default.yaml index f5909166..b29a3b5f 100644 --- a/data/yum-cron/default.yaml +++ b/data/yum-cron/default.yaml @@ -4,3 +4,18 @@ yum-cron::settings: service_name: 'yum-cron' config_file_path: '/etc/yum/yum-cron.conf' log_file_path: '/var/log/yum.log' + +# Version 4 format + packages: + main: + name: yum-cron + services: + yum-cron: {} + files: + config: + path: "/etc/yum/yum-cron.conf" + log: + path: "/var/log/yum.log" + user_files: + config: + path: "$HOME/.yum/yum-cron.conf" diff --git a/data/zabbix-agent/default.yaml b/data/zabbix-agent/default.yaml index bc24cc49..443f2c90 100644 --- a/data/zabbix-agent/default.yaml +++ b/data/zabbix-agent/default.yaml @@ -11,3 +11,35 @@ zabbix-agent::settings: process_user: 'zabbix' process_group: 'zabbix' tcp_port: '10050' + +# Version 4 format + packages: + main: + name: zabbix-agent + services: + zabbix-agent: + process_name: zabbix_agentd + process_user: zabbix + process_group: zabbix + files: + config: + path: "/etc/zabbix/zabbix_agentd.conf" + log: + path: "/var/log/zabbix-agent/zabbix_agentd.log" + pid: + path: "/var/run/zabbix/zabbix_agentd.pid" + user_files: + config: + path: "$HOME/.zabbix/zabbix_agentd.conf" + dirs: + config: + path: "/etc/zabbix" + log: + path: "/var/log/zabbix-agent" + user_dirs: + config: + path: "$HOME/.zabbix" + ports: + main: + port: '10050' + protocol: tcp diff --git a/data/zabbix-agent/osfamily/Debian.yaml b/data/zabbix-agent/osfamily/Debian.yaml index 53b88c4c..8042c9e8 100644 --- a/data/zabbix-agent/osfamily/Debian.yaml +++ b/data/zabbix-agent/osfamily/Debian.yaml @@ -1,3 +1,8 @@ --- zabbix-agent::settings: init_file_path: '/etc/default/zabbix-agent' + +# Version 4 format + files: + init: + path: "/etc/default/zabbix-agent" diff --git a/data/zabbix-agent/osfamily/RedHat.yaml b/data/zabbix-agent/osfamily/RedHat.yaml index e23095b3..26d73320 100644 --- a/data/zabbix-agent/osfamily/RedHat.yaml +++ b/data/zabbix-agent/osfamily/RedHat.yaml @@ -1,3 +1,8 @@ --- zabbix-agent::settings: init_file_path: '/etc/sysconfig/zabbix-agent' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/zabbix-agent" diff --git a/data/zabbix-agent/osfamily/Suse.yaml b/data/zabbix-agent/osfamily/Suse.yaml index 68cc7f51..550cc7ef 100644 --- a/data/zabbix-agent/osfamily/Suse.yaml +++ b/data/zabbix-agent/osfamily/Suse.yaml @@ -4,3 +4,11 @@ zabbix-agent::settings: repo_name: 'server_monitoring' service_name: 'zabbix-agentd' + +# Version 4 format + services: + zabbix-agentd: {} + repo: + upstream: + name: server_monitoring + zypper_repofile_url: http://download.opensuse.org/repositories/server:/monitoring/SLE_12/ diff --git a/data/zeek/default.yaml b/data/zeek/default.yaml index 5868a09a..dee81e49 100644 --- a/data/zeek/default.yaml +++ b/data/zeek/default.yaml @@ -9,3 +9,28 @@ zeek::settings: process_group: 'zeek' config_file_path: '/etc/zeek/daemon.json' config_dir_path: '/etc/zeek' + +# Version 4 format + packages: + main: + name: zeek + services: + zeek: + process_name: zeek + process_user: zeek + process_group: zeek + files: + config: + path: "/etc/zeek/daemon.json" + pid: + path: "/var/run/zeek.pid" + user_files: + config: + path: "$HOME/.zeek/daemon.json" + dirs: + config: + path: "/etc/zeek" + user_dirs: + config: + path: "$HOME/.zeek" + repo: upstream diff --git a/data/zeek/upstream/default.yaml b/data/zeek/upstream/default.yaml index 443a68c5..7a111031 100644 --- a/data/zeek/upstream/default.yaml +++ b/data/zeek/upstream/default.yaml @@ -1,3 +1,8 @@ --- zeek::settings: package_name: 'zeek' + +# Version 4 format + packages: + main: + name: zeek diff --git a/data/zeek/upstream/operatingsystem/CentOS.yaml b/data/zeek/upstream/operatingsystem/CentOS.yaml index 79251401..e1949197 100644 --- a/data/zeek/upstream/operatingsystem/CentOS.yaml +++ b/data/zeek/upstream/operatingsystem/CentOS.yaml @@ -1,3 +1,8 @@ --- zeek::settings: init_file_path: '/etc/sysconfig/zeek' + +# Version 4 format + files: + init: + path: "/etc/sysconfig/zeek" diff --git a/data/zeek/upstream/operatingsystem/CentOS7.yaml b/data/zeek/upstream/operatingsystem/CentOS7.yaml index 0eee7888..85cce612 100644 --- a/data/zeek/upstream/operatingsystem/CentOS7.yaml +++ b/data/zeek/upstream/operatingsystem/CentOS7.yaml @@ -1,3 +1,8 @@ --- zeek::settings: repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/CentOS_7/security:zeek.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index fbefebdb..92f7d694 100644 --- a/data/zeek/upstream/operatingsystem/CentOS8.yaml +++ b/data/zeek/upstream/operatingsystem/CentOS8.yaml @@ -1,3 +1,8 @@ --- zeek::settings: repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/CentOS_8/security:zeek.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index 115321d4..df44e01d 100644 --- a/data/zeek/upstream/operatingsystem/Darwin.yaml +++ b/data/zeek/upstream/operatingsystem/Darwin.yaml @@ -2,3 +2,8 @@ zeek::settings: package_source: https://download.zeek.com/mac/stable/Docker.dmg + +# Version 4 format + packages: + main: + 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 index 13039430..ede826e2 100644 --- a/data/zeek/upstream/operatingsystem/Debian.yaml +++ b/data/zeek/upstream/operatingsystem/Debian.yaml @@ -5,3 +5,15 @@ zeek::settings: key: '0EBFCD88' key_url: 'https://download.zeek.com/linux/debian/gpg' apt_repos: 'stable' + +# Version 4 format + files: + init: + path: "/etc/default/zeek" + repo: + upstream: + url: https://download.zeek.com/linux/debian + key: 0EBFCD88 + key_url: https://download.zeek.com/linux/debian/gpg + yum: + gpgcheck: true diff --git a/data/zeek/upstream/operatingsystem/Debian10.yaml b/data/zeek/upstream/operatingsystem/Debian10.yaml index 881eb53a..4836e4fd 100644 --- a/data/zeek/upstream/operatingsystem/Debian10.yaml +++ b/data/zeek/upstream/operatingsystem/Debian10.yaml @@ -2,3 +2,9 @@ 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' + +# Version 4 format + repo: + upstream: + 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/Fedora29.yaml b/data/zeek/upstream/operatingsystem/Fedora29.yaml index 0efec7ae..459b4189 100644 --- a/data/zeek/upstream/operatingsystem/Fedora29.yaml +++ b/data/zeek/upstream/operatingsystem/Fedora29.yaml @@ -1,3 +1,8 @@ --- zeek::settings: repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/Fedora_29/security:zeek.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index 670035e3..16dfcac5 100644 --- a/data/zeek/upstream/operatingsystem/Fedora30.yaml +++ b/data/zeek/upstream/operatingsystem/Fedora30.yaml @@ -1,3 +1,8 @@ --- zeek::settings: repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/Fedora_30/security:zeek.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index f0431e2a..35abe4ab 100644 --- a/data/zeek/upstream/operatingsystem/Fedora31.yaml +++ b/data/zeek/upstream/operatingsystem/Fedora31.yaml @@ -1,3 +1,8 @@ --- zeek::settings: repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/Fedora_31/security:zeek.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index dbe50061..523c7931 100644 --- a/data/zeek/upstream/operatingsystem/Fedora32.yaml +++ b/data/zeek/upstream/operatingsystem/Fedora32.yaml @@ -1,3 +1,8 @@ --- zeek::settings: repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/Fedora_32/security:zeek.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index 7ff69e90..25c2cefe 100644 --- a/data/zeek/upstream/operatingsystem/Raspbian10.yaml +++ b/data/zeek/upstream/operatingsystem/Raspbian10.yaml @@ -2,3 +2,9 @@ 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' + +# Version 4 format + repo: + upstream: + 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 index e53aa333..7bfb6416 100644 --- a/data/zeek/upstream/operatingsystem/RedHat.yaml +++ b/data/zeek/upstream/operatingsystem/RedHat.yaml @@ -4,3 +4,19 @@ zeek::settings: config_file_path: '/etc/sysconfig/zeek' key: '2C52609D' key_url: 'http://yum.zeekproject.org/gpg' + +# Version 4 format + files: + config: + path: "/etc/sysconfig/zeek" + init: + path: "/etc/sysconfig/zeek" + user_files: + config: + path: "$HOME/.sysconfig/zeek" + repo: + upstream: + key: 2C52609D + key_url: http://yum.zeekproject.org/gpg + yum: + gpgcheck: true diff --git a/data/zeek/upstream/operatingsystem/RedHat7.yaml b/data/zeek/upstream/operatingsystem/RedHat7.yaml index 0eee7888..85cce612 100644 --- a/data/zeek/upstream/operatingsystem/RedHat7.yaml +++ b/data/zeek/upstream/operatingsystem/RedHat7.yaml @@ -1,3 +1,8 @@ --- zeek::settings: repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/CentOS_7/security:zeek.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index fbefebdb..92f7d694 100644 --- a/data/zeek/upstream/operatingsystem/RedHat8.yaml +++ b/data/zeek/upstream/operatingsystem/RedHat8.yaml @@ -1,3 +1,8 @@ --- zeek::settings: repo_file_url: 'https://download.opensuse.org/repositories/security:zeek/CentOS_8/security:zeek.repo' + +# Version 4 format + repo: + upstream: + repofile_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 index 2435c2f3..c64b3c5f 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu.yaml @@ -6,3 +6,17 @@ zeek::settings: key_url: 'https://download.zeek.com/linux/ubuntu/gpg' apt_repos: '/' apt_key_server: 'http://p80.pool.sks-keyservers.net' + +# Version 4 format + files: + init: + path: "/etc/default/zeek" + repo: + upstream: + 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 + yum: + gpgcheck: true + apt: + key_server: http://p80.pool.sks-keyservers.net diff --git a/data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml b/data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml index 4e2b5228..7e6ee613 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu18.04.yaml @@ -2,3 +2,9 @@ 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' + +# Version 4 format + repo: + upstream: + 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 index f47f5c24..a4029549 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu18.10.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu18.10.yaml @@ -2,3 +2,9 @@ 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' + +# Version 4 format + repo: + upstream: + 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 index 3b57e7ee..2341f1f8 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu19.04.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu19.04.yaml @@ -2,3 +2,9 @@ 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' + +# Version 4 format + repo: + upstream: + 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 index fdbf2018..32c1e9aa 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu19.10.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu19.10.yaml @@ -2,3 +2,9 @@ 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' + +# Version 4 format + repo: + upstream: + 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 index 48f088d2..470e329b 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu20.04.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu20.04.yaml @@ -1,4 +1,9 @@ --- 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 + key_url: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_20.04/Release.key' +# Version 4 format + repo: + upstream: + 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 diff --git a/data/zeek/upstream/operatingsystem/Ubuntu22.04.yaml b/data/zeek/upstream/operatingsystem/Ubuntu22.04.yaml index 162f336e..fc263822 100644 --- a/data/zeek/upstream/operatingsystem/Ubuntu22.04.yaml +++ b/data/zeek/upstream/operatingsystem/Ubuntu22.04.yaml @@ -1,4 +1,9 @@ --- 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 + key_url: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_22.04/Release.key' +# Version 4 format + repo: + upstream: + 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 diff --git a/data/zeek/upstream/osfamily/Debian.yaml b/data/zeek/upstream/osfamily/Debian.yaml index fb46cfb3..41e2594c 100644 --- a/data/zeek/upstream/osfamily/Debian.yaml +++ b/data/zeek/upstream/osfamily/Debian.yaml @@ -1,3 +1,5 @@ --- zeek:settings: key: '' + +# No data to convert to Version 4 format diff --git a/data/zenml/default.yaml b/data/zenml/default.yaml index 0180d7fa..16f2e182 100644 --- a/data/zenml/default.yaml +++ b/data/zenml/default.yaml @@ -3,3 +3,9 @@ zenml::settings: package_name: zenml package_provider: 'pip' + +# Version 4 format + packages: + main: + name: zenml + provider: pip diff --git a/data/zoom/default.yaml b/data/zoom/default.yaml index 7748531c..90cc3885 100644 --- a/data/zoom/default.yaml +++ b/data/zoom/default.yaml @@ -3,3 +3,13 @@ zoom::settings: package_name: '' snap_package_name: 'zoom' website_url: 'https://zoom.us/' + +# Version 4 format + packages: + main: + name: '' + providers: + snap: + name: zoom + urls: + website: https://zoom.us/ diff --git a/data/zoom/osfamily/Darwin.yaml b/data/zoom/osfamily/Darwin.yaml index ce8d49af..670d02e3 100644 --- a/data/zoom/osfamily/Darwin.yaml +++ b/data/zoom/osfamily/Darwin.yaml @@ -2,3 +2,11 @@ zoom::settings: brew_package_name: 'zoom' package_name: 'zoom' + +# Version 4 format + packages: + main: + name: zoom + providers: + brew: + name: zoom diff --git a/data/zoom/osfamily/windows.yaml b/data/zoom/osfamily/windows.yaml index 328f5aa1..dafa0239 100644 --- a/data/zoom/osfamily/windows.yaml +++ b/data/zoom/osfamily/windows.yaml @@ -3,3 +3,13 @@ zoom::settings: winget_package_name: 'Zoom.Zoom' choco_package_name: 'zoom' package_name: 'zoom' + +# Version 4 format + packages: + main: + name: zoom + providers: + winget: + name: Zoom.Zoom + choco: + name: zoom From 5d765d2bedaaa00e6987564f64f1179e8554c56b Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Mon, 26 Feb 2024 20:43:15 +0100 Subject: [PATCH 17/17] Initial ai scripts to generate tinydata from llm --- .gitignore | 3 +- .requirements.txt | 4 +++ scripts/ai/tinydata_create.py | 53 ++++++++++++++++++++++++++++++++ scripts/ai/tinydata_functions.py | 17 ++++++++++ scripts/ai/tinydata_import.py | 24 +++++++++++++++ 5 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 .requirements.txt create mode 100644 scripts/ai/tinydata_create.py create mode 100644 scripts/ai/tinydata_functions.py create mode 100644 scripts/ai/tinydata_import.py diff --git a/.gitignore b/.gitignore index d59c5401..dac84166 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ .project .envrc /inventory.yaml -/results.txt \ No newline at end of file +/results.txt +/chroma_db/ \ No newline at end of file diff --git a/.requirements.txt b/.requirements.txt new file mode 100644 index 00000000..e5241d78 --- /dev/null +++ b/.requirements.txt @@ -0,0 +1,4 @@ +langchain +langchain_community +langchain_openai +openai \ No newline at end of file diff --git a/scripts/ai/tinydata_create.py b/scripts/ai/tinydata_create.py new file mode 100644 index 00000000..b8f165c8 --- /dev/null +++ b/scripts/ai/tinydata_create.py @@ -0,0 +1,53 @@ +from openai import OpenAI +from langchain_community.vectorstores import Chroma +from langchain_community.embeddings import HuggingFaceEmbeddings +import tinydata_functions +import sys + +app = sys.argv[1] +git_dir = tinydata_functions.get_git_base_dir() +vectordb_path = "#{git_dir}/chroma_db" + +# Defaults for local Lm Studio server +client = OpenAI(base_url="http://localhost:1234/v1", api_key="not-needed") + +embedding_function=HuggingFaceEmbeddings(model_name="sentence-transformers/all-MiniLM-L6-v2") +vector_db = Chroma(persist_directory=vectordb_path, embedding_function=embedding_function) + +history = [ + {"role": "system", "content": "You are a tinydata generator. When asked to provide tinydata for an applications, you generate a yaml file in tinydata format. Tinydata format reference is based on reference::settings. Your yaml output will have a single key called like the requested application and followed by ::settings The contents of this key is an hash of valid tinydata settings fro that application."}, + {"role": "user", "content": "Generate tinydata for #{app}."}, +] + +while True: + completion = client.chat.completions.create( + model="local-model", # this field is currently unused + messages=history, + temperature=0.7, + stream=True, + ) + + new_message = {"role": "assistant", "content": ""} + + for chunk in completion: + if chunk.choices[0].delta.content: + print(chunk.choices[0].delta.content, end="", flush=True) + new_message["content"] += chunk.choices[0].delta.content + + history.append(new_message) + + #Uncomment to see chat history + import json + gray_color = "\033[90m" + reset_color = "\033[0m" + print(f"{gray_color}\n{'-'*20} History dump {'-'*20}\n") + print(json.dumps(history, indent=2)) + print(f"\n{'-'*55}\n{reset_color}") + + print() + next_input = input("> ") + search_results = vector_db.similarity_search(next_input, k=2) + some_context = "" + for result in search_results: + some_context += result.page_content + "\n\n" + history.append({"role": "user", "content": some_context + next_input}) diff --git a/scripts/ai/tinydata_functions.py b/scripts/ai/tinydata_functions.py new file mode 100644 index 00000000..4c9d76c1 --- /dev/null +++ b/scripts/ai/tinydata_functions.py @@ -0,0 +1,17 @@ +import subprocess +import os + +def get_git_base_dir(): + try: + base_dir = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]) + return base_dir.decode('utf-8').strip() + except subprocess.CalledProcessError: + print("This directory is not a Git repository.") + return None + +def get_files_in_directory(directory): + file_list = [] + for dirpath, dirnames, filenames in os.walk(directory): + for filename in filenames: + file_list.append(os.path.join(dirpath, filename)) + return file_list diff --git a/scripts/ai/tinydata_import.py b/scripts/ai/tinydata_import.py new file mode 100644 index 00000000..b31acc77 --- /dev/null +++ b/scripts/ai/tinydata_import.py @@ -0,0 +1,24 @@ +from langchain_community.vectorstores import Chroma +from langchain_community.embeddings import HuggingFaceEmbeddings +from langchain.text_splitter import RecursiveCharacterTextSplitter +from langchain_community.document_loaders import PyPDFLoader +from langchain_community.llms import OpenAI +import openai +import tinydata_functions + +git_dir = tinydata_functions.get_git_base_dir() +files = tinydata_functions.get_files_in_directory("#{git_dir}/data") +vectordb_path = "#{git_dir}/chroma_db" + +docs = [] +for file in files: + docs.extend(file.load()) +#split text to chunks +text_splitter = RecursiveCharacterTextSplitter(chunk_size=1000, chunk_overlap=100) +docs = text_splitter.split_documents(docs) +embedding_function = HuggingFaceEmbeddings(model_name="sentence-transformers/all-MiniLM-L6-v2", model_kwargs={'device': 'cpu'}) +#print(len(docs)) + +vectorstore = Chroma.from_documents(docs, embedding_function, persist_directory=vectordb_path) + +print(vectorstore._collection.count()) \ No newline at end of file