solr: Add parameter for htaccess source
This commit is contained in:
parent
43985294b1
commit
336c1c40ab
1 changed files with 6 additions and 5 deletions
|
@ -11,10 +11,14 @@
|
||||||
# $webhosts:
|
# $webhosts:
|
||||||
# List of Solr virtual hosts.
|
# List of Solr virtual hosts.
|
||||||
#
|
#
|
||||||
|
# $htaccess:
|
||||||
|
# Source for htaccess file.
|
||||||
|
#
|
||||||
class solr(
|
class solr(
|
||||||
$cores,
|
$cores,
|
||||||
$datadir="/srv/solr",
|
$datadir="/srv/solr",
|
||||||
$webhosts=undef
|
$webhosts=undef,
|
||||||
|
$htaccess="puppet:///modules/solr/htaccess",
|
||||||
) {
|
) {
|
||||||
|
|
||||||
if ! ($::apache::sslserver::user and $::apache::sslserver::group) {
|
if ! ($::apache::sslserver::user and $::apache::sslserver::group) {
|
||||||
|
@ -175,10 +179,7 @@ class solr(
|
||||||
mode => "0644",
|
mode => "0644",
|
||||||
owner => "root",
|
owner => "root",
|
||||||
group => "root",
|
group => "root",
|
||||||
source => [
|
source => $htaccess,
|
||||||
"puppet:///files/solr/htaccess",
|
|
||||||
"puppet:///modules/solr/htaccess",
|
|
||||||
],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if $webhosts {
|
if $webhosts {
|
||||||
|
|
Loading…
Add table
Reference in a new issue