summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2010-November/000726.html
blob: e6747ba6085faf30e89513f641187abe2040a2aa (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [361] - move apache requirement in the blog class ( so we do not forget it )
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B361%5D%20-%20move%20apache%20requirement%20in%20the%20blog%20class%20%28%0A%20so%20we%20do%20not%20forget%20it%20%29&In-Reply-To=%3C20101121232359.4C07B3F829%40valstar.mageia.org%3E">
   <META NAME="robots" CONTENT="index,nofollow">
   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <LINK REL="Previous"  HREF="000725.html">
   <LINK REL="Next"  HREF="000727.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [361] - move apache requirement in the blog class ( so we do not forget it )</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B361%5D%20-%20move%20apache%20requirement%20in%20the%20blog%20class%20%28%0A%20so%20we%20do%20not%20forget%20it%20%29&In-Reply-To=%3C20101121232359.4C07B3F829%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [361] - move apache requirement in the blog class ( so we do not forget it )">root at mageia.org
       </A><BR>
    <I>Mon Nov 22 00:23:59 CET 2010</I>
    <P><UL>
        <LI>Previous message: <A HREF="000725.html">[Mageia-sysadm] [360] add a repository cname for valstar
</A></li>
        <LI>Next message: <A HREF="000727.html">[Mageia-sysadm] [362] add ssh::auth module (unstable) from	projects.puppetlabs.com wiki
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#726">[ date ]</a>
              <a href="thread.html#726">[ thread ]</a>
              <a href="subject.html#726">[ subject ]</a>
              <a href="author.html#726">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>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 { &quot;Europe/Paris&quot;: }
-    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 =&gt; installed
         }
 
+    include apache::mod_php
+
     	package { 'php-mysql':
         	ensure =&gt; installed
     	}
 
-	service { mysqld:
-        	ensure =&gt; running,
-        	subscribe =&gt; Package[&quot;mysql&quot;],
-    	}
-	
+
 	file { &quot;check_new-blog-post&quot;:
         	path =&gt; &quot;/usr/local/bin/check_new-blog-post.sh&quot;,
         	ensure =&gt; present,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20101122/493e00e7/attachment.html&gt;
</PRE>






<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="000725.html">[Mageia-sysadm] [360] add a repository cname for valstar
</A></li>
	<LI>Next message: <A HREF="000727.html">[Mageia-sysadm] [362] add ssh::auth module (unstable) from	projects.puppetlabs.com wiki
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#726">[ date ]</a>
              <a href="thread.html#726">[ thread ]</a>
              <a href="subject.html#726">[ subject ]</a>
              <a href="author.html#726">[ author ]</a>
         </LI>
       </UL>

<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>