tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

solr: Remove redundant dependencies

Browse source
This commit is contained in:
Ossi Salmi 2015-01-27 14:39:14 +02:00
parent 32c29abdd7
commit 14949bd1f7
1 changed files with 40 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
solr/manifests/init.pp
View file

@ -49,18 +49,16 @@ class solr(
if $datadir != "/srv/solr" { if $datadir != "/srv/solr" {
file { "/srv/solr": file { "/srv/solr":
ensure => link, ensure => link,
target => $datadir, target => $datadir,
require => File[$datadir],
} }
} }
file { $datadir: file { $datadir:
ensure => directory, ensure => directory,
mode => "0770", mode => "0770",
owner => "solr", owner => "solr",
group => "solr", group => "solr",
require => User["solr"],
} }
file { [ "/srv/solr/cores", file { [ "/srv/solr/cores",
@ -70,11 +68,10 @@ class solr(
"/srv/solr/run/logs", "/srv/solr/run/logs",
"/srv/solr/run/solr-webapp", "/srv/solr/run/solr-webapp",
"/srv/solr/spool", ]: "/srv/solr/spool", ]:
ensure => directory, ensure => directory,
mode => "2770", mode => "2770",
owner => "solr", owner => "solr",
group => "solr", group => "solr",
require => File["/srv/solr"],
} }
file { "/srv/solr/cores/solr.xml": file { "/srv/solr/cores/solr.xml":
@ -83,27 +80,23 @@ class solr(
owner => "solr", owner => "solr",
group => "solr", group => "solr",
content => template("solr/solr.xml.erb"), content => template("solr/solr.xml.erb"),
require => File["/srv/solr/cores"],
notify => Service["solr"], notify => Service["solr"],
} }
file { "/srv/solr/run/start.jar": file { "/srv/solr/run/start.jar":
ensure => link, ensure => link,
target => "/usr/local/share/solr/example/start.jar", target => "/usr/local/share/solr/example/start.jar",
require => File["/srv/solr/run"], before => Service["solr"],
before => Service["solr"],
} }
file { "/srv/solr/run/contexts": file { "/srv/solr/run/contexts":
ensure => link, ensure => link,
target => "/usr/local/share/solr/example/contexts", target => "/usr/local/share/solr/example/contexts",
require => File["/srv/solr/run"], before => Service["solr"],
before => Service["solr"],
} }
file { "/srv/solr/run/etc": file { "/srv/solr/run/etc":
ensure => link, ensure => link,
target => "/usr/local/share/solr/example/etc", target => "/usr/local/share/solr/example/etc",
require => File["/srv/solr/run"], before => Service["solr"],
before => Service["solr"],
} }
file { "/srv/solr/run/etc/jetty.xml": file { "/srv/solr/run/etc/jetty.xml":
ensure => present, ensure => present,
@ -114,22 +107,19 @@ class solr(
notify => Service["solr"], notify => Service["solr"],
} }
file { "/srv/solr/run/lib": file { "/srv/solr/run/lib":
ensure => link, ensure => link,
target => "/usr/local/share/solr/example/lib", target => "/usr/local/share/solr/example/lib",
require => File["/srv/solr/run"], before => Service["solr"],
before => Service["solr"],
} }
file { "/srv/solr/run/resources": file { "/srv/solr/run/resources":
ensure => link, ensure => link,
target => "/usr/local/share/solr/example/resources", target => "/usr/local/share/solr/example/resources",
require => File["/srv/solr/run"], before => Service["solr"],
before => Service["solr"],
} }
file { "/srv/solr/run/webapps": file { "/srv/solr/run/webapps":
ensure => link, ensure => link,
target => "/usr/local/share/solr/example/webapps", target => "/usr/local/share/solr/example/webapps",
require => File["/srv/solr/run"], before => Service["solr"],
before => Service["solr"],
} }
file { "/etc/init.d/solr": file { "/etc/init.d/solr":
@ -165,11 +155,10 @@ class solr(
group => "root", group => "root",
} }
file { "/etc/solr/htpasswd": file { "/etc/solr/htpasswd":
ensure => present, ensure => present,
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $::apache::sslserver::group, group => $::apache::sslserver::group,
require => File["/etc/solr"],
} }
$htdocs = "/usr/local/share/solr/htdocs" $htdocs = "/usr/local/share/solr/htdocs"
@ -182,13 +171,14 @@ class solr(
require => Util::Extract::Tar["/usr/local/share/solr"], require => Util::Extract::Tar["/usr/local/share/solr"],
} }
file { "${htdocs}/.htaccess": file { "${htdocs}/.htaccess":
ensure => present, ensure => present,
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",
source => [ "puppet:///files/solr/htaccess", source => [
"puppet:///modules/solr/htaccess", ], "puppet:///files/solr/htaccess",
require => File[$htdocs], "puppet:///modules/solr/htaccess",
],
} }
if $webhosts { if $webhosts {