Skip to content

Commit 2d9fb23

Browse files
authored
Tell RPM pbench-agent.cfg file is a config file (#2403)
And while we are at it, update how we set all the permissions when installing so that we no longer have write permission by default.
1 parent 0aa01a9 commit 2d9fb23

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

agent/bench-scripts/templates/fio-shared-fs.job

100755100644
File mode changed.

agent/rpm/pbench-agent.spec.j2

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Patch0: stockpile-shebang.patch
4949
%define installdir opt/pbench-agent
5050

5151
%description
52-
The pbench harness
52+
The pbench "agent" harness
5353

5454
%prep
5555

@@ -95,26 +95,35 @@ fi
9595
%posttrans
9696

9797
%files
98-
%defattr(775,pbench,pbench,775)
98+
%defattr(444,root,root,555)
99+
/%{installdir}/ansible
99100
/%{installdir}/config
100-
101101
/%{installdir}/lib
102-
/%{installdir}/ansible
103-
/%{installdir}/base
104102

103+
/%{installdir}/base
105104
/%{installdir}/VERSION
106105
/%{installdir}/SEQNO
107106
/%{installdir}/SHA1
108107
/%{installdir}/profile
109108

110-
%ghost %attr(0400,pbench,pbench) /%{installdir}/id_rsa
109+
%config(noreplace) %attr(0664,root,root) /%{installdir}/config/pbench-agent.cfg
111110

112-
%defattr(775,pbench,pbench,775)
111+
%defattr(555,root,root,555)
113112
/%{installdir}/util-scripts
113+
%attr(444,root,root) /%{installdir}/util-scripts/README
114114
/%{installdir}/tool-scripts
115+
%attr(444,root,root) /%{installdir}/tool-scripts/perf.README
116+
%attr(444,root,root) /%{installdir}/tool-scripts/README
115117
/%{installdir}/bench-scripts
118+
%attr(444,root,root) /%{installdir}/bench-scripts/pbench-fio.md
119+
%attr(444,root,root) /%{installdir}/bench-scripts/pbench-uperf.md
120+
%attr(444,root,root) /%{installdir}/bench-scripts/postprocess/BenchPostprocess.pm
121+
%attr(444,root,root) /%{installdir}/bench-scripts/templates/fio.job
122+
%attr(444,root,root) /%{installdir}/bench-scripts/templates/fio-shared-fs.job
116123

117124
# stockpile
118-
%defattr(775,pbench,pbench,775)
125+
%defattr(444,root,root,555)
119126
/%{installdir}/stockpile
120-
127+
%attr(555,root,root) /%{installdir}/stockpile/import_roles.sh
128+
%attr(555,root,root) /%{installdir}/stockpile/roles/openshift-cluster-topology/files/openshift_config_scraper.py
129+
%attr(555,root,root) /%{installdir}/stockpile/roles/openstack_common/files/openstack-config-parser.py

0 commit comments

Comments
 (0)