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
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [655] - deploy trunk as a test instance, as asked several time on irc
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B655%5D%20-%20deploy%20trunk%20as%20a%20test%20instance%2C%0A%09as%20asked%20several%20time%20on%20irc&In-Reply-To=%3C20110105181251.1490B4196F%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="001518.html">
<LINK REL="Next" HREF="001520.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [655] - deploy trunk as a test instance, as asked several time on irc</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B655%5D%20-%20deploy%20trunk%20as%20a%20test%20instance%2C%0A%09as%20asked%20several%20time%20on%20irc&In-Reply-To=%3C20110105181251.1490B4196F%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [655] - deploy trunk as a test instance, as asked several time on irc">root at mageia.org
</A><BR>
<I>Wed Jan 5 19:12:51 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="001518.html">[Mageia-sysadm] maint db, rails and hosting
</A></li>
<LI>Next message: <A HREF="001520.html">[Mageia-sysadm] Puppet Report for jonund.mageia.org
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1519">[ date ]</a>
<a href="thread.html#1519">[ thread ]</a>
<a href="subject.html#1519">[ subject ]</a>
<a href="author.html#1519">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 655
Author: misc
Date: 2011-01-05 19:12:50 +0100 (Wed, 05 Jan 2011)
Log Message:
-----------
- deploy trunk as a test instance, as asked several time on irc
Modified Paths:
--------------
puppet/modules/catdap/manifests/init.pp
Modified: puppet/modules/catdap/manifests/init.pp
===================================================================
--- puppet/modules/catdap/manifests/init.pp 2011-01-05 13:41:16 UTC (rev 654)
+++ puppet/modules/catdap/manifests/init.pp 2011-01-05 18:12:50 UTC (rev 655)
@@ -1,7 +1,6 @@
class catdap {
- $catdap_location = "/var/www/identity"
- $catdap_vhost = "identity.$domain"
+ $upstream_svn = "<A HREF="svn://svn.mageia.org/svn/soft/identity/CatDap/">svn://svn.mageia.org/svn/soft/identity/CatDap/</A>"
# TODO switch to a proper rpm packaging
$rpm_requirement = ['perl-Catalyst-Runtime',"perl-FCGI", 'perl-Catalyst-Plugin-Authorization-Roles',
@@ -17,27 +16,41 @@
ensure => installed
}
- subversion::snapshot { $catdap_location:
- source => "<A HREF="svn://svn.mageia.org/svn/soft/identity/CatDap/branches/live">svn://svn.mageia.org/svn/soft/identity/CatDap/branches/live</A>"
- }
-
$ldap_password = extlookup('catdap_ldap','x')
- file { "$catdap_location/catdap_local.yml":
- ensure => present,
- owner => root,
- group => apache,
- mode => 640,
- content => template("catdap/catdap_local.yml"),
- require => Subversion::Snapshot[$catdap_location]
+
+
+ define catdap_snapshot($location, $svn_location) {
+ file { "$location/catdap_local.yml":
+ ensure => present,
+ owner => root,
+ group => apache,
+ mode => 640,
+ content => template("catdap/catdap_local.yml"),
+ require => Subversion::Snapshot[$location],
+ }
+
+ subversion::snapshot { $location:
+ source => $svn_location
+ }
+
+ apache::vhost_catalyst_app { $name:
+ script => "$location/script/catdap_fastcgi.pl",
+ location => $location,
+ use_ssl => true,
+ }
+
+ apache::vhost_redirect_ssl { $name: }
}
- apache::vhost_catalyst_app { $catdap_vhost:
- script => "$catdap_location/script/catdap_fastcgi.pl",
- location => $catdap_location,
- use_ssl => true,
+ catdap_snapshot { "identity.$domain":
+ location => "/var/www/identity",
+ svn_location => "$upstream_svn/branches/live"
}
- apache::vhost_redirect_ssl { $catdap_vhost: }
+ catdap_snapshot { "identity-trunk.$domain":
+ location => "/var/www/identity-trunk",
+ svn_location => "$upstream_svn/trunk"
+ }
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110105/6f9d880c/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001518.html">[Mageia-sysadm] maint db, rails and hosting
</A></li>
<LI>Next message: <A HREF="001520.html">[Mageia-sysadm] Puppet Report for jonund.mageia.org
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1519">[ date ]</a>
<a href="thread.html#1519">[ thread ]</a>
<a href="subject.html#1519">[ subject ]</a>
<a href="author.html#1519">[ 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>
|
