Skip to content

Commit 28d7c54

Browse files
authored
Merge pull request #998 from tylerjl/logging-dir-remove-recursion
Remove recursive management from logdir
2 parents e75d08d + c16e4ae commit 28d7c54

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
- TASK=beaker:debian-8-x64:snapshot
2424
- env:
2525
- TASK=beaker:debian-9-x64:snapshot
26+
- env:
27+
- OSS_PACKAGE=true
28+
- TASK=beaker:debian-9-x64:snapshot
2629
include:
2730
- stage: intake
2831
env:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## x.x.x (Month Day, Year)
22

33
#### Fixes
4+
* The Elasticsearch log directory is no longer recursively managed to avoid stomping on the user/mode settings that Elasticsearch prefers.
45

56
#### Features
67

manifests/config.pp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@
3232
group => $elasticsearch::elasticsearch_group,
3333
owner => $elasticsearch::elasticsearch_user;
3434
$elasticsearch::logdir:
35-
ensure => 'directory',
36-
group => $elasticsearch::elasticsearch_group,
37-
owner => $elasticsearch::elasticsearch_user,
38-
mode => '0750',
39-
recurse => true;
35+
ensure => 'directory',
36+
group => $elasticsearch::elasticsearch_group,
37+
owner => $elasticsearch::elasticsearch_user,
38+
mode => '0750';
4039
$elasticsearch::plugindir:
4140
ensure => 'directory',
4241
group => $elasticsearch::elasticsearch_group,

0 commit comments

Comments
 (0)