Differential D889

taskotron.spec: fix conf files permissions
ClosedPublic
Actions

Authored by mkrizek on Jun 13 2016, 8:15 AM.

Details

Reviewers
tflink
Commits
rTRGR8d8f1f7d070f: taskotron-trigger.spec: fix conf files permissions
Test Plan

make mockbuild

Diff Detail

Repository
rTRGR taskotron-trigger
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to taskotron.spec: fix conf files permissions.Jun 13 2016, 8:15 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a reviewer: tflink.
tflink accepted this revision.Jun 13 2016, 2:56 PM
This revision is now accepted and ready to land.Jun 13 2016, 2:56 PM
mkrizek updated this revision to Diff 2548.Sep 13 2016, 8:25 AM
  • update
Closed by commit rTRGR8d8f1f7d070f: taskotron-trigger.spec: fix conf files permissions (authored by mkrizek). · Explain WhySep 13 2016, 8:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mreadme.rst (2 lines)
Msetup.py (1 line)
Mtaskotron-trigger.spec (38 lines)

Diff 2550

View Options

readme.rst

Show All 12 Lines
13 13​
14Parts of the trigger do need to be installed on the local system:: 14​Parts of the trigger do need to be installed on the local system::
15 15​
16 python setup.py install 16​ python setup.py install
17 17​
18Updating Production Logging Configuration 18​Updating Production Logging Configuration
19----------------------------------------- 19​-----------------------------------------
20 20​
21In /etc/fedmsg.d/logging, add the following handler:: 21​In /etc/fedmsg.d/logging.py, add the following handler::
22 22​
23 filelog={ 23​ filelog={
24 "class": "logging.handlers.RotatingFileHandler", 24​ "class": "logging.handlers.RotatingFileHandler",
25 "formatter": "bare", 25​ "formatter": "bare",
26 "level": "INFO", 26​ "level": "INFO",
27 "filename": "/var/log/fedmsg/taskotron-trigger.log", 27​ "filename": "/var/log/fedmsg/taskotron-trigger.log",
28 "mode": "a", 28​ "mode": "a",
29 } 29​ }
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines
View Options

setup.py

Show All 25 Lines24 entry_points={
26 'moksha.consumer': ( 26​ 'moksha.consumer': (
27 'kojibuildcompletedjobtrigger = jobtriggers.koji_build_msg:KojiBuildCompletedJobTrigger', 27​ 'kojibuildcompletedjobtrigger = jobtriggers.koji_build_msg:KojiBuildCompletedJobTrigger',
28 'kojitagchangedjobtrigger = jobtriggers.koji_tag_msg:KojiTagChangedJobTrigger', 28​ 'kojitagchangedjobtrigger = jobtriggers.koji_tag_msg:KojiTagChangedJobTrigger',
29 'composecompletedjobtrigger = jobtriggers.compose_complete_msg:ComposeCompletedJobTrigger', 29​ 'composecompletedjobtrigger = jobtriggers.compose_complete_msg:ComposeCompletedJobTrigger',
30 ), 30​ ),
31 }, 31​ },
32 include_package_data=True, 32​ include_package_data=True,
33 install_requires=[ 33​ install_requires=[
34 'moksha.hub', ​
35 'fedmsg', 34​ 'fedmsg',
36 'requests', 35​ 'requests',
37 ], 36​ ],
38 cmdclass={'test': PyTest} 37​ cmdclass={'test': PyTest}
39) 38​)
View Options

taskotron-trigger.spec

