From 14949bd1f779de0f9e82debfea65fb561ea9befd Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Tue, 27 Jan 2015 14:39:14 +0200
Subject: [PATCH] solr: Remove redundant dependencies

---
 solr/manifests/init.pp | 90 +++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 50 deletions(-)

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