File tree 3 files changed +23
-5
lines changed 3 files changed +23
-5
lines changed Original file line number Diff line number Diff line change 22
22
if ( $elasticsearch::ensure == ' present' ) {
23
23
24
24
file {
25
- $elasticsearch::configdir :
26
- ensure => ' directory' ,
27
- group => $elasticsearch::elasticsearch_group ,
28
- owner => ' root' ,
29
- mode => ' 2750' ;
30
25
$elasticsearch::datadir :
31
26
ensure => ' directory' ,
32
27
group => $elasticsearch::elasticsearch_group ,
Original file line number Diff line number Diff line change 21
21
22
22
if $elasticsearch::ensure == ' present' {
23
23
24
+ file { $elasticsearch::configdir :
25
+ ensure => ' directory' ,
26
+ group => $elasticsearch::elasticsearch_group ,
27
+ owner => ' root' ,
28
+ mode => ' 2750'
29
+ }
30
+
24
31
if $elasticsearch::restart_package_change {
25
32
Package[' elasticsearch' ] ~> Elasticsearch::Service <| |>
26
33
}
155
162
156
163
} else {
157
164
if ($elasticsearch::manage_repo and $facts [' os' ][' family' ] == ' Debian' ) {
165
+ # work-around elasticsearch package postinst/prerm package issues
166
+ # instance keystore cli (java) expects ES_CONF_PATH variable, but the package
167
+ # scripts assume it's always /etc/elasticsearch :(
168
+ # touch the files so it doesn't complain on upgrade
169
+ # https://github.com/elastic/elasticsearch/pull/51827
170
+ # TODO safe to remove after upgrade to ES 7
171
+ file { '/etc/elasticsearch/.elasticsearch.keystore.initial_md5sum' :
172
+ content => ' afc927e7ebed425d7f593b766b0e5b6c /etc/elasticsearch/elasticsearch.keystore' ,
173
+ replace => false ,
174
+ }
175
+ -> file { ' /etc/elasticsearch/elasticsearch.keystore' :
176
+ source => " puppet:///modules/${module_name} /elasticsearch.keystore" ,
177
+ replace => false ,
178
+ before => Package[' elasticsearch' ],
179
+ }
180
+
158
181
Class[' apt::update' ] -> Package[' elasticsearch' ]
159
182
}
160
183
}
You can’t perform that action at this time.
0 commit comments