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
149
150
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [323] - try to workaround the missing feature of puppet about umask and Exec
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B323%5D%20-%20try%20to%20workaround%20the%20missing%20feature%20of%0A%20puppet%20about%20umask%20and%20Exec&In-Reply-To=%3C20101119010001.A5FC03FBCB%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="000662.html">
<LINK REL="Next" HREF="000664.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [323] - try to workaround the missing feature of puppet about umask and Exec</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B323%5D%20-%20try%20to%20workaround%20the%20missing%20feature%20of%0A%20puppet%20about%20umask%20and%20Exec&In-Reply-To=%3C20101119010001.A5FC03FBCB%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [323] - try to workaround the missing feature of puppet about umask and Exec">root at mageia.org
</A><BR>
<I>Fri Nov 19 02:00:01 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000662.html">[Mageia-sysadm] [322] - testing show that perl-SVN-Notify-Mirror is required
</A></li>
<LI>Next message: <A HREF="000664.html">[Mageia-sysadm] [324] - add some documentation
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#663">[ date ]</a>
<a href="thread.html#663">[ thread ]</a>
<a href="subject.html#663">[ subject ]</a>
<a href="author.html#663">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 323
Author: misc
Date: 2010-11-19 02:00:01 +0100 (Fri, 19 Nov 2010)
Log Message:
-----------
- try to workaround the missing feature of puppet about umask and Exec
Modified Paths:
--------------
puppet/modules/subversion/manifests/init.pp
Added Paths:
-----------
puppet/modules/subversion/templates/create_svn_repo.sh
Modified: puppet/modules/subversion/manifests/init.pp
===================================================================
--- puppet/modules/subversion/manifests/init.pp 2010-11-19 01:00:00 UTC (rev 322)
+++ puppet/modules/subversion/manifests/init.pp 2010-11-19 01:00:01 UTC (rev 323)
@@ -22,6 +22,15 @@
ensure => directory,
}
+ # workaround the lack of umask command in puppet < 2.7
+ file { "/usr/local/bin/create_svn_repo.sh":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 755,
+ content => template('subversion/create_svn_repo.sh')
+ }
+
define syntax_check($regexp_ext,$check_cmd) {
file { "$local_dir/pre-commit.d/$name":
ensure => present,
@@ -105,7 +114,9 @@
# $name ==> directory of the repo
include subversion::server
# TODO set umask -> requires puppet 2.7.0
- exec { "svnadmin create $name":
+ # unfortunatly, umask is required
+ # <A HREF="http://projects.puppetlabs.com/issues/4424">http://projects.puppetlabs.com/issues/4424</A>
+ exec { "/usr/local/bin/create_svn_repo.sh $name":
user => root,
group => $group,
creates => "$name/hooks",
@@ -129,7 +140,7 @@
group => root,
mode => 755,
content => template("subversion/hook_commit.sh"),
- require => Exec["svnadmin create $name"],
+ require => Exec["/usr/local/bin/create_svn_repo.sh $name"],
}
file { ["$name/hooks/post-commit.d", "$name/hooks/pre-commit.d"]:
@@ -137,7 +148,7 @@
owner => root,
group => root,
mode => 755,
- require => Exec["svnadmin create $name"],
+ require => File["$name/hooks/pre-commit"],
}
if $commit_mail {
@@ -147,7 +158,7 @@
group => root,
mode => 755,
content => template("subversion/hook_sendmail.pl"),
- require => [Exec["svnadmin create $name"], Package['perl-SVN-Notify-Config']],
+ require => [Package['perl-SVN-Notify-Config']],
}
}
Added: puppet/modules/subversion/templates/create_svn_repo.sh
===================================================================
--- puppet/modules/subversion/templates/create_svn_repo.sh (rev 0)
+++ puppet/modules/subversion/templates/create_svn_repo.sh 2010-11-19 01:00:01 UTC (rev 323)
@@ -0,0 +1,7 @@
+#!/bin/bash
+umask 0002
+# needed for <A HREF="http://idolinux.blogspot.com/2010/05/subversion-svn-group-permissions.html">http://idolinux.blogspot.com/2010/05/subversion-svn-group-permissions.html</A>
+svnadmin create --pre-1.6-compatible "$1"
+#chmod g+w "$1"/db/txn-current-lock
+#chmod g+w "$1"/db/transactions
+#chmod g+w "$1"/db/locks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101119/3d3e2d10/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000662.html">[Mageia-sysadm] [322] - testing show that perl-SVN-Notify-Mirror is required
</A></li>
<LI>Next message: <A HREF="000664.html">[Mageia-sysadm] [324] - add some documentation
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#663">[ date ]</a>
<a href="thread.html#663">[ thread ]</a>
<a href="subject.html#663">[ subject ]</a>
<a href="author.html#663">[ 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>
|
