From c21f582d5a7b43094004bdc46bba77f75f56579b Mon Sep 17 00:00:00 2001 From: bms8197 Date: Tue, 9 Nov 2021 13:16:22 +0200 Subject: [PATCH] committing changes in /etc made by "-bash" Package changes: --- .etckeeper | 16 ++++- ... kernel-4.18.0-305.25.1.el8_4.x86_64.conf} | 0 mock/epel-next-9-aarch64.cfg | 7 +++ mock/epel-next-9-ppc64le.cfg | 7 +++ mock/epel-next-9-s390x.cfg | 7 +++ mock/epel-next-9-x86_64.cfg | 7 +++ mock/eurolinux-8-aarch64.cfg | 7 +++ mock/templates/epel-9.tpl | 4 ++ mock/templates/epel-next-9.tpl | 59 +++++++++++++++++++ mock/templates/eurolinux-8.tpl | 22 ++++++- mock/templates/fedora-eln.tpl | 2 +- nfs.conf | 1 + rspamd/modules.d/antivirus.conf | 2 +- rspamd/modules.d/rbl.conf | 5 -- rspamd/options.inc | 1 - rspamd/statistic.conf | 5 +- 16 files changed, 138 insertions(+), 14 deletions(-) rename ld.so.conf.d/{kernel-4.18.0-305.12.1.el8_4.x86_64.conf => kernel-4.18.0-305.25.1.el8_4.x86_64.conf} (100%) create mode 100644 mock/epel-next-9-aarch64.cfg create mode 100644 mock/epel-next-9-ppc64le.cfg create mode 100644 mock/epel-next-9-s390x.cfg create mode 100644 mock/epel-next-9-x86_64.cfg create mode 100644 mock/eurolinux-8-aarch64.cfg create mode 100644 mock/templates/epel-9.tpl create mode 100644 mock/templates/epel-next-9.tpl diff --git a/.etckeeper b/.etckeeper index 6418f47..719fd75 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1022,8 +1022,8 @@ maybe chmod 0755 'ld.so.conf.d' maybe chmod 0644 'ld.so.conf.d/bind-export-x86_64.conf' maybe chmod 0644 'ld.so.conf.d/dyninst-x86_64.conf' maybe chmod 0444 'ld.so.conf.d/kernel-4.18.0-193.6.3.el8_2.x86_64.conf' -maybe chmod 0444 'ld.so.conf.d/kernel-4.18.0-305.12.1.el8_4.x86_64.conf' maybe chmod 0444 'ld.so.conf.d/kernel-4.18.0-305.19.1.el8_4.x86_64.conf' +maybe chmod 0444 'ld.so.conf.d/kernel-4.18.0-305.25.1.el8_4.x86_64.conf' maybe chmod 0444 'ld.so.conf.d/kernel-4.18.0-305.3.1.el8.x86_64.conf' maybe chmod 0755 'letsencrypt' maybe chown 'setroubleshoot' 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt' @@ -3009,12 +3009,22 @@ maybe chgrp 'mock' 'mock/epel-next-8-ppc64le.cfg' maybe chmod 0644 'mock/epel-next-8-ppc64le.cfg' maybe chgrp 'mock' 'mock/epel-next-8-x86_64.cfg' maybe chmod 0644 'mock/epel-next-8-x86_64.cfg' +maybe chgrp 'mock' 'mock/epel-next-9-aarch64.cfg' +maybe chmod 0644 'mock/epel-next-9-aarch64.cfg' +maybe chgrp 'mock' 'mock/epel-next-9-ppc64le.cfg' +maybe chmod 0644 'mock/epel-next-9-ppc64le.cfg' +maybe chgrp 'mock' 'mock/epel-next-9-s390x.cfg' +maybe chmod 0644 'mock/epel-next-9-s390x.cfg' +maybe chgrp 'mock' 'mock/epel-next-9-x86_64.cfg' +maybe chmod 0644 'mock/epel-next-9-x86_64.cfg' maybe chgrp 'mock' 'mock/epelplayground-8-aarch64.cfg' maybe chmod 0644 'mock/epelplayground-8-aarch64.cfg' maybe chgrp 'mock' 'mock/epelplayground-8-ppc64le.cfg' maybe chmod 0644 'mock/epelplayground-8-ppc64le.cfg' maybe chgrp 'mock' 'mock/epelplayground-8-x86_64.cfg' maybe chmod 0644 'mock/epelplayground-8-x86_64.cfg' +maybe chgrp 'mock' 'mock/eurolinux-8-aarch64.cfg' +maybe chmod 0644 'mock/eurolinux-8-aarch64.cfg' maybe chgrp 'mock' 'mock/eurolinux-8-i686.cfg' maybe chmod 0644 'mock/eurolinux-8-i686.cfg' maybe chgrp 'mock' 'mock/eurolinux-8-x86_64.cfg' @@ -3217,8 +3227,12 @@ maybe chgrp 'mock' 'mock/templates/epel-7.tpl' maybe chmod 0644 'mock/templates/epel-7.tpl' maybe chgrp 'mock' 'mock/templates/epel-8.tpl' maybe chmod 0644 'mock/templates/epel-8.tpl' +maybe chgrp 'mock' 'mock/templates/epel-9.tpl' +maybe chmod 0644 'mock/templates/epel-9.tpl' maybe chgrp 'mock' 'mock/templates/epel-next-8.tpl' maybe chmod 0644 'mock/templates/epel-next-8.tpl' +maybe chgrp 'mock' 'mock/templates/epel-next-9.tpl' +maybe chmod 0644 'mock/templates/epel-next-9.tpl' maybe chgrp 'mock' 'mock/templates/epelplayground-8.tpl' maybe chmod 0644 'mock/templates/epelplayground-8.tpl' maybe chgrp 'mock' 'mock/templates/eurolinux-8.tpl' diff --git a/ld.so.conf.d/kernel-4.18.0-305.12.1.el8_4.x86_64.conf b/ld.so.conf.d/kernel-4.18.0-305.25.1.el8_4.x86_64.conf similarity index 100% rename from ld.so.conf.d/kernel-4.18.0-305.12.1.el8_4.x86_64.conf rename to ld.so.conf.d/kernel-4.18.0-305.25.1.el8_4.x86_64.conf diff --git a/mock/epel-next-9-aarch64.cfg b/mock/epel-next-9-aarch64.cfg new file mode 100644 index 0000000..f4e0253 --- /dev/null +++ b/mock/epel-next-9-aarch64.cfg @@ -0,0 +1,7 @@ +include('templates/centos-stream-9.tpl') +include('templates/epel-9.tpl') +include('templates/epel-next-9.tpl') + +config_opts['root'] = 'epel-next-9-aarch64' +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) diff --git a/mock/epel-next-9-ppc64le.cfg b/mock/epel-next-9-ppc64le.cfg new file mode 100644 index 0000000..72ecd36 --- /dev/null +++ b/mock/epel-next-9-ppc64le.cfg @@ -0,0 +1,7 @@ +include('templates/centos-stream-9.tpl') +include('templates/epel-9.tpl') +include('templates/epel-next-9.tpl') + +config_opts['root'] = 'epel-next-9-ppc64le' +config_opts['target_arch'] = 'ppc64le' +config_opts['legal_host_arches'] = ('ppc64le',) diff --git a/mock/epel-next-9-s390x.cfg b/mock/epel-next-9-s390x.cfg new file mode 100644 index 0000000..f9801a0 --- /dev/null +++ b/mock/epel-next-9-s390x.cfg @@ -0,0 +1,7 @@ +include('templates/centos-stream-9.tpl') +include('templates/epel-9.tpl') +include('templates/epel-next-9.tpl') + +config_opts['root'] = 'epel-next-9-s390x' +config_opts['target_arch'] = 's390x' +config_opts['legal_host_arches'] = ('s390x',) diff --git a/mock/epel-next-9-x86_64.cfg b/mock/epel-next-9-x86_64.cfg new file mode 100644 index 0000000..d5f5be6 --- /dev/null +++ b/mock/epel-next-9-x86_64.cfg @@ -0,0 +1,7 @@ +include('templates/centos-stream-9.tpl') +include('templates/epel-9.tpl') +include('templates/epel-next-9.tpl') + +config_opts['root'] = 'epel-next-9-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) diff --git a/mock/eurolinux-8-aarch64.cfg b/mock/eurolinux-8-aarch64.cfg new file mode 100644 index 0000000..c1b91ac --- /dev/null +++ b/mock/eurolinux-8-aarch64.cfg @@ -0,0 +1,7 @@ +include('templates/eurolinux-8.tpl') + +# To enable modules use: +#config_opts['module_enable'] = ['swig', 'httpd', 'ruby'] +config_opts['root'] = 'eurolinux-8-aarch64' +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) diff --git a/mock/templates/epel-9.tpl b/mock/templates/epel-9.tpl new file mode 100644 index 0000000..f73427e --- /dev/null +++ b/mock/templates/epel-9.tpl @@ -0,0 +1,4 @@ +config_opts['chroot_setup_cmd'] += " epel-release epel-rpm-macros fedpkg-minimal" + +# epel9-next is launching before epel9. This file will not have repo +# definitions until after the epel9 launch. diff --git a/mock/templates/epel-next-9.tpl b/mock/templates/epel-next-9.tpl new file mode 100644 index 0000000..aedb33f --- /dev/null +++ b/mock/templates/epel-next-9.tpl @@ -0,0 +1,59 @@ +config_opts['chroot_setup_cmd'] += " epel-next-release" + +config_opts['dnf.conf'] += """ + +[epel-next] +name=Extra Packages for Enterprise Linux $releasever - Next - $basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch +enabled=1 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=False + +[epel-next-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-debug-$releasever&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=False + +[epel-next-source] +name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Source +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-source-$releasever&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=False + +[epel-next-testing] +name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-$releasever&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=False + +[epel-next-testing-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-debug-$releasever&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=False + +[epel-next-testing-source] +name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Source +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-source-$releasever&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=False + +[local] +name=local +baseurl=https://kojipkgs.fedoraproject.org/repos/epel$releasever-next-build/latest/$basearch/ +cost=2000 +enabled=0 +skip_if_unavailable=False +""" diff --git a/mock/templates/eurolinux-8.tpl b/mock/templates/eurolinux-8.tpl index 61315b6..d324503 100644 --- a/mock/templates/eurolinux-8.tpl +++ b/mock/templates/eurolinux-8.tpl @@ -29,23 +29,39 @@ module_platform_id=platform:el8 [baseos-all] name=EuroLinux 8 BaseOS All -baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/8/$basearch/certify-BaseOS/all +baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/8/$basearch/certify-BaseOS/all/ gpgcheck=1 enabled=1 gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux8 [appstream-all] name=EuroLinux 8 AppStream All -baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/8/$basearch/certify-AppStream/all +baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/8/$basearch/certify-AppStream/all/ gpgcheck=1 enabled=1 gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux8 [powertools-all] name=EuroLinux 8 PowerTools All -baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/8/$basearch/certify-PowerTools/all +baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/8/$basearch/certify-PowerTools/all/ gpgcheck=1 enabled=1 gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux8 +# There is no HA and RS for i686 or aarch64 +{% if target_arch == 'x86_64' %} +[ha-all] +name=EuroLinux 8 HighAvailability All +baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/8/$basearch/certify-HighAvailability/all/ +gpgcheck=1 +enabled=1 +gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux8 + +[rs-all] +name=EuroLinux 8 PowerTools All +baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/8/$basearch/certify-ResilientStorage/all/ +gpgcheck=1 +enabled=1 +gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux8 +{% endif %} """ diff --git a/mock/templates/fedora-eln.tpl b/mock/templates/fedora-eln.tpl index 2b47532..64200e5 100644 --- a/mock/templates/fedora-eln.tpl +++ b/mock/templates/fedora-eln.tpl @@ -1,5 +1,5 @@ config_opts['releasever'] = 'eln' -config_opts['eln_rawhide_releasever'] = '35' +config_opts['eln_rawhide_releasever'] = '36' config_opts['root'] = 'fedora-eln-{{ target_arch }}' diff --git a/nfs.conf b/nfs.conf index 56172c4..ebc57d3 100644 --- a/nfs.conf +++ b/nfs.conf @@ -21,6 +21,7 @@ use-gss-proxy=1 # keytab-file=/etc/krb5.keytab # cred-cache-directory= # preferred-realm= +# set-home=1 # [lockd] # port=0 diff --git a/rspamd/modules.d/antivirus.conf b/rspamd/modules.d/antivirus.conf index 9b475bc..b172288 100644 --- a/rspamd/modules.d/antivirus.conf +++ b/rspamd/modules.d/antivirus.conf @@ -48,7 +48,7 @@ antivirus { # symbol_name = "pattern"; #CLAM_PROTOCOL_ERROR = '^unhandled response'; #} - # `whitelist` points to a map of IP addresses. Mail from these addresses is not scanned. + # `whitelist` points to a map of signature names. Hits on these signatures are ignored. #whitelist = "/etc/rspamd/antivirus.wl"; #} diff --git a/rspamd/modules.d/rbl.conf b/rspamd/modules.d/rbl.conf index 1a97efc..b8ef44c 100644 --- a/rspamd/modules.d/rbl.conf +++ b/rspamd/modules.d/rbl.conf @@ -14,12 +14,7 @@ rbl { default_exclude_users = true; - default_exclude_local = true; default_unknown = true; - default_dkim_domainonly = true; - default_dkim_match_from = false; - default_ipv4 = true; - default_ipv6 = true; url_whitelist = [ "https://maps.rspamd.com/rspamd/surbl-whitelist.inc.zst", diff --git a/rspamd/options.inc b/rspamd/options.inc index f305bcf..d5cf60d 100644 --- a/rspamd/options.inc +++ b/rspamd/options.inc @@ -14,7 +14,6 @@ # Relevant documentation: https://rspamd.com/doc/configuration/options.html filters = "chartable,dkim,regexp,fuzzy_check"; -raw_mode = false; one_shot = false; cache_file = "$DBDIR/symbols.cache"; # How often maps are checked ( diff --git a/rspamd/statistic.conf b/rspamd/statistic.conf index 60b6dcb..5fea483 100644 --- a/rspamd/statistic.conf +++ b/rspamd/statistic.conf @@ -44,8 +44,9 @@ classifier "bayes" { # Autolearn sample # autolearn { - # spam_threshold = 6.0; # When to learn spam (score >= threshold) - # ham_threshold = -0.5; # When to learn ham (score <= threshold) + # spam_threshold = 6.0; # When to learn spam (score >= threshold and action is reject) + # junk_threshold = 4.0; # When to learn spam (score >= threshold and action is rewrite subject or add header, and has two or more positive results) + # ham_threshold = -0.5; # When to learn ham (score <= threshold and action is no action, and score is negative or has three or more negative results) # check_balance = true; # Check spam and ham balance # min_balance = 0.9; # Keep diff for spam/ham learns for at least this value #}