summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/attachments/20101207/034fe5ea/attachment.html
blob: b213bbb39d1574cb5128772855b4986f8cb05671 (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
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
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191

<!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>[516] use a mdv-youri-submit wrapper through sudo, for repsys</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>516</dd>
<dt>Author</dt> <dd>blino</dd>
<dt>Date</dt> <dd>2010-12-07 00:38:39 +0100 (Tue, 07 Dec 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>use a mdv-youri-submit wrapper through sudo, for repsys</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#puppetmodulesbuildsystemmanifestsinitpp">puppet/modules/buildsystem/manifests/init.pp</a></li>
<li><a href="#puppetmodulesbuildsystemtemplatesrepsysconf">puppet/modules/buildsystem/templates/repsys.conf</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#puppetmodulesbuildsystemtemplatesmdvyourisubmit">puppet/modules/buildsystem/templates/mdv-youri-submit</a></li>
<li><a href="#puppetmodulesbuildsystemtemplatesmdvyourisubmitwrapper">puppet/modules/buildsystem/templates/mdv-youri-submit.wrapper</a></li>
<li><a href="#puppetmodulesbuildsystemtemplatessudoersyouri">puppet/modules/buildsystem/templates/sudoers.youri</a></li>
</ul>

</div>
<div id="patch"><pre>
<a id="puppetmodulesbuildsystemmanifestsinitpp">Modified: puppet/modules/buildsystem/manifests/init.pp</a>
===================================================================
--- puppet/modules/buildsystem/manifests/init.pp	2010-12-06 17:25:58 UTC (rev 515)
+++ puppet/modules/buildsystem/manifests/init.pp	2010-12-06 23:38:39 UTC (rev 516)
@@ -104,6 +104,29 @@
         }
     }
 
+    class youri_submit {
+        file { &quot;/usr/local/bin/mdv-youri-submit&quot;:
+          owner  =&gt; root,
+          group =&gt; root,
+          mode =&gt; 755,
+          content =&gt; template(&quot;buildsystem/mdv-youri-submit&quot;)
+        }
+
+        file { &quot;/usr/local/bin/mdv-youri-submit.wrapper&quot;:
+          owner  =&gt; root,
+          group =&gt; root,
+          mode =&gt; 755,
+          content =&gt; template(&quot;buildsystem/mdv-youri-submit.wrapper&quot;)
+        }
+
+        file { &quot;/etc/sudoers.d/mdv-youri-submit&quot;:
+            owner =&gt; root,
+            group =&gt; root,
+            mode =&gt; 440,
+            content =&gt; template(&quot;buildsystem/sudoers.youri&quot;)
+        }
+    }
+
     define sshuser($homedir, $comment) {
         group {&quot;$title&quot;: 
             ensure =&gt; present,

<a id="puppetmodulesbuildsystemtemplatesmdvyourisubmit">Added: puppet/modules/buildsystem/templates/mdv-youri-submit</a>
===================================================================
--- puppet/modules/buildsystem/templates/mdv-youri-submit	                        (rev 0)
+++ puppet/modules/buildsystem/templates/mdv-youri-submit	2010-12-06 23:38:39 UTC (rev 516)
@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo mdv-youri-submit.wrapper &quot;$@&quot;


Property changes on: puppet/modules/buildsystem/templates/mdv-youri-submit
___________________________________________________________________
<a id="svnexecutable">Added: svn:executable</a>
   + *

<a id="puppetmodulesbuildsystemtemplatesmdvyourisubmitwrapper">Added: puppet/modules/buildsystem/templates/mdv-youri-submit.wrapper</a>
===================================================================
--- puppet/modules/buildsystem/templates/mdv-youri-submit.wrapper	                        (rev 0)
+++ puppet/modules/buildsystem/templates/mdv-youri-submit.wrapper	2010-12-06 23:38:39 UTC (rev 516)
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+# youri-submit wrapper
+
+use strict;
+use warnings;
+use Fcntl ':mode';
+use File::Basename;
+use MDK::Common;
+
+my $log_dir = &quot;$ENV{HOME}/submit-logs&quot;;
+
+my $sudo_user = $ENV{SUDO_USER} or die &quot;should be run through sudo&quot;;
+my @prog = ('perl', '-I/usr/share/mdv-youri-core/lib', '-I/usr/share/mdv-youri-submit/lib', '/usr/share/mdv-youri-submit/bin/youri-submit');
+
+my @options;
+foreach my $arg (@ARGV) {
+    if ($arg =~ /^-?-(\S+)/) {
+	# drop prohibited options
+	if ($arg =~ /-c/ || $arg =~ /-s/) {
+	    print STDERR &quot;prohibited option $arg, skipping\n&quot;;
+	    next;
+	}
+    }
+    push(@options, $arg);
+}
+
+# logging for bug #30315 -spuk, 2007-05-29
+mkdir_p($log_dir);
+open(STDERR, &quot;| tee -a $log_dir/$sudo_user.err &gt;&amp;2&quot;);
+open(STDOUT, &quot;| tee -a $log_dir/$sudo_user.out&quot;);
+
+# call wrapped program
+print &quot;Executing @prog --config /etc/youri/submit-todo.conf --define user=$sudo_user @options (sudo_user $sudo_user)\n&quot;;
+my $err = system(@prog, &quot;-v&quot;, &quot;--verbose&quot;, &quot;--config&quot;, &quot;/etc/youri/submit-todo.conf&quot;, &quot;--define&quot;, &quot;user=$sudo_user&quot;, @options) &amp;&amp; ($? &gt;&gt; 8 || 1);
+
+exit $err


Property changes on: puppet/modules/buildsystem/templates/mdv-youri-submit.wrapper
___________________________________________________________________
Added: svn:executable
   + *

<a id="puppetmodulesbuildsystemtemplatesrepsysconf">Modified: puppet/modules/buildsystem/templates/repsys.conf</a>
===================================================================
--- puppet/modules/buildsystem/templates/repsys.conf	2010-12-06 17:25:58 UTC (rev 515)
+++ puppet/modules/buildsystem/templates/repsys.conf	2010-12-06 23:38:39 UTC (rev 516)
@@ -56,7 +56,7 @@
 
 [helper]
 create-srpm = /usr/share/repsys/create-srpm
-upload-srpm = perl -I/usr/share/mdv-youri-core/lib -I/usr/share/mdv-youri-submit/lib /usr/share/mdv-youri-submit/bin/youri-submit
+upload-srpm = /usr/local/bin/mdv-youri-submit
 # needed by mdvsys 2.0
 install-buildrequires = sudo rurpmi --auto --no-suggests 
 

<a id="puppetmodulesbuildsystemtemplatessudoersyouri">Added: puppet/modules/buildsystem/templates/sudoers.youri</a>
===================================================================
--- puppet/modules/buildsystem/templates/sudoers.youri	                        (rev 0)
+++ puppet/modules/buildsystem/templates/sudoers.youri	2010-12-06 23:38:39 UTC (rev 516)
@@ -0,0 +1,3 @@
+Cmnd_Alias	YOURI = /usr/local/bin/mdv-youri-submit.wrapper
+Defaults!YOURI	always_set_home
+%mga-packagers	ALL = (&lt;%= sched_login %&gt;) NOPASSWD: YOURI

</pre></div>

</body>
</html>
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-01 11:32:07 +0000