Revision

361

Author

misc

Date

2010-11-22 00:23:59 +0100 (Mon, 22 Nov 2010)

Log Message

- move apache requirement in the blog class ( so we do not forget it )
- since apache::mod_php implie apache::base, remove redundant include

Modified Paths

• puppet/manifests/nodes.pp
• puppet/modules/blog/manifests/init.pp

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2010-11-21 23:12:54 UTC (rev 360)
+++ puppet/manifests/nodes.pp	2010-11-21 23:23:59 UTC (rev 361)
@@ -111,8 +111,6 @@
 #
     include default_mageia_server
     timezone::timezone { "Europe/Paris": }
-    include apache::base
-    include apache::mod_php
     include blog
 }
 

Modified: puppet/modules/blog/manifests/init.pp
===================================================================
--- puppet/modules/blog/manifests/init.pp	2010-11-21 23:12:54 UTC (rev 360)
+++ puppet/modules/blog/manifests/init.pp	2010-11-21 23:23:59 UTC (rev 361)
@@ -9,15 +9,13 @@
                 ensure => installed
         }
 
+    include apache::mod_php
+
     	package { 'php-mysql':
         	ensure => installed
     	}
 
-	service { mysqld:
-        	ensure => running,
-        	subscribe => Package["mysql"],
-    	}
-	
+
 	file { "check_new-blog-post":
         	path => "/usr/local/bin/check_new-blog-post.sh",
         	ensure => present,