Skip to content
This repository has been archived by the owner on Aug 23, 2019. It is now read-only.

bugfixes, cleanups and improvements #10

Closed
wants to merge 24 commits into from
Closed

bugfixes, cleanups and improvements #10

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f844164
sympa 6.2.19 beta 2
xavierba Sep 11, 2017
696fd25
Add changelog entry
xavierba Sep 14, 2017
9abd932
Ignore test suite results on F25 and F26, earlier and later releases …
xavierba Sep 14, 2017
fffa167
Use %make_build and %make_install
xavierba Sep 13, 2017
28644ae
Don't override PATH
xavierba Sep 13, 2017
c370756
Move rsyslog conf installation next to logrotate conf installation
xavierba Sep 13, 2017
158c012
Remove useless ca-bundle.crt
xavierba Sep 13, 2017
b29bd76
Move README to doc dir
xavierba Sep 13, 2017
353d936
Add note to unbundle fonts
xavierba Sep 13, 2017
878a7be
Don't ship bogus smtpc.1.md
xavierba Sep 13, 2017
497f4ea
Fix create_cookie to only replace the cookie config and not random co…
xavierba Sep 11, 2017
45958f3
Use mktemp to create temporary cookie file in %post
xavierba Sep 14, 2017
69491c4
Remove function to migrate legacy /etc/sysconfig/sympa
xavierba Sep 13, 2017
ecaa5cf
Remove un-necessary owner/group fixup of main and robot confs
xavierba Sep 13, 2017
392f866
Don't hide intranet choices
xavierba Sep 13, 2017
8992f82
Re-order %files
xavierba Sep 13, 2017
5221a70
Fix creation of directory structure for overiding default configs
xavierba Sep 13, 2017
447299a
data_structure.current_version needs to be owned by user and group sympa
xavierba Sep 27, 2017
af4808c
Replace deprecated fcgid directives with their new names
xavierba Sep 18, 2017
f3b6ba3
FcgidMaxProcesses should be set in /etc/httpd/conf.d/fcgid.conf if ne…
xavierba Sep 19, 2017
139c03c
Rename httpd conf according to httpd version
xavierba Sep 27, 2017
8a89be9
Rename README.RPM.md
xavierba Sep 13, 2017
001e622
Fix typos in README.RPM.md
xavierba Sep 14, 2017
d65ddc7
doc: Setup MTA before DB to receive mail sent by 'sympa.pl --health_c…
xavierba Sep 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions SPECS/sympa-6.2.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,21 @@ install -m 0644 %{SOURCE106} %{buildroot}%{_sysconfdir}/rsyslog.d/sympa.conf
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
install -m 0644 %{SOURCE107} %{buildroot}%{_sysconfdir}/logrotate.d/sympa

# Create configuration override structure
for conffile in \
auth.conf charset.conf crawlers_detection.conf create_list.conf \
edit_list.conf nrcpt_by_domain.conf topics.conf \
mime.types sympa.wsdl ;
do cp -a %{buildroot}%{_datadir}/%{name}/default/$conffile \
%{buildroot}%{_sysconfdir}/%{name}/;
done
for confdir in \
create_list_templates global_task_models list_task_models scenari \
mail_tt2 web_tt2 custom_actions custom_conditions data_sources families \
search_filters ;
do mkdir %{buildroot}%{_sysconfdir}/$confdir
done


%check
%if 0%{?fc25}%{?fc26}
Expand Down Expand Up @@ -547,17 +562,26 @@ fi
%license COPYING
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/
%config(noreplace) %attr(0640,sympa,sympa) %{_sysconfdir}/sympa/sympa.conf
%config(missingok) %{_sysconfdir}/sympa/create_list_templates
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Files under _sysconfdir (except sympa.conf) are optional: Files under DIFAULTDIR are used by default.
And any or most of these files can be removed or moved by upstream in the future.
So I suppose missingok is better than noreplace.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having all the config files available make it easier to understand how to tune sympa behaviour, so I'd like to keep them. But as you outlined, these config files are actually not mandatory, so I'll go with %config(noreplace,missingok) which should allow for both. If file are removed or moved upstream, it would need to be acommodated for in the specfile anyway, so this shouldn't be an issue.

%config(missingok) %{_sysconfdir}/sympa/custom_actions
%config(missingok) %{_sysconfdir}/sympa/custom_conditions
%config(missingok) %{_sysconfdir}/sympa/data_sources
%config(missingok) %{_sysconfdir}/sympa/families
%config(missingok) %{_sysconfdir}/sympa/global_task_models
%config(missingok) %{_sysconfdir}/sympa/list_task_models
%config(missingok) %{_sysconfdir}/sympa/search_filters
%config(missingok) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/mail_tt2
%config(missingok) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/scenari
%config(missingok) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/web_tt2
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/auth.conf
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/charset.conf
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/crawlers_detection.conf
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/create_list.conf
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/edit_list.conf
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/nrcpt_by_domain.conf
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/topics.conf
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/mime.types
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/sympa.wsdl
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/create_list_templates
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/global_task_models
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/list_task_models
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/scenari
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/mail_tt2
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/web_tt2
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/custom_actions
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/custom_conditions
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/data_sources
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/families
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/search_filters
%config(missingok) %{_sysconfdir}/sympa/data_structure.current_version
%config(noreplace) %attr(-,sympa,sympa) %{_sysconfdir}/sympa/aliases
%config(noreplace) %{_sysconfdir}/sympa/aliases.sympa.sendmail
Expand Down