Skip to content

Commit 78b747c

Browse files
committed
Merge pull request 'Refactor Hiera namespaces to standardize system lookups' (#1529) from fix_overrider into master
Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1529
2 parents 20f7a3e + ce05f82 commit 78b747c

22 files changed

Lines changed: 314 additions & 316 deletions

File tree

modules/enableit/common/REFERENCE.md

Lines changed: 197 additions & 197 deletions
Large diffs are not rendered by default.

modules/enableit/common/data/architectures/armv7l.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
common::openvox::linuxaid_cli::checksums:
32
common::monitor::prometheus::install_method: "url"
43
common::monitor::prometheus::env_file_path: "/etc/default"
54
common::monitor::prometheus::server::checksums:

modules/enableit/common/data/common.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ lookup_options:
2020
merge: "unique"
2121
common::system::ssh_authorized_keys:
2222
merge: "deep"
23-
common::services::disabled_services:
23+
common::system::disabled_services:
2424
merge: "unique"
2525
common::system::package::manage:
2626
merge: "deep"
@@ -184,7 +184,6 @@ common::system::classes:
184184
## System Settings
185185
common::system::repo::manage: true
186186
common::system::cron::purge_unmanaged: false
187-
common::system::services::manage: true
188187
common::user_management::security::manage: true
189188
common::system::mail::manage: false
190189

@@ -305,7 +304,7 @@ common::system::package::default_packages:
305304
- "tmux"
306305
- "net-tools"
307306

308-
common::system::services::disabled_services:
307+
common::system::disabled_services:
309308
- "smartd"
310309
- "rpc-svcgssd"
311310
- "sssd-pac"
@@ -327,7 +326,7 @@ common::system::openvox::configure_agent: true
327326
# Update other architecture checksums in their respective heira config file.
328327
# https://github.com/Obmondo/LinuxAid/blob/master/modules/enableit/common/data/architectures/armv7l.yaml
329328
common::system::openvox::linuxaid_cli::install_method: package
330-
common::system::openvox::linuxaid_cli::version: 1.2.0
329+
common::system::openvox::linuxaid_cli::version: 1.2.1
331330
common::system::openvox::linuxaid_cli::checksums:
332331
1.2.0: 53d285fb6a8fca93609fe0ce71fc31ea0158aafefb3e7890b82b09a6d18134e4
333332
1.2.1: 4b3f7e4acc244a17e8c1294ce2029107b542cec9b6627f39387397a6406bd0af

modules/enableit/common/data/os/RedHat.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
---
2-
common::mail::maildrop_perms: 'o=rwx,g=wx'
3-
2+
common::system::mail::maildrop_perms: 'o=rwx,g=wx'
43
common::logging::log_dir_group: 'root'
5-
64
common::user_management::security::selinux::enable: true
7-
85
common::user_management::sshd::subsystems:
96
sftp:
107
'/usr/libexec/openssh/sftp-server -f AUTHPRIV -l INFO'

modules/enableit/common/manifests/monitor/splunk/forwarder.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#
1919
# @param enable Enable or disable the forwarder. Defaults to false.
2020
#
21+
# @param manage Whether to include the underlying profile to manage the forwarder.
22+
#
2123
# @param noop_value No-operation mode value. Defaults to undef.
2224
#
2325
# @groups settings enable, noop_value
@@ -44,6 +46,7 @@
4446
Eit_types::Noop_Value $noop_value = undef,
4547
) {
4648

49+
4750
if $manage {
4851
contain profile::collector::splunk::forwarder
4952
}

modules/enableit/common/manifests/system/mail.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149

150150
'/var/spool/postfix/maildrop':
151151
group => 'postdrop',
152-
mode => lookup('common::mail::maildrop_perms'),
152+
mode => lookup('common::system::mail::maildrop_perms'),
153153
}
154154
$aliases.map |$target, $recipient| {
155155
mailalias { $target:

0 commit comments

Comments
 (0)