[Mageia-sysadm] [276] Merge two modules: mysql and blog

[root at mageia.org]

Revision: 276
Author:   dams
Date:     2010-11-18 10:50:40 +0100 (Thu, 18 Nov 2010)
Log Message:
-----------
Merge two modules: mysql and blog

Modified Paths:
--------------
    puppet/manifests/nodes.pp
    puppet/modules/blog/manifests/init.pp

Removed Paths:
-------------
    puppet/modules/mysql/

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2010-11-18 00:57:00 UTC (rev 275)
+++ puppet/manifests/nodes.pp	2010-11-18 09:50:40 UTC (rev 276)
@@ -111,10 +111,9 @@
 # - setup blog
 #
     include default_mageia_server
+    timezone::timezone { "Europe/Paris": }
     include apache::base
     include apache::mod_php
-    include mysql
-    timezone::timezone { "Europe/Paris": }
     include blog
 }
 

Modified: puppet/modules/blog/manifests/init.pp
===================================================================
--- puppet/modules/blog/manifests/init.pp	2010-11-18 00:57:00 UTC (rev 275)
+++ puppet/modules/blog/manifests/init.pp	2010-11-18 09:50:40 UTC (rev 276)
@@ -1,6 +1,20 @@
 #TODO: 
 # - add the creation of the user 'blog' in puppet
-class blog {
+class mysql {
+	package { 'mysql':
+        	ensure => installed
+    	}
+    	package { 'php-mysql':
+        	ensure => installed
+    	}
+
+	service { mysqld:
+        	ensure => running,
+        	subscribe => Package["mysql"],
+    	}
+}
+
+class check_new-blog-post {
 	package { 'wget':
         	ensure => installed
     	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101118/097fa3d8/attachment.html>