Greetings.
Just before freeze in ansible commit dc86b22f9054bdcefd51e46db90433c03d54410c pingou disabled the fedmsg hook because there was a permissions problem reading the fedmsg key.
In ansible commit 9cbf120b54a79ecb07931f3a3a1b059525d4d766 patrick fixed this perm issue via a facl.
So, I would like to re-enable the hook on normal projects and remove it from forks. (I think we decided forks should only get the pagure hook, not the main fedmsg one).
So, I'd like to apply:
diff --git a/roles/git/hooks/files/post-receive-chained b/roles/git/hooks/files/post-receive-chained index 99b5a2a..5c74da4 100755 --- a/roles/git/hooks/files/post-receive-chained +++ b/roles/git/hooks/files/post-receive-chained @@ -8,7 +8,7 @@ pee \ /usr/share/git-core/post-receive-alternativearch \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \ /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \
+# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \ "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we send to diff --git a/roles/git/hooks/files/post-receive-chained-forks b/roles/git/hooks/files/post-receive-chained-forks index 5e0056d..67565e6 100755 --- a/roles/git/hooks/files/post-receive-chained-forks +++ b/roles/git/hooks/files/post-receive-chained-forks @@ -6,7 +6,7 @@ pee \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \ /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \
+# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \ "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we send to
Run the ansible playbook against pkgs, And then run the script to make sure all projects are set right.
+1s?
kevin
+1
On 18 April 2018 at 13:21, Kevin Fenzi kevin@scrye.com wrote:
Greetings.
Just before freeze in ansible commit dc86b22f9054bdcefd51e46db90433c03d54410c pingou disabled the fedmsg hook because there was a permissions problem reading the fedmsg key.
In ansible commit 9cbf120b54a79ecb07931f3a3a1b059525d4d766 patrick fixed this perm issue via a facl.
So, I would like to re-enable the hook on normal projects and remove it from forks. (I think we decided forks should only get the pagure hook, not the main fedmsg one).
So, I'd like to apply:
diff --git a/roles/git/hooks/files/post-receive-chained b/roles/git/hooks/files/post-receive-chained index 99b5a2a..5c74da4 100755 --- a/roles/git/hooks/files/post-receive-chained +++ b/roles/git/hooks/files/post-receive-chained @@ -8,7 +8,7 @@ pee \ /usr/share/git-core/post-receive-alternativearch \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \ /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \
+# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \ "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we send to diff --git a/roles/git/hooks/files/post-receive-chained-forks b/roles/git/hooks/files/post-receive-chained-forks index 5e0056d..67565e6 100755 --- a/roles/git/hooks/files/post-receive-chained-forks +++ b/roles/git/hooks/files/post-receive-chained-forks @@ -6,7 +6,7 @@ pee \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \ /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \
+# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \ "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we send to
Run the ansible playbook against pkgs, And then run the script to make sure all projects are set right.
+1s?
kevin
infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org
+1
On Wed, Apr 18, 2018 at 7:21 PM, Kevin Fenzi kevin@scrye.com wrote:
Greetings.
Just before freeze in ansible commit dc86b22f9054bdcefd51e46db90433c03d54410c pingou disabled the fedmsg hook because there was a permissions problem reading the fedmsg key.
In ansible commit 9cbf120b54a79ecb07931f3a3a1b059525d4d766 patrick fixed this perm issue via a facl.
So, I would like to re-enable the hook on normal projects and remove it from forks. (I think we decided forks should only get the pagure hook, not the main fedmsg one).
So, I'd like to apply:
diff --git a/roles/git/hooks/files/post-receive-chained
b/roles/git/hooks/files/post-receive-chained
index 99b5a2a..5c74da4 100755 --- a/roles/git/hooks/files/post-receive-chained +++ b/roles/git/hooks/files/post-receive-chained @@ -8,7 +8,7 @@ pee \ /usr/share/git-core/post-receive-alternativearch \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py
\
/usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py
\
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py
\
+# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py
\
"/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t
/srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we
send to
diff --git a/roles/git/hooks/files/post-receive-chained-forks
b/roles/git/hooks/files/post-receive-chained-forks
index 5e0056d..67565e6 100755 --- a/roles/git/hooks/files/post-receive-chained-forks +++ b/roles/git/hooks/files/post-receive-chained-forks @@ -6,7 +6,7 @@ pee \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py
\
/usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py
\
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py
\
+# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py
\
"/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t
/srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we
send to
Run the ansible playbook against pkgs, And then run the script to make sure all projects are set right.
+1s?
kevin
infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists. fedoraproject.org
Odd. Somehow my patch was not my patch. ;(
Here is the real one...
diff --git a/roles/git/hooks/files/post-receive-chained b/roles/git/hooks/files/post-receive-chained index 5c74da4..99b5a2a 100755 --- a/roles/git/hooks/files/post-receive-chained +++ b/roles/git/hooks/files/post-receive-chained @@ -8,7 +8,7 @@ pee \ /usr/share/git-core/post-receive-alternativearch \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \ /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \ -# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \ "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we send to diff --git a/roles/git/hooks/files/post-receive-chained-forks b/roles/git/hooks/files/post-receive-chained-forks index 67565e6..6f0fd88 100755 --- a/roles/git/hooks/files/post-receive-chained-forks +++ b/roles/git/hooks/files/post-receive-chained-forks @@ -6,7 +6,6 @@ pee \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \ /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \ -# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \ "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we send to
kevin
On Thu, Apr 19, 2018 at 2:07 AM, Kevin Fenzi kevin@scrye.com wrote:
Odd. Somehow my patch was not my patch. ;(
Here is the real one...
diff --git a/roles/git/hooks/files/post-receive-chained
b/roles/git/hooks/files/post-receive-chained
index 5c74da4..99b5a2a 100755 --- a/roles/git/hooks/files/post-receive-chained +++ b/roles/git/hooks/files/post-receive-chained @@ -8,7 +8,7 @@ pee \ /usr/share/git-core/post-receive-alternativearch \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py
\
/usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py
\
-# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py
\
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py
\
"/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t
/srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we
send to
diff --git a/roles/git/hooks/files/post-receive-chained-forks
b/roles/git/hooks/files/post-receive-chained-forks
index 67565e6..6f0fd88 100755 --- a/roles/git/hooks/files/post-receive-chained-forks +++ b/roles/git/hooks/files/post-receive-chained-forks @@ -6,7 +6,6 @@ pee \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py
\
/usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py
\
-# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py
\
This only removes the commented out line. We should actually fully revert https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=dc86b22...,
I believe.
"/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t
/srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we
send to
kevin
infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists. fedoraproject.org
On Thu, Apr 19, 2018 at 02:17:00AM +0200, Michal Novotny wrote:
This only removes the commented out line. We should actually fully revert https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=dc86b22...,
+1 to this, it'll be just as easy to revert this commit now that the permission issue got fixed (Thanks Patrick for that!)
Sorry about this commit breaking grok btw, I didn't realize commenting out one line in pee would also impact the next line, although it does make sense now that it's pointed out.
Pierre
OK this makes sense now why it is not there. +!
On 19 April 2018 at 04:18, Pierre-Yves Chibon pingou@pingoured.fr wrote:
On Thu, Apr 19, 2018 at 02:17:00AM +0200, Michal Novotny wrote:
This only removes the commented out line. We should actually fully revert https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=dc86b22...,
+1 to this, it'll be just as easy to revert this commit now that the permission issue got fixed (Thanks Patrick for that!)
Sorry about this commit breaking grok btw, I didn't realize commenting out one line in pee would also impact the next line, although it does make sense now that it's pointed out.
Pierre _______________________________________________ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org
On 18 April 2018 at 20:07, Kevin Fenzi kevin@scrye.com wrote:
Odd. Somehow my patch was not my patch. ;(
Here is the real one...
I am confused by the second part now. The first part is uncommenting a line. The second is removing a commented out part.
diff --git a/roles/git/hooks/files/post-receive-chained b/roles/git/hooks/files/post-receive-chained index 5c74da4..99b5a2a 100755 --- a/roles/git/hooks/files/post-receive-chained +++ b/roles/git/hooks/files/post-receive-chained @@ -8,7 +8,7 @@ pee \ /usr/share/git-core/post-receive-alternativearch \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \ /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \ -# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \
- /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \ "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we send to diff --git a/roles/git/hooks/files/post-receive-chained-forks b/roles/git/hooks/files/post-receive-chained-forks index 67565e6..6f0fd88 100755 --- a/roles/git/hooks/files/post-receive-chained-forks +++ b/roles/git/hooks/files/post-receive-chained-forks @@ -6,7 +6,6 @@ pee \ /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \ /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \ -# /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \ "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"
# We used to send emails directly from the git hook here, but now we send to
kevin
infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org
infrastructure@lists.fedoraproject.org