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
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[97] - refactor the vhost</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>97</dd>
<dt>Author</dt> <dd>misc</dd>
<dt>Date</dt> <dd>2010-11-04 18:51:05 +0100 (Thu, 04 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>- refactor the vhost
- fix the url used for svn checkout
- add a requires from catdap config to svn checkout for ordering purpose
- move extlookup call outside of template
- fix the name of apache config file
- fix the naming of the ldap server </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#puppetmodulescatdapmanifestsinitpp">puppet/modules/catdap/manifests/init.pp</a></li>
<li><a href="#puppetmodulescatdaptemplatescatdap_localyml">puppet/modules/catdap/templates/catdap_local.yml</a></li>
<li><a href="#puppetmodulescatdaptemplatescatdap_vhostconf">puppet/modules/catdap/templates/catdap_vhost.conf</a></li>
</ul>
</div>
<div id="patch"><pre>
<a id="puppetmodulescatdapmanifestsinitpp">Modified: puppet/modules/catdap/manifests/init.pp</a>
===================================================================
--- puppet/modules/catdap/manifests/init.pp 2010-11-04 17:42:21 UTC (rev 96)
+++ puppet/modules/catdap/manifests/init.pp 2010-11-04 17:51:05 UTC (rev 97)
@@ -5,6 +5,7 @@
include apache::mod_fcgid
$catdap_location = "/var/www/identity"
+ $catdap_vhost = "identity.$domain"
# TODO switch to a proper rpm packaging
$rpm_requirement = ['perl-Catalyst-Runtime',
@@ -19,7 +20,7 @@
}
subversion::snapshot { $catdap_location:
- source => "svn+ssh://svn.mageia.org/srv/mx2-dd0/svn/soft/identity/CatDap/branches/live"
+ source => "svn://svn.mageia.org/soft/identity/CatDap/branches/live"
}
# add a catdap config file
@@ -27,12 +28,14 @@
ensure => present,
owner => apache,
mode => 600,
- content => template("catdap/catdap_local.yml")
+ content => template("catdap/catdap_local.yml"),
+ require => Subversion::Snapshot[$catdap_location]
}
+ $catdap_password = extlookup('catdap_password')
# add a apache vhost
- file { "identity.$domain.conf":
- path => "/etc/httpd/conf/vhosts.d/$name",
+ file { "$catdap_vhost.conf":
+ path => "/etc/httpd/conf/vhosts.d/$catdap_vhost.conf",
ensure => "present",
owner => root,
group => root,
<a id="puppetmodulescatdaptemplatescatdap_localyml">Modified: puppet/modules/catdap/templates/catdap_local.yml</a>
===================================================================
--- puppet/modules/catdap/templates/catdap_local.yml 2010-11-04 17:42:21 UTC (rev 96)
+++ puppet/modules/catdap/templates/catdap_local.yml 2010-11-04 17:51:05 UTC (rev 97)
@@ -3,9 +3,9 @@
dc_suffix = 'dc=' + domain.gsub('.',',dc=')
-ldap_server = 'ldap' + domain
+ldap_server = 'ldap.' + domain
-ldap_password = extlookup('catdap_password')
+ldap_password = catdap_password
ldap_account = 'cn=catdap-valstar,ou=System Accounts,' + dc_suffix
%>
<a id="puppetmodulescatdaptemplatescatdap_vhostconf">Modified: puppet/modules/catdap/templates/catdap_vhost.conf</a>
===================================================================
--- puppet/modules/catdap/templates/catdap_vhost.conf 2010-11-04 17:42:21 UTC (rev 96)
+++ puppet/modules/catdap/templates/catdap_vhost.conf 2010-11-04 17:51:05 UTC (rev 97)
@@ -1,5 +1,5 @@
<VirtualHost *:80>
- ServerName identity.<%= domain %>
+ ServerName <%= catdap_vhost %>
# Serve static content directly
DocumentRoot <%= catdap_location %>/root
Alias /static <%= catdap_location %>/root/static
</pre></div>
</body>
</html>
|
