Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #971 - File realm files MUST NOT trigger Elasticsearch service restart #991

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Issue #971 - File realm files MUST NOT trigger Elasticsearch service restart #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9535ace
Issue #971 - File realm files MUST NOT trigger Elasticsearch service …
lucabelluccini Oct 13, 2018
3a28e19
update CHANGELOG and CONTRIBUTORS
lucabelluccini Oct 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## x.x.x (Month Day, Year)

#### Fixes
* Update of the roles, roles mappings and users will not trigger service restart (if enabled).

#### Features

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ Rhommel Lamas (rhoml)
Jose Luis Ledesma (sp-joseluis-ledesma)
Matthias Baur (baurmatt)
Gavin Williams (fatmcgav)
Luca Belluccini (lucabelluccini)
36 changes: 36 additions & 0 deletions manifests/instance.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,10 @@
"${elasticsearch::configdir}/jvm.options",
"${elasticsearch::configdir}/logging.yml",
"${elasticsearch::configdir}/log4j2.properties",
"${elasticsearch::configdir}/users",
"${elasticsearch::configdir}/users_roles",
"${elasticsearch::configdir}/roles.yml",
"${elasticsearch::configdir}/role_mapping.yml",
],
recurse => 'remote',
recurselimit => 1,
Expand All @@ -378,6 +382,38 @@
before => Elasticsearch::Service[$name],
notify => $notify_service,
}
file { "${configdir}/users_roles":
ensure => 'file',
source => "${elasticsearch::configdir}/users_roles",
purge => $elasticsearch::purge_configdir,
force => $elasticsearch::purge_configdir,
require => File[$configdir],
before => Elasticsearch::Service[$name],
}
file { "${configdir}/roles.yml":
ensure => 'file',
source => "${elasticsearch::configdir}/roles.yml",
purge => $elasticsearch::purge_configdir,
force => $elasticsearch::purge_configdir,
require => File[$configdir],
before => Elasticsearch::Service[$name],
}
file { "${configdir}/role_mapping.yml":
ensure => 'file',
source => "${elasticsearch::configdir}/role_mapping.yml",
purge => $elasticsearch::purge_configdir,
force => $elasticsearch::purge_configdir,
require => File[$configdir],
before => Elasticsearch::Service[$name],
}
file { "${configdir}/users":
ensure => 'file',
source => "${elasticsearch::configdir}/users",
purge => $elasticsearch::purge_configdir,
force => $elasticsearch::purge_configdir,
require => File[$configdir],
before => Elasticsearch::Service[$name],
}

# Do _not_ copy in instance directories. This avoids a) recursing
# indefinitely by copying our own instance directory and b) copying in any
Expand Down