1Name: taskotron-trigger 1​Name: taskotron-trigger
2Version: 0.3.16 2​Version: 0.3.16
3Release: 2%{?dist} 3​Release: 4%{?dist}
4Summary: Triggering Taskotron jobs via fedmsg. 4​Summary: Triggering Taskotron jobs via fedmsg
5 5​
6License: GPLv2+ 6​License: GPLv2+
7URL: https://bitbucket.org/fedoraqa/taskotron-trigger 7​URL: https://bitbucket.org/fedoraqa/taskotron-trigger
8Source0: http://qadevel.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz 8​Source0: https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
9 9​
10BuildArch: noarch 10​BuildArch: noarch
11 11​
12Requires: fedmsg 12​Requires: fedmsg
13Requires: fedmsg-hub 13​Requires: fedmsg-hub
14Requires: git 14​Requires: git
15Requires: koji 15​Requires: koji
16Requires: python-requests 16​Requires: python-requests
17Requires: python-twisted 17​Requires: python-twisted
18Requires: PyYAML 18​Requires: PyYAML
19BuildRequires: fedmsg 19​BuildRequires: fedmsg
20BuildRequires: koji 20​BuildRequires: koji
21BuildRequires: pytest 21​BuildRequires: pytest
22​BuildRequires: python2-devel
22BuildRequires: python-dingus 23​BuildRequires: python-dingus
23BuildRequires: python-mock 24​BuildRequires: python-mock
24BuildRequires: python-munch 25​BuildRequires: python-munch
25BuildRequires: python-setuptools 26​BuildRequires: python-setuptools
26BuildRequires: PyYAML 27​BuildRequires: PyYAML
27 28​
28%description 29​%description
29Triggering Taskotron jobs via fedmsg. 30​Triggering Taskotron jobs via fedmsg.
30 31​
31%prep 32​%prep
32%setup -q 33​%setup -q
33 34​
34%check 35​%check
35py.test testing 36​py.test testing
37​rm -f %{buildroot}%{_sysconfdir}/fedmsg.d/*.py{c,o}
36 38​
37%build 39​%build
38%{__python} setup.py build 40​%{__python} setup.py build
39 41​
40%install 42​%install
41rm -rf $RPM_BUILD_ROOT ​
42%{__python} setup.py install -O1 --skip-build --root %{buildroot} 43​%{__python} setup.py install -O1 --skip-build --root %{buildroot}
43 44​
44mkdir -p %{buildroot}%{_sysconfdir}/taskotron/ 45​install -d %{buildroot}%{_sysconfdir}/taskotron/
45install conf/trigger.cfg.example %{buildroot}%{_sysconfdir}/taskotron/trigger.cfg 46​install -p -m 644 conf/trigger.cfg.example %{buildroot}%{_sysconfdir}/taskotron/trigger.cfg
46 47​
47mkdir -p %{buildroot}%{_sysconfdir}/fedmsg.d/ 48​install -d %{buildroot}%{_sysconfdir}/fedmsg.d/
48install fedmsg.d/taskotron-trigger.py %{buildroot}%{_sysconfdir}/fedmsg.d/taskotron-trigger.py 49​install -p -m 0644 fedmsg.d/taskotron-trigger.py %{buildroot}%{_sysconfdir}/fedmsg.d/taskotron-trigger.py
49 50​
50mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ 51​install -d %{buildroot}%{_sysconfdir}/logrotate.d/
51install conf/logrotate.d/taskotron-trigger %{buildroot}%{_sysconfdir}/logrotate.d/taskotron-trigger 52​install -p -m 0644 conf/logrotate.d/taskotron-trigger %{buildroot}%{_sysconfdir}/logrotate.d/taskotron-trigger
52 53​
53mkdir -p %{buildroot}%{_localstatedir}/log/taskotron-trigger/ 54​install -d %{buildroot}%{_localstatedir}/log/taskotron-trigger/
54mkdir -p %{buildroot}%{_sharedstatedir}/taskotron-trigger/ 55​install -d %{buildroot}%{_sharedstatedir}/taskotron-trigger/
55 56​
56%files 57​%files
57%doc readme.rst 58​%doc readme.rst
58%license LICENSE 59​%license LICENSE
59%{python_sitelib}/* 60​%{python_sitelib}/*
60 61​
61%attr(755,root,root) %{_bindir}/jobrunner 62​%attr(755,root,root) %{_bindir}/jobrunner
62 63​
63%config(noreplace) %{_sysconfdir}/logrotate.d/taskotron-trigger ​
64%attr(644,root,root) %{_sysconfdir}/logrotate.d/taskotron-trigger ​
65 ​
66%dir %attr(755,fedmsg,fedmsg) %{_localstatedir}/log/taskotron-trigger 64​%dir %attr(755,fedmsg,fedmsg) %{_localstatedir}/log/taskotron-trigger
67%dir %attr(755,fedmsg,fedmsg) %{_sharedstatedir}/taskotron-trigger 65​%dir %attr(755,fedmsg,fedmsg) %{_sharedstatedir}/taskotron-trigger
68 66​
69%dir %{_sysconfdir}/taskotron 67​%dir %{_sysconfdir}/taskotron
70%{_sysconfdir}/fedmsg.d/taskotron-trigger.py* 68​%{_sysconfdir}/fedmsg.d/taskotron-trigger.py*
71 ​
72%config(noreplace) %{_sysconfdir}/taskotron/trigger.cfg 69​%config(noreplace) %{_sysconfdir}/taskotron/trigger.cfg
70​%config(noreplace) %{_sysconfdir}/logrotate.d/taskotron-trigger
73 71​
74%changelog 72​%changelog
73​* Fri Jul 22 2016 Martin Krizek <mkrizek@redhat.com> - 0.3.16-4
74​- remove rm -rf buildroot as it's not neccessary
75​- preserve timestamps of installed files
76​
77​* Mon Jun 13 2016 Martin Krizek <mkrizek@redhat.com> - 0.3.16-3
78​- fix Source0 url
79​- fix conf files permissions
80​
75* Mon May 30 2016 Martin Krizek <mkrizek@redhat.com> - 0.3.16-2 81​* Mon May 30 2016 Martin Krizek <mkrizek@redhat.com> - 0.3.16-2
76- add license file 82​- add license file
77- add check 83​- add check
78- fix url and source 84​- fix url and source
79- fix requires and buildrequires 85​- fix requires and buildrequires
80 86​
81* Wed May 25 2016 Martin Krizek <mkrizek@redhat.com> - 0.3.16-1 87​* Wed May 25 2016 Martin Krizek <mkrizek@redhat.com> - 0.3.16-1
82- Allow enabling distgit style tasks in config 88​- Allow enabling distgit style tasks in config
▲ Show 20 Lines • Show All 72 Lines • Show Last 20 Lines