smeserver/smeserver-update
6
0
Fork 0
generated from smedev/Template-for-SMEServer-Core-Package
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sat May 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-12.sme

Browse Source 
- revert plugin changes to force modules [SME: 12618]
- tag service to limit log noise in message [SME: 12668]
- sort nut service to restart [SME: 12662]
This commit is contained in:
Jean-Philippe Pialasse 2024-05-11 21:34:47 -04:00
parent 6e69a3f6e6
commit 45e3c516b5
9 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
root/etc/e-smith/templates/etc/rsyslog.conf/32smeserver-update
View File

@ -1,4 +1,5 @@
#dnf Koozali SME Server updater #dnf Koozali SME Server updater, dnf automatic and dnf makecache
if $programname startswith "dnf_update_dbs" then /var/log/dnf/dnf-update.log if $programname startswith "dnf_update_dbs" then /var/log/dnf/dnf-update.log
& stop & stop
if $programname startswith "dnf-automatic" then stop
if $programname startswith "dnf-makecache" theb stop

12
root/usr/lib/python3.6/site-packages/dnf-plugins/smeserver.py
View File

@ -50,7 +50,7 @@ servicenames['freeradius']='radiusd',
servicenames['httpd']='httpd-admin','httpd-e-smith', servicenames['httpd']='httpd-admin','httpd-e-smith',
servicenames['iptables']='masq', servicenames['iptables']='masq',
servicenames['mariadb']='mariadb', servicenames['mariadb']='mariadb',
servicenames['nut']='nut-server','nut-driver','nut-monitor', servicenames['nut']='nut',
servicenames['openldap']='ldap', servicenames['openldap']='ldap',
servicenames['openssh']='sshd', servicenames['openssh']='sshd',
servicenames['php']='httpd-e-smith', 'php72-php-fpm', 'php73-php-fpm', 'php74-php-fpm', 'php80-php-fpm', 'php81-php-fpm', 'php82-php-fpm', 'php83-php-fpm', servicenames['php']='httpd-e-smith', 'php72-php-fpm', 'php73-php-fpm', 'php74-php-fpm', 'php80-php-fpm', 'php81-php-fpm', 'php82-php-fpm', 'php83-php-fpm',
@ -122,19 +122,9 @@ class SMEServer(dnf.Plugin):
global ourfile global ourfile
ourfile = True ourfile = True
self.report_yum_status('sack') self.report_yum_status('sack')
module_base = dnf.module.module_base.ModuleBase(self.base)
module_base.switch_to(['php:remi-8.3'])
module_base.switch_to(['perl:5.26'])
module_base.switch_to(['python36:3.6'])
module_base.switch_to(['mariadb:10.5'])
def resolved(self): def resolved(self):
self.report_yum_status('resolved') self.report_yum_status('resolved')
module_base = dnf.module.module_base.ModuleBase(self.base)
module_base.switch_to(['php:remi-8.3'])
module_base.switch_to(['perl:5.26'])
module_base.switch_to(['python36:3.6'])
module_base.switch_to(['mariadb:10.5'])
#2 PKG_DOWNGRADE = dnf.transaction.PKG_DOWNGRADE # :api #2 PKG_DOWNGRADE = dnf.transaction.PKG_DOWNGRADE # :api
#1 PKG_INSTALL = dnf.transaction.PKG_INSTALL # :api #1 PKG_INSTALL = dnf.transaction.PKG_INSTALL # :api

2
root/usr/lib/systemd/system/dnf-automatic-download.service.d/50koozali.conf Normal file
View File

@ -0,0 +1,2 @@
[Service]
SyslogIdentifier=dnf-automatic

2
root/usr/lib/systemd/system/dnf-automatic-install.service.d/50koozali.conf Normal file
View File

@ -0,0 +1,2 @@
[Service]
SyslogIdentifier=dnf-automatic

2
root/usr/lib/systemd/system/dnf-automatic-notifyonly.service.d/50koozali.conf Normal file
View File

@ -0,0 +1,2 @@
[Service]
SyslogIdentifier=dnf-automatic

2
root/usr/lib/systemd/system/dnf-automatic.service.d/50koozali.conf Normal file
View File

@ -0,0 +1,2 @@
[Service]
SyslogIdentifier=dnf-automatic

3
root/usr/lib/systemd/system/dnf-makecache.service.d/50koozali.conf Normal file
View File

@ -0,0 +1,3 @@
[Service]
SyslogIdentifier=dnf-makecache

1
root/usr/lib/systemd/system/dnf.service
View File

@ -4,6 +4,7 @@ After=network-pre.target networking.service
[Service] [Service]
Type=forking Type=forking
SyslogIdentifier=dnf_update_dbs
ExecStartPre=/sbin/e-smith/service-status dnf ExecStartPre=/sbin/e-smith/service-status dnf
ExecStart=/sbin/e-smith/dnf_update_dbs ExecStart=/sbin/e-smith/dnf_update_dbs
TimeoutSec=0 TimeoutSec=0

7
smeserver-update.spec
View File

@ -2,7 +2,7 @@
Summary: Koozali SME Server rpm updater Summary: Koozali SME Server rpm updater
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 11 %define release 12
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -68,6 +68,11 @@ mkdir -p root/etc/yum.smerepos.d
%changelog %changelog
* Sat May 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-12.sme
- revert plugin changes to force modules [SME: 12618]
- tag service to limit log noise in message [SME: 12668]
- sort nut service to restart [SME: 12662]
* Tue Apr 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme * Tue Apr 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme
- fix debuglevel=-2 not allowed [SME: 12637] - fix debuglevel=-2 not allowed [SME: 12637]
- force modules needed for core [SME: 12618] - force modules needed for core [SME: 12618]