Merge branch 'master' of ssh://redmine.inuits.eu:2223/puppetmaster/modules/inuits-puppet-solr

Kris Buytaert · Kris Buytaert · commit 59542ec66fa5 · 2012-12-29T20:50:35.000+01:00
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -20,7 +20,7 @@
     ensure  => 'present',
     owner   => 'root',
     group   => 'root',
-    mode    => '0755',
+    mode    => '0644',
     content => template('solr/Catalina.solr.xml.erb');
   }
 
@@ -31,7 +31,7 @@
     # path    => "${solr::home}/solr.xml",
     owner   => 'root',
     group   => 'root',
-    mode    => '0755',
+    mode    => '0644',
   }
   concat::fragment {'header':
     target  => "${solr::home}/solr.xml",
@@ -46,4 +46,3 @@
   }
 
 }
-
diff --git a/manifests/core.pp b/manifests/core.pp
@@ -18,4 +18,3 @@
   }
 
 }
-

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`ensure => 'present',`
`21`	`21`	`owner => 'root',`
`22`	`22`	`group => 'root',`
`23`		`- mode => '0755',`
	`23`	`+ mode => '0644',`
`24`	`24`	`content => template('solr/Catalina.solr.xml.erb');`
`25`	`25`	`}`
`26`	`26`
`@@ -31,7 +31,7 @@`
`31`	`31`	`# path => "${solr::home}/solr.xml",`
`32`	`32`	`owner => 'root',`
`33`	`33`	`group => 'root',`
`34`		`- mode => '0755',`
	`34`	`+ mode => '0644',`
`35`	`35`	`}`
`36`	`36`	`concat::fragment {'header':`
`37`	`37`	`target => "${solr::home}/solr.xml",`
`@@ -46,4 +46,3 @@`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`}`
`49`		`-`