From d2cb5d9c0f06f9466a2c2dc2e0097088ca5afd4a Mon Sep 17 00:00:00 2001 From: Alessandro Franceschi Date: Fri, 16 Feb 2024 21:57:55 +0100 Subject: [PATCH] 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'